From: Maxime Coquelin <maxime.coquelin@redhat.com>
To: Tiwei Bie <tiwei.bie@intel.com>
Cc: zhihong.wang@intel.com, dev@dpdk.org
Subject: Re: [dpdk-dev] [PATCH v3 2/7] vhost: make gpa to hpa failure an error
Date: Tue, 3 Jul 2018 07:51:33 +0200 [thread overview]
Message-ID: <3988e6b4-f7db-9f48-cb33-f859b39398d0@redhat.com> (raw)
In-Reply-To: <20180703044535.GB3041@debian>
On 07/03/2018 06:45 AM, Tiwei Bie wrote:
> On Wed, Jun 27, 2018 at 04:49:54PM +0200, Maxime Coquelin wrote:
>> CVE-2018-1059 fix makes sure gpa contiguous memory is
>> also contiguous in hva space. Incidentally, it also makes
>> sure it is contiguous in hpa space.
>>
>> So we can simplify the code by making gpa contiguous memory
>> discontiguous in hpa space an error.
>
> Does it mean that when guest virtio driver using
> gpa contiguous but hpa discontiguous memory, vhost
> won't be able to process the corresponding desc?
> And in this case, should vhost skip this desc?
No, I think that's a mistake from my side, I mixed hpa and hva,
and so thought that this case would never happen as we already
manage buffers discontiguous in hva space.
I'll revert to the old behaviour.
Thanks!
Maxime
> Best regards,
> Tiwei Bie
>
>>
>> Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
>> ---
>> lib/librte_vhost/virtio_net.c | 14 +++++++-------
>> 1 file changed, 7 insertions(+), 7 deletions(-)
>>
>> diff --git a/lib/librte_vhost/virtio_net.c b/lib/librte_vhost/virtio_net.c
>> index 7e70a927f..ec4bcc400 100644
>> --- a/lib/librte_vhost/virtio_net.c
>> +++ b/lib/librte_vhost/virtio_net.c
>> @@ -884,13 +884,13 @@ copy_desc_to_mbuf(struct virtio_net *dev, struct vhost_virtqueue *vq,
>>
>> cpy_len = RTE_MIN(desc_chunck_len, mbuf_avail);
>>
>> - /*
>> - * A desc buf might across two host physical pages that are
>> - * not continuous. In such case (gpa_to_hpa returns 0), data
>> - * will be copied even though zero copy is enabled.
>> - */
>> - if (unlikely(dev->dequeue_zero_copy && (hpa = gpa_to_hpa(dev,
>> - desc_gaddr + desc_offset, cpy_len)))) {
>> + if (unlikely(dev->dequeue_zero_copy)) {
>> + hpa = gpa_to_hpa(dev,
>> + desc_gaddr + desc_offset, cpy_len);
>> + if (unlikely(!hpa)) {
>> + error = -1;
>> + goto out;
>> + }
>> cur->data_len = cpy_len;
>> cur->data_off = 0;
>> cur->buf_addr = (void *)(uintptr_t)(desc_addr
>> --
>> 2.14.4
>>
next prev parent reply other threads:[~2018-07-03 5:51 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-27 14:49 [dpdk-dev] [PATCH v3 0/7] vhost: generalize buffer vectors Maxime Coquelin
2018-06-27 14:49 ` [dpdk-dev] [PATCH v3 1/7] vhost: use shadow used ring in dequeue path Maxime Coquelin
2018-07-03 3:28 ` Tiwei Bie
2018-07-03 5:53 ` Maxime Coquelin
2018-06-27 14:49 ` [dpdk-dev] [PATCH v3 2/7] vhost: make gpa to hpa failure an error Maxime Coquelin
2018-07-03 4:45 ` Tiwei Bie
2018-07-03 5:51 ` Maxime Coquelin [this message]
2018-06-27 14:49 ` [dpdk-dev] [PATCH v3 3/7] vhost: use buffer vectors in dequeue path Maxime Coquelin
2018-06-27 14:49 ` [dpdk-dev] [PATCH v3 4/7] vhost: translate iovas at vectors fill time Maxime Coquelin
2018-06-27 14:49 ` [dpdk-dev] [PATCH v3 5/7] vhost: improve prefetching in dequeue path Maxime Coquelin
2018-06-27 14:49 ` [dpdk-dev] [PATCH v3 6/7] vhost: prefetch first descriptor " Maxime Coquelin
2018-06-27 14:49 ` [dpdk-dev] [PATCH v3 7/7] vhost: improve prefetching in enqueue path 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=3988e6b4-f7db-9f48-cb33-f859b39398d0@redhat.com \
--to=maxime.coquelin@redhat.com \
--cc=dev@dpdk.org \
--cc=tiwei.bie@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).