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 CD4B6A0C3F for ; Sat, 12 Jun 2021 01:15:30 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C75644003F; Sat, 12 Jun 2021 01:15:30 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2047.outbound.protection.outlook.com [40.107.243.47]) by mails.dpdk.org (Postfix) with ESMTP id 137D640691 for ; Sat, 12 Jun 2021 01:15:30 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fLiWUp9XvI1oSmZ3r3idY7IGqEtWDvhLyXF3ejjPO00SwogdO+TV86cVLcrWpZhIDdHk0txwEBmsZXCy0DTC3TTGTOg24weKd+VhmxMgG18dsNFY2Q6EJYfpyfkSMBIiCzDSI49L4sZkEhh8J2LlNSQN3PQUYbYekGnQqgvHYkEyZ8VqDk4JfOKKfVQNa19a1Ad7zOwbIg8KrgUgUXkjdBs/OdmcenxWsn3WgQ7eRxZGtqofY/GwFoIRAmegMBaed6EtdGdgpomBQFhDbEah5E8UUZIw7mmXQvNJ2L6SCKvgBy5PV5h3sBKZfn5bTFtvBpKBZQBL1u6uJM+H3OtcNQ== 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=7uZEfiAsVAfdIGCMJjcll2T6ibn5GtW8/VV/5xTntGk=; b=L/SuoUeTZIN5VlUCZ7JPN9d/PbCyKmJaSOyymSiHDz5fkgdsWw45j3E9gJ3rr8V9k7ImO1F1+mPIasAKM7ipr5AOyncjfWqCMKNjlqgOgKluGsLXSZHmJQmvhXqCkfZwE5o0Y5sG8nF3HRGgXyNuRBpHwLAEyIv9NyeDLBkOWiwFLdlMoIDVaYZBzJxtWSgGZHsVktpprbsUivRH0tShGcaaxXz63mtHmr+tdUDnnwKihLDlO2Vf2z21K7EN4lZQ1/Tll73GHQn3kXn4u16uKuY8LB+ZU6EAaKs29mZWy+ppvjNyUVPgmn2BhhFVJgPlr6UyBBlnjCQLRnX5A/SilA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=amazon.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=7uZEfiAsVAfdIGCMJjcll2T6ibn5GtW8/VV/5xTntGk=; b=rQ1LiY0ja8Fa3uz0z+EzKmp7wIXwrlKecG/dhikxnupyjdGPs0wEge7UdpzPGKBb8nuyznaYl0/W2EnTQvqrg0QcuScTN2NdevUu/zKdNeMQrNRJ6G7dOaO0wUNh9c9SEeCZTj532rpbXtNkQ5EeK4UCpfWRDMtY91CERqabQEtx0HSW6/+ywjT+PGrcRdoljWfb9ENiNxgNqwaRgeHCIqtDFNocmOJe7kY3fzOMmUMsCTc2Czik3wRZP25dRcS6vo/b1LBE2Vc4lyPIdWUHS6KX5PasqwR2OFcZf0SlN+4g9xK5ATBDfxiL03nc0kpE7r0lKfC4hvNHb/OnLEGBiA== Received: from BN6PR1101CA0008.namprd11.prod.outlook.com (2603:10b6:405:4a::18) by DM6PR12MB3130.namprd12.prod.outlook.com (2603:10b6:5:11b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.24; Fri, 11 Jun 2021 23:15:28 +0000 Received: from BN8NAM11FT009.eop-nam11.prod.protection.outlook.com (2603:10b6:405:4a:cafe::3) by BN6PR1101CA0008.outlook.office365.com (2603:10b6:405:4a::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.20 via Frontend Transport; Fri, 11 Jun 2021 23:15:28 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; amazon.com; dkim=none (message not signed) header.d=none;amazon.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 BN8NAM11FT009.mail.protection.outlook.com (10.13.176.65) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4219.21 via Frontend Transport; Fri, 11 Jun 2021 23:15:28 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 11 Jun 2021 23:15:25 +0000 From: Xueming Li To: Michal Krawczyk CC: Luca Boccassi , Igor Chauskin , Guy Tzalik , dpdk stable Date: Sat, 12 Jun 2021 07:03:26 +0800 Message-ID: <20210611230433.8208-112-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210611230433.8208-1-xuemingl@nvidia.com> References: <20210510160258.30982-229-xuemingl@nvidia.com> <20210611230433.8208-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL105.nvidia.com (172.20.187.12) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dfdd6140-79e6-420e-3ae2-08d92d2ecd45 X-MS-TrafficTypeDiagnostic: DM6PR12MB3130: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7219; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MNgqAiFnYN66CV4y0bFG8RqGQTg7oLkR5pZTLOUjJYIOWgurjWCi6ljgFlicadayF3wNNobbEJNqOglC+vRkiiBzbKaK8suj2Qr7fQGA5WpV3/LwIhivxIKK6fGOO1qSWqsdZwnGzkFj5NcXd03sNx2VGuT+xelyyOtAOmGCPc+5uQEkRjtdfQoswsulSr0XIv2ZL6+pMsVLItb9Z0285mbYie4OdA4pdTbuQZLaxucIdNsv8ZNwPd4D9wPDOZ0WVVmyv2pQaMHkd3TblTbEDy00qBzQlzQ3pS2YP1y9iSYOa72/xJR0mmoYQzt7u219Ge2x2SzIABHpq+0phvUK+uTLQWvkU1u+b8tf4BzpCD7+vulCPN9jUvOeZKs2f7MXlc+kdZnfmyiy4crqhisKI6+2idI+D4SggQ9L68h1YL1MVA+hMsTPNkzi3dhpE+RqchLPhRlSLParXzpQCJSvxfF9NZgCyGs6P+VkzGi8ux9Tf1AkbAglvMY2yI88HuQgo1f7Dic3X3XlLbH+tY9m+F0YjBL5x/gdi8GFmUsN84H96yXDE0ZUoSOJ4CHNFmQKGiTW82Q/biYBKnwDVRp7ByJ6hYGqNLsh4pMYYjuLEo/wPOb0Jg97FKYB6bE5w5zmDLhaV5eNAAd9pHBmfylKakLPlgS8ZDpFqam/e2T5rO5v8IAyp4EZ1UgfEGf4mOHKLqhA+Jr5FX3dzsoCOd4/KjaRi6pPRCg/JTkX13YcTzrmNvcF5G/lkutx9WSFvzTLYb4pS51HpdfIodyb4Fy4sxqdwEvYirrlPT68B+egKc0h/lOCmIKhZDm/ZsNm87sk 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)(396003)(376002)(39860400002)(346002)(136003)(36840700001)(46966006)(36860700001)(1076003)(8676002)(966005)(336012)(426003)(36756003)(53546011)(26005)(2616005)(186003)(7636003)(86362001)(8936002)(70586007)(70206006)(478600001)(55016002)(54906003)(16526019)(82310400003)(36906005)(6286002)(7696005)(5660300002)(6916009)(316002)(4326008)(356005)(83380400001)(47076005)(2906002)(82740400003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2021 23:15:28.3428 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: dfdd6140-79e6-420e-3ae2-08d92d2ecd45 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: BN8NAM11FT009.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3130 Subject: [dpdk-stable] patch 'net/ena/base: destroy multiple wait events' 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 06/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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/1c44277b56335adce9b697b0635533cd13ed3cc5 Thanks. Xueming Li --- >From 1c44277b56335adce9b697b0635533cd13ed3cc5 Mon Sep 17 00:00:00 2001 From: Michal Krawczyk Date: Tue, 11 May 2021 08:45:41 +0200 Subject: [PATCH] net/ena/base: destroy multiple wait events Cc: Luca Boccassi [ upstream commit 04a6a3e63a1ebde2161caffb8f034fb30afce72c ] Although the ENA DPDK PMD doesn't have to perform any actions for destroying the wait event, some other platforms have to. The macro "ENA_WAIT_EVENT_DESTROY" was renamed to "ENA_WAIT_EVENTS_DESTROY" and also whole implementation responsible for that was moved to a separate function for better readability. Fixes: 3adcba9a8987 ("net/ena: update HAL to the newer version") Signed-off-by: Michal Krawczyk Reviewed-by: Igor Chauskin Reviewed-by: Guy Tzalik --- drivers/net/ena/base/ena_com.c | 24 +++++++++++++++++------- drivers/net/ena/base/ena_plat_dpdk.h | 2 +- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/drivers/net/ena/base/ena_com.c b/drivers/net/ena/base/ena_com.c index ae69b63602..00dea4bfc7 100644 --- a/drivers/net/ena/base/ena_com.c +++ b/drivers/net/ena/base/ena_com.c @@ -1655,6 +1655,22 @@ int ena_com_validate_version(struct ena_com_dev *ena_dev) return 0; } +static void +ena_com_free_ena_admin_queue_comp_ctx(struct ena_com_dev *ena_dev, + struct ena_com_admin_queue *admin_queue) + +{ + if (!admin_queue->comp_ctx) + return; + + ENA_WAIT_EVENTS_DESTROY(admin_queue); + ENA_MEM_FREE(ena_dev->dmadev, + admin_queue->comp_ctx, + (admin_queue->q_depth * sizeof(struct ena_comp_ctx))); + + admin_queue->comp_ctx = NULL; +} + void ena_com_admin_destroy(struct ena_com_dev *ena_dev) { struct ena_com_admin_queue *admin_queue = &ena_dev->admin_queue; @@ -1663,14 +1679,8 @@ void ena_com_admin_destroy(struct ena_com_dev *ena_dev) struct ena_com_aenq *aenq = &ena_dev->aenq; u16 size; - if (admin_queue->comp_ctx) { - ENA_WAIT_EVENT_DESTROY(admin_queue->comp_ctx->wait_event); - ENA_MEM_FREE(ena_dev->dmadev, - admin_queue->comp_ctx, - (admin_queue->q_depth * sizeof(struct ena_comp_ctx))); - } + ena_com_free_ena_admin_queue_comp_ctx(ena_dev, admin_queue); - admin_queue->comp_ctx = NULL; size = ADMIN_SQ_SIZE(admin_queue->q_depth); if (sq->entries) ENA_MEM_FREE_COHERENT(ena_dev->dmadev, size, sq->entries, diff --git a/drivers/net/ena/base/ena_plat_dpdk.h b/drivers/net/ena/base/ena_plat_dpdk.h index ae68f860a5..bd8ebad9a7 100644 --- a/drivers/net/ena/base/ena_plat_dpdk.h +++ b/drivers/net/ena/base/ena_plat_dpdk.h @@ -294,7 +294,7 @@ extern rte_atomic32_t ena_alloc_cnt; #define ENA_TIME_EXPIRE(timeout) (timeout < rte_get_timer_cycles()) #define ENA_GET_SYSTEM_TIMEOUT(timeout_us) \ (timeout_us * rte_get_timer_hz() / 1000000 + rte_get_timer_cycles()) -#define ENA_WAIT_EVENT_DESTROY(waitqueue) ((void)(waitqueue)) +#define ENA_WAIT_EVENTS_DESTROY(admin_queue) ((void)(admin_queue)) #ifndef READ_ONCE #define READ_ONCE(var) (*((volatile typeof(var) *)(&(var)))) -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-12 06:53:59.479196500 +0800 +++ 0112-net-ena-base-destroy-multiple-wait-events.patch 2021-06-12 06:53:56.490000000 +0800 @@ -1 +1 @@ -From 04a6a3e63a1ebde2161caffb8f034fb30afce72c Mon Sep 17 00:00:00 2001 +From 1c44277b56335adce9b697b0635533cd13ed3cc5 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit 04a6a3e63a1ebde2161caffb8f034fb30afce72c ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org @@ -25 +27 @@ -index 0cdeb1a2d9..d025c9cee1 100644 +index ae69b63602..00dea4bfc7 100644 @@ -28 +30 @@ -@@ -1671,6 +1671,22 @@ int ena_com_validate_version(struct ena_com_dev *ena_dev) +@@ -1655,6 +1655,22 @@ int ena_com_validate_version(struct ena_com_dev *ena_dev) @@ -51 +53 @@ -@@ -1679,14 +1695,8 @@ void ena_com_admin_destroy(struct ena_com_dev *ena_dev) +@@ -1663,14 +1679,8 @@ void ena_com_admin_destroy(struct ena_com_dev *ena_dev) @@ -68 +70 @@ -index df2fdd30f6..ddf54f0ad5 100644 +index ae68f860a5..bd8ebad9a7 100644 @@ -71 +73 @@ -@@ -299,7 +299,7 @@ extern rte_atomic32_t ena_alloc_cnt; +@@ -294,7 +294,7 @@ extern rte_atomic32_t ena_alloc_cnt;