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 BB10EA00C4 for ; Sun, 10 Jul 2022 09:03:55 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B49274021E; Sun, 10 Jul 2022 09:03:55 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2046.outbound.protection.outlook.com [40.107.237.46]) by mails.dpdk.org (Postfix) with ESMTP id 5A4354021E for ; Sun, 10 Jul 2022 09:03:54 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oZAm84LMODw/soEU3pudNFpoWxlPWnuMEGPHrpvvAPoqboEJJtV4VHAhPvrkl9Ec8efTvOb20bcfJJWtktTNJlWgjTXOlvTKUy0ZkT1yDeW36V+LoBAlYqc+XNlmeU4m3hIZwaUOe6KA2laqsWPMWvZGh3CbqrFr/guhBnn/CYuLb1peFi/jdwqoEPdOXH1mErHzed0EspyPF235kpLw/xdkB7JdVDn8GSZzuqJtwRA/dOixzZ29bQwdnofS3Oa0zANsDhBTbGGUkBYp6i72zasWrP7z1VlG3eGmFabMMZJEMSOZI/5RVgE/HXCIpLt9pqpmEqkJ7V7WfJYABsizFg== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=RBJF0VMmYpvlsbel0u/2LolXgd87TvCO6jRnhSnVwsI=; b=B/pEvqPLXgxUF65wvPllfF6i8AOeM1rhnZEYi2te/sybDodrU9rE+tWNekKubGbARYs1qvUePtmOi98j95Gx54SG5nPf7zd9c8ttY+kC+seAUGM9gbEuran+U7Hf5t34jU2Eucl3Z/fODV12rSsOgV430KvjHLzAmacCzKTNg3i+Z4sU6g1t4RiSkRVE2OSJ7jxwL287qtDJXPWp9J6nB21/yBwdYscX5hdOagszIePurRkxZJByJIzM2VOsUuxIBl3KnBJXRqdcoKPszrE8HoVfnjW4XY1slSrAcC8oxxxHxkz0EkWooU2Nb8FkCJGOCLt8WCggKb4hhglbakB5xQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.234) smtp.rcpttodomain=canonical.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject 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=RBJF0VMmYpvlsbel0u/2LolXgd87TvCO6jRnhSnVwsI=; b=XK2fM3p1E4pzHil5+PFeEcPojJ77VdEdrx44tJqEYa8sIWrE952fY3qQ1Es63p3K5yVe4qQAhYAIWBKbB+Byeq6jNNGQPglZVs2uBT/o1qXsOgEr/Q3OIjl+0m9zTHFIRn9DC8x0IEcSe19rm748r/t0G+5PpGWMIFQbHfxtSbHfacVLCVBXy9vpcmCxnpkFixVnCa2Dfzg+35bAYmFVgP5GMa1CltShPKHlfyzCl7f5pmRWGY4h2b2n/HU8xxitZYy6r5qLbwoA//S+BBO5D7oSdA6CxxJJ0+hqzW9svfsZSRpAz/IAhp21DfW5CGd/eYdankFC7fYn6MLQnwIxJA== Received: from MW3PR06CA0023.namprd06.prod.outlook.com (2603:10b6:303:2a::28) by PH8PR12MB6795.namprd12.prod.outlook.com (2603:10b6:510:1c6::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.18; Sun, 10 Jul 2022 07:03:53 +0000 Received: from CO1NAM11FT068.eop-nam11.prod.protection.outlook.com (2603:10b6:303:2a:cafe::ef) by MW3PR06CA0023.outlook.office365.com (2603:10b6:303:2a::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.23 via Frontend Transport; Sun, 10 Jul 2022 07:03:52 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.234) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 12.22.5.234 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.234; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (12.22.5.234) by CO1NAM11FT068.mail.protection.outlook.com (10.13.175.142) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5417.15 via Frontend Transport; Sun, 10 Jul 2022 07:03:52 +0000 Received: from rnnvmail205.nvidia.com (10.129.68.10) by DRHQMAIL101.nvidia.com (10.27.9.10) with Microsoft SMTP Server (TLS) id 15.0.1497.32; Sun, 10 Jul 2022 07:03:51 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by rnnvmail205.nvidia.com (10.129.68.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.26; Sun, 10 Jul 2022 00:03:51 -0700 Received: from nvidia.com (10.127.8.13) by mail.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.26 via Frontend Transport; Sun, 10 Jul 2022 00:03:49 -0700 From: Michael Baum To: CC: Matan Azrad , Viacheslav Ovsiienko , Christian Ehrhardt Subject: [PATCH 19.11] net/mlx5: fix LRO validation in Rx setup Date: Sun, 10 Jul 2022 10:03:42 +0300 Message-ID: <20220710070342.563953-1-michaelba@nvidia.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 600d2415-e07d-4f9d-ca15-08da624258dd X-MS-TrafficTypeDiagnostic: PH8PR12MB6795:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aIUq5KIaBK1x90E9OZgRCqNOtOczLgEG2LLbPoL9hvWCDBPOVatwR5etVU06cr4UWbAs/hVjFSxLpyY+9xqy1cEdBrRjMZzQQUrfy1DALVIWXCjfBKXOH8P3FtU8qw46AkfqTdBTvNbT0zx6aczGE2CqIZqDgDSgu65yG2DTG6R2/arAKdna/YnUNYZAApEZFTwcxErBge03TA1oUGteJS4oaHHGiZnMepjUW/1fE21OPHPS/S5mSOmLiwWXdULXHVIjO3dGKx2HHOUGjyuKfqwmEdiFDHK8Wra9yLMTsITJfv0pg5MVop85MMBIVGWGOToJgLYpuX2XMifpGjOqdQBQ35FCuVRoBOTG5wdJAw0ac1gJOe4tuzSh7MysdxXWmBmIRDZuS9MMIbr+x1KSrRsJAo1Nd6uSyUmpk14n1HN9lD8KwGUA7eSH3rvrWJ8bq54ZmUe6O2c03ed2TfukppQd9IkHZpJxhmM8Iew2J+MvjKCVnmMiQq/r1RhjShxYPsp+oBKCU+QsR1uRObLB1wo+cV+Hccda/R02d5NFKWdTRIHKqjjvTr7Da4ie34cTW1rjptOWxW0Ugj8IYc4Lk32dclhjBj+URPw9g2xGoiVre3L+DuhWJ+XI64JGQZGqxpb7YRL80kFEezGVUqhtNWeUmcIpacK7RfboKE/5ae6EHALKDuUF5w0yzG0iOc+uah69M5plaN6S67H7OU4/zOBhGk+0nCSdELC9HQGt2nknY9Y2zW9sLbz0zXPkX2HkM1Nb17bSglLND9UBgYbZGk4Lq07teKiDZaCYjApFRgoLOOuaLIWYG2/ioKh5E/pKlNQH0IRgidfDUyGwR8dgoO2e/JuNYWCsTPh5uuhwxAg= X-Forefront-Antispam-Report: CIP:12.22.5.234; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:InfoNoRecords; CAT:NONE; SFS:(13230016)(4636009)(39860400002)(396003)(136003)(376002)(346002)(46966006)(40470700004)(36840700001)(426003)(86362001)(40460700003)(40480700001)(54906003)(82740400003)(81166007)(47076005)(70586007)(8676002)(4326008)(336012)(70206006)(36756003)(186003)(6916009)(36860700001)(41300700001)(2616005)(55016003)(26005)(356005)(478600001)(1076003)(6666004)(316002)(6286002)(8936002)(2906002)(7696005)(82310400005)(5660300002)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jul 2022 07:03:52.3390 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 600d2415-e07d-4f9d-ca15-08da624258dd X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[12.22.5.234]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT068.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR12MB6795 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 [ upstream commit a213b8682117711c8e92475c5bbb321a3d8428dd ] The mlx5_rx_queue_setup() get LRO offload from user. When LRO is configured, the LRO flag in rxq_data is set to 1. This patch adds validation to make sure the LRO is supported. Fixes: 17ed314 ("net/mlx5: allow LRO per Rx queue") Signed-off-by: Michael Baum Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_rxq.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c index bb4f11bccb..7a0a7e6ac9 100644 --- a/drivers/net/mlx5/mlx5_rxq.c +++ b/drivers/net/mlx5/mlx5_rxq.c @@ -502,8 +502,18 @@ mlx5_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc, struct mlx5_rxq_data *rxq = (*priv->rxqs)[idx]; struct mlx5_rxq_ctrl *rxq_ctrl = container_of(rxq, struct mlx5_rxq_ctrl, rxq); + uint64_t offloads = conf->offloads | + dev->data->dev_conf.rxmode.offloads; int res; + if ((offloads & DEV_RX_OFFLOAD_TCP_LRO) && + !priv->config.lro.supported) { + DRV_LOG(ERR, + "Port %u queue %u LRO is configured but not supported.", + dev->data->port_id, idx); + rte_errno = EINVAL; + return -rte_errno; + } res = mlx5_rx_queue_pre_setup(dev, idx, &desc); if (res) return res; -- 2.25.1