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 099F045610 for ; Fri, 12 Jul 2024 12:47:59 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F11CD402E5; Fri, 12 Jul 2024 12:47:58 +0200 (CEST) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2083.outbound.protection.outlook.com [40.107.102.83]) by mails.dpdk.org (Postfix) with ESMTP id E4B1240261 for ; Fri, 12 Jul 2024 12:47:57 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=dydMpGeN0J4HD1rO+H5FzJyIErh8qJm1wioR1X/gR0iBaWQfLOWTvg8NrlPAqIMndXTrfwrojS7hoXXEQAkJqUVUXb3Uik9nLNoMDznA44qkZQD7vzW85+nVB0/e1XVA3HMysnyl/Tr4dDZRnL6PoYMMJCa12r4bSnwUZVqsLQWNLbmtpeSePy6EHhOInLxLHP3an4XMLo/1SwLqHNtIxL8Nb5bcwnj2mF8rnCuUqkSEgjUiSsUsjSWu8TKLK1I7stt8VnhGbo1punBcs3+q6wFmzK63nozeK1WuL+hdE22zmQaT6KVu38DNl3N7QUOcGbfoO9hnEphDWhy0lt6peA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=YQg0ZWzDon6D0a3ybDB/jXVnQ9Pg+KxiRHYHfNqV+Ak=; b=wdRrmvYkoLSM44AWdqXTJaNmKA8sh5ZhCxYE+Yw0UuOfC+0fBHJOJ1Hy+cFih/cGapTNMZB6A3AMWr2pyZKGs0rP4iYyfojj7mL464tuZ8C5wSvyBHSi2263a5MolERJHkpPQiUs3GV1LZ83payTiKsRfdNbQWxb3i887Epg3e9a/Qy9TRu/j46pFLUrzD2ub6g+zRVqQoDvo9N+ugmb7eZUra+WSf4sQtaZandT1q1cGY8SG5shELBijKUV1geeiQvNYLNPkz/R/G9U0b5uhwCVi8t3qfHwk9qKMcSwUbJazfeFAVPt4HFr8rpLQrkqz3B6T+QaKgu9otZjxBArDQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=ericsson.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 (0) 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=YQg0ZWzDon6D0a3ybDB/jXVnQ9Pg+KxiRHYHfNqV+Ak=; b=iueFxDgb2BerBPuFwcXEdfs9hzN9Tn7+esWveOdh2wkC/B5CZOo3JEZhdHeMFyFay5anMioU/jBVkrgrTgyCf5iDfXMXfuQ8fowazReNOrO7UpDF9cKv3ZICPI9Utx43rH+DrIo6xJoLMAqQJBxmtKn3PKSn3JMf4O1qgZBgZ83hV1N89RITJGNFrqRHszhS2bZ5TCFaa3K6lwHRpNvPjqdeI1zmiTGTDuo6zuK2gwkVA/zfXaeS9jlbSp//UDbcahhpFcK7NXeBbdtuBFfaRfPi5no70p4TWtd/T0sHISF1SWzwEEYklSKhuQNZ/jyKpdfIiFpy03VYX0AU5OGrQw== Received: from DM6PR02CA0166.namprd02.prod.outlook.com (2603:10b6:5:332::33) by BL1PR12MB5850.namprd12.prod.outlook.com (2603:10b6:208:395::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.20; Fri, 12 Jul 2024 10:47:54 +0000 Received: from DS1PEPF00017098.namprd05.prod.outlook.com (2603:10b6:5:332:cafe::d3) by DM6PR02CA0166.outlook.office365.com (2603:10b6:5:332::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.23 via Frontend Transport; Fri, 12 Jul 2024 10:47:54 +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 DS1PEPF00017098.mail.protection.outlook.com (10.167.18.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.17 via Frontend Transport; Fri, 12 Jul 2024 10:47:54 +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.1544.4; Fri, 12 Jul 2024 03:47:43 -0700 Received: from nvidia.com (10.126.231.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.1544.4; Fri, 12 Jul 2024 03:47:40 -0700 From: Xueming Li To: =?UTF-8?q?Mattias=20R=C3=B6nnblom?= CC: =?UTF-8?q?Morten=20Br=C3=B8rup?= , "Stephen Hemminger" , Tyler Retzlaff , dpdk stable Subject: patch 'net/af_packet: align Rx/Tx structs to cache line' has been queued to stable release 23.11.2 Date: Fri, 12 Jul 2024 18:44:06 +0800 Message-ID: <20240712104528.308638-21-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240712104528.308638-1-xuemingl@nvidia.com> References: <20240712104528.308638-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS1PEPF00017098:EE_|BL1PR12MB5850:EE_ X-MS-Office365-Filtering-Correlation-Id: 75cb7a38-ab9d-48ac-8cc1-08dca26015ab X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|36860700013|1800799024|82310400026; X-Microsoft-Antispam-Message-Info: =?utf-8?B?bzR2cFdkRjN5K2xJejdhL3YwWnQ4MTY5VXlrMnVlSlFERkRYQnJlM1lrY0I4?= =?utf-8?B?dXl6UzRkT2lFTlJLVFBuY3lzOC9BY0tpd3lLUXhyVTVqOHl1YTNibmphdUMx?= =?utf-8?B?RVF0c3h0cGVqbVlaK3VSQ2thNDEySmZQTjZGS3dJMGZkNkxTWUtxK0Z6MjR3?= =?utf-8?B?eHVwanlhc21Xd3NDL0xTWHArdUY1L201Rmh3T1pPeDg4Mm9ISDZUTVpHTDZ4?= =?utf-8?B?bExMYU4xaTczbGQ2MTNYcTMwVVBVelh1VmFrTGlNbTB4SDV3a1lTZkZrbUEr?= =?utf-8?B?S3NISld2RjJZUXhKVTc1S3A1dHhXaDFvUDQvYnpIOUN6aVpYcVhIZGJRbVVT?= =?utf-8?B?aXJ6UExQWEkyOHJGOFdERU4zNU1oa29aQXdPQVJsRU03elo3SlpQc001SERj?= =?utf-8?B?NGVpaHFVVHhIR2MxRFA5Q1pUUnBucTlKR3RETFV6NGFiMEVUOFVpU0U1eWpJ?= =?utf-8?B?NTV4L0dubExFQjNQTkdHZUxDUnVlcDN0cEFmVWRhQ1NtNWxVbkFNeDZwZU03?= =?utf-8?B?cXpHNnFSaDZGZU5sM09IcDFsenQrV1RGYlVZc1lnNTRVQkkvVzVJQnNKZXdh?= =?utf-8?B?aFJHVmR0Y0p0RUl4MjZVc1Vodzh6VnBENjlFY2p2S01wcGsvaVA5K2pyTWxl?= =?utf-8?B?bXpyUmEwWk1GVVp1Yk9MODR2am5RL1ZXdnR1eEpVczlRM0d0bmdSWnZIeEEw?= =?utf-8?B?UjJpT2ZFelp5WUEvL0RJblNWRU1oR2FzeWNKNENBYmRUNHZBam10T2hXRFJX?= =?utf-8?B?NEVZYmhRaGM5NllOY0Q3Zi8yOXFaMlFhYlFqOVkxelpxZHhQT2lhMzA1N1I4?= =?utf-8?B?VFE2VWovcDBoY2VjUzM2QjNvUkt0NEZnQ0hqNDFHMEJEcnh5OFg1N1FBVjAz?= =?utf-8?B?b1lzY2J5TDRSQUFmZnQzd3RUSTgwMVprcmRxNkhTTFFnZHR6ZE4zN0dxOHBN?= =?utf-8?B?dTE5ZGh4SHNXaFdsN1kybFVmb005WHZHUC9PTzJENHQ4a2llUW00TzRMVTJ3?= =?utf-8?B?V3pXZk9COXR0QjREQkJGMzVGTld2VHcvcjQyTHRuUlRuK1BhRGFOcklzbmV5?= =?utf-8?B?dTdSZWc0K3F2djRSR29DZ3h2eTlueUEyRU9RNEVoRG82Ymp5ODhEZzFyODZM?= =?utf-8?B?aHNhQnZvdmNNL0tWRTJrRjhsZ21Sd2pTNGF6aFlCN3dmNlBnMkRMalNaRGVV?= =?utf-8?B?Vys5OU94cVNTby85SW56Um5qUGxKeDVyKys1ZDUvdjV2cm5lMUcrYXBkV2Vr?= =?utf-8?B?Mng0elRtM0dmS2htQzc1Ny9rVm5qVk4zNnhmYTMzMy9OZDF3eWM0cGN6QnF2?= =?utf-8?B?MFVFMjNEd2JvVktEWXlwWVdOdzA1R21KSjhLZHRHNWZPNnhuRmROdWRqT2l3?= =?utf-8?B?aERBN2JXVDFxdmZFUjM3My82RGtuWDlBNjdGZXlHT21MWXlJeCtlOWdiOGhk?= =?utf-8?B?aTBIVG5wdERPYzZpek9HMEJNMEJKOHNJRVhnZk1OdW5oTHMzWjJGcloyY21Y?= =?utf-8?B?cU8xWkE3cnYzZ2VzTkM2N1dVenRKQ3AxdFQ5SkZ3cEhYb1NzYUVReDNHbnNN?= =?utf-8?B?aHRBYXYzemgrbkE2NmRkeE50TERGd3Zwa0lJalZIMnFjNno3Tm9UbkpYUVI0?= =?utf-8?B?UldlNGpFWUdGZGdGeEo5SkRyVEpCZjZlQ3Zwckt5ci9jcVdiQ3A2R1F5a0RN?= =?utf-8?B?Q3RocHZUUC9qbVUrRmNTR0kwcDlrTjdpZUwwM2lIcHJrSEVYTmxLRlN6ZklW?= =?utf-8?B?MGE1U0ZydlVqRW45YlAvWlV4a09ORjhpaE9jeWxYcGRJY3VUWDVzNFJrc2Qr?= =?utf-8?B?ZWVhVC9YcEovN2puQ1JubU5NMHZxYTJ3VFZmVWl5OTI3NXZTVEM1T0FFZ3Q2?= =?utf-8?B?RzVTNDB2cDJUbWRvZVlXYUN5ZEROTUQvSkFaaWxTZVJiYWlnQ1Q2T3liRFE1?= =?utf-8?Q?n73MkfoM8Id2kiYmWcW9TTqKjp8z/kAs?= 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:(13230040)(376014)(36860700013)(1800799024)(82310400026); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2024 10:47:54.2329 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 75cb7a38-ab9d-48ac-8cc1-08dca26015ab 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: DS1PEPF00017098.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5850 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 23.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 07/14/24. 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=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=01c5355b2b130803b4299c783f5157339e88dd24 Thanks. Xueming Li --- >From 01c5355b2b130803b4299c783f5157339e88dd24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mattias=20R=C3=B6nnblom?= Date: Fri, 26 Apr 2024 11:05:02 +0200 Subject: [PATCH] net/af_packet: align Rx/Tx structs to cache line MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Xueming Li [ upstream commit c7a2ce0c1b1bb526304f8875f68cab78f5a5d42c ] Cache align Rx and Tx queue struct to avoid false sharing. The RX struct happens to be 64 bytes on x86_64 already, so cache alignment has no effect there, but it does on 32-bit ISAs. The TX struct is 56 bytes on x86_64. Both structs keep counters, and in the RX case they are updated even for empty polls. Fixes: 364e08f2bbc0 ("af_packet: add PMD for AF_PACKET-based virtual devices") Signed-off-by: Mattias Rönnblom Reviewed-by: Morten Brørup Acked-by: Stephen Hemminger Acked-by: Tyler Retzlaff --- drivers/net/af_packet/rte_eth_af_packet.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/af_packet/rte_eth_af_packet.c b/drivers/net/af_packet/rte_eth_af_packet.c index 397a32db58..6b7b16f348 100644 --- a/drivers/net/af_packet/rte_eth_af_packet.c +++ b/drivers/net/af_packet/rte_eth_af_packet.c @@ -6,6 +6,7 @@ * All rights reserved. */ +#include #include #include #include @@ -39,7 +40,7 @@ #define DFLT_FRAME_SIZE (1 << 11) #define DFLT_FRAME_COUNT (1 << 9) -struct pkt_rx_queue { +struct __rte_cache_aligned pkt_rx_queue { int sockfd; struct iovec *rd; @@ -55,7 +56,7 @@ struct pkt_rx_queue { volatile unsigned long rx_bytes; }; -struct pkt_tx_queue { +struct __rte_cache_aligned pkt_tx_queue { int sockfd; unsigned int frame_data_size; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-12 18:40:15.213393394 +0800 +++ 0020-net-af_packet-align-Rx-Tx-structs-to-cache-line.patch 2024-07-12 18:40:13.966594244 +0800 @@ -1 +1 @@ -From c7a2ce0c1b1bb526304f8875f68cab78f5a5d42c Mon Sep 17 00:00:00 2001 +From 01c5355b2b130803b4299c783f5157339e88dd24 Mon Sep 17 00:00:00 2001 @@ -7,0 +8,3 @@ +Cc: Xueming Li + +[ upstream commit c7a2ce0c1b1bb526304f8875f68cab78f5a5d42c ] @@ -20 +22,0 @@ -Cc: stable@dpdk.org