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 0F0F642D46 for ; Sun, 25 Jun 2023 08:44:56 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0A56240ED8; Sun, 25 Jun 2023 08:44:56 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2063.outbound.protection.outlook.com [40.107.92.63]) by mails.dpdk.org (Postfix) with ESMTP id 0383140A7F for ; Sun, 25 Jun 2023 08:44:55 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZlCz3dmL57N/Z7YaVisUebdhM1oDqEwmEw7OHnHONumUQLrdoknq4DrKSduvBYoYezi3M/eMzx/53aO8JOcG+XWn4ZoWPyMGrmHv4MxohVEU7Z8xDn8t26FjMEeYuFnwPPtKP3AO7aO/jq0Q6o4zAyBicHB9lh0Vro+dOa6NIFES6CbR/wQGmC+EfTsc9T3EW5w1RiG/ncniqauwdHmsGA2/Pqolt1qNaXL57ce0JZ6cjJ5riDQreGmTb/qP1LP9LtOB4lHAV5YxfptFAnNcqfuqkP4Ag31XLTuvidJ5I/NgKRN9siautR4/yUBLzZ9DrvsnrCWYs0thoXDv7x4dsg== 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=UCg/ZgktRQFCHJVASB8SPeiQWY6EaV4GehFN54OiNlM=; b=EmMhhwGfw3+7gKZQujNPTGTU7RDMGfBzo0u+EeGlzfwYuT/dxC0FufQg28+gGL5TnTjjcc4LPwXrCsO/GHYR5ODOCo4Gx9ddTnxHKRkOhbkUauxJqXTplH1oxvgJ/BxbMyWBizQCfCrr2nTg14fIouo6MGJ/v03Ht3nRQRffP+mHNC7UqPEfW7+XG0oe+3hQaYz82oq018fJ3sImYZLTeQfjjGkaECA07pSdpDl+qxgeh8NbqZ5DX/iMV1EumVkPrqz4NiDeCas/mXrObZiou7eSGYLaIoS73g2bnqrm6nfU4a94EtFJZ99z7LcJ5QnYo5ahbBXzXpELvdiY8OSWnw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=intel.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=UCg/ZgktRQFCHJVASB8SPeiQWY6EaV4GehFN54OiNlM=; b=LPvHhSIEZmbXaFnYnlYjvpwdnNnK0sutN2+/yQ2s6Cbm7AnYyUvIRfdRZd4V+wc3WsIsYOwQpvAeQAI3Ov4axV5wRxfdDhNgCu3efwCEyfYI7vbe6BdO+FipvWEaT8lrUAalcZwYJGbhTI2ptIy4ZAImiqYFXQmWMiwl5bAFm6u6V+Z/KklmMslVgR/c/nI46TUVp9QP3oCjMXgavgy70+GJPWjcqMpmHv5gvG6bOzT2m13M9h8SDotvI8WEohHtW/D2nTCvP5+aW0VVMCsgLXfnc5rehBBPgx2EZ1zv/OGnCcfPhz+nmN/gT20Nz/Dk+6IWHHjBQXRtSkE0vkb8kA== Received: from MW4PR02CA0007.namprd02.prod.outlook.com (2603:10b6:303:16d::33) by SA3PR12MB9199.namprd12.prod.outlook.com (2603:10b6:806:398::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.23; Sun, 25 Jun 2023 06:44:53 +0000 Received: from CO1NAM11FT068.eop-nam11.prod.protection.outlook.com (2603:10b6:303:16d:cafe::a6) by MW4PR02CA0007.outlook.office365.com (2603:10b6:303:16d::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.32 via Frontend Transport; Sun, 25 Jun 2023 06:44:53 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by CO1NAM11FT068.mail.protection.outlook.com (10.13.175.142) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.47 via Frontend Transport; Sun, 25 Jun 2023 06:44:52 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Sat, 24 Jun 2023 23:44:42 -0700 Received: from nvidia.com (10.126.230.35) 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; Sat, 24 Jun 2023 23:44:41 -0700 From: Xueming Li To: Wenjun Wu CC: Qi Zhang , dpdk stable Subject: patch 'net/i40e: fix Rx data buffer size' has been queued to stable release 22.11.3 Date: Sun, 25 Jun 2023 14:35:21 +0800 Message-ID: <20230625063544.11183-104-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230625063544.11183-1-xuemingl@nvidia.com> References: <20230625063544.11183-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] 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: CO1NAM11FT068:EE_|SA3PR12MB9199:EE_ X-MS-Office365-Filtering-Correlation-Id: d982d37e-6a4e-4675-3dcc-08db7547ae52 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0R7JxFaaVBVkKueSbWds1mbcminI5uS0mpUnafxzXpTJpjvXDgbWElIUJxrMZw2l6ciEErDDq4u3yRBFVP9X0wpkQVskBG9bKIVgPNZKrEhJHV4Whr2ZaaWpMm9PK9T4gYlPOM86gwDXfKBIbZYtpc14Jj4uOYqaBshv4jGzfxW/V9LrRuLCMRItjEFIbiLnsQTx5HLMAsQZY+mFo4VlP/BsYIxnAopHRKbDAThGxX0veU51O67kSlHFJ/YuxrqwUaP5trUM6Kvyf1ywJ9bP0bBUrHOuAkVE1rxY97moAKPG3a9iPJBwdiNljbKSVAlZLinaV6AtsdDhFhxyvHhdjgOI1VnnA/Z5YpvLzAZMJw/CbukkyJOC2jYfT2saQEPu6Owy1vHWpfpfLgr0ym3ygFZbSZNAFymcxAzpSv6799y3A8Mac1uX/7W/LS4SuoOuuy5VmUjJ/v13usgnlbAdx13W63VW/5GjWR7x1h2NaADc+7zD9jqsQnpWc+J9sOHOHCvN/FH6MN+HQ5RHJzyVvoTckl8cO/K7IWURexaXqB+v7F5U6QYDjyXFAWj9+WK6exZ6Fwid6seMWRxkbdIYgWeihZz5C43AmQ0j1sJwxyfEZlAs69KhKdx4ErsUKm5W5A/Owbwd5p3pOctdTWGgG6Mmf+AHAvhfBZpFYr4OLCLzwYnPU0EZfNAC/ecihW9XhiB2aM+CHi6c+OOb4Y2zQLZCme3q+rx//hU+d1boPcrgzf4Q2nF/kidOzAl8c9trd6h8dD8ED8S6JDu0g/jWVg== X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(376002)(136003)(396003)(39860400002)(346002)(451199021)(40470700004)(36840700001)(46966006)(82310400005)(36860700001)(40460700003)(47076005)(966005)(478600001)(7696005)(2616005)(54906003)(426003)(6666004)(336012)(53546011)(1076003)(26005)(16526019)(6286002)(186003)(2906002)(5660300002)(36756003)(70206006)(356005)(4326008)(70586007)(82740400003)(7636003)(40480700001)(8936002)(8676002)(41300700001)(316002)(86362001)(6916009)(55016003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jun 2023 06:44:52.9872 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d982d37e-6a4e-4675-3dcc-08db7547ae52 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT068.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR12MB9199 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 06/27/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=7a72db6add7409b907b499d8b05266175dbdf589 Thanks. Xueming Li --- >From 7a72db6add7409b907b499d8b05266175dbdf589 Mon Sep 17 00:00:00 2001 From: Wenjun Wu Date: Fri, 14 Apr 2023 13:47:40 +0800 Subject: [PATCH] net/i40e: fix Rx data buffer size Cc: Xueming Li [ upstream commit ff2ec0ce04739240205628207881a91e1e330cb7 ] According to hardware spec, the data buffer size should not be greater than 16K - 128. Fixes: 4861cde46116 ("i40e: new poll mode driver") Signed-off-by: Wenjun Wu Acked-by: Qi Zhang --- drivers/net/i40e/i40e_rxtx.c | 2 ++ drivers/net/i40e/i40e_rxtx.h | 3 +++ 2 files changed, 5 insertions(+) diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c index 788ffb51c2..fbbefb5015 100644 --- a/drivers/net/i40e/i40e_rxtx.c +++ b/drivers/net/i40e/i40e_rxtx.c @@ -2904,6 +2904,8 @@ i40e_rx_queue_config(struct i40e_rx_queue *rxq) rxq->rx_hdr_len = 0; rxq->rx_buf_len = RTE_ALIGN_FLOOR(buf_size, (1 << I40E_RXQ_CTX_DBUFF_SHIFT)); + rxq->rx_buf_len = RTE_MIN(rxq->rx_buf_len, + I40E_RX_MAX_DATA_BUF_SIZE); rxq->hs_mode = i40e_header_split_none; break; } diff --git a/drivers/net/i40e/i40e_rxtx.h b/drivers/net/i40e/i40e_rxtx.h index 5e6eecc501..0376c219be 100644 --- a/drivers/net/i40e/i40e_rxtx.h +++ b/drivers/net/i40e/i40e_rxtx.h @@ -21,6 +21,9 @@ /* In none-PXE mode QLEN must be whole number of 32 descriptors. */ #define I40E_ALIGN_RING_DESC 32 +/* Max data buffer size must be 16K - 128 bytes */ +#define I40E_RX_MAX_DATA_BUF_SIZE (16 * 1024 - 128) + #define I40E_MIN_RING_DESC 64 #define I40E_MAX_RING_DESC 4096 -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-25 14:32:01.250955900 +0800 +++ 0103-net-i40e-fix-Rx-data-buffer-size.patch 2023-06-25 14:31:58.545773900 +0800 @@ -1 +1 @@ -From ff2ec0ce04739240205628207881a91e1e330cb7 Mon Sep 17 00:00:00 2001 +From 7a72db6add7409b907b499d8b05266175dbdf589 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit ff2ec0ce04739240205628207881a91e1e330cb7 ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org