From: "Xia, Chenbo" <chenbo.xia@intel.com>
To: Wan Junjie <wanjunjie@bytedance.com>,
Maxime Coquelin <maxime.coquelin@redhat.com>
Cc: "dev@dpdk.org" <dev@dpdk.org>,
Peng He <hepeng.0320@bytedance.com>,
Zhihong Wang <wangzhihong.wzh@bytedance.com>
Subject: Re: [dpdk-dev] [PATCH v2] vhost: avoid iotlb mempool allocation while IOMMU disabled
Date: Wed, 3 Feb 2021 02:26:06 +0000 [thread overview]
Message-ID: <MN2PR11MB4063B430E7D7345108916B609CB49@MN2PR11MB4063.namprd11.prod.outlook.com> (raw)
In-Reply-To: <20210202083845.79726-1-wanjunjie@bytedance.com>
> -----Original Message-----
> From: Wan Junjie <wanjunjie@bytedance.com>
> Sent: Tuesday, February 2, 2021 4:39 PM
> To: Xia, Chenbo <chenbo.xia@intel.com>; Maxime Coquelin
> <maxime.coquelin@redhat.com>
> Cc: dev@dpdk.org; Wan Junjie <wanjunjie@bytedance.com>; Peng He
> <hepeng.0320@bytedance.com>; Zhihong Wang <wangzhihong.wzh@bytedance.com>
> Subject: [PATCH v2] vhost: avoid iotlb mempool allocation while IOMMU disabled
>
> If vhost device's IOMMU feature is disabled, iotlb mempool allocation
> is unnecessary.
>
> Reported-by: Peng He <hepeng.0320@bytedance.com>
> Signed-off-by: Wan Junjie <wanjunjie@bytedance.com>
> Reviewed-by: Zhihong Wang <wangzhihong.wzh@bytedance.com>
> ---
> lib/librte_vhost/vhost.c | 4 ++--
> lib/librte_vhost/vhost_user.c | 6 +++++-
> 2 files changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c
> index b83cf639e..e5341ab98 100644
> --- a/lib/librte_vhost/vhost.c
> +++ b/lib/librte_vhost/vhost.c
> @@ -352,7 +352,8 @@ free_vq(struct virtio_net *dev, struct vhost_virtqueue *vq)
> vhost_free_async_mem(vq);
> }
> rte_free(vq->batch_copy_elems);
> - rte_mempool_free(vq->iotlb_pool);
> + if (vq->iotlb_pool)
> + rte_mempool_free(vq->iotlb_pool);
> rte_free(vq);
> }
>
> @@ -556,7 +557,6 @@ init_vring_queue(struct virtio_net *dev, uint32_t
> vring_idx)
> vq->callfd = VIRTIO_UNINITIALIZED_EVENTFD;
> vq->notif_enable = VIRTIO_UNINITIALIZED_NOTIF;
>
> - vhost_user_iotlb_init(dev, vring_idx);
> /* Backends are set to -1 indicating an inactive device. */
> vq->backend = -1;
> }
> diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
> index 45c8ac09d..81cbb9797 100644
> --- a/lib/librte_vhost/vhost_user.c
> +++ b/lib/librte_vhost/vhost_user.c
> @@ -470,6 +470,10 @@ vhost_user_set_vring_num(struct virtio_net **pdev,
> return RTE_VHOST_MSG_RESULT_ERR;
> }
>
> + if (dev->features & (1ULL << VIRTIO_F_IOMMU_PLATFORM)) {
> + if (vhost_user_iotlb_init(dev, msg->payload.state.index))
> + return RTE_VHOST_MSG_RESULT_ERR;
> + }
> return RTE_VHOST_MSG_RESULT_OK;
> }
>
> @@ -575,7 +579,7 @@ numa_realloc(struct virtio_net *dev, int index)
> dev->virtqueue[index] = vq;
> vhost_devices[dev->vid] = dev;
>
> - if (old_vq != vq)
> + if (old_vq != vq && (dev->features & (1ULL << VIRTIO_F_IOMMU_PLATFORM)))
> vhost_user_iotlb_init(dev, index);
>
> return dev;
> --
> 2.11.0
Reviewed-by: Chenbo Xia <chenbo.xia@intel.com>
next prev parent reply other threads:[~2021-02-03 2:26 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-29 16:39 [dpdk-dev] [PATCH] " Wan Junjie
2021-02-01 7:41 ` Xia, Chenbo
2021-02-02 8:38 ` [dpdk-dev] [PATCH v2] " Wan Junjie
2021-02-03 2:26 ` Xia, Chenbo [this message]
2021-02-03 16:49 ` Maxime Coquelin
2021-02-02 8:14 Wan Junjie
2021-04-07 7:10 ` Xia, Chenbo
2021-05-13 8:39 ` David Marchand
2021-05-13 10:24 ` Xia, Chenbo
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=MN2PR11MB4063B430E7D7345108916B609CB49@MN2PR11MB4063.namprd11.prod.outlook.com \
--to=chenbo.xia@intel.com \
--cc=dev@dpdk.org \
--cc=hepeng.0320@bytedance.com \
--cc=maxime.coquelin@redhat.com \
--cc=wangzhihong.wzh@bytedance.com \
--cc=wanjunjie@bytedance.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 NNTP newsgroup(s).