From: Maxime Coquelin <maxime.coquelin@redhat.com>
To: Adrian Moreno <amorenoz@redhat.com>,
Marvin Liu <yong.liu@intel.com>,
tiwei.bie@intel.com, zhihong.wang@intel.com
Cc: dev@dpdk.org
Subject: Re: [dpdk-dev] [PATCH v4] vhost: fix vhost user virtqueue not accessible
Date: Wed, 6 Nov 2019 21:16:18 +0100 [thread overview]
Message-ID: <0495baad-48fa-2ff1-154d-efa124defca9@redhat.com> (raw)
In-Reply-To: <bcbfd749-70c3-0b4f-348c-1c546f4b7ea4@redhat.com>
On 11/4/19 9:47 AM, Adrian Moreno wrote:
> On 11/4/19 11:13 AM, Marvin Liu wrote:
>> Log feature is disabled in vhost user, so that log address was invalid
>> when checking. Check whether log address is valid can work around it.
>> Log address should also be translated in packed ring virtqueue.
>>
>> Fixes: 04cfc7fdbfca ("vhost: translate incoming log address to gpa")
>>
>> Signed-off-by: Marvin Liu <yong.liu@intel.com>
>> ---
>> lib/librte_vhost/vhost_user.c | 20 +++++++++++---------
>> 1 file changed, 11 insertions(+), 9 deletions(-)
>>
>> diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
>> index 61ef699ac..09e241305 100644
>> --- a/lib/librte_vhost/vhost_user.c
>> +++ b/lib/librte_vhost/vhost_user.c
>> @@ -641,11 +641,21 @@ translate_ring_addresses(struct virtio_net *dev, int vq_index)
>> struct vhost_vring_addr *addr = &vq->ring_addrs;
>> uint64_t len, expected_len;
>>
>> + if (addr->flags & (1 << VHOST_VRING_F_LOG)) {
>> + vq->log_guest_addr =
>> + translate_log_addr(dev, vq, addr->log_guest_addr);
>> + if (vq->log_guest_addr == 0) {
>> + RTE_LOG(DEBUG, VHOST_CONFIG,
>> + "(%d) failed to map log_guest_addr.\n",
>> + dev->vid);
>> + return dev;
>> + }
>> + }
>> +
>> if (vq_is_packed(dev)) {
>> len = sizeof(struct vring_packed_desc) * vq->size;
>> vq->desc_packed = (struct vring_packed_desc *)(uintptr_t)
>> ring_addr_to_vva(dev, vq, addr->desc_user_addr, &len);
>> - vq->log_guest_addr = 0;
>> if (vq->desc_packed == NULL ||
>> len != sizeof(struct vring_packed_desc) *
>> vq->size) {
>> @@ -741,14 +751,6 @@ translate_ring_addresses(struct virtio_net *dev, int vq_index)
>> vq->last_avail_idx = vq->used->idx;
>> }
>>
>> - vq->log_guest_addr =
>> - translate_log_addr(dev, vq, addr->log_guest_addr);
>> - if (vq->log_guest_addr == 0) {
>> - RTE_LOG(DEBUG, VHOST_CONFIG,
>> - "(%d) failed to map log_guest_addr .\n",
>> - dev->vid);
>> - return dev;
>> - }
>> vq->access_ok = 1;
>>
>> VHOST_LOG_DEBUG(VHOST_CONFIG, "(%d) mapped address desc: %p\n",
>>
>
> Reviewed-by: Adrian Moreno <amorenoz@redhat.com>
>
Thanks Marvin for the fix, and Adrian for the review.
It looks good to me too now:
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Maxime
next prev parent reply other threads:[~2019-11-06 20:16 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-25 16:20 [dpdk-dev] [PATCH] vhost: fix vhost user virtqueue not accessable Marvin Liu
2019-10-25 12:20 ` Adrian Moreno
2019-10-28 2:13 ` Liu, Yong
2019-10-29 10:02 ` Adrian Moreno
2019-10-30 11:07 ` [dpdk-dev] [PATCH v2] vhost: fix vhost user virtqueue not accessible Marvin Liu
2019-10-30 6:58 ` Tiwei Bie
2019-10-30 14:56 ` [dpdk-dev] [PATCH v3] " Marvin Liu
2019-10-31 10:42 ` Tiwei Bie
2019-10-31 14:54 ` Liu, Yong
2019-10-31 17:47 ` Adrian Moreno
2019-11-01 7:16 ` Liu, Yong
2019-11-04 8:44 ` Adrian Moreno
2019-11-04 10:13 ` [dpdk-dev] [PATCH v4] " Marvin Liu
2019-11-04 8:47 ` Adrian Moreno
2019-11-06 20:16 ` Maxime Coquelin [this message]
2019-11-06 20:59 ` Maxime Coquelin
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=0495baad-48fa-2ff1-154d-efa124defca9@redhat.com \
--to=maxime.coquelin@redhat.com \
--cc=amorenoz@redhat.com \
--cc=dev@dpdk.org \
--cc=tiwei.bie@intel.com \
--cc=yong.liu@intel.com \
--cc=zhihong.wang@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;
as well as URLs for NNTP newsgroup(s).