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 7C05143829 for ; Tue, 5 Mar 2024 16:36:10 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 72EEA42E48; Tue, 5 Mar 2024 16:36:10 +0100 (CET) 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 17817415D7 for ; Tue, 5 Mar 2024 16:36:09 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709652968; 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=xawcJ2xKzvnvB9lTG7Tm7nHyPdqRM4D4HPMIhPL9ZU4=; b=DkXlMllEQ3xnl+Ln0j39MBy/CdSK6H9bzvTLG9Ajc8D3WWnnJ1gvEXOYt+iNPU/Nb58F4v JA6k1d0BE76DZ8RDVdrgLwQLDvVXD0WF9iVKfj3PSAQ9BU42ihuMCYta+BwFAYZ5cN6pjB PlWazB1mjY0+UC49GePLo8esCVFfKZE= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-122--ic_gblBPB6uxc2yqgbL8A-1; Tue, 05 Mar 2024 10:36:04 -0500 X-MC-Unique: -ic_gblBPB6uxc2yqgbL8A-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3368C101CC63; Tue, 5 Mar 2024 15:36:04 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8E56D200AE7F; Tue, 5 Mar 2024 15:36:03 +0000 (UTC) From: Kevin Traynor To: Akshay Dorwat Cc: Andrew Boyer , dpdk stable Subject: patch 'net/ionic: fix RSS query' has been queued to stable release 21.11.7 Date: Tue, 5 Mar 2024 15:34:25 +0000 Message-ID: <20240305153449.263666-52-ktraynor@redhat.com> In-Reply-To: <20240305153449.263666-1-ktraynor@redhat.com> References: <20240305153449.263666-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/11/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/bee2ac79066df271ed0624892176b0bae3e4455f Thanks. Kevin --- >From bee2ac79066df271ed0624892176b0bae3e4455f Mon Sep 17 00:00:00 2001 From: Akshay Dorwat Date: Tue, 6 Feb 2024 19:13:11 -0800 Subject: [PATCH] net/ionic: fix RSS query [ upstream commit 1df32bfd0317a3c8aed1e91b51ca2aa8317812e4 ] The routine that copies out the RSS config can't use memcpy() because 'reta_conf->reta' is an array of uint16_t while 'lif->rss_ind_tbl' is an array of uint8_t. Instead, copy the values individually. Fixes: 22e7171bc63b ("net/ionic: support RSS") Signed-off-by: Akshay Dorwat Signed-off-by: Andrew Boyer --- .mailmap | 1 + drivers/net/ionic/ionic_ethdev.c | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.mailmap b/.mailmap index 813e42b2d5..af1a1103cb 100644 --- a/.mailmap +++ b/.mailmap @@ -28,4 +28,5 @@ Akash Saxena Akeem G Abodunrin Akhil Goyal +Akshay Dorwat Alain Leon Alan Carew diff --git a/drivers/net/ionic/ionic_ethdev.c b/drivers/net/ionic/ionic_ethdev.c index 28280c5377..31fe23ef34 100644 --- a/drivers/net/ionic/ionic_ethdev.c +++ b/drivers/net/ionic/ionic_ethdev.c @@ -568,5 +568,5 @@ ionic_dev_rss_reta_query(struct rte_eth_dev *eth_dev, struct ionic_adapter *adapter = lif->adapter; struct ionic_identity *ident = &adapter->ident; - int i, num; + int i, j, num; uint16_t tbl_sz = rte_le_to_cpu_16(ident->lif.eth.rss_ind_tbl_sz); @@ -589,7 +589,8 @@ ionic_dev_rss_reta_query(struct rte_eth_dev *eth_dev, for (i = 0; i < num; i++) { - memcpy(reta_conf->reta, - &lif->rss_ind_tbl[i * RTE_ETH_RETA_GROUP_SIZE], - RTE_ETH_RETA_GROUP_SIZE); + for (j = 0; j < RTE_ETH_RETA_GROUP_SIZE; j++) { + reta_conf->reta[j] = + lif->rss_ind_tbl[(i * RTE_ETH_RETA_GROUP_SIZE) + j]; + } reta_conf++; } -- 2.43.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 14:08:55.889340148 +0000 +++ 0052-net-ionic-fix-RSS-query.patch 2024-03-05 14:08:54.691520874 +0000 @@ -1 +1 @@ -From 1df32bfd0317a3c8aed1e91b51ca2aa8317812e4 Mon Sep 17 00:00:00 2001 +From bee2ac79066df271ed0624892176b0bae3e4455f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 1df32bfd0317a3c8aed1e91b51ca2aa8317812e4 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index d066dc35b6..dc7cd0497d 100644 +index 813e42b2d5..af1a1103cb 100644 @@ -24 +25,2 @@ -@@ -30,4 +30,5 @@ Akeem G Abodunrin +@@ -28,4 +28,5 @@ Akash Saxena + Akeem G Abodunrin @@ -26 +27,0 @@ - Akihiko Odaki @@ -29 +30 @@ - Alan Brady + Alan Carew @@ -31 +32 @@ -index 340fd0cd59..008e50e0b9 100644 +index 28280c5377..31fe23ef34 100644 @@ -34 +35 @@ -@@ -562,5 +562,5 @@ ionic_dev_rss_reta_query(struct rte_eth_dev *eth_dev, +@@ -568,5 +568,5 @@ ionic_dev_rss_reta_query(struct rte_eth_dev *eth_dev, @@ -41 +42 @@ -@@ -583,7 +583,8 @@ ionic_dev_rss_reta_query(struct rte_eth_dev *eth_dev, +@@ -589,7 +589,8 @@ ionic_dev_rss_reta_query(struct rte_eth_dev *eth_dev,