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 BE95FA0C47 for ; Tue, 10 Aug 2021 17:41:38 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B82CC411C6; Tue, 10 Aug 2021 17:41:38 +0200 (CEST) Received: from smtp-relay-canonical-1.canonical.com (smtp-relay-canonical-1.canonical.com [185.125.188.121]) by mails.dpdk.org (Postfix) with ESMTP id 965684014F for ; Tue, 10 Aug 2021 17:41:37 +0200 (CEST) Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPS id 7F4C33F0B8 for ; Tue, 10 Aug 2021 15:41:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1628610097; bh=iZ/tfz7SWf/11N6gWw5i4OKtHvKZwGK+5kUdM16qQWI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=k1MJvIqKUEFHNiqZW38NOweGCDqIiqykPedkfO8wggi/ZjQZKlZ2AXLsBdjGAHZI7 xG9D0o+x1uG0156TgiRRxs3yPGJEfrFIXqCyoW5P4lZx0KrnZ3ppQBRwmJNHpYURCG qiuJ+We7mqHchOYmrBy2y2E0Bvi4Ugnb25PDdS1FdUBFHfwbT19LlNXvglT0m28wSP XVamfqaYghRp5D0fiZXg36ZEAaAUS3WrBbeUvB1AMuLxNKQvDAxk1w5R7reDV8EvjZ q3R0oaowtQf2ev1Atte7A4DMSDx5V+Jf0eFQFWApaSffEFpGxbOk6b+HLWNLawzEMi iD/2VPPh2nvEA== Received: by mail-ed1-f71.google.com with SMTP id l3-20020aa7c3030000b02903bccf1897f9so10930234edq.19 for ; Tue, 10 Aug 2021 08:41:37 -0700 (PDT) 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=iZ/tfz7SWf/11N6gWw5i4OKtHvKZwGK+5kUdM16qQWI=; b=mbsCZHiXXILbegvlcAmF4ZtVdom1Q5ZtGcvDkW8I79pz7ngvogtsSlUaLrJphdFpO5 /Py9TjQj+YJ5EzjbbhYu9PUxXMyuDOw4qZAj7nUYfEhWnzzW5b5J8RXMZhJBrXoj5DhU NnzkIYfbcJ5m91yFJuu4498PY2zZvqWFcM9yg5tYJocc5yUm8PnparqyH2i1v5BSPAwl ryl6biav8GKRIjn1+ukKDAlZrlQ3SkyKmNI6XvSdSNxW6ZBUX1XH10W9u+q9+MjPlmId FKTl7E9+eJeEdAafoXy/T6ySEXjnp0l6VYnNG/baR7zXepf7HFmSbKmbU+ZcRLkhVSrG KaQg== X-Gm-Message-State: AOAM532twX3yako0NUukSo4wRnLVpA2D0/KsBieASu8LT4/sxmUHzH9Y Fk31KA4lq1VBVzyE7BQB86eQOGLQ1ccxRtwLzVP+vgNZ7QYYM1qs4Q+O3x5ppcBESHII/Zr2swZ E3Uc1TS4qijGDphaZEwt9AVIz X-Received: by 2002:a05:6402:35d2:: with SMTP id z18mr5793068edc.282.1628610097264; Tue, 10 Aug 2021 08:41:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyL/RTrv50Z0GffAAtvOweAjy+OYjQLdpZ6XpwOlxw0VRRi/TOTgkDOhzg7XRgNZO0l0Cz8eQ== X-Received: by 2002:a05:6402:35d2:: with SMTP id z18mr5793044edc.282.1628610097028; Tue, 10 Aug 2021 08:41:37 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id b5sm7047320ejq.56.2021.08.10.08.41.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Aug 2021 08:41:36 -0700 (PDT) From: christian.ehrhardt@canonical.com To: Olivier Matz Cc: Zhihong Peng , David Marchand , dpdk stable Date: Tue, 10 Aug 2021 17:39:02 +0200 Message-Id: <20210810154022.749358-22-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210810154022.749358-1-christian.ehrhardt@canonical.com> References: <20210810154022.749358-1-christian.ehrhardt@canonical.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 19.11.10 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 19.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/12/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/fc6e2aa74a7400c4b4d38051fbcccc346db74af1 Thanks. Christian Ehrhardt --- >From fc6e2aa74a7400c4b4d38051fbcccc346db74af1 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 a5bd1693b2..3224272eaa 100644 --- a/app/test/test_mbuf.c +++ b/app/test/test_mbuf.c @@ -2344,7 +2344,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.32.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-08-10 15:11:13.924437706 +0200 +++ 0022-test-mbuf-fix-virtual-address-conversion.patch 2021-08-10 15:11:12.926637435 +0200 @@ -1 +1 @@ -From eb3fea3cdebbd860b6094e21aae589746e13c22a Mon Sep 17 00:00:00 2001 +From fc6e2aa74a7400c4b4d38051fbcccc346db74af1 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 a5bd1693b2..3224272eaa 100644 @@ -26 +27 @@ -@@ -2363,7 +2363,7 @@ test_pktmbuf_ext_shinfo_init_helper(struct rte_mempool *pktmbuf_pool) +@@ -2344,7 +2344,7 @@ test_pktmbuf_ext_shinfo_init_helper(struct rte_mempool *pktmbuf_pool)