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 A435EA0C4C for ; Mon, 12 Jul 2021 15:12:24 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9ECAB4069D; Mon, 12 Jul 2021 15:12:24 +0200 (CEST) Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by mails.dpdk.org (Postfix) with ESMTP id 01C314119C for ; Mon, 12 Jul 2021 15:12:23 +0200 (CEST) Received: by mail-wr1-f42.google.com with SMTP id g16so15657617wrw.5 for ; Mon, 12 Jul 2021 06:12:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2M94mTgNQuzqxjdFOenq2VHotA3fWHHt+ymNolcsOTE=; b=Ak/UD7fZblJ6iEzuG2bsX+h4cRMn7M8YhWhv4hy6JPkp1WzrNTfWhZTjCbMJQm/FZW NpPlRrGv7l4rQ52CLKgjKPHNOaExWnSYypyVgIpKBJX0IFO9cHyOLkKYOtqsAZp7mRWy ZyLIUsmAYok+fTZBOsBdUCqyeuM9bKas6Y3j0UNOIuHwIRBKxfVU+pLCQ827zAcMI3oe 5aNmIZ+R1CnWss8fGICk8ApmM2q5jsXMD3Ls/EG8dFH2zCtTWixg5LBg+h9n2RmcQGw0 FKLjY353Q1xae+/GCFFzDY01HM68UTVKAI66wSOUIP9lY4Xmr+67pwbpKHxc7e+il3Cv 8V9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2M94mTgNQuzqxjdFOenq2VHotA3fWHHt+ymNolcsOTE=; b=Kf5iso3lkyUcB91zG5kh24qakUIznPe+hDm02UOaTUiu6ySo95NwTK7/IELIEH+uRG pTBjf68IAzNm/fbtmbbwbXwXQfff+IxsT4DN58mJe+cdOlEUBjklpiR0evLkV8mGMnni PfRH/xK6gcTeufX6aP9gXtpBnK0Z4G/Eo/Vq4JHaVVRik1XAZwXuzUCT02Nk7VYZ6TkI W9i1rArIr1SsaxLEL1kF763ioEJQ0tJ9yak1jyHDQ+Xw5Mfep/6M+lUI2wFu6Rl3PXuK 3MM3+K3nBSDBbp7RcJEiP2MhShEeRSjxQ4aODqAvLWIGh0gpZ9A1PeECwBJmqpoNc+tg Ra9A== X-Gm-Message-State: AOAM533b4qqdlmn4WpeOFQuUUq51qrVlQBDhBKfMOQhqJiicTC1TpjuQ BQgFnTQVD4BrR8y4NVmILR0= X-Google-Smtp-Source: ABdhPJz3Vq/CRkLF9yS8VP0WS9EwRHNZ+urqzmzbxzcE11ruV70V8Qx0NPre+V+eLVZ77QsPpBCxTA== X-Received: by 2002:adf:ebc6:: with SMTP id v6mr57905794wrn.398.1626095542774; Mon, 12 Jul 2021 06:12:22 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id h13sm14265707wrs.68.2021.07.12.06.12.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 06:12:22 -0700 (PDT) From: luca.boccassi@gmail.com To: Olivier Matz Cc: Zhihong Peng , David Marchand , dpdk stable Date: Mon, 12 Jul 2021 14:04:40 +0100 Message-Id: <20210712130551.2462159-45-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210712130551.2462159-1-luca.boccassi@gmail.com> References: <20210712130551.2462159-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'test/mbuf: fix virtual address conversion' has been queued to stable release 20.11.3 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/14/21. 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/4d1f97bca4be8b063fdb44b413ca382cfab2638a Thanks. Luca Boccassi --- >From 4d1f97bca4be8b063fdb44b413ca382cfab2638a Mon Sep 17 00:00:00 2001 From: Olivier Matz Date: Mon, 5 Jul 2021 09:27:34 +0200 Subject: [PATCH] test/mbuf: fix virtual address conversion [ upstream commit eb3fea3cdebbd860b6094e21aae589746e13c22a ] Seen with address sanitizer. rte_mempool_virt2iova() can only be used on mempool elements. In this case, it is incorrect, and rte_mem_virt2iova() has to be used. Bugzilla ID: 737 Fixes: 7b295dceea07 ("test/mbuf: add unit test cases") Reported-by: Zhihong Peng Signed-off-by: Olivier Matz Reviewed-by: David Marchand --- app/test/test_mbuf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/test/test_mbuf.c b/app/test/test_mbuf.c index 47a7b197d7..5bb4786e5a 100644 --- a/app/test/test_mbuf.c +++ b/app/test/test_mbuf.c @@ -2363,7 +2363,7 @@ test_pktmbuf_ext_shinfo_init_helper(struct rte_mempool *pktmbuf_pool) if (rte_mbuf_refcnt_read(m) != 1) GOTO_FAIL("%s: Invalid refcnt in mbuf\n", __func__); - buf_iova = rte_mempool_virt2iova(ext_buf_addr); + buf_iova = rte_mem_virt2iova(ext_buf_addr); rte_pktmbuf_attach_extbuf(m, ext_buf_addr, buf_iova, buf_len, ret_shinfo); if (m->ol_flags != EXT_ATTACHED_MBUF) -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-07-12 13:41:38.977800519 +0100 +++ 0045-test-mbuf-fix-virtual-address-conversion.patch 2021-07-12 13:41:36.342119528 +0100 @@ -1 +1 @@ -From eb3fea3cdebbd860b6094e21aae589746e13c22a Mon Sep 17 00:00:00 2001 +From 4d1f97bca4be8b063fdb44b413ca382cfab2638a Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit eb3fea3cdebbd860b6094e21aae589746e13c22a ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 8e0561eabb..9a248dfaea 100644 +index 47a7b197d7..5bb4786e5a 100644