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 A887C45804 for ; Fri, 23 Aug 2024 18:20:14 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A408043390; Fri, 23 Aug 2024 18:20:14 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 1FE5E40295 for ; Fri, 23 Aug 2024 18:20:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724430012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UX4eSrYJZj1MLOj/z7mpsv/TwOIMlC3CYg4r2XJU0oo=; b=Zh6PXZbRWj+D5amtoAvPMWTFWkeC+rb/C8CPzhYaDP7OyVieemYb3DH3AVj+l8819oYdaX C5OmC1pFVGOyoK1SWFlut7sZo3VdbFiAbNvTeFZPmajDrRweEuokM6aBYBAuWuVjwsURos e5c1gi2COo1uv43c/INLaLb6FtmwLUk= Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-336-zleRx0NdPHeOA3kjJJWjtQ-1; Fri, 23 Aug 2024 12:20:07 -0400 X-MC-Unique: zleRx0NdPHeOA3kjJJWjtQ-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8782F1956048; Fri, 23 Aug 2024 16:20:05 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.193.224]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 31EE31955F44; Fri, 23 Aug 2024 16:20:02 +0000 (UTC) From: Kevin Traynor 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 21.11.8 Date: Fri, 23 Aug 2024 17:17:20 +0100 Message-ID: <20240823161929.1004778-12-ktraynor@redhat.com> In-Reply-To: <20240823161929.1004778-1-ktraynor@redhat.com> References: <20240823161929.1004778-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 21.11.8 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/28/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://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/858c31a50101ef9e5812c2717ab860890295fe52 Thanks. Kevin --- >From 858c31a50101ef9e5812c2717ab860890295fe52 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 [ 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 88cdc7ee2e..164597d767 100644 --- a/drivers/net/af_packet/rte_eth_af_packet.c +++ b/drivers/net/af_packet/rte_eth_af_packet.c @@ -7,4 +7,5 @@ */ +#include #include #include @@ -39,5 +40,5 @@ #define DFLT_FRAME_COUNT (1 << 9) -struct pkt_rx_queue { +struct __rte_cache_aligned pkt_rx_queue { int sockfd; @@ -55,5 +56,5 @@ struct pkt_rx_queue { }; -struct pkt_tx_queue { +struct __rte_cache_aligned pkt_tx_queue { int sockfd; unsigned int frame_data_size; -- 2.46.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-23 17:18:10.383819571 +0100 +++ 0012-net-af_packet-align-Rx-Tx-structs-to-cache-line.patch 2024-08-23 17:18:09.626429777 +0100 @@ -1 +1 @@ -From c7a2ce0c1b1bb526304f8875f68cab78f5a5d42c Mon Sep 17 00:00:00 2001 +From 858c31a50101ef9e5812c2717ab860890295fe52 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit c7a2ce0c1b1bb526304f8875f68cab78f5a5d42c ] + @@ -20 +21,0 @@ -Cc: stable@dpdk.org @@ -31 +32 @@ -index 397a32db58..6b7b16f348 100644 +index 88cdc7ee2e..164597d767 100644 @@ -40 +41 @@ -@@ -40,5 +41,5 @@ +@@ -39,5 +40,5 @@ @@ -47 +48 @@ -@@ -56,5 +57,5 @@ struct pkt_rx_queue { +@@ -55,5 +56,5 @@ struct pkt_rx_queue {