From nobody Sun May 19 15:29:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1640951351; cv=none; d=zohomail.com; s=zohoarc; b=kXdaLdmf+jFsGTY//fPHgVRW5qW0b9zU/pjH041KllpdiZfiTWLxIrIjboe31Vmp9ZoskceCla/upLEyyYQ2/7thNgBUOs0tyh93zk9QblJzkl9uDDFVc3HdxNo9dAXczHy02/PHchIVjlCj+zAtYcpnOUfbKL/QCr6/bDaWiJA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1640951351; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=Mzp4W/VQyMxGd5CvQVuwL031robPDmwL00FTI5wH9/Y=; b=ZPoGSljFIuqaUH/QVRq2pvn7rj4foLOcqQsPJV5L7sgfVg3NzB7nQ44RSpd2ltXLJnFAEQDrheJZPHGIJHI4P0AI3ADyXkXYKEM8N252auO7y+/QI9MOUTf9fyLIPcMjYNPQQiHo4M1L5IkoYu+IsGm5TQHbdfv5RzQ4pZfR1/8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1640951351190728.226593534708; Fri, 31 Dec 2021 03:49:11 -0800 (PST) Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-114-zZWRbqEROiG205cqpfDisQ-1; Fri, 31 Dec 2021 06:49:09 -0500 Received: by mail-wr1-f72.google.com with SMTP id s30-20020adfa29e000000b001a25caee635so7477800wra.19 for ; Fri, 31 Dec 2021 03:49:08 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (26.red-83-50-86.dynamicip.rima-tde.net. [83.50.86.26]) by smtp.gmail.com with ESMTPSA id l4sm26395582wrm.62.2021.12.31.03.49.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Dec 2021 03:49:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1640951350; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Mzp4W/VQyMxGd5CvQVuwL031robPDmwL00FTI5wH9/Y=; b=ijrxFiQCS49Tjcq8K1XAFKzaY8nTN5fLxufnFj/E04Q9WHl+b3raDOjd0UoVNaR5KwirTn KdplsMApr0xFis1cZv7uMRHf48TBdJIWUUHYV769Th8SN8qgzkixkzJ4IhI5FzBtnANjy+ eNc9IVN1puPZ0ZhTU15VzksbTEWvecU= X-MC-Unique: zZWRbqEROiG205cqpfDisQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Mzp4W/VQyMxGd5CvQVuwL031robPDmwL00FTI5wH9/Y=; b=jctlJlIMF/0ie5ybqH++j+XYzmLHGy3m8EJ/h91cwrJK5N7CkyiHRCnNK+jOUM20T/ 9Gume0YQJ9fiTOwv7zMotjGxJmIdeSEDQxYzL3ACDeE2LEbD/trtJMKAPhfFMrsRVbGd tMIUSDGBkf1RfLBpY/Mnb/wEeGM9YJJv1bWLMxVaJQJrBnDMgXaGjFPjmhYFVLAhoffL hzkxKQpe8o61fo2g7PLlnwF5MSC3PiLwP51nOoTMtmAxUqNJ5tPoXoGZvrNqvUY8HS4p /qWBKXXumngOgaf13dv7QdlgfO4WnMO/CdpNfpjR97wkyAV1riQXdvcAWkX0JjpfLLJV PHvA== X-Gm-Message-State: AOAM532RA0bOtKzYdRKyJenzH5d3K9E9DoAz7pkWE0ahiMgPiRUIhEUw /7ZlEYBw+//wg62KD3i1zz5RzJUyflwOJrFdpBTQg6+g/7z4ys7oWqPedHE5YR+GHalMXFxcea6 VFiUPF2dreatMfw== X-Received: by 2002:adf:9c85:: with SMTP id d5mr28584578wre.374.1640951348012; Fri, 31 Dec 2021 03:49:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJzOSGEuDRp2HNybF3MVJgPfgxFxNFANVmmtSwHonmlbykW9rRWMFORYSBDtBN1+3dkgCGjZ6Q== X-Received: by 2002:adf:9c85:: with SMTP id d5mr28584572wre.374.1640951347875; Fri, 31 Dec 2021 03:49:07 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Marcel Apfelbaum , Gerd Hoffmann , David Hildenbrand , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , "Michael S. Tsirkin" , Peter Xu Subject: [PATCH 1/8] hw/nvram: Restrict stub to sysemu and tools Date: Fri, 31 Dec 2021 12:48:54 +0100 Message-Id: <20211231114901.976937-2-philmd@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211231114901.976937-1-philmd@redhat.com> References: <20211231114901.976937-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1640951351925000003 User-mode emulation doesn't need the fw_cfg stub. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/nvram/meson.build | 6 ++++-- stubs/meson.build | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/hw/nvram/meson.build b/hw/nvram/meson.build index 202a5466e63..f5ee9f6b88c 100644 --- a/hw/nvram/meson.build +++ b/hw/nvram/meson.build @@ -1,5 +1,7 @@ -# QOM interfaces must be available anytime QOM is used. -qom_ss.add(files('fw_cfg-interface.c')) +if have_system or have_tools + # QOM interfaces must be available anytime QOM is used. + qom_ss.add(files('fw_cfg-interface.c')) +endif =20 softmmu_ss.add(files('fw_cfg.c')) softmmu_ss.add(when: 'CONFIG_CHRP_NVRAM', if_true: files('chrp_nvram.c')) diff --git a/stubs/meson.build b/stubs/meson.build index 71469c1d50a..363f6fa785d 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -11,7 +11,6 @@ stub_ss.add(files('dump.c')) stub_ss.add(files('error-printf.c')) stub_ss.add(files('fdset.c')) -stub_ss.add(files('fw_cfg.c')) stub_ss.add(files('gdbstub.c')) stub_ss.add(files('get-vm-name.c')) if linux_io_uring.found() @@ -51,6 +50,7 @@ stub_ss.add(files('replay-tools.c')) endif if have_system + stub_ss.add(files('fw_cfg.c')) stub_ss.add(files('semihost.c')) stub_ss.add(files('usb-dev-stub.c')) stub_ss.add(files('xen-hw-stub.c')) --=20 2.33.1 From nobody Sun May 19 15:29:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1640951357; cv=none; d=zohomail.com; s=zohoarc; b=E0VEr4kGPajC+jqO8YIB1sX6J2I0Y1R1WjLHBq5AUpL8IvTulISsVsTN6OkkWUm4NL31sR0VocUQsdZssuvtLCa7JErGLYxwlUC5biYbj/5QC/qdnTLAt+Ru8bdQ3zJ2wf6jx/JpKNH8AtpWkE0iqAU/JvBuxvulq0kd5DZSyJA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1640951357; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=3SyegUav7Y4rfG22z5S0cm0XRrlspgF1hM8sq9A6HmQ=; b=GTismfmxHhv/F81sCGaMEO+2SKrBSwQKxwi63WhbqoUEEQPyOxG3uEqmWubvjAJoFhy0ycVO4jz0Uz0PRBjqH/TcNTangIEjl4XG+HEfdvUtu7MZKj/kvUfBvljqHKQhba1zLujiposrrOzg12HJyclppAUIFPhtTXCAJKEsqfw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1640951357350785.3519746220901; Fri, 31 Dec 2021 03:49:17 -0800 (PST) Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-191-tcWcXkxMMryhQdIcA3uLNQ-1; Fri, 31 Dec 2021 06:49:13 -0500 Received: by mail-wr1-f72.google.com with SMTP id j26-20020adfb31a000000b001a2356afd4fso7463524wrd.21 for ; Fri, 31 Dec 2021 03:49:13 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (26.red-83-50-86.dynamicip.rima-tde.net. [83.50.86.26]) by smtp.gmail.com with ESMTPSA id m21sm25219027wrb.2.2021.12.31.03.49.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Dec 2021 03:49:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1640951356; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3SyegUav7Y4rfG22z5S0cm0XRrlspgF1hM8sq9A6HmQ=; b=MnBbVvKNZlpob+etyEkmG533dyJ+bbu5Rlm9wPNePk9rnImSS9O+uXp1Ezvo3PuS6wC925 LBnQi5m3vgkK9TgKVa7EiIztpin8zA3V22XrYeX+Djkj6Z7UVijsQ29+JPySca7bBvrBDw mEXvsnEE0AmKFpiHv3nWY9hnmaP6PeM= X-MC-Unique: tcWcXkxMMryhQdIcA3uLNQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3SyegUav7Y4rfG22z5S0cm0XRrlspgF1hM8sq9A6HmQ=; b=6OEx8GAKB7Wm3w/6mYEp137pbCY8BiZzlzoYKXn45EzKeF2weivIox47tWBnXLXku1 nf2U+wBgjhp+KwiOekYwlsI8yYVhnktLWOZriNvgKufrVKN74p9ub8Lt3hN0n5BYNYcQ fnqUZ3fXMPR1aEGLOQL6+B2ujySt1nr8fL3ml9ySZEiTPRVYCuvscjxDlEMfEnvinrNG AnvAbVUq00dgt4kURF2AWNk9gN7obdAu/VQAToFicuLL+YDfRaYO46TsnuZN2tt3AnL7 jINZNB7AING8fZVmJNUDf8Zs91OOvfch7rNE7kE4ajnlKKgSs+2nDYj8sMAt6RATi7UW Vieg== X-Gm-Message-State: AOAM531LTLSNG/DkQCfYAYW/60zN0wIVLKaXUtl7tK4/R8vkSzESWE6L 7TnOriV0EI10JfA/jqEK3qMAUo4Ez+keHKxawnw8D1HVoj2Z3uU6L+ToZ+Fg5qphPNA4SBd0pwy pm25XCKjNG4npOg== X-Received: by 2002:adf:d1e5:: with SMTP id g5mr28819450wrd.94.1640951352375; Fri, 31 Dec 2021 03:49:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJxZuvmwQBmcyP5Iini/Kdf7lPa55OIBxKp8Z4wbQBcBNLjJNM2vSXfxFZbF8YsVxbsifrcAZQ== X-Received: by 2002:adf:d1e5:: with SMTP id g5mr28819430wrd.94.1640951352192; Fri, 31 Dec 2021 03:49:12 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Marcel Apfelbaum , Gerd Hoffmann , David Hildenbrand , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , "Michael S. Tsirkin" , Peter Xu Subject: [PATCH 2/8] hw/pci: Restrict pci-bus stub to sysemu Date: Fri, 31 Dec 2021 12:48:55 +0100 Message-Id: <20211231114901.976937-3-philmd@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211231114901.976937-1-philmd@redhat.com> References: <20211231114901.976937-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1640951358878000003 Neither tools nor user-mode emulation require the PCI bus stub. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- stubs/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stubs/meson.build b/stubs/meson.build index 363f6fa785d..d359cbe1ad7 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -26,7 +26,6 @@ stub_ss.add(files('module-opts.c')) stub_ss.add(files('monitor.c')) stub_ss.add(files('monitor-core.c')) -stub_ss.add(files('pci-bus.c')) stub_ss.add(files('qemu-timer-notify-cb.c')) stub_ss.add(files('qmp_memory_device.c')) stub_ss.add(files('qmp-command-available.c')) @@ -51,6 +50,7 @@ endif if have_system stub_ss.add(files('fw_cfg.c')) + stub_ss.add(files('pci-bus.c')) stub_ss.add(files('semihost.c')) stub_ss.add(files('usb-dev-stub.c')) stub_ss.add(files('xen-hw-stub.c')) --=20 2.33.1 From nobody Sun May 19 15:29:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1640951359; cv=none; d=zohomail.com; s=zohoarc; b=ITlv6I3IyLwKAxDHnCZjYyFibwPi12VadxIXLPEXqyyvlrNi6siqGS0bMUgs5xeD2Xx9Ck6lH6hSXztMrjaknZ+pY9CR/w2nP5JIc8LnhR6hgaR5uxkAakDC4NRPNIRBXmgythqA7usAd05c4lQDSWPs1i+ZRuyzTIuXz/tIEjk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1640951359; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=/KXeNIFUnY1pUcNuTPWkGRZ5r1qlFjH4izW6QJgPWUg=; b=W5jqxKotrfsb5tK28FQzIOwpXGoAdjiiRTyNBsP2Lk2E+wm2bHvzbAPeDs6ZLT2NLrmeuUcXvH6HSyPu1CKwashMwRKj1rsSgP7Wki2dwZjIvhIum2cwBL/rIRkTgV+yc/BocFKoeiS9gbFmNYBf1zm9dIqNPkcnOuJ8jJhLBG4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1640951359655156.7229375111092; Fri, 31 Dec 2021 03:49:19 -0800 (PST) Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-374-mdSQH9PZNv24HBlU61ytow-1; Fri, 31 Dec 2021 06:49:18 -0500 Received: by mail-wr1-f70.google.com with SMTP id l9-20020adfa389000000b001a23bd1c661so7467105wrb.6 for ; Fri, 31 Dec 2021 03:49:17 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (26.red-83-50-86.dynamicip.rima-tde.net. [83.50.86.26]) by smtp.gmail.com with ESMTPSA id p21sm27122889wmq.20.2021.12.31.03.49.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Dec 2021 03:49:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1640951359; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/KXeNIFUnY1pUcNuTPWkGRZ5r1qlFjH4izW6QJgPWUg=; b=Wjpc7D1sLGhLo6b2hgwVi+9y+C6EMYuNRqreOynpirAWxh90XCNEv8BniMnBZHf/4gphwJ 9OmdpO+t1P5y82lKj9J3o6rm2ap7LBXJ0Za4rNbZ3yAMaVylCI6fftwNbwIBi25HzFq39u OHHJ1caUqUzQ6DrManqh6T9us0Xnzec= X-MC-Unique: mdSQH9PZNv24HBlU61ytow-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/KXeNIFUnY1pUcNuTPWkGRZ5r1qlFjH4izW6QJgPWUg=; b=hzW4v7fr3xT7kbibjCXqdF0w1ED0v/8YFvDNVnMUhecq0eGM/xnZnJhK3u3WkMJ+MX ywRd+QDQgKuwbkDtCZqDQ5jEty0CPrWcANXX1O4Jx4sFUXJy/N1ooALDZUxFn1GMcWzF D8lM2Qm/ZuP4cWdPYsOS9hHGz5N0O8a0sxFxODP6mxeIgE3zGt7/2DOjfwKigxA1cl+8 Dhkrxw2KtaDo7RKylJf3iy5xJGsukQq0y1xwEz9AXh8b5J7Dman0IpSzifbvvMRXGlSI jb4L+/KFLKRmoeD1CNpp8u+6fdb/BIcMzOzBz/UkJiHUYVU/zGirxHyGTnXSdNLFNbrr gO1A== X-Gm-Message-State: AOAM530jIZbFMaOZm/bH9Pjtz2xItQr63qqoAqyUibECyMDgUvnjLI3R MVFKKCZoxMUk+8RQzgdEyMsGOT2SYubcdNC8xb0wFZkQ+vz91pFGhMDs99RlxRCmQPjqViD2khX yvUJ6mgnsy8FUJg== X-Received: by 2002:a05:6000:1085:: with SMTP id y5mr29841577wrw.696.1640951356742; Fri, 31 Dec 2021 03:49:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJyJ0MH1adbramq6Rx/LSJHzXDf5WIu2+OFf7IbTHinEeLWq3jsFk+YmaSZE0hFzSmOw/pqLlA== X-Received: by 2002:a05:6000:1085:: with SMTP id y5mr29841565wrw.696.1640951356595; Fri, 31 Dec 2021 03:49:16 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Marcel Apfelbaum , Gerd Hoffmann , David Hildenbrand , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , "Michael S. Tsirkin" , Peter Xu Subject: [PATCH 3/8] hw/pci: Document pci_dma_map() Date: Fri, 31 Dec 2021 12:48:56 +0100 Message-Id: <20211231114901.976937-4-philmd@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211231114901.976937-1-philmd@redhat.com> References: <20211231114901.976937-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1640951361300000001 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/pci/pci.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h index 5b36334a28a..f0d707efb8c 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -876,6 +876,18 @@ PCI_DMA_DEFINE_LDST(q_be, q_be, 64); =20 #undef PCI_DMA_DEFINE_LDST =20 +/** + * pci_dma_map: Map a physical memory region into a device PCI address spa= ce. + * + * May map a subset of the requested range, given by and returned in @plen. + * May return %NULL and set *@plen to zero(0), if resources needed to perf= orm + * the mapping are exhausted. + * + * @dev: #PCIDevice to be accessed + * @addr: address within that device's address space + * @plen: pointer to length of buffer; updated on return + * @dir: indicates the transfer direction + */ static inline void *pci_dma_map(PCIDevice *dev, dma_addr_t addr, dma_addr_t *plen, DMADirection dir) { --=20 2.33.1 From nobody Sun May 19 15:29:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1640951365; cv=none; d=zohomail.com; s=zohoarc; b=K1Q9Y7l9TAc7Lj8HnuS/FH9QadARWifxksl6gDotw4UPvZc22hHBrrWe/txvKT57NAoGVY/1jmbsF+UxcavaAStV/ZicDUcbgawLdbFYw4gXZU6xKK1LcJrocrvVrAjExp0C+ex/ifH4rSXZKLjX1PAbziVr4XtaPWHl4C6oqQM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1640951365; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=wE876U4co5d7p9CIe8hQXrALAIoZI1O45edviYMOfa0=; b=JbcruPw9fZH4wFiFkWQQUaK/n3uKo3r9+0qHrSZBZdDA3mGM/97LXVMR0R2KIVFGpqTFzkUpoYhkLUvk8AWyhu7HfhRyUNkcB6wNfliEQ9kDZPoRjpP9d942Q0N5mXFeLWWwUWPAj/dYWROjhTmgT08e69t89Pybvvv9xeFummU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1640951365323888.3260985486207; Fri, 31 Dec 2021 03:49:25 -0800 (PST) Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-75-bYuqh99jOxGN9BeSDgjjdA-1; Fri, 31 Dec 2021 06:49:22 -0500 Received: by mail-wr1-f71.google.com with SMTP id c16-20020adfa310000000b001a2349890e1so7446090wrb.0 for ; Fri, 31 Dec 2021 03:49:22 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (26.red-83-50-86.dynamicip.rima-tde.net. [83.50.86.26]) by smtp.gmail.com with ESMTPSA id b19sm31281895wmb.38.2021.12.31.03.49.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Dec 2021 03:49:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1640951363; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wE876U4co5d7p9CIe8hQXrALAIoZI1O45edviYMOfa0=; b=anw+/YjFY0lFKqoil5uZFhlmvAzHtaa+ZMjfklu3cWiZp1Fkd3qzGkDOY4jXEyyzQPCpvN KVXnuKHt1LFnvMxW3eHnOe6q64MB/bZdwFxKryZGof8EG9Ojy2PUNFS7sWxXboiIFtaXyQ lBTxa5z6pc36heGnhlZKgRJPAq7U/48= X-MC-Unique: bYuqh99jOxGN9BeSDgjjdA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wE876U4co5d7p9CIe8hQXrALAIoZI1O45edviYMOfa0=; b=fB/Yom5XZD5limv31SGvJxTuQCquxhmuB8U/lBC31k7ZqtwHajDwxRRimCs/HjdiDz ika6e8MSHLm+1+hpolTh4Vy7uKvN/GIvnrMa4yfT5j74ySsX50tGLU+ASyNLUpUV4P5y wHtdMUcIhRRgJELxuwTRS2gJ1toC2QMdF4z2v+shLQK0qbiMTc/oaAQA18tzXOHH8Qih SMIyIDzyeDi8fc5XCN+z/nv8IutRkWVVNjy7bitU+NkAIhUx3UQu/r0p1dtpKZdqaSMB kRvCS+ikDTgcYCTcFv+zOqhzIOPbVhb8pDxC/I5UPJr4IIEYC03E6RTPrwJF0IeI+mdq m8sg== X-Gm-Message-State: AOAM532q7ExMu4waOEChCZvTUYbT+Zc/mz0BAvCMGl1hovyyug2/RvRc ld8RvReZyXxT3Qv2LhTJBXmJMJ6kYdpmfp+bXZ1CAjeMNxtRtYlsByAu5Iu86c2wLhUE9Mnc0s+ ULAlVT1MLnCqJjQ== X-Received: by 2002:a5d:59a7:: with SMTP id p7mr28725164wrr.258.1640951361226; Fri, 31 Dec 2021 03:49:21 -0800 (PST) X-Google-Smtp-Source: ABdhPJzVhucnXHOV0IsRs6rCE30ye6CzRZ+G0PvrOs/WcOL/mG4e5/HH8kMeMAmq+JlOxXCqJwdyDA== X-Received: by 2002:a5d:59a7:: with SMTP id p7mr28725150wrr.258.1640951361047; Fri, 31 Dec 2021 03:49:21 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Marcel Apfelbaum , Gerd Hoffmann , David Hildenbrand , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , "Michael S. Tsirkin" , Peter Xu Subject: [PATCH 4/8] hw/dma: Remove CONFIG_USER_ONLY check Date: Fri, 31 Dec 2021 12:48:57 +0100 Message-Id: <20211231114901.976937-5-philmd@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211231114901.976937-1-philmd@redhat.com> References: <20211231114901.976937-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1640951366402000001 DMA API should not be included in user-mode emulation. If so, build should fail. Remove the CONFIG_USER_ONLY check. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/sysemu/dma.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/include/sysemu/dma.h b/include/sysemu/dma.h index b3faef41b2f..0db2478a506 100644 --- a/include/sysemu/dma.h +++ b/include/sysemu/dma.h @@ -31,8 +31,6 @@ struct QEMUSGList { AddressSpace *as; }; =20 -#ifndef CONFIG_USER_ONLY - /* * When an IOMMU is present, bus addresses become distinct from * CPU/memory physical addresses and may be a different size. Because @@ -288,7 +286,6 @@ void qemu_sglist_init(QEMUSGList *qsg, DeviceState *dev= , int alloc_hint, AddressSpace *as); void qemu_sglist_add(QEMUSGList *qsg, dma_addr_t base, dma_addr_t len); void qemu_sglist_destroy(QEMUSGList *qsg); -#endif =20 typedef BlockAIOCB *DMAIOFunc(int64_t offset, QEMUIOVector *iov, BlockCompletionFunc *cb, void *cb_opaque, --=20 2.33.1 From nobody Sun May 19 15:29:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1640951368; cv=none; d=zohomail.com; s=zohoarc; b=NAw3L1v/wzo9thL1XO2eLn80oW1KqINM5psyh6+FIY2ZeTZE8uJQJv2tosX0hRXeFxHXnzHpnZ487tSFPhPKlVWkD9c0XHm/0Aw6bGuK5HzE2xZ5QczWrgR1cHh+YtMjyFFwOMfSYaQd0f8/0KSsApzhk8bFhtErUCzLyN1IO1s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1640951368; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=s1gWXzHHA08XyBDnum+yCmIoN801ZHiVaEGOwmKagUU=; b=DAATnvabNxYWF9QBr0hNsQRAR5ijDmfyVUo0rC/6vvzgryqcOvfWGgQaMpsLX1mPVdi0q/RwSw8PlUM54rQY1gG420+UXWd5IFzlErmXHumP3DItXKJm8X6CkcY2DcgaoDoT8he7pE9Oc/rJThLD2AaJS5kSk0dtvytOJfPkUJo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1640951368626873.5542935880533; Fri, 31 Dec 2021 03:49:28 -0800 (PST) Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-158-X-7pCuZ-P4aXoIZUzFuX4Q-1; Fri, 31 Dec 2021 06:49:26 -0500 Received: by mail-wr1-f72.google.com with SMTP id g6-20020adfbc86000000b001a2d62be244so6190579wrh.23 for ; Fri, 31 Dec 2021 03:49:26 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (26.red-83-50-86.dynamicip.rima-tde.net. [83.50.86.26]) by smtp.gmail.com with ESMTPSA id p18sm37592945wmq.0.2021.12.31.03.49.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Dec 2021 03:49:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1640951368; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=s1gWXzHHA08XyBDnum+yCmIoN801ZHiVaEGOwmKagUU=; b=UDnp8K3uptp/PZRaECYqnzo5EOShw2YthqRj9Van/NE4E3LfS0s0K7EEA2bmEsDfcha71i 8p2rfKFn03BxnxJy3r3Iw/YJB4ma2l8cIuw8TB5bC1oQZAJGreIDc2yvzYeZ6FQYCnPtYX QJWO2B27WNAQQTfngRLcNJ3il1cliN4= X-MC-Unique: X-7pCuZ-P4aXoIZUzFuX4Q-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=s1gWXzHHA08XyBDnum+yCmIoN801ZHiVaEGOwmKagUU=; b=ozrxMy14NwfpVryk4A5Ff7OYkBI3/DofgCBn/7xfq7n+r2oOaMNtXkJR3w5yoyOYh/ AbppvH+l16vFCWU7DP89E0GhxcRrxiU4kZX6wKCoY1CyIQNKlx7SCzSIuDBYOrYIThiA jyeWJfuz4yH9qdiprkwCpByvREZkKztajj9simT98AB0XLdSJ23MI1m3QjkMWefu6/w8 yucK+nnuuTCaNnzmtiTBO+CaJdEoZig8x7hbRYrWYmHHTzrpKJYX4g5vmFxOQovgRFw7 XyqYxfHIN6QYbErIdNsKF+Ii/65beNMpLBxUFDlXF4rSpCYgayrFPB1rXBx+xRcRynih zrhA== X-Gm-Message-State: AOAM532DGGtJoqLjtfKnGh3Yk/2LXEBVInAzSt8PTkD9iE0nzPRuWO0f OWv8FNkc7ndplUdS6XB9C5pPPWHPVI896A8S4atiS5HTWRRoU/ZmgGUTbhsepeb0Y0E5ZrIii+i j27Xi5Pd/DZdWiw== X-Received: by 2002:a5d:6c67:: with SMTP id r7mr30217558wrz.350.1640951365600; Fri, 31 Dec 2021 03:49:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJzk1PB0CJ5V9w98GPEgQGppaZfUg+L1brKLinrifqfcLoq4u//4eSk3Tj3jBGG9MHrHO+v/9Q== X-Received: by 2002:a5d:6c67:: with SMTP id r7mr30217546wrz.350.1640951365458; Fri, 31 Dec 2021 03:49:25 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Marcel Apfelbaum , Gerd Hoffmann , David Hildenbrand , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , "Michael S. Tsirkin" , Peter Xu Subject: [PATCH 5/8] hw/rdma/rdma_utils: Rename rdma_pci_dma_map 'len' argument Date: Fri, 31 Dec 2021 12:48:58 +0100 Message-Id: <20211231114901.976937-6-philmd@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211231114901.976937-1-philmd@redhat.com> References: <20211231114901.976937-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1640951370883000001 Various APIs use 'pval' naming for 'pointer to val'. rdma_pci_dma_map() uses 'plen' for 'PCI length', but since 'PCI' is already explicit in the function name, simplify and rename the argument 'len'. No logical change. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Yuval Shaia Tested-by: Yuval Shaia --- hw/rdma/rdma_utils.h | 2 +- hw/rdma/rdma_utils.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hw/rdma/rdma_utils.h b/hw/rdma/rdma_utils.h index 9fd0efd940b..0c6414e7e0a 100644 --- a/hw/rdma/rdma_utils.h +++ b/hw/rdma/rdma_utils.h @@ -38,7 +38,7 @@ typedef struct RdmaProtectedGSList { GSList *list; } RdmaProtectedGSList; =20 -void *rdma_pci_dma_map(PCIDevice *dev, dma_addr_t addr, dma_addr_t plen); +void *rdma_pci_dma_map(PCIDevice *dev, dma_addr_t addr, dma_addr_t len); void rdma_pci_dma_unmap(PCIDevice *dev, void *buffer, dma_addr_t len); void rdma_protected_gqueue_init(RdmaProtectedGQueue *list); void rdma_protected_gqueue_destroy(RdmaProtectedGQueue *list); diff --git a/hw/rdma/rdma_utils.c b/hw/rdma/rdma_utils.c index 98df58f6897..61cb8ede0fd 100644 --- a/hw/rdma/rdma_utils.c +++ b/hw/rdma/rdma_utils.c @@ -17,29 +17,29 @@ #include "trace.h" #include "rdma_utils.h" =20 -void *rdma_pci_dma_map(PCIDevice *dev, dma_addr_t addr, dma_addr_t plen) +void *rdma_pci_dma_map(PCIDevice *dev, dma_addr_t addr, dma_addr_t len) { void *p; - hwaddr len =3D plen; + hwaddr pci_len =3D len; =20 if (!addr) { rdma_error_report("addr is NULL"); return NULL; } =20 - p =3D pci_dma_map(dev, addr, &len, DMA_DIRECTION_TO_DEVICE); + p =3D pci_dma_map(dev, addr, &pci_len, DMA_DIRECTION_TO_DEVICE); if (!p) { rdma_error_report("pci_dma_map fail, addr=3D0x%"PRIx64", len=3D%"P= RId64, - addr, len); + addr, pci_len); return NULL; } =20 - if (len !=3D plen) { - rdma_pci_dma_unmap(dev, p, len); + if (pci_len !=3D len) { + rdma_pci_dma_unmap(dev, p, pci_len); return NULL; } =20 - trace_rdma_pci_dma_map(addr, p, len); + trace_rdma_pci_dma_map(addr, p, pci_len); =20 return p; } --=20 2.33.1 From nobody Sun May 19 15:29:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1640951394; cv=none; d=zohomail.com; s=zohoarc; b=e+/UGbwPWi2Clgbv9WIRd6Jol4qcrSDCr5MSwREGF1uPTXYdUN3r3M6dNI6bNOXU1X8/d6n9IaLZE3Fp1OYD1AvjfBQHfDaabcH04xWew6figFFB5Rw8fnPT6Pyq9yI7YgdaLHYyQFC5ubP5cFSKZRS6gTHY/q8OZiooQrHh3lA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1640951394; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=zc7qbwDFORfvzaOFgdWHz84wTbYxgE4ItWWUjM2vJzI=; b=ZxxNHchVOKi/SOBIcxRWlYkdgGZa/H0YP8UXyJg8U6QZWs9IvLKXB/7R/Wbo10ViCB0G7FlAroCFKIWijy7P16F6L7d2HOYkeKHvx7+7RGQzgeba6dzXhUyMmb9aL9jMqaWzxY3KcGxWKf7tFu/2pQVPcx8W8HtsFUhW2em5wXA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1640951394820345.43284739337275; Fri, 31 Dec 2021 03:49:54 -0800 (PST) Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-351-31kjfRXcOi2x0z5zxjUq6g-1; Fri, 31 Dec 2021 06:49:32 -0500 Received: by mail-wr1-f69.google.com with SMTP id o20-20020adfa114000000b001a2abc089d8so7430413wro.4 for ; Fri, 31 Dec 2021 03:49:32 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (26.red-83-50-86.dynamicip.rima-tde.net. [83.50.86.26]) by smtp.gmail.com with ESMTPSA id o38sm24808178wms.11.2021.12.31.03.49.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Dec 2021 03:49:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1640951394; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zc7qbwDFORfvzaOFgdWHz84wTbYxgE4ItWWUjM2vJzI=; b=f/fFJB8RnQnwIab01ESRxH+nhwcynz9IueIpQ4g818BFGQnhl6RkbF3m8C7Uljs/DpbGo3 ZiNvPLgURwPf7+t8s0bUfPtq/l/Xj8RsroqIvUYqN/iBTwU0EC7uhIZ9jmg4PViXHjVpwm cz8zEIXpdVtvPu+b0betUrOiqslxarU= X-MC-Unique: 31kjfRXcOi2x0z5zxjUq6g-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zc7qbwDFORfvzaOFgdWHz84wTbYxgE4ItWWUjM2vJzI=; b=YglTUnLRn2w9KOAhaweCUdUzQ3Iq9vxgXi7uSAzsbnDb4BGVw+oqbrEFzcqcrfeKoh /EcLMKjuk2WtAxM8knrrf934D6Jyxk2hO/utgfKfKajkWNjbGFE21Q6LwAukk1gKFz9s 1ZELtluk4Q48ooUSWFMR6klyXiB584JrJxwTpNFCtd/NZIM3me4KjmwiRmQZX9Vc46iE c1OStfOAl1ZlyIGBaYc5bVw0yvsOlqtPIBx69QrwswlJwKO2OWRaCF1Ix9XoY0V8c0vr qFGi2jqqVKRWkDUSH9kcn/hM6SgNOMmL+OImEKpGulYhdo8fz4b6NvjpGH7llQJnMhug Mqlg== X-Gm-Message-State: AOAM530gls8UjH7SzxmXlTSexYy2UKj1rFu2AINlJIPAS8xhGoOY3GDf ao0E25xm2ySvybrJXtmDGujZo4AElBU9qTRP+6VRIOohQaBBcZvdb9WjS25mOseQhx1gPxCAqKR lXUJtAPtlhPFj+Q== X-Received: by 2002:a1c:1dc9:: with SMTP id d192mr29894726wmd.95.1640951370960; Fri, 31 Dec 2021 03:49:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJzwh0MshaBZaWtcRc6fHWdv+TupxL0BpQwFByB51qvYil02BDqRkWkTGpzjhkcV6D+CEgQQLg== X-Received: by 2002:a1c:1dc9:: with SMTP id d192mr29894672wmd.95.1640951369819; Fri, 31 Dec 2021 03:49:29 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Marcel Apfelbaum , Gerd Hoffmann , David Hildenbrand , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , "Michael S. Tsirkin" , Peter Xu Subject: [PATCH 6/8] hw/scsi: Rename SCSIRequest::resid as 'residual' Date: Fri, 31 Dec 2021 12:48:59 +0100 Message-Id: <20211231114901.976937-7-philmd@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211231114901.976937-1-philmd@redhat.com> References: <20211231114901.976937-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1640951395459000001 The 'resid' field is slightly confusing and could be interpreted as some ID. Rename it as 'residual' which is clearer to review. No logical change. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/scsi/scsi.h | 4 ++-- hw/scsi/megasas.c | 42 +++++++++++++++++++++++++----------------- hw/scsi/scsi-bus.c | 10 +++++----- hw/scsi/scsi-disk.c | 4 ++-- softmmu/dma-helpers.c | 26 +++++++++++++------------- 5 files changed, 47 insertions(+), 39 deletions(-) diff --git a/include/hw/scsi/scsi.h b/include/hw/scsi/scsi.h index 2ef80af6dca..b27d133b113 100644 --- a/include/hw/scsi/scsi.h +++ b/include/hw/scsi/scsi.h @@ -30,7 +30,7 @@ struct SCSIRequest { int16_t status; int16_t host_status; void *hba_private; - size_t resid; + size_t residual; SCSICommand cmd; NotifierList cancel_notifiers; =20 @@ -125,7 +125,7 @@ struct SCSIBusInfo { void *hba_private); void (*transfer_data)(SCSIRequest *req, uint32_t arg); void (*fail)(SCSIRequest *req); - void (*complete)(SCSIRequest *req, size_t resid); + void (*complete)(SCSIRequest *req, size_t residual); void (*cancel)(SCSIRequest *req); void (*change)(SCSIBus *bus, SCSIDevice *dev, SCSISense sense); QEMUSGList *(*get_sg_list)(SCSIRequest *req); diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index dc9bbdb740e..cb019549371 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -1045,7 +1045,8 @@ static int megasas_pd_get_info_submit(SCSIDevice *sde= v, int lun, uint64_t pd_size; uint16_t pd_id =3D ((sdev->id & 0xFF) << 8) | (lun & 0xFF); uint8_t cmdbuf[6]; - size_t len, resid; + size_t len; + size_t residual; =20 if (!cmd->iov_buf) { cmd->iov_buf =3D g_malloc0(dcmd_size); @@ -1112,9 +1113,10 @@ static int megasas_pd_get_info_submit(SCSIDevice *sd= ev, int lun, info->connected_port_bitmap =3D 0x1; info->device_speed =3D 1; info->link_speed =3D 1; - resid =3D dma_buf_read(cmd->iov_buf, dcmd_size, &cmd->qsg, MEMTXATTRS_= UNSPECIFIED); + residual =3D dma_buf_read(cmd->iov_buf, dcmd_size, &cmd->qsg, + MEMTXATTRS_UNSPECIFIED); g_free(cmd->iov_buf); - cmd->iov_size =3D dcmd_size - resid; + cmd->iov_size =3D dcmd_size - residual; cmd->iov_buf =3D NULL; return MFI_STAT_OK; } @@ -1149,7 +1151,8 @@ static int megasas_dcmd_pd_get_info(MegasasState *s, = MegasasCmd *cmd) static int megasas_dcmd_ld_get_list(MegasasState *s, MegasasCmd *cmd) { struct mfi_ld_list info; - size_t dcmd_size =3D sizeof(info), resid; + size_t dcmd_size =3D sizeof(info); + size_t residual; uint32_t num_ld_disks =3D 0, max_ld_disks; uint64_t ld_size; BusChild *kid; @@ -1184,8 +1187,9 @@ static int megasas_dcmd_ld_get_list(MegasasState *s, = MegasasCmd *cmd) info.ld_count =3D cpu_to_le32(num_ld_disks); trace_megasas_dcmd_ld_get_list(cmd->index, num_ld_disks, max_ld_disks); =20 - resid =3D dma_buf_read(&info, dcmd_size, &cmd->qsg, MEMTXATTRS_UNSPECI= FIED); - cmd->iov_size =3D dcmd_size - resid; + residual =3D dma_buf_read(&info, dcmd_size, &cmd->qsg, + MEMTXATTRS_UNSPECIFIED); + cmd->iov_size =3D dcmd_size - residual; return MFI_STAT_OK; } =20 @@ -1193,7 +1197,8 @@ static int megasas_dcmd_ld_list_query(MegasasState *s= , MegasasCmd *cmd) { uint16_t flags; struct mfi_ld_targetid_list info; - size_t dcmd_size =3D sizeof(info), resid; + size_t dcmd_size =3D sizeof(info); + size_t residual; uint32_t num_ld_disks =3D 0, max_ld_disks =3D s->fw_luns; BusChild *kid; =20 @@ -1233,8 +1238,9 @@ static int megasas_dcmd_ld_list_query(MegasasState *s= , MegasasCmd *cmd) info.size =3D dcmd_size; trace_megasas_dcmd_ld_get_list(cmd->index, num_ld_disks, max_ld_disks); =20 - resid =3D dma_buf_read(&info, dcmd_size, &cmd->qsg, MEMTXATTRS_UNSPECI= FIED); - cmd->iov_size =3D dcmd_size - resid; + residual =3D dma_buf_read(&info, dcmd_size, &cmd->qsg, + MEMTXATTRS_UNSPECIFIED); + cmd->iov_size =3D dcmd_size - residual; return MFI_STAT_OK; } =20 @@ -1244,7 +1250,8 @@ static int megasas_ld_get_info_submit(SCSIDevice *sde= v, int lun, struct mfi_ld_info *info =3D cmd->iov_buf; size_t dcmd_size =3D sizeof(struct mfi_ld_info); uint8_t cdb[6]; - ssize_t len, resid; + ssize_t len; + size_t residual; uint16_t sdev_id =3D ((sdev->id & 0xFF) << 8) | (lun & 0xFF); uint64_t ld_size; =20 @@ -1283,9 +1290,10 @@ static int megasas_ld_get_info_submit(SCSIDevice *sd= ev, int lun, info->ld_config.span[0].num_blocks =3D info->size; info->ld_config.span[0].array_ref =3D cpu_to_le16(sdev_id); =20 - resid =3D dma_buf_read(cmd->iov_buf, dcmd_size, &cmd->qsg, MEMTXATTRS_= UNSPECIFIED); + residual =3D dma_buf_read(cmd->iov_buf, dcmd_size, &cmd->qsg, + MEMTXATTRS_UNSPECIFIED); g_free(cmd->iov_buf); - cmd->iov_size =3D dcmd_size - resid; + cmd->iov_size =3D dcmd_size - residual; cmd->iov_buf =3D NULL; return MFI_STAT_OK; } @@ -1617,13 +1625,13 @@ static int megasas_handle_dcmd(MegasasState *s, Meg= asasCmd *cmd) } =20 static int megasas_finish_internal_dcmd(MegasasCmd *cmd, - SCSIRequest *req, size_t resid) + SCSIRequest *req, size_t residual) { int retval =3D MFI_STAT_OK; int lun =3D req->lun; =20 trace_megasas_dcmd_internal_finish(cmd->index, cmd->dcmd_opcode, lun); - cmd->iov_size -=3D resid; + cmd->iov_size -=3D residual; switch (cmd->dcmd_opcode) { case MFI_DCMD_PD_GET_INFO: retval =3D megasas_pd_get_info_submit(req->dev, lun, cmd); @@ -1865,12 +1873,12 @@ static void megasas_xfer_complete(SCSIRequest *req,= uint32_t len) } } =20 -static void megasas_command_complete(SCSIRequest *req, size_t resid) +static void megasas_command_complete(SCSIRequest *req, size_t residual) { MegasasCmd *cmd =3D req->hba_private; uint8_t cmd_status =3D MFI_STAT_OK; =20 - trace_megasas_command_complete(cmd->index, req->status, resid); + trace_megasas_command_complete(cmd->index, req->status, residual); =20 if (req->io_canceled) { return; @@ -1880,7 +1888,7 @@ static void megasas_command_complete(SCSIRequest *req= , size_t resid) /* * Internal command complete */ - cmd_status =3D megasas_finish_internal_dcmd(cmd, req, resid); + cmd_status =3D megasas_finish_internal_dcmd(cmd, req, residual); if (cmd_status =3D=3D MFI_STAT_INVALID_STATUS) { return; } diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index 2b5e9dca311..3466e680ac7 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -760,7 +760,7 @@ SCSIRequest *scsi_req_new(SCSIDevice *d, uint32_t tag, = uint32_t lun, } =20 req->cmd =3D cmd; - req->resid =3D req->cmd.xfer; + req->residual =3D req->cmd.xfer; =20 switch (buf[0]) { case INQUIRY: @@ -1408,7 +1408,7 @@ void scsi_req_data(SCSIRequest *req, int len) trace_scsi_req_data(req->dev->id, req->lun, req->tag, len); assert(req->cmd.mode !=3D SCSI_XFER_NONE); if (!req->sg) { - req->resid -=3D len; + req->residual -=3D len; req->bus->info->transfer_data(req, len); return; } @@ -1421,9 +1421,9 @@ void scsi_req_data(SCSIRequest *req, int len) =20 buf =3D scsi_req_get_buf(req); if (req->cmd.mode =3D=3D SCSI_XFER_FROM_DEV) { - req->resid =3D dma_buf_read(buf, len, req->sg, MEMTXATTRS_UNSPECIF= IED); + req->residual =3D dma_buf_read(buf, len, req->sg, MEMTXATTRS_UNSPE= CIFIED); } else { - req->resid =3D dma_buf_write(buf, len, req->sg, MEMTXATTRS_UNSPECI= FIED); + req->residual =3D dma_buf_write(buf, len, req->sg, MEMTXATTRS_UNSP= ECIFIED); } scsi_req_continue(req); } @@ -1512,7 +1512,7 @@ void scsi_req_complete(SCSIRequest *req, int status) =20 scsi_req_ref(req); scsi_req_dequeue(req); - req->bus->info->complete(req, req->resid); + req->bus->info->complete(req, req->residual); =20 /* Cancelled requests might end up being completed instead of cancelle= d */ notifier_list_notify(&req->cancel_notifiers, req); diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index d4914178ea0..9c0dc7b9468 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -420,7 +420,7 @@ static void scsi_do_read(SCSIDiskReq *r, int ret) =20 if (r->req.sg) { dma_acct_start(s->qdev.conf.blk, &r->acct, r->req.sg, BLOCK_ACCT_R= EAD); - r->req.resid -=3D r->req.sg->size; + r->req.residual -=3D r->req.sg->size; r->req.aiocb =3D dma_blk_io(blk_get_aio_context(s->qdev.conf.blk), r->req.sg, r->sector << BDRV_SECTOR_BITS, BDRV_SECTOR_SIZE, @@ -580,7 +580,7 @@ static void scsi_write_data(SCSIRequest *req) =20 if (r->req.sg) { dma_acct_start(s->qdev.conf.blk, &r->acct, r->req.sg, BLOCK_ACCT_W= RITE); - r->req.resid -=3D r->req.sg->size; + r->req.residual -=3D r->req.sg->size; r->req.aiocb =3D dma_blk_io(blk_get_aio_context(s->qdev.conf.blk), r->req.sg, r->sector << BDRV_SECTOR_BITS, BDRV_SECTOR_SIZE, diff --git a/softmmu/dma-helpers.c b/softmmu/dma-helpers.c index b0be1564797..4563a775aa7 100644 --- a/softmmu/dma-helpers.c +++ b/softmmu/dma-helpers.c @@ -294,49 +294,49 @@ BlockAIOCB *dma_blk_write(BlockBackend *blk, } =20 =20 -static MemTxResult dma_buf_rw(void *buf, int32_t len, uint64_t *residp, +static MemTxResult dma_buf_rw(void *buf, int32_t len, uint64_t *residual, QEMUSGList *sg, DMADirection dir, MemTxAttrs attrs) { uint8_t *ptr =3D buf; - uint64_t resid; + uint64_t xresidual; int sg_cur_index; MemTxResult res =3D MEMTX_OK; =20 - resid =3D sg->size; + xresidual =3D sg->size; sg_cur_index =3D 0; - len =3D MIN(len, resid); + len =3D MIN(len, xresidual); while (len > 0) { ScatterGatherEntry entry =3D sg->sg[sg_cur_index++]; int32_t xfer =3D MIN(len, entry.len); res |=3D dma_memory_rw(sg->as, entry.base, ptr, xfer, dir, attrs); ptr +=3D xfer; len -=3D xfer; - resid -=3D xfer; + xresidual -=3D xfer; } =20 - if (residp) { - *residp =3D resid; + if (residual) { + *residual =3D xresidual; } return res; } =20 uint64_t dma_buf_read(void *ptr, int32_t len, QEMUSGList *sg, MemTxAttrs a= ttrs) { - uint64_t resid; + uint64_t residual; =20 - dma_buf_rw(ptr, len, &resid, sg, DMA_DIRECTION_FROM_DEVICE, attrs); + dma_buf_rw(ptr, len, &residual, sg, DMA_DIRECTION_FROM_DEVICE, attrs); =20 - return resid; + return residual; } =20 uint64_t dma_buf_write(void *ptr, int32_t len, QEMUSGList *sg, MemTxAttrs = attrs) { - uint64_t resid; + uint64_t residual; =20 - dma_buf_rw(ptr, len, &resid, sg, DMA_DIRECTION_TO_DEVICE, attrs); + dma_buf_rw(ptr, len, &residual, sg, DMA_DIRECTION_TO_DEVICE, attrs); =20 - return resid; + return residual; } =20 void dma_acct_start(BlockBackend *blk, BlockAcctCookie *cookie, --=20 2.33.1 From nobody Sun May 19 15:29:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1640951378; cv=none; d=zohomail.com; s=zohoarc; b=F/acrO9bPw77x1lN5k6LWSl7wyxPbq6ulHiW890SLJMUACckvBJym8kAvTu5oNNY+L4yimWZALUSOWueSAdUqLECGRrIcdPmNixPpdS5YOrnD7gwGIyRvSpNVd8fOhCFfNt+beWJh20RJ3mvNsgSKnvo6CYc3SK3VrzXCDVxtAE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1640951378; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=VWOQCoOQErbEn0u8LJsn620oYxNKcQdFiEhqtenCnB4=; b=YymrSA1nlQM/+ytJCiiLYj0s3PGviYbpV7d0Y4uP2U7zZP9OI4qZ9YnbCXpjCTHNh9YEfUJ+2Kd9x3o1WaJI62iWBYbUuVxGZcvEKzOyHBI5RYX3nDU3AxHW012VOwKwObEgvc/u+HDq5Gk9zLX8BlijhCohlW1Yi9Mx5AXE7Wg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1640951378268652.7925662584298; Fri, 31 Dec 2021 03:49:38 -0800 (PST) Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-464-N2MhddlZPKCyRcJl5oN2xQ-1; Fri, 31 Dec 2021 06:49:36 -0500 Received: by mail-wr1-f70.google.com with SMTP id x20-20020adfbb54000000b001a0d044e20fso7525377wrg.11 for ; Fri, 31 Dec 2021 03:49:36 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (26.red-83-50-86.dynamicip.rima-tde.net. [83.50.86.26]) by smtp.gmail.com with ESMTPSA id p13sm26070464wrr.37.2021.12.31.03.49.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Dec 2021 03:49:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1640951377; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VWOQCoOQErbEn0u8LJsn620oYxNKcQdFiEhqtenCnB4=; b=AegxuQ9DNYad2grcydzBS6uZTYceYWretLlDdx9QwbKGKg05GBPaPfIFOEoeGdFspNz6bM m+ZRf7mXOqtspw/6du8M+U8dR9E5aSOiQWwfRO/d8KneNoXeeskYDHhl4LvMyUBtkPPcov xzAjeCg6QJnEO8P1w5rpi255kEgx6K4= X-MC-Unique: N2MhddlZPKCyRcJl5oN2xQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VWOQCoOQErbEn0u8LJsn620oYxNKcQdFiEhqtenCnB4=; b=SlZJPc6GBG5L71erqpr/lZr4isHeOsGlwXpCWRwzRS/2P8CdtR0I9rRNyLTvpT2c1T wSZ+QVaZ9AmepcjbCxXt3z23zdmQvfGTyUKi1vAwaEYEEqt+M3vTByIU71/rsXad5Ey+ C3sK+TaZQmYTGDBQ1WRE0z3UbEN8s+Qz5pbK+MAwHEZGO00SoPxjT7chKj5GK0tl6E3H 0GrwiN4zdlD1pv9vO+qIyXSzYiGuMjAREBv4eJdNBSJjqKKVtiJmnDQR042ZHHEHt/az hSI7hrARpruIZMxT9Q81Cs1oo/oehrfqJlKYMV7kgITyBUZ9cwCpbA9Tqxcfgi1lwLng uDFg== X-Gm-Message-State: AOAM5304l9J0XE0el2nKz69E8lOMQhUSjyDzv7WE6s7gbfoIbilfD5Za Q77GJGdrPV/aFkrpIsNCFkQLF2aTfXd5VL23rne3/zFCMtt9T/jJrWIps3YQ9sxYj34xPopUiUs ifnA/jCjEwDIZJg== X-Received: by 2002:adf:cd8a:: with SMTP id q10mr28918175wrj.164.1640951374632; Fri, 31 Dec 2021 03:49:34 -0800 (PST) X-Google-Smtp-Source: ABdhPJw2dIVmmJjJoWOYkN6QY4oEzQHq2PYPcfJGoUKtxh9GPOzq4G0wqsdDi0lyd+GdbG73VYoPTQ== X-Received: by 2002:adf:cd8a:: with SMTP id q10mr28918156wrj.164.1640951374374; Fri, 31 Dec 2021 03:49:34 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Marcel Apfelbaum , Gerd Hoffmann , David Hildenbrand , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , "Michael S. Tsirkin" , Peter Xu Subject: [PATCH 7/8] hw/dma: Introduce dma_size_t type definition Date: Fri, 31 Dec 2021 12:49:00 +0100 Message-Id: <20211231114901.976937-8-philmd@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211231114901.976937-1-philmd@redhat.com> References: <20211231114901.976937-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1640951379753000001 The DMA API defines the dma_addr_t type for DMA addresses. Some sizes related to the API also use this type, which is a bit confusing when reviewing. Add a similar 'dma_size_t' definition (and its format string). Update the obvious places where dma_size_t should be used, and adapt a pair of format strings. Move QEMUSGList declaration after dma_size_t definition so this structure can use the new type. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/rdma/rdma_utils.h | 4 ++-- include/hw/pci/pci.h | 10 ++++---- include/sysemu/dma.h | 50 ++++++++++++++++++++------------------- hw/ide/ahci.c | 2 +- hw/nvme/ctrl.c | 2 +- hw/nvram/fw_cfg.c | 2 +- hw/rdma/rdma_utils.c | 6 ++--- hw/rdma/vmw/pvrdma_main.c | 2 +- hw/scsi/lsi53c895a.c | 4 ++-- hw/scsi/megasas.c | 10 ++++---- hw/usb/libhw.c | 4 ++-- softmmu/dma-helpers.c | 10 ++++---- hw/rdma/trace-events | 2 +- 13 files changed, 55 insertions(+), 53 deletions(-) diff --git a/hw/rdma/rdma_utils.h b/hw/rdma/rdma_utils.h index 0c6414e7e0a..5446e4e2500 100644 --- a/hw/rdma/rdma_utils.h +++ b/hw/rdma/rdma_utils.h @@ -38,8 +38,8 @@ typedef struct RdmaProtectedGSList { GSList *list; } RdmaProtectedGSList; =20 -void *rdma_pci_dma_map(PCIDevice *dev, dma_addr_t addr, dma_addr_t len); -void rdma_pci_dma_unmap(PCIDevice *dev, void *buffer, dma_addr_t len); +void *rdma_pci_dma_map(PCIDevice *dev, dma_addr_t addr, dma_size_t len); +void rdma_pci_dma_unmap(PCIDevice *dev, void *buffer, dma_size_t len); void rdma_protected_gqueue_init(RdmaProtectedGQueue *list); void rdma_protected_gqueue_destroy(RdmaProtectedGQueue *list); void rdma_protected_gqueue_append_int64(RdmaProtectedGQueue *list, diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h index f0d707efb8c..f2257b2cd8c 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -805,7 +805,7 @@ static inline AddressSpace *pci_get_address_space(PCIDe= vice *dev) * @dir: indicates the transfer direction */ static inline MemTxResult pci_dma_rw(PCIDevice *dev, dma_addr_t addr, - void *buf, dma_addr_t len, + void *buf, dma_size_t len, DMADirection dir, MemTxAttrs attrs) { return dma_memory_rw(pci_get_address_space(dev), addr, buf, len, @@ -825,7 +825,7 @@ static inline MemTxResult pci_dma_rw(PCIDevice *dev, dm= a_addr_t addr, * @len: length of the data transferred */ static inline MemTxResult pci_dma_read(PCIDevice *dev, dma_addr_t addr, - void *buf, dma_addr_t len) + void *buf, dma_size_t len) { return pci_dma_rw(dev, addr, buf, len, DMA_DIRECTION_TO_DEVICE, MEMTXATTRS_UNSPECIFIED); @@ -844,7 +844,7 @@ static inline MemTxResult pci_dma_read(PCIDevice *dev, = dma_addr_t addr, * @len: the number of bytes to write */ static inline MemTxResult pci_dma_write(PCIDevice *dev, dma_addr_t addr, - const void *buf, dma_addr_t len) + const void *buf, dma_size_t len) { return pci_dma_rw(dev, addr, (void *) buf, len, DMA_DIRECTION_FROM_DEVICE, MEMTXATTRS_UNSPECIFIED); @@ -889,7 +889,7 @@ PCI_DMA_DEFINE_LDST(q_be, q_be, 64); * @dir: indicates the transfer direction */ static inline void *pci_dma_map(PCIDevice *dev, dma_addr_t addr, - dma_addr_t *plen, DMADirection dir) + dma_size_t *plen, DMADirection dir) { void *buf; =20 @@ -898,7 +898,7 @@ static inline void *pci_dma_map(PCIDevice *dev, dma_add= r_t addr, return buf; } =20 -static inline void pci_dma_unmap(PCIDevice *dev, void *buffer, dma_addr_t = len, +static inline void pci_dma_unmap(PCIDevice *dev, void *buffer, dma_size_t = len, DMADirection dir, dma_addr_t access_len) { dma_memory_unmap(pci_get_address_space(dev), buffer, len, dir, access_= len); diff --git a/include/sysemu/dma.h b/include/sysemu/dma.h index 0db2478a506..45a2567848c 100644 --- a/include/sysemu/dma.h +++ b/include/sysemu/dma.h @@ -15,22 +15,11 @@ #include "block/block.h" #include "block/accounting.h" =20 -typedef struct ScatterGatherEntry ScatterGatherEntry; - typedef enum { DMA_DIRECTION_TO_DEVICE =3D 0, DMA_DIRECTION_FROM_DEVICE =3D 1, } DMADirection; =20 -struct QEMUSGList { - ScatterGatherEntry *sg; - int nsg; - int nalloc; - size_t size; - DeviceState *dev; - AddressSpace *as; -}; - /* * When an IOMMU is present, bus addresses become distinct from * CPU/memory physical addresses and may be a different size. Because @@ -39,9 +28,22 @@ struct QEMUSGList { * least most) cases. */ typedef uint64_t dma_addr_t; +typedef uint64_t dma_size_t; =20 #define DMA_ADDR_BITS 64 #define DMA_ADDR_FMT "%" PRIx64 +#define DMA_SIZE_FMT "%" PRIx64 + +typedef struct ScatterGatherEntry ScatterGatherEntry; + +struct QEMUSGList { + ScatterGatherEntry *sg; + int nsg; + int nalloc; + dma_size_t size; + DeviceState *dev; + AddressSpace *as; +}; =20 static inline void dma_barrier(AddressSpace *as, DMADirection dir) { @@ -70,7 +72,7 @@ static inline void dma_barrier(AddressSpace *as, DMADirec= tion dir) * useful for certain cases, but usually you should just use * dma_memory_{read,write}() and check for errors */ static inline bool dma_memory_valid(AddressSpace *as, - dma_addr_t addr, dma_addr_t len, + dma_addr_t addr, dma_size_t len, DMADirection dir, MemTxAttrs attrs) { return address_space_access_valid(as, addr, len, @@ -80,7 +82,7 @@ static inline bool dma_memory_valid(AddressSpace *as, =20 static inline MemTxResult dma_memory_rw_relaxed(AddressSpace *as, dma_addr_t addr, - void *buf, dma_addr_t len, + void *buf, dma_size_t len, DMADirection dir, MemTxAttrs attrs) { @@ -90,7 +92,7 @@ static inline MemTxResult dma_memory_rw_relaxed(AddressSp= ace *as, =20 static inline MemTxResult dma_memory_read_relaxed(AddressSpace *as, dma_addr_t addr, - void *buf, dma_addr_t le= n) + void *buf, dma_size_t le= n) { return dma_memory_rw_relaxed(as, addr, buf, len, DMA_DIRECTION_TO_DEVICE, @@ -100,7 +102,7 @@ static inline MemTxResult dma_memory_read_relaxed(Addre= ssSpace *as, static inline MemTxResult dma_memory_write_relaxed(AddressSpace *as, dma_addr_t addr, const void *buf, - dma_addr_t len) + dma_size_t len) { return dma_memory_rw_relaxed(as, addr, (void *)buf, len, DMA_DIRECTION_FROM_DEVICE, @@ -122,7 +124,7 @@ static inline MemTxResult dma_memory_write_relaxed(Addr= essSpace *as, * @attrs: memory transaction attributes */ static inline MemTxResult dma_memory_rw(AddressSpace *as, dma_addr_t addr, - void *buf, dma_addr_t len, + void *buf, dma_size_t len, DMADirection dir, MemTxAttrs attrs) { dma_barrier(as, dir); @@ -144,7 +146,7 @@ static inline MemTxResult dma_memory_rw(AddressSpace *a= s, dma_addr_t addr, * @attrs: memory transaction attributes */ static inline MemTxResult dma_memory_read(AddressSpace *as, dma_addr_t add= r, - void *buf, dma_addr_t len, + void *buf, dma_size_t len, MemTxAttrs attrs) { return dma_memory_rw(as, addr, buf, len, @@ -165,7 +167,7 @@ static inline MemTxResult dma_memory_read(AddressSpace = *as, dma_addr_t addr, * @attrs: memory transaction attributes */ static inline MemTxResult dma_memory_write(AddressSpace *as, dma_addr_t ad= dr, - const void *buf, dma_addr_t len, + const void *buf, dma_size_t len, MemTxAttrs attrs) { return dma_memory_rw(as, addr, (void *)buf, len, @@ -186,7 +188,7 @@ static inline MemTxResult dma_memory_write(AddressSpace= *as, dma_addr_t addr, * @attrs: memory transaction attributes */ MemTxResult dma_memory_set(AddressSpace *as, dma_addr_t addr, - uint8_t c, dma_addr_t len, MemTxAttrs attrs); + uint8_t c, dma_size_t len, MemTxAttrs attrs); =20 /** * address_space_map: Map a physical memory region into a host virtual add= ress. @@ -203,7 +205,7 @@ MemTxResult dma_memory_set(AddressSpace *as, dma_addr_t= addr, * @attrs: memory attributes */ static inline void *dma_memory_map(AddressSpace *as, - dma_addr_t addr, dma_addr_t *len, + dma_addr_t addr, dma_size_t *len, DMADirection dir, MemTxAttrs attrs) { hwaddr xlen =3D *len; @@ -230,8 +232,8 @@ static inline void *dma_memory_map(AddressSpace *as, * @access_len: amount of data actually transferred */ static inline void dma_memory_unmap(AddressSpace *as, - void *buffer, dma_addr_t len, - DMADirection dir, dma_addr_t access_le= n) + void *buffer, dma_size_t len, + DMADirection dir, dma_size_t access_le= n) { address_space_unmap(as, buffer, (hwaddr)len, dir =3D=3D DMA_DIRECTION_FROM_DEVICE, access_len); @@ -279,12 +281,12 @@ DEFINE_LDST_DMA(q, q, 64, be); =20 struct ScatterGatherEntry { dma_addr_t base; - dma_addr_t len; + dma_size_t len; }; =20 void qemu_sglist_init(QEMUSGList *qsg, DeviceState *dev, int alloc_hint, AddressSpace *as); -void qemu_sglist_add(QEMUSGList *qsg, dma_addr_t base, dma_addr_t len); +void qemu_sglist_add(QEMUSGList *qsg, dma_addr_t base, dma_size_t len); void qemu_sglist_destroy(QEMUSGList *qsg); =20 typedef BlockAIOCB *DMAIOFunc(int64_t offset, QEMUIOVector *iov, diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index 205dfdc6622..256bbc377ce 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -1159,7 +1159,7 @@ static void process_ncq_command(AHCIState *s, int por= t, const uint8_t *cmd_fis, ahci_populate_sglist(ad, &ncq_tfs->sglist, ncq_tfs->cmdh, size, 0); =20 if (ncq_tfs->sglist.size < size) { - error_report("ahci: PRDT length for NCQ command (0x%zx) " + error_report("ahci: PRDT length for NCQ command (0x" DMA_SIZE_FMT = ") " "is smaller than the requested size (0x%zx)", ncq_tfs->sglist.size, size); ncq_err(ncq_tfs); diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c index 462f79a1f60..4620e662fc9 100644 --- a/hw/nvme/ctrl.c +++ b/hw/nvme/ctrl.c @@ -1147,7 +1147,7 @@ static uint16_t nvme_tx(NvmeCtrl *n, NvmeSg *sg, uint= 8_t *ptr, uint32_t len, =20 if (sg->flags & NVME_SG_DMA) { const MemTxAttrs attrs =3D MEMTXATTRS_UNSPECIFIED; - uint64_t residual; + dma_size_t residual; =20 if (dir =3D=3D NVME_TX_DIRECTION_TO_DEVICE) { residual =3D dma_buf_write(ptr, len, &sg->qsg, attrs); diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index e5f3c981841..a30bff8a14a 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -346,12 +346,12 @@ static void fw_cfg_data_mem_write(void *opaque, hwadd= r addr, =20 static void fw_cfg_dma_transfer(FWCfgState *s) { - dma_addr_t len; FWCfgDmaAccess dma; int arch; FWCfgEntry *e; int read =3D 0, write =3D 0; dma_addr_t dma_addr; + dma_size_t len; =20 /* Reset the address before the next access */ dma_addr =3D s->dma_addr; diff --git a/hw/rdma/rdma_utils.c b/hw/rdma/rdma_utils.c index 61cb8ede0fd..677d7ffba53 100644 --- a/hw/rdma/rdma_utils.c +++ b/hw/rdma/rdma_utils.c @@ -17,10 +17,10 @@ #include "trace.h" #include "rdma_utils.h" =20 -void *rdma_pci_dma_map(PCIDevice *dev, dma_addr_t addr, dma_addr_t len) +void *rdma_pci_dma_map(PCIDevice *dev, dma_addr_t addr, dma_size_t len) { void *p; - hwaddr pci_len =3D len; + dma_size_t pci_len =3D len; =20 if (!addr) { rdma_error_report("addr is NULL"); @@ -44,7 +44,7 @@ void *rdma_pci_dma_map(PCIDevice *dev, dma_addr_t addr, d= ma_addr_t len) return p; } =20 -void rdma_pci_dma_unmap(PCIDevice *dev, void *buffer, dma_addr_t len) +void rdma_pci_dma_unmap(PCIDevice *dev, void *buffer, dma_size_t len) { trace_rdma_pci_dma_unmap(buffer); if (buffer) { diff --git a/hw/rdma/vmw/pvrdma_main.c b/hw/rdma/vmw/pvrdma_main.c index 91206dbb8eb..bf3d542302e 100644 --- a/hw/rdma/vmw/pvrdma_main.c +++ b/hw/rdma/vmw/pvrdma_main.c @@ -124,7 +124,7 @@ static int init_dev_ring(PvrdmaRing *ring, PvrdmaRingSt= ate **ring_state, (num_pages - 1) * TARGET_PAGE_SIZE / sizeof(struct pvrdma_cqne), sizeof(struct pvrdma_cqne), - (dma_addr_t *)&tbl[1], (dma_addr_t)num_pages - 1= ); + (dma_addr_t *)&tbl[1], (dma_size_t)num_pages - 1= ); if (rc) { rc =3D -ENOMEM; goto out_free_ring_state; diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c index 4c431adb774..6d63bffc804 100644 --- a/hw/scsi/lsi53c895a.c +++ b/hw/scsi/lsi53c895a.c @@ -444,7 +444,7 @@ static void lsi_execute_script(LSIState *s); static void lsi_reselect(LSIState *s, lsi_request *p); =20 static inline void lsi_mem_read(LSIState *s, dma_addr_t addr, - void *buf, dma_addr_t len) + void *buf, dma_size_t len) { if (s->dmode & LSI_DMODE_SIOM) { address_space_read(&s->pci_io_as, addr, MEMTXATTRS_UNSPECIFIED, @@ -455,7 +455,7 @@ static inline void lsi_mem_read(LSIState *s, dma_addr_t= addr, } =20 static inline void lsi_mem_write(LSIState *s, dma_addr_t addr, - const void *buf, dma_addr_t len) + const void *buf, dma_size_t len) { if (s->dmode & LSI_DMODE_DIOM) { address_space_write(&s->pci_io_as, addr, MEMTXATTRS_UNSPECIFIED, diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index cb019549371..7456a25970a 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -1046,7 +1046,7 @@ static int megasas_pd_get_info_submit(SCSIDevice *sde= v, int lun, uint16_t pd_id =3D ((sdev->id & 0xFF) << 8) | (lun & 0xFF); uint8_t cmdbuf[6]; size_t len; - size_t residual; + dma_size_t residual; =20 if (!cmd->iov_buf) { cmd->iov_buf =3D g_malloc0(dcmd_size); @@ -1152,7 +1152,7 @@ static int megasas_dcmd_ld_get_list(MegasasState *s, = MegasasCmd *cmd) { struct mfi_ld_list info; size_t dcmd_size =3D sizeof(info); - size_t residual; + dma_size_t residual; uint32_t num_ld_disks =3D 0, max_ld_disks; uint64_t ld_size; BusChild *kid; @@ -1198,7 +1198,7 @@ static int megasas_dcmd_ld_list_query(MegasasState *s= , MegasasCmd *cmd) uint16_t flags; struct mfi_ld_targetid_list info; size_t dcmd_size =3D sizeof(info); - size_t residual; + dma_size_t residual; uint32_t num_ld_disks =3D 0, max_ld_disks =3D s->fw_luns; BusChild *kid; =20 @@ -1251,7 +1251,7 @@ static int megasas_ld_get_info_submit(SCSIDevice *sde= v, int lun, size_t dcmd_size =3D sizeof(struct mfi_ld_info); uint8_t cdb[6]; ssize_t len; - size_t residual; + dma_size_t residual; uint16_t sdev_id =3D ((sdev->id & 0xFF) << 8) | (lun & 0xFF); uint64_t ld_size; =20 @@ -1625,7 +1625,7 @@ static int megasas_handle_dcmd(MegasasState *s, Megas= asCmd *cmd) } =20 static int megasas_finish_internal_dcmd(MegasasCmd *cmd, - SCSIRequest *req, size_t residual) + SCSIRequest *req, dma_size_t resid= ual) { int retval =3D MFI_STAT_OK; int lun =3D req->lun; diff --git a/hw/usb/libhw.c b/hw/usb/libhw.c index f350eae443d..f632258459a 100644 --- a/hw/usb/libhw.c +++ b/hw/usb/libhw.c @@ -32,10 +32,10 @@ int usb_packet_map(USBPacket *p, QEMUSGList *sgl) =20 for (i =3D 0; i < sgl->nsg; i++) { dma_addr_t base =3D sgl->sg[i].base; - dma_addr_t len =3D sgl->sg[i].len; + dma_size_t len =3D sgl->sg[i].len; =20 while (len) { - dma_addr_t xlen =3D len; + dma_size_t xlen =3D len; mem =3D dma_memory_map(sgl->as, base, &xlen, dir, MEMTXATTRS_UNSPECIFIED); if (!mem) { diff --git a/softmmu/dma-helpers.c b/softmmu/dma-helpers.c index 4563a775aa7..66ba0b2c361 100644 --- a/softmmu/dma-helpers.c +++ b/softmmu/dma-helpers.c @@ -19,7 +19,7 @@ /* #define DEBUG_IOMMU */ =20 MemTxResult dma_memory_set(AddressSpace *as, dma_addr_t addr, - uint8_t c, dma_addr_t len, MemTxAttrs attrs) + uint8_t c, dma_size_t len, MemTxAttrs attrs) { dma_barrier(as, DMA_DIRECTION_FROM_DEVICE); =20 @@ -51,7 +51,7 @@ void qemu_sglist_init(QEMUSGList *qsg, DeviceState *dev, = int alloc_hint, object_ref(OBJECT(dev)); } =20 -void qemu_sglist_add(QEMUSGList *qsg, dma_addr_t base, dma_addr_t len) +void qemu_sglist_add(QEMUSGList *qsg, dma_addr_t base, dma_size_t len) { if (qsg->nsg =3D=3D qsg->nalloc) { qsg->nalloc =3D 2 * qsg->nalloc + 1; @@ -294,12 +294,12 @@ BlockAIOCB *dma_blk_write(BlockBackend *blk, } =20 =20 -static MemTxResult dma_buf_rw(void *buf, int32_t len, uint64_t *residual, +static MemTxResult dma_buf_rw(void *buf, dma_size_t len, dma_size_t *resid= ual, QEMUSGList *sg, DMADirection dir, MemTxAttrs attrs) { uint8_t *ptr =3D buf; - uint64_t xresidual; + dma_size_t xresidual; int sg_cur_index; MemTxResult res =3D MEMTX_OK; =20 @@ -308,7 +308,7 @@ static MemTxResult dma_buf_rw(void *buf, int32_t len, u= int64_t *residual, len =3D MIN(len, xresidual); while (len > 0) { ScatterGatherEntry entry =3D sg->sg[sg_cur_index++]; - int32_t xfer =3D MIN(len, entry.len); + dma_size_t xfer =3D MIN(len, entry.len); res |=3D dma_memory_rw(sg->as, entry.base, ptr, xfer, dir, attrs); ptr +=3D xfer; len -=3D xfer; diff --git a/hw/rdma/trace-events b/hw/rdma/trace-events index 9accb149734..c23175120e1 100644 --- a/hw/rdma/trace-events +++ b/hw/rdma/trace-events @@ -27,5 +27,5 @@ rdma_rm_alloc_qp(uint32_t rm_qpn, uint32_t backend_qpn, u= int8_t qp_type) "rm_qpn rdma_rm_modify_qp(uint32_t qpn, uint32_t attr_mask, int qp_state, uint8_t = sgid_idx) "qpn=3D0x%x, attr_mask=3D0x%x, qp_state=3D%d, sgid_idx=3D%d" =20 # rdma_utils.c -rdma_pci_dma_map(uint64_t addr, void *vaddr, uint64_t len) "0x%"PRIx64" ->= %p (len=3D%" PRId64")" +rdma_pci_dma_map(uint64_t addr, void *vaddr, uint64_t len) "0x%"PRIx64" ->= %p (len=3D%" PRIu64")" rdma_pci_dma_unmap(void *vaddr) "%p" --=20 2.33.1 From nobody Sun May 19 15:29:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1640951382; cv=none; d=zohomail.com; s=zohoarc; b=HiHn0UcJVCN183RUB0pKux+or4XfBMe4APX6mLPJAgKfOAkWa/0st8boeDWBu37iEt2y/vFL1k3FROclTrx0PyDb9lOy5Bk+cxJASxS4XsPvXRYC6a0bQIUAHgBUCraAfDcto6lpI0D4cJhLf66SIOHttO2np0WvDMX2hMF4kBE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1640951382; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=sVbqGuL5i4KG9wiyUQdUi9FXx9GY+w1Tl1XX5hguON4=; b=WretNm29sh5Sa+3DY1WsKVMcLMH9dQNrdUtj5YxFu4L7j7xrR8v228q9Wx3LcN2Q/6XGwuFPHEVLSuRUlm/O2+nW9NFLOHuHhdfhirvqG/GwTQS5sli3RSGZkNrUpOfLsj8EnNnyi1TueYW1W6Wfwov9bXCpQtKd8fQwHnFbuE4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1640951382959935.2631924783658; Fri, 31 Dec 2021 03:49:42 -0800 (PST) Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-55-AieJKipUMG2HqczDeXDKmw-1; Fri, 31 Dec 2021 06:49:40 -0500 Received: by mail-wm1-f71.google.com with SMTP id 144-20020a1c0496000000b003305ac0e03aso14211364wme.8 for ; Fri, 31 Dec 2021 03:49:40 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (26.red-83-50-86.dynamicip.rima-tde.net. [83.50.86.26]) by smtp.gmail.com with ESMTPSA id n17sm24984705wmc.32.2021.12.31.03.49.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Dec 2021 03:49:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1640951381; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sVbqGuL5i4KG9wiyUQdUi9FXx9GY+w1Tl1XX5hguON4=; b=a7gFxwuKt5bXpO1mEvnfj/sDkDZafca7cthZ8wuUoUejT+PF7KAAu6xKJz2c9ncXjgoJGM XbThsK5rR0iqlgYJUhczkdhDFJFistaLmmHC/uk7Mwn5ZkEFljdTXIV0brWSfAA3G0DHMg Wn6y9lf7dHXQ6MfTGfA7Kr3geLt6sSo= X-MC-Unique: AieJKipUMG2HqczDeXDKmw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sVbqGuL5i4KG9wiyUQdUi9FXx9GY+w1Tl1XX5hguON4=; b=OjvyRipRlzM/FhVoOds9dT5dwQ9hKQKkkJJkgxeOudrUtUXTnYnAvVlmkvsvKQKvYY QvzVTOoeB9O2hnuMt9WCsAXFCdLohN51R02InqSdRyhr14GFEInjUWN0sFUQ02xaylVK cye8DJoL+mXGgmlWsC05Q95rMAPtpQv1Q8pllCjZkGhRdYZtHSMu4ItRNovbxVlU2Jdz jbgBiEpL6aCQxkcDbAw6xBOV203R6qivU2Lp25J07L4OWriF/yQ4L+cwDoxSHJq7bseN uejSYNTH3cf/Mm4fSJ8UtFmNKVmDeotSuHj+CnGtdhsKpX28c22pumqWm9uYAxXeWMyH CNIg== X-Gm-Message-State: AOAM530JxUKS6whnnkBxHiVmFpp61EZOXDOxMkgMXvQCgLGNXTt868H+ 9jqRVMb/tyKGQpzk4EfSJwlCtrONWlBdtGZl6Mn6JZIJBYziycB9Flqk/I0UETSFmosLGLUiEVW APKyRCK8rVoY4+g== X-Received: by 2002:a05:6000:c6:: with SMTP id q6mr28844949wrx.181.1640951378886; Fri, 31 Dec 2021 03:49:38 -0800 (PST) X-Google-Smtp-Source: ABdhPJze40y+FDpdvAVYk73CGv/wGhHSTGgdTSeJfcfRcrkN+CMguXeVW7PqdwukP2iZB0f9tFhPlg== X-Received: by 2002:a05:6000:c6:: with SMTP id q6mr28844937wrx.181.1640951378689; Fri, 31 Dec 2021 03:49:38 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Marcel Apfelbaum , Gerd Hoffmann , David Hildenbrand , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , "Michael S. Tsirkin" , Peter Xu , Klaus Jensen Subject: [PATCH 8/8] hw/dma: Let dma_buf_read() / dma_buf_write() propagate MemTxResult Date: Fri, 31 Dec 2021 12:49:01 +0100 Message-Id: <20211231114901.976937-9-philmd@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211231114901.976937-1-philmd@redhat.com> References: <20211231114901.976937-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1640951384489000001 Since the previous commit, dma_buf_rw() returns a MemTxResult type. Do not discard it, return it to the caller. Since both dma_buf_read/dma_buf_write functions were previously returning the QEMUSGList size not consumed, add an extra argument where the unconsummed size can be stored. Update the few callers. Reviewed-by: Klaus Jensen Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/scsi/scsi.h | 2 +- include/sysemu/dma.h | 6 +++-- hw/ide/ahci.c | 8 +++--- hw/nvme/ctrl.c | 4 +-- hw/scsi/megasas.c | 59 ++++++++++++++++++++++++++++++------------ hw/scsi/scsi-bus.c | 6 +++-- softmmu/dma-helpers.c | 18 +++++-------- 7 files changed, 63 insertions(+), 40 deletions(-) diff --git a/include/hw/scsi/scsi.h b/include/hw/scsi/scsi.h index b27d133b113..1ffb367f94f 100644 --- a/include/hw/scsi/scsi.h +++ b/include/hw/scsi/scsi.h @@ -30,7 +30,7 @@ struct SCSIRequest { int16_t status; int16_t host_status; void *hba_private; - size_t residual; + uint64_t residual; SCSICommand cmd; NotifierList cancel_notifiers; =20 diff --git a/include/sysemu/dma.h b/include/sysemu/dma.h index 45a2567848c..77a346d5ed1 100644 --- a/include/sysemu/dma.h +++ b/include/sysemu/dma.h @@ -303,8 +303,10 @@ BlockAIOCB *dma_blk_read(BlockBackend *blk, BlockAIOCB *dma_blk_write(BlockBackend *blk, QEMUSGList *sg, uint64_t offset, uint32_t align, BlockCompletionFunc *cb, void *opaque); -uint64_t dma_buf_read(void *ptr, int32_t len, QEMUSGList *sg, MemTxAttrs a= ttrs); -uint64_t dma_buf_write(void *ptr, int32_t len, QEMUSGList *sg, MemTxAttrs = attrs); +MemTxResult dma_buf_read(void *ptr, dma_size_t len, dma_size_t *residual, + QEMUSGList *sg, MemTxAttrs attrs); +MemTxResult dma_buf_write(void *ptr, dma_size_t len, dma_size_t *residual, + QEMUSGList *sg, MemTxAttrs attrs); =20 void dma_acct_start(BlockBackend *blk, BlockAcctCookie *cookie, QEMUSGList *sg, enum BlockAcctType type); diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index 256bbc377ce..564293fd492 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -1384,9 +1384,9 @@ static void ahci_pio_transfer(const IDEDMA *dma) const MemTxAttrs attrs =3D MEMTXATTRS_UNSPECIFIED; =20 if (is_write) { - dma_buf_write(s->data_ptr, size, &s->sg, attrs); + dma_buf_write(s->data_ptr, size, NULL, &s->sg, attrs); } else { - dma_buf_read(s->data_ptr, size, &s->sg, attrs); + dma_buf_read(s->data_ptr, size, NULL, &s->sg, attrs); } } =20 @@ -1479,9 +1479,9 @@ static int ahci_dma_rw_buf(const IDEDMA *dma, bool is= _write) } =20 if (is_write) { - dma_buf_read(p, l, &s->sg, MEMTXATTRS_UNSPECIFIED); + dma_buf_read(p, l, NULL, &s->sg, MEMTXATTRS_UNSPECIFIED); } else { - dma_buf_write(p, l, &s->sg, MEMTXATTRS_UNSPECIFIED); + dma_buf_write(p, l, NULL, &s->sg, MEMTXATTRS_UNSPECIFIED); } =20 /* free sglist, update byte count */ diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c index 4620e662fc9..72faa94a4a3 100644 --- a/hw/nvme/ctrl.c +++ b/hw/nvme/ctrl.c @@ -1150,9 +1150,9 @@ static uint16_t nvme_tx(NvmeCtrl *n, NvmeSg *sg, uint= 8_t *ptr, uint32_t len, dma_size_t residual; =20 if (dir =3D=3D NVME_TX_DIRECTION_TO_DEVICE) { - residual =3D dma_buf_write(ptr, len, &sg->qsg, attrs); + dma_buf_write(ptr, len, &residual, &sg->qsg, attrs); } else { - residual =3D dma_buf_read(ptr, len, &sg->qsg, attrs); + dma_buf_read(ptr, len, &residual, &sg->qsg, attrs); } =20 if (unlikely(residual)) { diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index 7456a25970a..f2daeeb7005 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -750,6 +750,7 @@ static int megasas_ctrl_get_info(MegasasState *s, Megas= asCmd *cmd) size_t dcmd_size =3D sizeof(info); BusChild *kid; int num_pd_disks =3D 0; + dma_size_t residual; =20 memset(&info, 0x0, dcmd_size); if (cmd->iov_size < dcmd_size) { @@ -860,7 +861,9 @@ static int megasas_ctrl_get_info(MegasasState *s, Megas= asCmd *cmd) MFI_INFO_PDMIX_SATA | MFI_INFO_PDMIX_LD); =20 - cmd->iov_size -=3D dma_buf_read(&info, dcmd_size, &cmd->qsg, MEMTXATTR= S_UNSPECIFIED); + dma_buf_read(&info, dcmd_size, &residual, &cmd->qsg, + MEMTXATTRS_UNSPECIFIED); + cmd->iov_size -=3D residual; return MFI_STAT_OK; } =20 @@ -868,6 +871,7 @@ static int megasas_mfc_get_defaults(MegasasState *s, Me= gasasCmd *cmd) { struct mfi_defaults info; size_t dcmd_size =3D sizeof(struct mfi_defaults); + dma_size_t residual; =20 memset(&info, 0x0, dcmd_size); if (cmd->iov_size < dcmd_size) { @@ -890,7 +894,9 @@ static int megasas_mfc_get_defaults(MegasasState *s, Me= gasasCmd *cmd) info.disable_preboot_cli =3D 1; info.cluster_disable =3D 1; =20 - cmd->iov_size -=3D dma_buf_read(&info, dcmd_size, &cmd->qsg, MEMTXATTR= S_UNSPECIFIED); + dma_buf_read(&info, dcmd_size, &residual, &cmd->qsg, + MEMTXATTRS_UNSPECIFIED); + cmd->iov_size -=3D residual; return MFI_STAT_OK; } =20 @@ -898,6 +904,7 @@ static int megasas_dcmd_get_bios_info(MegasasState *s, = MegasasCmd *cmd) { struct mfi_bios_data info; size_t dcmd_size =3D sizeof(info); + dma_size_t residual; =20 memset(&info, 0x0, dcmd_size); if (cmd->iov_size < dcmd_size) { @@ -911,7 +918,9 @@ static int megasas_dcmd_get_bios_info(MegasasState *s, = MegasasCmd *cmd) info.expose_all_drives =3D 1; } =20 - cmd->iov_size -=3D dma_buf_read(&info, dcmd_size, &cmd->qsg, MEMTXATTR= S_UNSPECIFIED); + dma_buf_read(&info, dcmd_size, &residual, &cmd->qsg, + MEMTXATTRS_UNSPECIFIED); + cmd->iov_size -=3D residual; return MFI_STAT_OK; } =20 @@ -919,10 +928,13 @@ static int megasas_dcmd_get_fw_time(MegasasState *s, = MegasasCmd *cmd) { uint64_t fw_time; size_t dcmd_size =3D sizeof(fw_time); + dma_size_t residual; =20 fw_time =3D cpu_to_le64(megasas_fw_time()); =20 - cmd->iov_size -=3D dma_buf_read(&fw_time, dcmd_size, &cmd->qsg, MEMTXA= TTRS_UNSPECIFIED); + dma_buf_read(&fw_time, dcmd_size, &residual, &cmd->qsg, + MEMTXATTRS_UNSPECIFIED); + cmd->iov_size -=3D residual; return MFI_STAT_OK; } =20 @@ -942,6 +954,7 @@ static int megasas_event_info(MegasasState *s, MegasasC= md *cmd) { struct mfi_evt_log_state info; size_t dcmd_size =3D sizeof(info); + dma_size_t residual; =20 memset(&info, 0, dcmd_size); =20 @@ -949,7 +962,9 @@ static int megasas_event_info(MegasasState *s, MegasasC= md *cmd) info.shutdown_seq_num =3D cpu_to_le32(s->shutdown_event); info.boot_seq_num =3D cpu_to_le32(s->boot_event); =20 - cmd->iov_size -=3D dma_buf_read(&info, dcmd_size, &cmd->qsg, MEMTXATTR= S_UNSPECIFIED); + dma_buf_read(&info, dcmd_size, &residual, &cmd->qsg, + MEMTXATTRS_UNSPECIFIED); + cmd->iov_size -=3D residual; return MFI_STAT_OK; } =20 @@ -979,6 +994,7 @@ static int megasas_dcmd_pd_get_list(MegasasState *s, Me= gasasCmd *cmd) size_t dcmd_size =3D sizeof(info); BusChild *kid; uint32_t offset, dcmd_limit, num_pd_disks =3D 0, max_pd_disks; + dma_size_t residual; =20 memset(&info, 0, dcmd_size); offset =3D 8; @@ -1018,7 +1034,9 @@ static int megasas_dcmd_pd_get_list(MegasasState *s, = MegasasCmd *cmd) info.size =3D cpu_to_le32(offset); info.count =3D cpu_to_le32(num_pd_disks); =20 - cmd->iov_size -=3D dma_buf_read(&info, offset, &cmd->qsg, MEMTXATTRS_U= NSPECIFIED); + dma_buf_read(&info, offset, &residual, &cmd->qsg, + MEMTXATTRS_UNSPECIFIED); + cmd->iov_size -=3D residual; return MFI_STAT_OK; } =20 @@ -1113,8 +1131,9 @@ static int megasas_pd_get_info_submit(SCSIDevice *sde= v, int lun, info->connected_port_bitmap =3D 0x1; info->device_speed =3D 1; info->link_speed =3D 1; - residual =3D dma_buf_read(cmd->iov_buf, dcmd_size, &cmd->qsg, - MEMTXATTRS_UNSPECIFIED); + dma_buf_read(cmd->iov_buf, dcmd_size, &residual, &cmd->qsg, + MEMTXATTRS_UNSPECIFIED); + cmd->iov_size -=3D residual; g_free(cmd->iov_buf); cmd->iov_size =3D dcmd_size - residual; cmd->iov_buf =3D NULL; @@ -1187,8 +1206,8 @@ static int megasas_dcmd_ld_get_list(MegasasState *s, = MegasasCmd *cmd) info.ld_count =3D cpu_to_le32(num_ld_disks); trace_megasas_dcmd_ld_get_list(cmd->index, num_ld_disks, max_ld_disks); =20 - residual =3D dma_buf_read(&info, dcmd_size, &cmd->qsg, - MEMTXATTRS_UNSPECIFIED); + dma_buf_read(&info, dcmd_size, &residual, &cmd->qsg, + MEMTXATTRS_UNSPECIFIED); cmd->iov_size =3D dcmd_size - residual; return MFI_STAT_OK; } @@ -1238,8 +1257,8 @@ static int megasas_dcmd_ld_list_query(MegasasState *s= , MegasasCmd *cmd) info.size =3D dcmd_size; trace_megasas_dcmd_ld_get_list(cmd->index, num_ld_disks, max_ld_disks); =20 - residual =3D dma_buf_read(&info, dcmd_size, &cmd->qsg, - MEMTXATTRS_UNSPECIFIED); + dma_buf_read(&info, dcmd_size, &residual, &cmd->qsg, + MEMTXATTRS_UNSPECIFIED); cmd->iov_size =3D dcmd_size - residual; return MFI_STAT_OK; } @@ -1290,8 +1309,8 @@ static int megasas_ld_get_info_submit(SCSIDevice *sde= v, int lun, info->ld_config.span[0].num_blocks =3D info->size; info->ld_config.span[0].array_ref =3D cpu_to_le16(sdev_id); =20 - residual =3D dma_buf_read(cmd->iov_buf, dcmd_size, &cmd->qsg, - MEMTXATTRS_UNSPECIFIED); + dma_buf_read(cmd->iov_buf, dcmd_size, &residual, &cmd->qsg, + MEMTXATTRS_UNSPECIFIED); g_free(cmd->iov_buf); cmd->iov_size =3D dcmd_size - residual; cmd->iov_buf =3D NULL; @@ -1336,6 +1355,7 @@ static int megasas_dcmd_cfg_read(MegasasState *s, Meg= asasCmd *cmd) struct mfi_config_data *info; int num_pd_disks =3D 0, array_offset, ld_offset; BusChild *kid; + dma_size_t residual; =20 if (cmd->iov_size > 4096) { return MFI_STAT_INVALID_PARAMETER; @@ -1410,7 +1430,9 @@ static int megasas_dcmd_cfg_read(MegasasState *s, Meg= asasCmd *cmd) ld_offset +=3D sizeof(struct mfi_ld_config); } =20 - cmd->iov_size -=3D dma_buf_read(data, info->size, &cmd->qsg, MEMTXATTR= S_UNSPECIFIED); + dma_buf_read(data, info->size, &residual, &cmd->qsg, + MEMTXATTRS_UNSPECIFIED); + cmd->iov_size -=3D residual; return MFI_STAT_OK; } =20 @@ -1418,6 +1440,7 @@ static int megasas_dcmd_get_properties(MegasasState *= s, MegasasCmd *cmd) { struct mfi_ctrl_props info; size_t dcmd_size =3D sizeof(info); + dma_size_t residual; =20 memset(&info, 0x0, dcmd_size); if (cmd->iov_size < dcmd_size) { @@ -1440,7 +1463,9 @@ static int megasas_dcmd_get_properties(MegasasState *= s, MegasasCmd *cmd) info.ecc_bucket_leak_rate =3D cpu_to_le16(1440); info.expose_encl_devices =3D 1; =20 - cmd->iov_size -=3D dma_buf_read(&info, dcmd_size, &cmd->qsg, MEMTXATTR= S_UNSPECIFIED); + dma_buf_read(&info, dcmd_size, &residual, &cmd->qsg, + MEMTXATTRS_UNSPECIFIED); + cmd->iov_size -=3D residual; return MFI_STAT_OK; } =20 @@ -1485,7 +1510,7 @@ static int megasas_dcmd_set_properties(MegasasState *= s, MegasasCmd *cmd) dcmd_size); return MFI_STAT_INVALID_PARAMETER; } - dma_buf_write(&info, dcmd_size, &cmd->qsg, MEMTXATTRS_UNSPECIFIED); + dma_buf_write(&info, dcmd_size, NULL, &cmd->qsg, MEMTXATTRS_UNSPECIFIE= D); trace_megasas_dcmd_unsupported(cmd->index, cmd->iov_size); return MFI_STAT_OK; } diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index 3466e680ac7..4057e04ce89 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -1421,9 +1421,11 @@ void scsi_req_data(SCSIRequest *req, int len) =20 buf =3D scsi_req_get_buf(req); if (req->cmd.mode =3D=3D SCSI_XFER_FROM_DEV) { - req->residual =3D dma_buf_read(buf, len, req->sg, MEMTXATTRS_UNSPE= CIFIED); + dma_buf_read(buf, len, &req->residual, req->sg, + MEMTXATTRS_UNSPECIFIED); } else { - req->residual =3D dma_buf_write(buf, len, req->sg, MEMTXATTRS_UNSP= ECIFIED); + dma_buf_write(buf, len, &req->residual, req->sg, + MEMTXATTRS_UNSPECIFIED); } scsi_req_continue(req); } diff --git a/softmmu/dma-helpers.c b/softmmu/dma-helpers.c index 66ba0b2c361..25120ea2792 100644 --- a/softmmu/dma-helpers.c +++ b/softmmu/dma-helpers.c @@ -321,22 +321,16 @@ static MemTxResult dma_buf_rw(void *buf, dma_size_t l= en, dma_size_t *residual, return res; } =20 -uint64_t dma_buf_read(void *ptr, int32_t len, QEMUSGList *sg, MemTxAttrs a= ttrs) +MemTxResult dma_buf_read(void *ptr, dma_size_t len, dma_size_t *residual, + QEMUSGList *sg, MemTxAttrs attrs) { - uint64_t residual; - - dma_buf_rw(ptr, len, &residual, sg, DMA_DIRECTION_FROM_DEVICE, attrs); - - return residual; + return dma_buf_rw(ptr, len, residual, sg, DMA_DIRECTION_FROM_DEVICE, a= ttrs); } =20 -uint64_t dma_buf_write(void *ptr, int32_t len, QEMUSGList *sg, MemTxAttrs = attrs) +MemTxResult dma_buf_write(void *ptr, dma_size_t len, dma_size_t *residual, + QEMUSGList *sg, MemTxAttrs attrs) { - uint64_t residual; - - dma_buf_rw(ptr, len, &residual, sg, DMA_DIRECTION_TO_DEVICE, attrs); - - return residual; + return dma_buf_rw(ptr, len, residual, sg, DMA_DIRECTION_TO_DEVICE, att= rs); } =20 void dma_acct_start(BlockBackend *blk, BlockAcctCookie *cookie, --=20 2.33.1