From: Ramesh Thomas <ramesh.thomas@intel.com>
To: Gerd Bayer <gbayer@linux.ibm.com>,
Alex Williamson <alex.williamson@redhat.com>,
Jason Gunthorpe <jgg@ziepe.ca>,
Niklas Schnelle <schnelle@linux.ibm.com>
Cc: <kvm@vger.kernel.org>, <linux-s390@vger.kernel.org>,
Ankit Agrawal <ankita@nvidia.com>,
Yishai Hadas <yishaih@nvidia.com>,
Halil Pasic <pasic@linux.ibm.com>,
Julian Ruess <julianr@linux.ibm.com>,
"Thomas, Ramesh" <ramesh.thomas@intel.com>
Subject: Re: [PATCH v3 1/3] vfio/pci: Extract duplicated code into macro
Date: Fri, 17 May 2024 03:47:00 -0700 [thread overview]
Message-ID: <0b0aa4cc-3262-4709-ace5-1fe3943e7894@intel.com> (raw)
In-Reply-To: <20240425165604.899447-2-gbayer@linux.ibm.com>
On 4/25/2024 9:56 AM, Gerd Bayer wrote:
> vfio_pci_core_do_io_rw() repeats the same code for multiple access
> widths. Factor this out into a macro
>
> Suggested-by: Alex Williamson <alex.williamson@redhat.com>
> Signed-off-by: Gerd Bayer <gbayer@linux.ibm.com>
> ---
> drivers/vfio/pci/vfio_pci_rdwr.c | 106 ++++++++++++++-----------------
> 1 file changed, 46 insertions(+), 60 deletions(-)
>
> diff --git a/drivers/vfio/pci/vfio_pci_rdwr.c b/drivers/vfio/pci/vfio_pci_rdwr.c
> index 03b8f7ada1ac..3335f1b868b1 100644
> --- a/drivers/vfio/pci/vfio_pci_rdwr.c
> +++ b/drivers/vfio/pci/vfio_pci_rdwr.c
> @@ -90,6 +90,40 @@ VFIO_IOREAD(8)
> VFIO_IOREAD(16)
> VFIO_IOREAD(32)
>
> +#define VFIO_IORDWR(size) \
> +static int vfio_pci_core_iordwr##size(struct vfio_pci_core_device *vdev,\
> + bool iswrite, bool test_mem, \
> + void __iomem *io, char __user *buf, \
> + loff_t off, size_t *filled) \
> +{ \
> + u##size val; \
> + int ret; \
> + \
> + if (iswrite) { \
> + if (copy_from_user(&val, buf, sizeof(val))) \
Another way to get the size is (size)/8
"if (copy_from_user(&val, buf, (size)/8))"
> + return -EFAULT; \
> + \
> + ret = vfio_pci_core_iowrite##size(vdev, test_mem, \
> + val, io + off); \
> + if (ret) \
> + return ret; \
> + } else { \
> + ret = vfio_pci_core_ioread##size(vdev, test_mem, \
> + &val, io + off); \
> + if (ret) \
> + return ret; \
> + \
> + if (copy_to_user(buf, &val, sizeof(val))) \
> + return -EFAULT; \
> + } \
> + \
> + *filled = sizeof(val); \
> + return 0; \
> +} \
> +
> +VFIO_IORDWR(8)
> +VFIO_IORDWR(16)
> +VFIO_IORDWR(32)
> /*
> * Read or write from an __iomem region (MMIO or I/O port) with an excluded
> * range which is inaccessible. The excluded range drops writes and fills
> @@ -115,71 +149,23 @@ ssize_t vfio_pci_core_do_io_rw(struct vfio_pci_core_device *vdev, bool test_mem,
> fillable = 0;
>
> if (fillable >= 4 && !(off % 4)) {
> - u32 val;
> -
> - if (iswrite) {
> - if (copy_from_user(&val, buf, 4))
> - return -EFAULT;
> -
> - ret = vfio_pci_core_iowrite32(vdev, test_mem,
> - val, io + off);
> - if (ret)
> - return ret;
> - } else {
> - ret = vfio_pci_core_ioread32(vdev, test_mem,
> - &val, io + off);
> - if (ret)
> - return ret;
> -
> - if (copy_to_user(buf, &val, 4))
> - return -EFAULT;
> - }
> + ret = vfio_pci_core_iordwr32(vdev, iswrite, test_mem,
> + io, buf, off, &filled);
> + if (ret)
> + return ret;
>
> - filled = 4;
> } else if (fillable >= 2 && !(off % 2)) {
> - u16 val;
> -
> - if (iswrite) {
> - if (copy_from_user(&val, buf, 2))
> - return -EFAULT;
> -
> - ret = vfio_pci_core_iowrite16(vdev, test_mem,
> - val, io + off);
> - if (ret)
> - return ret;
> - } else {
> - ret = vfio_pci_core_ioread16(vdev, test_mem,
> - &val, io + off);
> - if (ret)
> - return ret;
> -
> - if (copy_to_user(buf, &val, 2))
> - return -EFAULT;
> - }
> + ret = vfio_pci_core_iordwr16(vdev, iswrite, test_mem,
> + io, buf, off, &filled);
> + if (ret)
> + return ret;
>
> - filled = 2;
> } else if (fillable) {
> - u8 val;
> -
> - if (iswrite) {
> - if (copy_from_user(&val, buf, 1))
> - return -EFAULT;
> -
> - ret = vfio_pci_core_iowrite8(vdev, test_mem,
> - val, io + off);
> - if (ret)
> - return ret;
> - } else {
> - ret = vfio_pci_core_ioread8(vdev, test_mem,
> - &val, io + off);
> - if (ret)
> - return ret;
> -
> - if (copy_to_user(buf, &val, 1))
> - return -EFAULT;
> - }
> + ret = vfio_pci_core_iordwr8(vdev, iswrite, test_mem,
> + io, buf, off, &filled);
> + if (ret)
> + return ret;
>
> - filled = 1;
> } else {
> /* Fill reads with -1, drop writes */
> filled = min(count, (size_t)(x_end - off));
next prev parent reply other threads:[~2024-05-17 10:47 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-25 16:56 [PATCH v3 0/3] vfio/pci: Support 8-byte PCI loads and stores Gerd Bayer
2024-04-25 16:56 ` [PATCH v3 1/3] vfio/pci: Extract duplicated code into macro Gerd Bayer
2024-04-29 16:31 ` Alex Williamson
2024-05-17 14:22 ` Gerd Bayer
2024-04-29 20:09 ` Jason Gunthorpe
2024-04-29 22:11 ` Alex Williamson
2024-04-29 22:33 ` Jason Gunthorpe
2024-05-21 15:47 ` Gerd Bayer
2024-04-30 8:16 ` liulongfang
2024-05-17 10:47 ` Ramesh Thomas [this message]
2024-04-25 16:56 ` [PATCH v3 2/3] vfio/pci: Support 8-byte PCI loads and stores Gerd Bayer
2024-04-29 16:31 ` Alex Williamson
2024-05-21 15:50 ` Gerd Bayer
2024-05-17 10:29 ` Ramesh Thomas
2024-05-20 9:02 ` Tian, Kevin
2024-05-23 0:11 ` Ramesh Thomas
2024-05-23 21:52 ` Ramesh Thomas
2024-05-21 16:40 ` Gerd Bayer
2024-05-22 13:48 ` Jason Gunthorpe
2024-05-22 23:57 ` Ramesh Thomas
2024-04-25 16:56 ` [PATCH v3 3/3] vfio/pci: Continue to refactor vfio_pci_core_do_io_rw Gerd Bayer
2024-04-28 6:59 ` Tian, Kevin
2024-04-29 16:32 ` Alex Williamson
2024-05-21 16:43 ` Gerd Bayer
2024-05-17 11:41 ` Ramesh Thomas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0b0aa4cc-3262-4709-ace5-1fe3943e7894@intel.com \
--to=ramesh.thomas@intel.com \
--cc=alex.williamson@redhat.com \
--cc=ankita@nvidia.com \
--cc=gbayer@linux.ibm.com \
--cc=jgg@ziepe.ca \
--cc=julianr@linux.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=pasic@linux.ibm.com \
--cc=schnelle@linux.ibm.com \
--cc=yishaih@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).