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 863BD43C60 for ; Thu, 7 Mar 2024 02:36:39 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7E2EC42F07; Thu, 7 Mar 2024 02:36:39 +0100 (CET) Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mails.dpdk.org (Postfix) with ESMTP id 1C0EE42EE3 for ; Thu, 7 Mar 2024 02:36:38 +0100 (CET) Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-33e1878e357so183871f8f.3 for ; Wed, 06 Mar 2024 17:36:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709775398; x=1710380198; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=h7J/QPpGyFFeaVvoq8VYc7Jq2HvujYeIgm31s9/t9Dg=; b=RG8XnmSCDXBoQow16kx82Wys45kNBHRfTmUtzgg9O/jrMdUr9l2D9qSbP853uaeW13 n26JfVh310AAzboiTN03yVNbwHeE7it/U79p+TKccppx3mTFLswbT1Jt50Ejx3PC/s6m CGgflJRwA8pUa9KqzR5lUA/dD9jh8r1kLlp/O4/7m+SZXVwL2ouU+y3qZunQzNOKF3SL FYKhbRY5E7lCdC8/sDsBZsZgj7ru5FcDYJqywu5gFT8slYpDXsZal57qoicayXb768Xq 1UuVcAtiRyAcQA2H3W14mw1O63UCuODc5g336BbeoMFxgODK4C8cPgVs1ou3mjcF6QLZ GX+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709775398; x=1710380198; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=h7J/QPpGyFFeaVvoq8VYc7Jq2HvujYeIgm31s9/t9Dg=; b=rJM/u8vWSfyv3zc0EJgIGCNplOJKJbq0vuoc4PlEhMZ1J22EfCLEFa/biiXUsPVkc2 Lt1Pfu74sEJRJiWsH0/q+Uybcgus9G2Fk5pZ9l6/BNweysd36UoE8hwn+q/IKzebrfZx TSmj/rnr2yg+/Jy/MqH1Egjrc4A6fZCwn//oqW4TCCdHOp0CL7kPqEXF+sczxCLtq2s8 BQh2N3f4edvKyISfT1SQGWOIAtEMvxrPLCjO2pAx5is3WPx64d2ckGfl4fEKd9ARhWKS IbtAj5zRvub2Q5f31C82ClRDqE0oDqbNv26XvsC+dUBEoqPUbeX2O1fzgxn+rB0rVt7o siXA== X-Forwarded-Encrypted: i=1; AJvYcCXaNtfWxl2tfPUMt0aBakJKp7qsKG2EqKnXLM+mpyJo+MQ69NGvLUjoMfFUYWs8P+jzqnu5QXhYW0BGqg9qjkM= X-Gm-Message-State: AOJu0Ywq3AvyAO8oDfFOqR2hB88tZXWj3C3JABQmEH713edFXqrbgCEz NyVt+9JfpXUlaKlyCTAqk2av7+15jNnMu5ExNkD9RHDIHBaQhHgQ X-Google-Smtp-Source: AGHT+IHoOWK9VEDxqCjsiTpilsEFHr37+2Y6ojRygd4S2jhfcQwPq5Gfp3wwUS0iRFzLEIRMUn1aQQ== X-Received: by 2002:adf:f350:0:b0:33e:592c:d7e5 with SMTP id e16-20020adff350000000b0033e592cd7e5mr2228386wrp.31.1709775397770; Wed, 06 Mar 2024 17:36:37 -0800 (PST) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id h5-20020adf9cc5000000b0033dd9b050f9sm18676116wre.14.2024.03.06.17.36.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Mar 2024 17:36:37 -0800 (PST) From: luca.boccassi@gmail.com To: Akshay Dorwat Cc: Andrew Boyer , dpdk stable Subject: patch 'net/ionic: fix RSS query' has been queued to stable release 22.11.5 Date: Thu, 7 Mar 2024 01:31:33 +0000 Message-Id: <20240307013159.1735343-76-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240307013159.1735343-1-luca.boccassi@gmail.com> References: <20240307013159.1735343-1-luca.boccassi@gmail.com> MIME-Version: 1.0 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 22.11.5 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/09/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/64baeefd1fb0c98a09f57d025023d33f5fcfef0c Thanks. Luca Boccassi --- >From 64baeefd1fb0c98a09f57d025023d33f5fcfef0c 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 841097364c..1d72c6c754 100644 --- a/.mailmap +++ b/.mailmap @@ -27,6 +27,7 @@ Ajit Khaparde Akash Saxena Akeem G Abodunrin Akhil Goyal +Akshay Dorwat Alain Leon Alan Carew Alan Dewar diff --git a/drivers/net/ionic/ionic_ethdev.c b/drivers/net/ionic/ionic_ethdev.c index 340fd0cd59..008e50e0b9 100644 --- a/drivers/net/ionic/ionic_ethdev.c +++ b/drivers/net/ionic/ionic_ethdev.c @@ -561,7 +561,7 @@ ionic_dev_rss_reta_query(struct rte_eth_dev *eth_dev, struct ionic_lif *lif = IONIC_ETH_DEV_TO_LIF(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); IONIC_PRINT_CALL(); @@ -582,9 +582,10 @@ ionic_dev_rss_reta_query(struct rte_eth_dev *eth_dev, num = reta_size / RTE_ETH_RETA_GROUP_SIZE; 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.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-07 01:05:41.262715596 +0000 +++ 0076-net-ionic-fix-RSS-query.patch 2024-03-07 01:05:34.926942733 +0000 @@ -1 +1 @@ -From 1df32bfd0317a3c8aed1e91b51ca2aa8317812e4 Mon Sep 17 00:00:00 2001 +From 64baeefd1fb0c98a09f57d025023d33f5fcfef0c 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 841097364c..1d72c6c754 100644 @@ -24 +25,2 @@ -@@ -29,6 +29,7 @@ Akash Saxena +@@ -27,6 +27,7 @@ Ajit Khaparde + Akash Saxena @@ -27 +28,0 @@ - Akihiko Odaki @@ -30 +30,0 @@ - Alan Brady @@ -31,0 +32 @@ + Alan Dewar