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 5057BA0540 for ; Thu, 7 Jul 2022 09:58:37 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4BC6E406B4; Thu, 7 Jul 2022 09:58:37 +0200 (CEST) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id 30379406B4 for ; Thu, 7 Jul 2022 09:58:36 +0200 (CEST) Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (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 smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id E5CF4402B9 for ; Thu, 7 Jul 2022 07:58:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657180715; bh=YGckOwc32pzju4OoOEDFEuK9pLQ7In3ZRYwrv1f61Hs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=RK2HSOKxS0sI16WXgXcZg4TgfT+pypiYS8PuyhEA4+PEVlPa/GclhltpyoCFKLLYO CE/mAghnodXEE8nf3l7uhb3uB/RmO2l5uMbnEWes7i+Ahss4Qdy4SNJ4VwNzZSnq3Q VfcdJfbnLBzwUGjAg9ZhaYUrzqM18s3AaHACi8RGPNdXYLIFP0mtPti2SlWwWCl82Y D7pJn34oqPZONYUfCnGeRXksT7kDHF7l0HBoRGjNdq8RH6YN3ZVDvEUhHm6ZlFf1X9 xwR+t7qUqMe0iMJjECjnOGD9Aw24Iu4e+jMEiFLf3jLrdweCJwDS4Ie15Dfel3yoK6 nLPLdllSGMUrw== Received: by mail-ed1-f72.google.com with SMTP id h16-20020a05640250d000b00435bab1a7b4so13424411edb.10 for ; Thu, 07 Jul 2022 00:58:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YGckOwc32pzju4OoOEDFEuK9pLQ7In3ZRYwrv1f61Hs=; b=lh58JLSdsFGdrGY4rF+sA2nJftie54+TvC5Qw47kz6rtH/sPS9GIWUi3VD6L0Y9Dfw 6Irt3/i1O7fV3QoejbS5Q0aNhjI8OElBUrB+FGEL/DFymEm/ixJD/FK5hyFjAAWJahjj tGMN/d8uZLNfnt76xnjm8WLTSf7qQQOx9ijM1NQS12nNO0Y5cUro5bvqWPO0jE4Ac1RM 3br79Fu7on8C+71MN4hUe+8CUo4Xefyl3nJhW8KO2ynRymQLljNoLEJF6kB+5LvzXsa6 ab5qLZ39EMmv1qkOjPSgew1DEsOhIAb4hZ5PY2EUntczal93tOQT4gAue3p0cOdhz7YX k6WQ== X-Gm-Message-State: AJIora8VlCP7KcjisOlpNDyyw+KUO1PCAQxmDasap+/LRy0hQBtePxJ2 UBRBylvHgEJQtgqcEOlN0lcKz3gFpyV6kbp/vdrQR4wvvoaVkzp5gCE60U/raH6dvHiakqQGOe3 Co4TeiwQ2h3S4d0HEsu5Urf4w X-Received: by 2002:a05:6402:5388:b0:435:71b:5d44 with SMTP id ew8-20020a056402538800b00435071b5d44mr58830488edb.364.1657180714815; Thu, 07 Jul 2022 00:58:34 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uIia5TaMtU8xLZ5LvI0CjCvH11aYEa7j/HRaxY4Mu8FdvpsDIqyQDKWj2xdYiw159YYW0Fqg== X-Received: by 2002:a05:6402:5388:b0:435:71b:5d44 with SMTP id ew8-20020a056402538800b00435071b5d44mr58830475edb.364.1657180714623; Thu, 07 Jul 2022 00:58:34 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2a02:6d40:3a4f:7b00:c19b:938e:7c97:afe2]) by smtp.gmail.com with ESMTPSA id w2-20020a170906384200b00722f8d02928sm18667444ejc.174.2022.07.07.00.58.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jul 2022 00:58:33 -0700 (PDT) From: christian.ehrhardt@canonical.com To: Huisong Li Cc: Min Hu , dpdk stable Subject: patch 'net/hns3: remove duplicate definition' has been queued to stable release 19.11.13 Date: Thu, 7 Jul 2022 09:54:58 +0200 Message-Id: <20220707075522.194223-63-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220707075522.194223-1-christian.ehrhardt@canonical.com> References: <20220707075522.194223-1-christian.ehrhardt@canonical.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 19.11.13 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/09/22. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/bde6cacb5a1a30486809697100ed5cd55a6af9fd Thanks. Christian Ehrhardt --- >From bde6cacb5a1a30486809697100ed5cd55a6af9fd Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Wed, 1 Jun 2022 11:52:45 +0800 Subject: [PATCH] net/hns3: remove duplicate definition [ upstream commit d7050da870a9d259a6422e253d54fa552cbfa7c8 ] The default hash key array is defined twice. Remove the extra one. Fixes: c37ca66f2b27 ("net/hns3: support RSS") Signed-off-by: Huisong Li Signed-off-by: Min Hu (Connor) --- drivers/net/hns3/hns3_flow.c | 9 --------- drivers/net/hns3/hns3_rss.c | 6 ++---- drivers/net/hns3/hns3_rss.h | 2 ++ 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/drivers/net/hns3/hns3_flow.c b/drivers/net/hns3/hns3_flow.c index a3bc037062..7ac6e06e7b 100644 --- a/drivers/net/hns3/hns3_flow.c +++ b/drivers/net/hns3/hns3_flow.c @@ -11,15 +11,6 @@ #include "hns3_ethdev.h" #include "hns3_logs.h" -/* Default default keys */ -static uint8_t hns3_hash_key[] = { - 0x6D, 0x5A, 0x56, 0xDA, 0x25, 0x5B, 0x0E, 0xC2, - 0x41, 0x67, 0x25, 0x3D, 0x43, 0xA3, 0x8F, 0xB0, - 0xD0, 0xCA, 0x2B, 0xCB, 0xAE, 0x7B, 0x30, 0xB4, - 0x77, 0xCB, 0x2D, 0xA3, 0x80, 0x30, 0xF2, 0x0C, - 0x6A, 0x42, 0xB7, 0x3B, 0xBE, 0xAC, 0x01, 0xFA -}; - static const uint8_t full_mask[VNI_OR_TNI_LEN] = { 0xFF, 0xFF, 0xFF }; static const uint8_t zero_mask[VNI_OR_TNI_LEN] = { 0x00, 0x00, 0x00 }; diff --git a/drivers/net/hns3/hns3_rss.c b/drivers/net/hns3/hns3_rss.c index 7aa57f054c..5b747a01ec 100644 --- a/drivers/net/hns3/hns3_rss.c +++ b/drivers/net/hns3/hns3_rss.c @@ -12,10 +12,8 @@ #include "hns3_ethdev.h" #include "hns3_logs.h" -/* - * The hash key used for rss initialization. - */ -static const uint8_t hns3_hash_key[] = { +/* Default hash keys */ +const uint8_t hns3_hash_key[] = { 0x6D, 0x5A, 0x56, 0xDA, 0x25, 0x5B, 0x0E, 0xC2, 0x41, 0x67, 0x25, 0x3D, 0x43, 0xA3, 0x8F, 0xB0, 0xD0, 0xCA, 0x2B, 0xCB, 0xAE, 0x7B, 0x30, 0xB4, diff --git a/drivers/net/hns3/hns3_rss.h b/drivers/net/hns3/hns3_rss.h index a03e7df6bb..920abb3f31 100644 --- a/drivers/net/hns3/hns3_rss.h +++ b/drivers/net/hns3/hns3_rss.h @@ -100,6 +100,8 @@ static inline uint32_t roundup_pow_of_two(uint32_t x) return 1UL << fls(x - 1); } +extern const uint8_t hns3_hash_key[]; + struct hns3_adapter; int hns3_dev_rss_hash_update(struct rte_eth_dev *dev, -- 2.37.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-07-07 09:54:13.787369668 +0200 +++ 0063-net-hns3-remove-duplicate-definition.patch 2022-07-07 09:54:10.973824666 +0200 @@ -1 +1 @@ -From d7050da870a9d259a6422e253d54fa552cbfa7c8 Mon Sep 17 00:00:00 2001 +From bde6cacb5a1a30486809697100ed5cd55a6af9fd Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d7050da870a9d259a6422e253d54fa552cbfa7c8 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 86ebbf69b6..ca9edc5244 100644 +index a3bc037062..7ac6e06e7b 100644 @@ -23 +24,2 @@ -@@ -10,15 +10,6 @@ +@@ -11,15 +11,6 @@ + #include "hns3_ethdev.h" @@ -25 +26,0 @@ - #include "hns3_flow.h" @@ -40 +41 @@ -index 4c546c9363..1003daf03e 100644 +index 7aa57f054c..5b747a01ec 100644 @@ -43 +44 @@ -@@ -9,10 +9,8 @@ +@@ -12,10 +12,8 @@ @@ -57 +58 @@ -index 55d5718ffc..56627cbd4c 100644 +index a03e7df6bb..920abb3f31 100644 @@ -60 +61 @@ -@@ -88,6 +88,8 @@ static inline uint32_t roundup_pow_of_two(uint32_t x) +@@ -100,6 +100,8 @@ static inline uint32_t roundup_pow_of_two(uint32_t x)