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 4DA624301F for ; Thu, 10 Aug 2023 02:01:54 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 47602410FD; Thu, 10 Aug 2023 02:01:54 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2041.outbound.protection.outlook.com [40.107.93.41]) by mails.dpdk.org (Postfix) with ESMTP id DD94D40DD8 for ; Thu, 10 Aug 2023 02:01:51 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XaICtmFGwG4SLDXs5MII7N4YvxR1S3A5sOkQrTAErYz4eM0CCOVWlEhU+QM6Q9ZYJET1scGVqgukFEqLSrhlYEeopx9lTSQvPOVR8r3X96Fh0z4uqEf0v5swLU+nm4toWhDUTmYOhwTv/kHDFMjmp4hnQHwVDwF4nagyuvtZYVz9V9sedsDl48ud2EvT5b1icVMu9g1HpkUEFs8I572XlKR9ZECmgYReDn5jSNXTjzBVYprhQYU9GqIAl10tCGWQNOEw9z5S1HCbznfaE2IEfoKLr+3/OgHIuKRTPqu+2t3EwEVDtnOGu2md1Zc/6LqwSf56tmDLAf2WrNE8nvBQiA== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=kDufpwvsaqfQHat3LdPW5wBWJWozDrweP3blMthwlZI=; b=YpKZlc3vsLbGWk7iGh5CEGgHxdjY3hitFcDXWRv0X8fWlWzlxuFscHD71oAAVfypfE3iD34ED3rXXmcmCYxmdyJFXs0Hv0GBBSiaqyURJh0ja1J560AzzPjkHMMARwqdPb21ior2vZ+kciJOVSizEo38HNyajdwiKSlY7k4pIiF7dTyzo2TDSemuyunypH5RJQMGqgWzjud4jdVydbcvQPwUGU+isD6KxqQst+EQUCmqBsboazvUlOU17ndZzVBpEY3bYJngax8qWTbnlS9Mw2MmkXWxFjoNIuKqzjmZr5bAwpHmP1O3E7zPTbxAo9SuVzfUr7hA2q574YGRwjgU4A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=microsoft.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject 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=kDufpwvsaqfQHat3LdPW5wBWJWozDrweP3blMthwlZI=; b=jVLrzkcOGxKwNqpPKAyRlcml7tGFmhgpgWrsgP5caLEeYchLCx26YoaDG9UCNf9cMQeA5TS23QaEvZia3b9BJsL+KwYn26apo0MtOUO5ngMJr2EsPnPTKmcrIDfwCBtuei48vd+laAR2VI/zwMFRF+KSvWbyDO7uGPLPKKUlMYAHsZ5ofYmm3lpZro7YLybL76ha1hZ4s+9ii18NCyaxTVC11OjVTZuZyY5j6yYeMNge4whkLyTF0ihCUMfD7POS82HzRxn20FwksFIejz6JRPXzhuGjvVLAAwBrS/K9/x22uuRPdD/pEotSYp9/a341mX5C93wgjMKxWi9eMrjJxg== Received: from CYZPR14CA0039.namprd14.prod.outlook.com (2603:10b6:930:a0::12) by SJ1PR12MB6145.namprd12.prod.outlook.com (2603:10b6:a03:45c::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.30; Thu, 10 Aug 2023 00:01:49 +0000 Received: from CY4PEPF0000EDD0.namprd03.prod.outlook.com (2603:10b6:930:a0:cafe::6f) by CYZPR14CA0039.outlook.office365.com (2603:10b6:930:a0::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.28 via Frontend Transport; Thu, 10 Aug 2023 00:01:49 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by CY4PEPF0000EDD0.mail.protection.outlook.com (10.167.241.204) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.19 via Frontend Transport; Thu, 10 Aug 2023 00:01:49 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Wed, 9 Aug 2023 17:01:31 -0700 Received: from nvidia.com (10.126.230.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Wed, 9 Aug 2023 17:01:29 -0700 From: Xueming Li To: Long Li CC: dpdk stable Subject: patch 'net/mana: fix WQE count for ringing RQ doorbell' has been queued to stable release 22.11.3 Date: Thu, 10 Aug 2023 07:58:49 +0800 Message-ID: <20230809235947.1187-17-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230809235947.1187-1-xuemingl@nvidia.com> References: <20230625063544.11183-1-xuemingl@nvidia.com> <20230809235947.1187-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000EDD0:EE_|SJ1PR12MB6145:EE_ X-MS-Office365-Filtering-Correlation-Id: 334dd4af-cd4a-40ef-deeb-08db9934feed X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MBlquhA9S8YgppQYsdzinvu8Nc+z39T8H/XbjQ4YbhxdkVCOiUDZKM7T77864qtgf3mbPR2qb1E9z1N6dDRAJf36coFKEfQ6TXqMHJM0IFLwCqm2vzEbwjflRP+GSHOjbjTkcdlh9eP7/SJko5t0CvuBY93cjF6/xsOp+ptvJX1PWtCWi2UVbkrCyTyA9w5BxOV3WChmlKLBWPXjRe9GZfT6v07WO4DTdYu1Y+CDznoW1K/YxgzbBE/ECGyEOyNMuFR/2Y6x9RKNbkJDnY/g9S/ho5rrtjcgIxjPAH1/YU5P8ys/Sd3uMwhaZbcktjOwbIdFV9oQ7LbfSsYerCqhA63UULoVBZh32YCDVE2xP/GiB2NLX3MIx1EjiMZRXqeRsI2rnt0qjCvkvHBaIg2DrwdeillZp1gCqgm+wRb7+bLj5buuREmEN4wsUyNhBORahdOTrfnZMFqezlL/zXYhR3vcJ/qmmuSVTC6ZvsC/6RtLo2WdS92d2sPo2rEtCUtK4g/qrutsoA+XH80xdacE46P8NuyFTKmhAyKqme6I3/bPelCiruzCx8mTNjknrf/zTJq+kP37AqbgwWtTvy2XLYut3zf+J/mQs4FRZOMl1XUXybgSg2WLqlclcdzOhMbvaNFSVaZeIDBFXaVfFCgshSpNg40TzWFbL/lu/1gnmT8dCAL1m7SRaSrC2QIAckxvV8AywNg+oszvGF3mo2Dc8IJktR3q7xRTEA6/w+FIDSklTz8wNFW/pqimyTBx8lX/pUY0VjCKh6febSGPLxzyWQ== X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(396003)(136003)(39860400002)(346002)(376002)(82310400008)(451199021)(186006)(1800799006)(36840700001)(40470700004)(46966006)(36860700001)(47076005)(2906002)(966005)(7696005)(70206006)(70586007)(6916009)(4326008)(83380400001)(478600001)(45080400002)(356005)(426003)(86362001)(40460700003)(82740400003)(2616005)(7636003)(40480700001)(316002)(55016003)(5660300002)(36756003)(41300700001)(8676002)(8936002)(16526019)(336012)(6666004)(6286002)(53546011)(1076003)(26005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Aug 2023 00:01:49.6000 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 334dd4af-cd4a-40ef-deeb-08db9934feed X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000EDD0.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ1PR12MB6145 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 22.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 08/11/23. 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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=17a066c87e0d4e38a5eeaea8393da1255050177e Thanks. Xueming Li --- >From 17a066c87e0d4e38a5eeaea8393da1255050177e Mon Sep 17 00:00:00 2001 From: Long Li Date: Mon, 10 Jul 2023 16:51:47 -0700 Subject: [PATCH] net/mana: fix WQE count for ringing RQ doorbell Cc: Xueming Li [ upstream commit 304ad3268b66c746d7e6d98840a64f17a3f48e53 ] The hardware specification specifies that WQE_COUNT should set to 0 for the Receive Queue. Although currently the hardware doesn't enforce the check, in the future releases it may check on this value. Signed-off-by: Long Li --- drivers/net/mana/mana.h | 2 +- drivers/net/mana/rx.c | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/net/mana/mana.h b/drivers/net/mana/mana.h index b653e1dd82..7dfacd57f3 100644 --- a/drivers/net/mana/mana.h +++ b/drivers/net/mana/mana.h @@ -452,7 +452,7 @@ extern int mana_logtype_init; int mana_ring_doorbell(void *db_page, enum gdma_queue_types queue_type, uint32_t queue_id, uint32_t tail, uint8_t arm); -int mana_rq_ring_doorbell(struct mana_rxq *rxq, uint8_t arm); +int mana_rq_ring_doorbell(struct mana_rxq *rxq); int gdma_post_work_request(struct mana_gdma_queue *queue, struct gdma_work_request *work_req, diff --git a/drivers/net/mana/rx.c b/drivers/net/mana/rx.c index 5c5f609ece..fdb56ce05d 100644 --- a/drivers/net/mana/rx.c +++ b/drivers/net/mana/rx.c @@ -22,7 +22,7 @@ static uint8_t mana_rss_hash_key_default[TOEPLITZ_HASH_KEY_SIZE_IN_BYTES] = { }; int -mana_rq_ring_doorbell(struct mana_rxq *rxq, uint8_t arm) +mana_rq_ring_doorbell(struct mana_rxq *rxq) { struct mana_priv *priv = rxq->priv; int ret; @@ -36,10 +36,13 @@ mana_rq_ring_doorbell(struct mana_rxq *rxq, uint8_t arm) db_page = process_priv->db_page; } + /* Hardware Spec specifies that software client should set 0 for + * wqe_cnt for Receive Queues. + */ ret = mana_ring_doorbell(db_page, GDMA_QUEUE_RECEIVE, rxq->gdma_rq.id, rxq->gdma_rq.head * GDMA_WQE_ALIGNMENT_UNIT_SIZE, - arm); + 0); if (ret) DP_LOG(ERR, "failed to ring RX doorbell ret %d", ret); @@ -120,7 +123,7 @@ mana_alloc_and_post_rx_wqes(struct mana_rxq *rxq) } } - mana_rq_ring_doorbell(rxq, rxq->num_desc); + mana_rq_ring_doorbell(rxq); return ret; } @@ -470,7 +473,7 @@ drop: } if (wqe_posted) - mana_rq_ring_doorbell(rxq, wqe_posted); + mana_rq_ring_doorbell(rxq); return pkt_received; } -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-08-09 21:51:19.961885400 +0800 +++ 0070-net-mana-fix-WQE-count-for-ringing-RQ-doorbell.patch 2023-08-09 21:51:18.214352000 +0800 @@ -1 +1 @@ -From 304ad3268b66c746d7e6d98840a64f17a3f48e53 Mon Sep 17 00:00:00 2001 +From 17a066c87e0d4e38a5eeaea8393da1255050177e Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 304ad3268b66c746d7e6d98840a64f17a3f48e53 ] @@ -10,2 +12,0 @@ -Cc: stable@dpdk.org - @@ -19 +20 @@ -index dfeda531eb..5801491d75 100644 +index b653e1dd82..7dfacd57f3 100644 @@ -22 +23 @@ -@@ -457,7 +457,7 @@ extern int mana_logtype_init; +@@ -452,7 +452,7 @@ extern int mana_logtype_init; @@ -32 +33 @@ -index 6ba0a712ef..14d9085801 100644 +index 5c5f609ece..fdb56ce05d 100644 @@ -68 +69 @@ -@@ -517,7 +520,7 @@ drop: +@@ -470,7 +473,7 @@ drop: