From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6FB08A0032 for ; Fri, 18 Feb 2022 13:44:25 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6B14940141; Fri, 18 Feb 2022 13:44:25 +0100 (CET) Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) by mails.dpdk.org (Postfix) with ESMTP id CFBC140141 for ; Fri, 18 Feb 2022 13:44:23 +0100 (CET) Received: by mail-ed1-f46.google.com with SMTP id b13so15385035edn.0 for ; Fri, 18 Feb 2022 04:44:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rO6Hs4ju87HHRomKLK+Bpw9mkEir3tU8jY5pA+ln6kI=; b=OX/lH6Ye8i47fa4QUzcKszwPAgu+xCKcDgSMn3/duIBBeDBcYWfhWzd8dKrO89fv8j 7fpKeIALk+e9tlqmH10/j85zSS2hj6k+ma1n1a1i1i0emhNrpTXrbcQphFHQFSfs/ETv inriVkj+QTxmpw5bAvseotlo2fXkVRFVk29QwF4HIbnFjiwVyiLv6KrbPyupcTuf6BUf L2QEGejgI+inRud22thVq+OQGZZU3ppdhiW76EtcztSDPjs4RTN20s7o2uWCeqO8vtkb 43lJwVqcDt29XGj5wjT7cZg5YH5Q5/MUwYLKynz98SRN/W9K14fkkeOZK/r62M0KLZSM FpsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rO6Hs4ju87HHRomKLK+Bpw9mkEir3tU8jY5pA+ln6kI=; b=UjFEgdzO/8zJeFtKb57Ay6AzkUa2P3iwgR54XwnWev4IE2fMwbSJcvTty24jWZyoxY pM6jKzlJ6RY6yHLoR+xZIKWMlgE84HCvrm2THrTej62yovqNRuqbvFskptMENfCYGgZ2 lUfum5zwSz0/N1LaOZi7669iiLiZgshLh5tHBkLUWscN/2QL7HQqnUxbIRf1Q7OzkpV+ WNitYTRQteoueh8uhupbL587Hi/EHy8JRH9561UCRYUtx86m2IcLYVzaDvbcM53WY5ex HaKKypTrSt5xHhojRt8aP1kqH9X2EDUPikqfUH8YVR8ulelefpAuc/YOiWsLzJN1MRmp n3HQ== X-Gm-Message-State: AOAM533waYcJos6B6vXZQmN62fgOXH+9jX1x9fdFHpbe+vTQrmILj/LV qjg0wxgvvGE70Lbp43xn9G8= X-Google-Smtp-Source: ABdhPJyhD2qm8So5JYGaX/G5NXyGAvm/tP7OH5zDEAuUUwABTxM5yOXzqHCZerhyoyzUZEjMxBHnzQ== X-Received: by 2002:aa7:cd81:0:b0:410:d64e:aa31 with SMTP id x1-20020aa7cd81000000b00410d64eaa31mr7948179edv.167.1645188263420; Fri, 18 Feb 2022 04:44:23 -0800 (PST) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id hs25sm2213118ejc.172.2022.02.18.04.44.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Feb 2022 04:44:22 -0800 (PST) From: luca.boccassi@gmail.com To: Yuan Wang Cc: Maxime Coquelin , dpdk stable Subject: patch 'vhost: fix guest to host physical address mapping' has been queued to stable release 20.11.5 Date: Fri, 18 Feb 2022 12:39:04 +0000 Message-Id: <20220218123931.1749595-95-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220218123931.1749595-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 20.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/20/22. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/0e63db20225d30607facb5db741edd543e0d3bdf Thanks. Luca Boccassi --- >From 0e63db20225d30607facb5db741edd543e0d3bdf Mon Sep 17 00:00:00 2001 From: Yuan Wang Date: Mon, 17 Jan 2022 16:20:27 +0000 Subject: [PATCH] vhost: fix guest to host physical address mapping [ upstream commit 8b764f460f168505b9335bdbd0e0fead8edbc188 ] Async copy fails when looking up hpa in the gpa to hpa mapping table. This happens because the gpa is matched exactly in the merged mapping table, and the merge loses the mapping entries. A new range comparison method is introduced to solve this issue. Fixes: 6563cf92380a ("vhost: fix async copy on multi-page buffers") Signed-off-by: Yuan Wang Reviewed-by: Maxime Coquelin --- lib/librte_vhost/vhost.h | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h index 984c7a6f5f..36d6fdabd8 100644 --- a/lib/librte_vhost/vhost.h +++ b/lib/librte_vhost/vhost.h @@ -565,6 +565,20 @@ static __rte_always_inline int guest_page_addrcmp(const void *p1, return 0; } +static __rte_always_inline int guest_page_rangecmp(const void *p1, const void *p2) +{ + const struct guest_page *page1 = (const struct guest_page *)p1; + const struct guest_page *page2 = (const struct guest_page *)p2; + + if (page1->guest_phys_addr >= page2->guest_phys_addr) { + if (page1->guest_phys_addr < page2->guest_phys_addr + page2->size) + return 0; + else + return 1; + } else + return -1; +} + static __rte_always_inline rte_iova_t gpa_to_first_hpa(struct virtio_net *dev, uint64_t gpa, uint64_t gpa_size, uint64_t *hpa_size) @@ -575,9 +589,9 @@ gpa_to_first_hpa(struct virtio_net *dev, uint64_t gpa, *hpa_size = gpa_size; if (dev->nr_guest_pages >= VHOST_BINARY_SEARCH_THRESH) { - key.guest_phys_addr = gpa & ~(dev->guest_pages[0].size - 1); + key.guest_phys_addr = gpa; page = bsearch(&key, dev->guest_pages, dev->nr_guest_pages, - sizeof(struct guest_page), guest_page_addrcmp); + sizeof(struct guest_page), guest_page_rangecmp); if (page) { if (gpa + gpa_size <= page->guest_phys_addr + page->size) { -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-18 12:37:41.516949670 +0000 +++ 0095-vhost-fix-guest-to-host-physical-address-mapping.patch 2022-02-18 12:37:37.826794957 +0000 @@ -1 +1 @@ -From 8b764f460f168505b9335bdbd0e0fead8edbc188 Mon Sep 17 00:00:00 2001 +From 0e63db20225d30607facb5db741edd543e0d3bdf Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8b764f460f168505b9335bdbd0e0fead8edbc188 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -17 +18 @@ - lib/vhost/vhost.h | 18 ++++++++++++++++-- + lib/librte_vhost/vhost.h | 18 ++++++++++++++++-- @@ -20,5 +21,5 @@ -diff --git a/lib/vhost/vhost.h b/lib/vhost/vhost.h -index 7085e0885c..b3f0c1d07c 100644 ---- a/lib/vhost/vhost.h -+++ b/lib/vhost/vhost.h -@@ -587,6 +587,20 @@ static __rte_always_inline int guest_page_addrcmp(const void *p1, +diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h +index 984c7a6f5f..36d6fdabd8 100644 +--- a/lib/librte_vhost/vhost.h ++++ b/lib/librte_vhost/vhost.h +@@ -565,6 +565,20 @@ static __rte_always_inline int guest_page_addrcmp(const void *p1, @@ -45 +46 @@ -@@ -597,9 +611,9 @@ gpa_to_first_hpa(struct virtio_net *dev, uint64_t gpa, +@@ -575,9 +589,9 @@ gpa_to_first_hpa(struct virtio_net *dev, uint64_t gpa,