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 900CAA0C3F for ; Sat, 12 Jun 2021 01:16:02 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 88FAC4003F; Sat, 12 Jun 2021 01:16:02 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2077.outbound.protection.outlook.com [40.107.93.77]) by mails.dpdk.org (Postfix) with ESMTP id F008240691 for ; Sat, 12 Jun 2021 01:16:00 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NNVS04yu6zyHUZGnWLoF1pi15csFj8PJ6GIVaGy2S08JVJHWM2gEMdMDiSgNRUhlNQs7xOgPTI/zcsDHWCJiIdlDB0NC+Dn+aTIghinfXZl2RNMx1UhXk1PNuxjc5M5boGGCD3rd+BUm7Sk3Xeynf0rNuriKqaaW8ctVcjf5Gml3PEaEQ6bQXiJuVap5CzWvZI0qnuJv9g5kEvHYEi/NGI24/S1mTYSb4RyyNCE5Djh8lhG/+qGYLDv/or7kIvQRDmJa2Yjd1hMyxR0IUvPxIcIAzLCykoUdPFDlteTQ8VABTvcc9TBSlb2u4jBoQSv7vY0DOzO7MXACY2eO8Rz3Xw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vHdTDvJxxwN0uHqfTtTE461LVZO3gSxZYcakUudbaDE=; b=mP869Na1VqhlD0GIi0sUnw2s3AjoYptqHLGKzfLiO1K2M7A/tj0+RJsVz9SuekwCjZamnQAZ1ZldyuFPrenpVxGAam6lomHRbtsWxvt+xtzkJv5x6jJT8SRhlrIxbiJzXC65SFdIZGryGDq5JMrrtRzb4xYF2AtPVvXJ86kDLsEPBwvzi6sjlIQaGbDi47hyzOjlYefA52YCCugwn0DMRAhyPKUXzSOEW8Yx1Kld/zIQfsaIfshHvrZ/caxQp0RgOvf9Mhws8rg68RDkH0SilQRLpep10Fhk7Rop//0yWdYbVfF3MyQIq2SFTOftYmlXtu59ZStwrVAxQAxqzYuRow== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=netronome.com smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vHdTDvJxxwN0uHqfTtTE461LVZO3gSxZYcakUudbaDE=; b=iQFSM+lRveuQCnVjfaMDr+22pMjk+JV/7xnuZJfpOBfMgB36MhfzwRNB0Yiw4DJf9I6pqb6i86qJiE+fHlyzx+O6fsJU2UoQ9B7wBqhpTKmjpDYb+/U8pjVgt0xCarDrsma1a/FTe9WNtaGkUANuk6/2/J98v96RjsPJphNQqd/cIJ95v4p4zmDIIphJX1u5Vq8OumLYB9X1PxOfjzJrmOtmInXweBgT302BW6fAQYyGMzeLdqQHRGJjZNWL8lqtEpSEIQMJr3EiIu7fNaVDB6+LNvTro01FdD3zN4zHctvOwt2Z59TiRSm5txNsI/suDq6M/cscSqGjQt8tShwfIg== Received: from BN9PR03CA0926.namprd03.prod.outlook.com (2603:10b6:408:107::31) by SN6PR12MB2766.namprd12.prod.outlook.com (2603:10b6:805:78::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.24; Fri, 11 Jun 2021 23:15:59 +0000 Received: from BN8NAM11FT030.eop-nam11.prod.protection.outlook.com (2603:10b6:408:107:cafe::71) by BN9PR03CA0926.outlook.office365.com (2603:10b6:408:107::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.20 via Frontend Transport; Fri, 11 Jun 2021 23:15:59 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; netronome.com; dkim=none (message not signed) header.d=none;netronome.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by BN8NAM11FT030.mail.protection.outlook.com (10.13.177.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4219.21 via Frontend Transport; Fri, 11 Jun 2021 23:15:58 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 11 Jun 2021 23:15:57 +0000 From: Xueming Li To: Heinrich Kuhn CC: Luca Boccassi , Simon Horman , dpdk stable Date: Sat, 12 Jun 2021 07:03:31 +0800 Message-ID: <20210611230433.8208-117-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210611230433.8208-1-xuemingl@nvidia.com> References: <20210510160258.30982-229-xuemingl@nvidia.com> <20210611230433.8208-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL105.nvidia.com (172.20.187.12) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c329a184-c321-4ec3-6038-08d92d2edf97 X-MS-TrafficTypeDiagnostic: SN6PR12MB2766: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: D+6UqNfnsK9nbcts15PY2OapPraSKJn55QYufqOk2wMGcgM+7QH750kNuDnGwPJumPeQ8pOcBKZyZ/nM9HmYsTqhx+yeKpvsjDAXHYAsTB1tafVTob32QVc8L8uIq6wgQUd4rU5OkvctXSY7RlE8zGkVWpkKFrXWIPo8JpngnHYdtYyAKCPu7vYYQ9ccpQeki52D0CpFVCPmXdgNsgSHmPz1JnuBNEDxHoYrkyMMvCyWO93FBVE60I86RB+/dvpeBEWzdQ3YjD2L9oP8khMWikCj1qla56rumpsu167GrPNZcrFM6O/+C5ComJRyyIU7EPT0Wy9s+4tFPHjZC5jaB32cxtgBTrjY5VEMc5fkFsxKDqbqFQIDCdv+WS9ZA3xbZpp/jY/YOjDxjguxGB3LUu77FgPKb6l3Xvh9HAl82lRRefPbBi0NUm+cp4gW4Put0zkoeFrnTMk+squTJl1h5teWWfPhOZpsr0oknCChNoRH/OABNHk4TvnCq+WQhQydVWI+BzTE8gwWqmWSh8xjq504eFTs3Nrt0Lib0iTDDKzk4iLLl7z7R2Roy+YgV4ndjyz99m8LzoZbHUv+ko8lM6Lflse6Uu12x1G2hIsseSf0heY1BffgJyZpcSjyLTEzvMjW7T21CPTIXUAbNc9wfyDJw+fGC9AQcirgGgF7Sy0PRs/bcMEaickBNbPmoird7pWZwfrKXIsw2p2jnqg0YjxXka6AFuj36WNPBNIpkdPMOfFD4h6ksahuqEoP3H90PLxnP/QwZ0xshAHQFJTSv8MB4PQoWJTwM2l7iMIil2a/onmUGVsWvzLSMNWD8z0K X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(136003)(346002)(39860400002)(396003)(376002)(46966006)(36840700001)(8936002)(6666004)(6286002)(6916009)(2906002)(55016002)(966005)(336012)(53546011)(356005)(5660300002)(7636003)(83380400001)(86362001)(426003)(316002)(82740400003)(16526019)(36906005)(47076005)(82310400003)(7696005)(186003)(2616005)(36756003)(70206006)(1076003)(70586007)(54906003)(36860700001)(4326008)(478600001)(8676002)(26005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2021 23:15:58.9972 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c329a184-c321-4ec3-6038-08d92d2edf97 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT030.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR12MB2766 Subject: [dpdk-stable] patch 'net/nfp: fix reporting of RSS capabilities' has been queued to stable release 20.11.2 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/14/21. 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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/3387f2c95ffae452e29b60bc0845edf55f27236d Thanks. Xueming Li --- >From 3387f2c95ffae452e29b60bc0845edf55f27236d Mon Sep 17 00:00:00 2001 From: Heinrich Kuhn Date: Mon, 10 May 2021 18:45:50 +0200 Subject: [PATCH] net/nfp: fix reporting of RSS capabilities Cc: Luca Boccassi [ upstream commit b75fc6b19057a7c5385c12a3c9353f2d5e27de20 ] Before this change the dev_infos callback always reported RSS capabilities regardless of whether the capability is supported by the device or not. First check the capabilities field in the BAR of the device and advertise RSS functionality accordingly. Fixes: 8b945a7f7dcb ("drivers/net: update Rx RSS hash offload capabilities") Signed-off-by: Heinrich Kuhn Signed-off-by: Simon Horman --- drivers/net/nfp/nfp_net.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c index 9ea24e5bda..91c6678c71 100644 --- a/drivers/net/nfp/nfp_net.c +++ b/drivers/net/nfp/nfp_net.c @@ -1220,9 +1220,6 @@ nfp_net_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) DEV_RX_OFFLOAD_UDP_CKSUM | DEV_RX_OFFLOAD_TCP_CKSUM; - dev_info->rx_offload_capa |= DEV_RX_OFFLOAD_JUMBO_FRAME | - DEV_RX_OFFLOAD_RSS_HASH; - if (hw->cap & NFP_NET_CFG_CTRL_TXVLAN) dev_info->tx_offload_capa = DEV_TX_OFFLOAD_VLAN_INSERT; @@ -1271,15 +1268,22 @@ nfp_net_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) .nb_mtu_seg_max = NFP_TX_MAX_MTU_SEG, }; - dev_info->flow_type_rss_offloads = ETH_RSS_IPV4 | - ETH_RSS_NONFRAG_IPV4_TCP | - ETH_RSS_NONFRAG_IPV4_UDP | - ETH_RSS_IPV6 | - ETH_RSS_NONFRAG_IPV6_TCP | - ETH_RSS_NONFRAG_IPV6_UDP; + /* All NFP devices support jumbo frames */ + dev_info->rx_offload_capa |= DEV_RX_OFFLOAD_JUMBO_FRAME; + + if (hw->cap & NFP_NET_CFG_CTRL_RSS) { + dev_info->rx_offload_capa |= DEV_RX_OFFLOAD_RSS_HASH; - dev_info->reta_size = NFP_NET_CFG_RSS_ITBL_SZ; - dev_info->hash_key_size = NFP_NET_CFG_RSS_KEY_SZ; + dev_info->flow_type_rss_offloads = ETH_RSS_IPV4 | + ETH_RSS_NONFRAG_IPV4_TCP | + ETH_RSS_NONFRAG_IPV4_UDP | + ETH_RSS_IPV6 | + ETH_RSS_NONFRAG_IPV6_TCP | + ETH_RSS_NONFRAG_IPV6_UDP; + + dev_info->reta_size = NFP_NET_CFG_RSS_ITBL_SZ; + dev_info->hash_key_size = NFP_NET_CFG_RSS_KEY_SZ; + } dev_info->speed_capa = ETH_LINK_SPEED_1G | ETH_LINK_SPEED_10G | ETH_LINK_SPEED_25G | ETH_LINK_SPEED_40G | -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-12 06:53:59.594435700 +0800 +++ 0117-net-nfp-fix-reporting-of-RSS-capabilities.patch 2021-06-12 06:53:56.510000000 +0800 @@ -1 +1 @@ -From b75fc6b19057a7c5385c12a3c9353f2d5e27de20 Mon Sep 17 00:00:00 2001 +From 3387f2c95ffae452e29b60bc0845edf55f27236d Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit b75fc6b19057a7c5385c12a3c9353f2d5e27de20 ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index ad2c2b55f6..90206a1685 100644 +index 9ea24e5bda..91c6678c71 100644 @@ -24 +26 @@ -@@ -1257,9 +1257,6 @@ nfp_net_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) +@@ -1220,9 +1220,6 @@ nfp_net_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) @@ -34 +36 @@ -@@ -1308,15 +1305,22 @@ nfp_net_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) +@@ -1271,15 +1268,22 @@ nfp_net_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)