From: "Dixit, Ashutosh" <ashutosh.dixit@intel.com>
To: "Michael S. Tsirkin" <mst@redhat.com>
Cc: <linux-kernel@vger.kernel.org>,
Sudeep Dutt <sudeep.dutt@intel.com>,
Arnd Bergmann <arnd@arndb.de>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Subject: Re: [PATCH v6 10/12] vop: switch to virtio_legacy_init/size
Date: Mon, 06 Apr 2020 15:28:58 -0700 [thread overview]
Message-ID: <87v9mctfit.wl-ashutosh.dixit@intel.com> (raw)
In-Reply-To: <20200406222507.281867-11-mst@redhat.com>
On Mon, 06 Apr 2020 15:26:48 -0700, Michael S. Tsirkin wrote:
>
> These are used for legacy ring format, switch to APIs that make this
> explicit.
>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> ---
>
> maintainers, pls ack merging this through virtio tree due to dependency
> on previous patches in the patchset.
Acked-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
>
> drivers/misc/mic/vop/vop_main.c | 5 +++--
> drivers/misc/mic/vop/vop_vringh.c | 8 +++++---
> 2 files changed, 8 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/misc/mic/vop/vop_main.c b/drivers/misc/mic/vop/vop_main.c
> index 85942f6717c5..829b3b14b1d7 100644
> --- a/drivers/misc/mic/vop/vop_main.c
> +++ b/drivers/misc/mic/vop/vop_main.c
> @@ -283,7 +283,7 @@ static struct virtqueue *vop_new_virtqueue(unsigned int index,
> bool weak_barriers = false;
> struct vring vring;
>
> - vring_init(&vring, num, pages, MIC_VIRTIO_RING_ALIGN);
> + vring_legacy_init(&vring, num, pages, MIC_VIRTIO_RING_ALIGN);
> vring.used = used;
>
> return __vring_new_virtqueue(index, vring, vdev, weak_barriers, context,
> @@ -320,7 +320,8 @@ static struct virtqueue *vop_find_vq(struct virtio_device *dev,
> /* First assign the vring's allocated in host memory */
> vqconfig = _vop_vq_config(vdev->desc) + index;
> memcpy_fromio(&config, vqconfig, sizeof(config));
> - _vr_size = vring_size(le16_to_cpu(config.num), MIC_VIRTIO_RING_ALIGN);
> + _vr_size = vring_legacy_size(le16_to_cpu(config.num),
> + MIC_VIRTIO_RING_ALIGN);
> vr_size = PAGE_ALIGN(_vr_size + sizeof(struct _mic_vring_info));
> va = vpdev->hw_ops->remap(vpdev, le64_to_cpu(config.address), vr_size);
> if (!va)
> diff --git a/drivers/misc/mic/vop/vop_vringh.c b/drivers/misc/mic/vop/vop_vringh.c
> index 30eac172f017..0535c02d637d 100644
> --- a/drivers/misc/mic/vop/vop_vringh.c
> +++ b/drivers/misc/mic/vop/vop_vringh.c
> @@ -296,7 +296,8 @@ static int vop_virtio_add_device(struct vop_vdev *vdev,
>
> num = le16_to_cpu(vqconfig[i].num);
> mutex_init(&vvr->vr_mutex);
> - vr_size = PAGE_ALIGN(vring_size(num, MIC_VIRTIO_RING_ALIGN) +
> + vr_size = PAGE_ALIGN(vring_legacy_size(num,
> + MIC_VIRTIO_RING_ALIGN) +
> sizeof(struct _mic_vring_info));
> vr->va = (void *)
> __get_free_pages(GFP_KERNEL | __GFP_ZERO,
> @@ -308,7 +309,8 @@ static int vop_virtio_add_device(struct vop_vdev *vdev,
> goto err;
> }
> vr->len = vr_size;
> - vr->info = vr->va + vring_size(num, MIC_VIRTIO_RING_ALIGN);
> + vr->info = vr->va + vring_legacy_size(num,
> + MIC_VIRTIO_RING_ALIGN);
> vr->info->magic = cpu_to_le32(MIC_MAGIC + vdev->virtio_id + i);
> vr_addr = dma_map_single(&vpdev->dev, vr->va, vr_size,
> DMA_BIDIRECTIONAL);
> @@ -321,7 +323,7 @@ static int vop_virtio_add_device(struct vop_vdev *vdev,
> }
> vqconfig[i].address = cpu_to_le64(vr_addr);
>
> - vring_init(&vr->vr, num, vr->va, MIC_VIRTIO_RING_ALIGN);
> + vring_legacy_init(&vr->vr, num, vr->va, MIC_VIRTIO_RING_ALIGN);
> ret = vringh_init_kern(&vvr->vrh,
> *(u32 *)mic_vq_features(vdev->dd),
> num, false, vr->vr.desc, vr->vr.avail,
> --
> MST
>
next prev parent reply other threads:[~2020-04-06 22:29 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-06 22:26 [PATCH v6 00/12] virtio: alignment issues Michael S. Tsirkin
2020-04-06 22:26 ` [PATCH v6 01/12] tools/virtio: define aligned attribute Michael S. Tsirkin
2020-04-06 22:26 ` [PATCH v6 02/12] tools/virtio: make asm/barrier.h self contained Michael S. Tsirkin
2020-04-06 22:26 ` [PATCH v6 03/12] tools/virtio: define __KERNEL__ Michael S. Tsirkin
2020-04-06 22:26 ` [PATCH v6 04/12] virtio: add VIRTIO_RING_NO_LEGACY Michael S. Tsirkin
2020-04-06 22:26 ` [PATCH v6 05/12] virtio: stop using legacy struct vring in kernel Michael S. Tsirkin
2020-04-06 22:26 ` [PATCH v6 06/12] vhost: force spec specified alignment on types Michael S. Tsirkin
2020-04-06 22:26 ` [PATCH v6 07/12] virtio: add legacy init/size APIs Michael S. Tsirkin
2020-04-06 22:26 ` [PATCH v6 08/12] virtio_ring: switch to virtio_legacy_init/size Michael S. Tsirkin
2020-04-06 22:26 ` [PATCH v6 09/12] tools/virtio: " Michael S. Tsirkin
2020-04-06 22:26 ` [PATCH v6 10/12] vop: " Michael S. Tsirkin
2020-04-06 22:28 ` Dixit, Ashutosh [this message]
2020-04-06 22:26 ` [PATCH v6 11/12] remoteproc: " Michael S. Tsirkin
2020-04-06 22:26 ` [PATCH v6 12/12] mellanox: " Michael S. Tsirkin
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=87v9mctfit.wl-ashutosh.dixit@intel.com \
--to=ashutosh.dixit@intel.com \
--cc=arnd@arndb.de \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mst@redhat.com \
--cc=sudeep.dutt@intel.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