From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id E166FA0518 for ; Fri, 24 Jul 2020 14:00:53 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D4FD41C01E; Fri, 24 Jul 2020 14:00:53 +0200 (CEST) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by dpdk.org (Postfix) with ESMTP id BDDF71C02C for ; Fri, 24 Jul 2020 14:00:52 +0200 (CEST) Received: by mail-wr1-f67.google.com with SMTP id f18so8090996wrs.0 for ; Fri, 24 Jul 2020 05:00:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Cn9Inj4DMhG/BF49drLMRWwxanvCK6IKCEuqZOaaHnw=; b=VMIGiVZ2qu4aYeevn3V3oEfwYa+wFBZel/qlFJIjDJcP03jUXtmZi3NvT4ScxAqn9E fsj3qIRNyS7OS/mcF43ZZyb+52rgvc4k4ZYQZ9YROmKfGHETOp9fqhdxfspWte+QSbyp LD/TkfsMioiOZnEImNuBLXgQoYyPFL3SBKsroV2pRB5vjnrEjc1kbzAYSmyW/fnFb9my /InrZBWaRaxic18V0ta6ThStwe41rqoL+dm2omATi+HNzzjATUsmmRMU+yee4Avlwbx6 qzkUA97YL4Adl/Ih8Q1kzZnMNuWLsa/u8Q7ua3rlzgNez6o8mY22bu6s7ovuXKhaCz8I Drwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Cn9Inj4DMhG/BF49drLMRWwxanvCK6IKCEuqZOaaHnw=; b=dq/BinyvfRkbkrbXiE/VeDr3k0G5eJRv4u5g7vCtVPfG3YbIHvMaNlxkbdkSihbCs9 MLp2X5lTcFs/A9VemOehpxHKe8QBUBnrKEIKY4zmcvDaTkxn5O04LPPPLWeq/ER0vuGU D7h+Fx1XZa4NYY8ASe8fHe/5HR2NYRQLTVUwqCm0levP0lsD2xNG0B488Kd3jTmWpM4O jg9uvXbiacBaQidGIsznjmjHbtimCHf466rHopxADFDIj9FvLAxJ4AlLLDY9fOsVFeaZ UT1jivvF9RrnH1DvgMebrAp5qT8WkHPCVWtjt4PzCxuVuq4gfwFwVZf2KHg9b1WsJoOV qZ4w== X-Gm-Message-State: AOAM531gl8gbQrykJgXYqnkPn6Bd2BxXFP+qiQSte5PQQEWllxPgQ5jC 2HDR8NiFZ4weYBzWDsl3SiI= X-Google-Smtp-Source: ABdhPJzyWB0vuGj1s2jfDgafLXsP1w3lziGCOaMj75U1X9PAw83j0f74GiV6iX5DarwGKslEv0m6lg== X-Received: by 2002:a5d:664e:: with SMTP id f14mr8351466wrw.6.1595592052512; Fri, 24 Jul 2020 05:00:52 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id a22sm6833280wmb.4.2020.07.24.05.00.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 05:00:51 -0700 (PDT) From: luca.boccassi@gmail.com To: Lijun Ou Cc: Wei Hu , dpdk stable Date: Fri, 24 Jul 2020 12:57:24 +0100 Message-Id: <20200724120030.1863487-6-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200724120030.1863487-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/hns3: fix key length when configuring RSS' has been queued to stable release 19.11.4 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.4 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/26/20. 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. Thanks. Luca Boccassi --- >From 8a1ae3e12667d43260a9546146d7d35c17884c58 Mon Sep 17 00:00:00 2001 From: Lijun Ou Date: Fri, 22 May 2020 17:21:18 +0800 Subject: [PATCH] net/hns3: fix key length when configuring RSS [ upstream commit 40783b1280e1833615885dc98f3c796ad5addb54 ] When users set the length of RSS hash key greater than the supported length by hardware, the driver should intercept and can not configure the wrong key into the hardware. Fixes: c37ca66f2b27 ("net/hns3: support RSS") Signed-off-by: Lijun Ou Signed-off-by: Wei Hu (Xavier) --- drivers/net/hns3/hns3_flow.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/net/hns3/hns3_flow.c b/drivers/net/hns3/hns3_flow.c index 1b9dc1dae..7d5ba61c6 100644 --- a/drivers/net/hns3/hns3_flow.c +++ b/drivers/net/hns3/hns3_flow.c @@ -1475,6 +1475,14 @@ hns3_config_rss_filter(struct rte_eth_dev *dev, return -EINVAL; } + if (rss_flow_conf.key_len && + rss_flow_conf.key_len > RTE_DIM(rss_info->key)) { + hns3_err(hw, + "input hash key(%u) greater than supported len(%zu)", + rss_flow_conf.key_len, RTE_DIM(rss_info->key)); + return -EINVAL; + } + /* Filter the unsupported flow types */ flow_types = rss_flow_conf.types & HNS3_ETH_RSS_SUPPORT; if (flow_types != rss_flow_conf.types) -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-07-24 12:53:48.836950551 +0100 +++ 0006-net-hns3-fix-key-length-when-configuring-RSS.patch 2020-07-24 12:53:48.155004000 +0100 @@ -1,14 +1,15 @@ -From 40783b1280e1833615885dc98f3c796ad5addb54 Mon Sep 17 00:00:00 2001 +From 8a1ae3e12667d43260a9546146d7d35c17884c58 Mon Sep 17 00:00:00 2001 From: Lijun Ou Date: Fri, 22 May 2020 17:21:18 +0800 Subject: [PATCH] net/hns3: fix key length when configuring RSS +[ upstream commit 40783b1280e1833615885dc98f3c796ad5addb54 ] + When users set the length of RSS hash key greater than the supported length by hardware, the driver should intercept and can not configure the wrong key into the hardware. Fixes: c37ca66f2b27 ("net/hns3: support RSS") -Cc: stable@dpdk.org Signed-off-by: Lijun Ou Signed-off-by: Wei Hu (Xavier) @@ -17,7 +18,7 @@ 1 file changed, 8 insertions(+) diff --git a/drivers/net/hns3/hns3_flow.c b/drivers/net/hns3/hns3_flow.c -index aef301a8a..c7851b235 100644 +index 1b9dc1dae..7d5ba61c6 100644 --- a/drivers/net/hns3/hns3_flow.c +++ b/drivers/net/hns3/hns3_flow.c @@ -1475,6 +1475,14 @@ hns3_config_rss_filter(struct rte_eth_dev *dev,