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 E57F5A0A0E for ; Mon, 10 May 2021 18:17:00 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DFEF040F35; Mon, 10 May 2021 18:17:00 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2084.outbound.protection.outlook.com [40.107.223.84]) by mails.dpdk.org (Postfix) with ESMTP id 4D31440395 for ; Mon, 10 May 2021 18:16:59 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fVfj9LCck37ZGfNi/dwxsLJgHKdJ9TlyAMojz9plGS+FIijIbPgQFlz+f2a3fjAw9qOqc/zN+WQEnR0+fzhzUcDhB9fvDZg2W4kd6ETuYhBmNa5FEezq6KtKMjEcksEePO0Rek4zHofZ6IMzmoo4GiepG5evuJVTL0SH9PHDTiKECOPUy4Dfw9rptcovzVMxe+8WFQHlK2j6/mKOiWd/ZMAbyQbWpj8SShEW9w1B4vujOefVIinzNAVhnYcgN7evUFadUyYnLgN1Jun6N29E7+RhQm/BrYLoW2/idQ8LxCmeX7lxCTrxjCIQ4JFhW25JRey5ip+MDZO++E0jcuWlHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bS2sQ6T0AxsxZSWzATsaWLFxXUeQuEnlMgCxkSQ9sN0=; b=faTyy0JdNns7PF7/L3L+iPfVtIBloqatcIjCk62hgEXapXFOxZIWeJ9L0QcyV4CpQVHKSXe1AwI3Q+/3JVFhlaiMmjWf/ifCp9NMKPr3XTv45SywSvSzasbbgQtoGthAkYvECIhYQY1gCfc8qjp9zJPVY+bTgE/7zKzrDDyb42Ba+y22AK0yNuB8pLIIHbRaiNcGZYM8lcevHME6MPZhChwoqPUPz9JaCNor+lkEOYxlEPv/FjfezJ7vhTONzhSdnctN/stO3M1vhtQy+XQE6jMZEHlQ7yMP7STg6dqctscuDVzf72PNDe6xhV1dpdZu8m6bxOSn0MLSOgAiIMbVNQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=semihalf.com smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bS2sQ6T0AxsxZSWzATsaWLFxXUeQuEnlMgCxkSQ9sN0=; b=A/LbOvgxRHnmJJN2sdd7CUtuU/QUV0G2TewkxcFF9yQb28JQYrT9wu9nJrKWPBXfSvmI4uKMKpYQS9gTsju9ad8UG16rogLZWZubo+cw8FR+iuxB99pF+6tnBePg38QJOFPLpVAgTjYPTdsqHdZL48c0sVUvU8aNAERvVYo+FeLq5XmNjczwZsD7a6TEZvYJJZLDw+wKu/x+TDyiJNMwlLyLDH2M/MJs1mBlQAUkedknoY6bt4IMixK2zoQVxckATBFuEggd2wY/1e/0FXX90g0VmjyOa/y8bYyVydttCOl4/irS+cZT51tNecftWTKZoWcnyJl/387sMZgUqRz2uQ== Received: from DS7PR03CA0148.namprd03.prod.outlook.com (2603:10b6:5:3b4::33) by DM6PR12MB3481.namprd12.prod.outlook.com (2603:10b6:5:11a::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.26; Mon, 10 May 2021 16:16:58 +0000 Received: from DM6NAM11FT052.eop-nam11.prod.protection.outlook.com (2603:10b6:5:3b4:cafe::23) by DS7PR03CA0148.outlook.office365.com (2603:10b6:5:3b4::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:16:58 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; semihalf.com; dkim=none (message not signed) header.d=none;semihalf.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT052.mail.protection.outlook.com (10.13.172.111) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:16:58 +0000 Received: from nvidia.com (172.20.145.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 10 May 2021 16:16:55 +0000 From: Xueming Li To: David Harton CC: Luca Boccassi , Michal Krawczyk , dpdk stable Date: Tue, 11 May 2021 00:01:28 +0800 Message-ID: <20210510160258.30982-139-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510160258.30982-1-xuemingl@nvidia.com> References: <20210510160258.30982-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.145.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 551afc2e-bde9-46a0-a9c6-08d913cf0921 X-MS-TrafficTypeDiagnostic: DM6PR12MB3481: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WC2nQGZY1/Snpfi1pcwzL5Be+npEzerj5jXLcfBGSLXoUZVMBQN7YPjEWoZdyy7RxHrnAAg3a+KWoxgBu+aJ9EMzpBg5fhTY0UuLmWcw1CkcrdptCd3DDolOLNFCV4AlY7AAm4usawZstV69/kXrBVTY9diGglxJsYd8p7pIyieWdSuT2T5iVGZI+xVxHXs3itvf+9et66wRwRIbTlgNI2j1/CD4WRtV4xykyqFsz9ihYeC62NeQR8AxntJ4Z9IkOuTgFtOmPNnWg5rMDQWS24fpMSPBc4xyUthqbWMUXYuRY+2sPtCHXITp38z6BcHgqrJ+XFItB4WL1z+LeQonEa1VUQdrEVyLkB4H/mqiWnupZIW5iiEr9OA02HU8hKVUyU2lFuVPSxkWymDeOt+rUQvJxYnZnKRpli4IHkGoprSm/D1SP71OocR8VXVqAel+8mOVJEAXfWBMoLYyCAU8We5IE+wCEMFOeLuMqBLIDsL+camkKYVYudMFfvCMA5eKeRG5jmobrvgQqQexc5aRfjbv/UuCGm0+oHmlMSxl0VEPShrTtgZD2lV/o1SXnx7518eSxHJhutbbJObcoT8WYAgKv1MUSCXIHHCCWu7IJsVSU2OhmvGBdBeqxpasOBGW0DqkZsdRyLbj/0RT9jGa7MDAj6pqkuIf82MIMpfpnr1p4PbYQUJcbaEo0QN2U8m3UukvuLbcd9srRhscUS2Xwxb7IykI0Bgdvp1xd+Fq2S47rGtO2UwdT0nHKEw+wiX0ghDEsgPTAYnOwVmH862b/Q== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(136003)(39860400002)(376002)(396003)(346002)(36840700001)(46966006)(36756003)(70206006)(2906002)(336012)(83380400001)(1076003)(26005)(82740400003)(86362001)(47076005)(70586007)(55016002)(54906003)(6916009)(82310400003)(2616005)(426003)(36860700001)(8676002)(186003)(966005)(4326008)(16526019)(7696005)(8936002)(478600001)(7636003)(6286002)(36906005)(53546011)(316002)(6666004)(5660300002)(356005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:16:58.0905 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 551afc2e-bde9-46a0-a9c6-08d913cf0921 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT052.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3481 Subject: [dpdk-stable] patch 'net/ena: fix releasing Tx ring mbufs' has been queued to stable release 20.11.2 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/13e3e5e93c0ffb14cf0fba04733b642940fc1ef2 Thanks. Xueming Li --- >From 13e3e5e93c0ffb14cf0fba04733b642940fc1ef2 Mon Sep 17 00:00:00 2001 From: David Harton Date: Mon, 5 Apr 2021 20:27:19 -0400 Subject: [PATCH] net/ena: fix releasing Tx ring mbufs Cc: Luca Boccassi [ upstream commit 3c8bc29fd07006338e3460b03655a772cd36a9e7 ] When ena_tx_queue_release_bufs() frees the mbufs it does not clear the mbuf pointers. So, when the device starts and stops multiple times it can cause the application to receive duplicate mbufs for two different packets. Fix the issue by clearing the mbuf pointer. Also, while tracking down the "double free" issue the ena calls to allocate and free mbufs in bulk were migrated to the mbuf based APIs so the common mbuf alloc/free routines are exercised. Fixes: 79405ee17585 ("net/ena: fix out of order completion") Fixes: 1173fca25af9 ("ena: add polling-mode driver") Signed-off-by: David Harton Acked-by: Michal Krawczyk --- drivers/net/ena/ena_ethdev.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c index 8baec80040..1b34c2aefa 100644 --- a/drivers/net/ena/ena_ethdev.c +++ b/drivers/net/ena/ena_ethdev.c @@ -767,8 +767,10 @@ static void ena_tx_queue_release_bufs(struct ena_ring *ring) for (i = 0; i < ring->ring_size; ++i) { struct ena_tx_buffer *tx_buf = &ring->tx_buffer_info[i]; - if (tx_buf->mbuf) + if (tx_buf->mbuf) { rte_pktmbuf_free(tx_buf->mbuf); + tx_buf->mbuf = NULL; + } } } @@ -1457,7 +1459,7 @@ static int ena_populate_rx_queue(struct ena_ring *rxq, unsigned int count) "bad ring state\n"); /* get resources for incoming packets */ - rc = rte_mempool_get_bulk(rxq->mb_pool, (void **)mbufs, count); + rc = rte_pktmbuf_alloc_bulk(rxq->mb_pool, mbufs, count); if (unlikely(rc < 0)) { rte_atomic64_inc(&rxq->adapter->drv_stats->rx_nombuf); ++rxq->rx_stats.mbuf_alloc_fail; @@ -1486,8 +1488,7 @@ static int ena_populate_rx_queue(struct ena_ring *rxq, unsigned int count) if (unlikely(i < count)) { PMD_DRV_LOG(WARNING, "refilled rx qid %d with only %d " "buffers (from %d)\n", rxq->id, i, count); - rte_mempool_put_bulk(rxq->mb_pool, (void **)(&mbufs[i]), - count - i); + rte_pktmbuf_free_bulk(&mbufs[i], count - i); ++rxq->rx_stats.refill_partial; } -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-10 23:59:30.194043500 +0800 +++ 0140-net-ena-fix-releasing-Tx-ring-mbufs.patch 2021-05-10 23:59:26.550000000 +0800 @@ -1 +1 @@ -From 3c8bc29fd07006338e3460b03655a772cd36a9e7 Mon Sep 17 00:00:00 2001 +From 13e3e5e93c0ffb14cf0fba04733b642940fc1ef2 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit 3c8bc29fd07006338e3460b03655a772cd36a9e7 ] @@ -17 +19,0 @@ -Cc: stable@dpdk.org @@ -26 +28 @@ -index 9aa51c9dcf..f60e843b7f 100644 +index 8baec80040..1b34c2aefa 100644