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 315DCA00C4 for ; Mon, 14 Feb 2022 10:35:33 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 65A2841157; Mon, 14 Feb 2022 10:35:32 +0100 (CET) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2071.outbound.protection.outlook.com [40.107.236.71]) by mails.dpdk.org (Postfix) with ESMTP id D2F7D40DDA; Mon, 14 Feb 2022 10:35:30 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ebD21l820vDu8RIcWc1XMuOIommSUg0RB8vua8hhlgwFIJh7F/nWAwM+IfE+W3OZEKr2qDuWhsG2/UQDfklgKQeEbLFWxiW+ObvPOliH1xsww41PgMjH/I4Janpdyijn/TEcQJBobUnCaVnMaJkqUcwGIAORmqloOeRG/iF8jZmqGEKa4/PC8yHwPe25oKJkiXTBhQH6uEDVjmwnwDH5q9xPWpk8o7U9M/Nuhbh8PF73wRJiTslJFvleXJI6rd3qX7GNNUr7KVqWMe8jKRNh73WtksqqRPX/CGU8tt9hLHjTT5j4a+QOVQdCo94Az7Xl/Qn80Bxz1cuDrj9XDS8hPQ== 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=6FtX1upatu/5yWuPJt3PyscfL1v9lUW+VvWJH1eYer0=; b=KNSP2jCc7WtF/lfDurab78J0kar22dnNs72asvdG2MuaTYvJoZ/dat9FqvLpUI42Z17fbuk1O3RhxgWtZP/SaPSEIb2EezkC2GfcjE6dk7fOH2yhfXOuLS2jHmJ+w1wEnwWtsJ5M0X30cY3lFWW+CFKMyGVBjVB3yeeM2GZufLsaOo9ZCEdnwpz3/o0ethD+7/UN2JcwIRhaeRVIAnIRiuJTKQAPIdu2q8V0JOWbMDtM8m7CGbiW8AoVW4uN7lH2Rjp/IMCYzk9z7kXq+g+vb8l9LuxwVGLGZHxCtzoH/kxUfQ/KtMWXDfQoO3n9iYqsGnfWwqrVobJzNzCOuMs4NQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.234) smtp.rcpttodomain=dpdk.org 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=6FtX1upatu/5yWuPJt3PyscfL1v9lUW+VvWJH1eYer0=; b=Gk6m3nKT0+43qI6cfTYV80ZQiFUs5k9v114j2Njy9QR9IAYBwzBLfsGpiBwtiXUpkjXkYQyOSqgwWI+ZAmY7ZrR90T9xrZ+r+voNbQH+MDEvtSsoBWXk0FNpyVhrLdlI2teRV2h6GhRQ7Zj8c1fW/4irZ2v/hwhlDqG3iJlKhqxeIwYs6LwRk7B+qQRLvune/fRCnd7NeH4dYLblk+mMgFXwJQ0wtHzzyNr+v6k0r4P/uQCEPRg2f2NtTTdW4aFFa7OiCPcu6rV+zGzlxRXBaBL3aES7rnKHN6vmek6AiNyDz3dzi05K7R0rI/hTTQska6pN7ccK8a3mlwx80uNrTw== Received: from MWHPR20CA0033.namprd20.prod.outlook.com (2603:10b6:300:ed::19) by BY5PR12MB4835.namprd12.prod.outlook.com (2603:10b6:a03:1fd::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.11; Mon, 14 Feb 2022 09:35:29 +0000 Received: from CO1NAM11FT022.eop-nam11.prod.protection.outlook.com (2603:10b6:300:ed:cafe::67) by MWHPR20CA0033.outlook.office365.com (2603:10b6:300:ed::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.17 via Frontend Transport; Mon, 14 Feb 2022 09:35:28 +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; Received: from mail.nvidia.com (12.22.5.234) by CO1NAM11FT022.mail.protection.outlook.com (10.13.175.199) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4975.11 via Frontend Transport; Mon, 14 Feb 2022 09:35:28 +0000 Received: from rnnvmail203.nvidia.com (10.129.68.9) by DRHQMAIL101.nvidia.com (10.27.9.10) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Mon, 14 Feb 2022 09:35:27 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by rnnvmail203.nvidia.com (10.129.68.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.9; Mon, 14 Feb 2022 01:35:26 -0800 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.9 via Frontend Transport; Mon, 14 Feb 2022 01:35:25 -0800 From: Michael Baum To: CC: Matan Azrad , Raslan Darawsheh , Viacheslav Ovsiienko , Subject: [PATCH v2 02/20] net/mlx5: fix ineffective metadata argument adjustment Date: Mon, 14 Feb 2022 11:34:53 +0200 Message-ID: <20220214093511.1592698-3-michaelba@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220214093511.1592698-1-michaelba@nvidia.com> References: <20220127153950.812953-1-michaelba@nvidia.com> <20220214093511.1592698-1-michaelba@nvidia.com> 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: 79a44887-8be3-445c-1ada-08d9ef9d5613 X-MS-TrafficTypeDiagnostic: BY5PR12MB4835:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 916Pt+razBeJiJyd3v465Xzugu6NqYeUsL5n4cLKqjMnLdpswy2RsbymkqPH8zKDE2IC76lREfn1Gf0LZxOtmoyCN4KyIVtQtfblbKTH5Puf213/vXMZp4fVHzPJjhNbYK4GoFlbSgxQEsygoLYWshKlElyop33bG008tqLBceLBz8K9PwoyBKV/ahYevgD0Ociqkg4gJdsw3m2y9OlvAYu3cGf3FLZcVtS/jgEWVxIYwGfBEFszsqY+CaCHDh2lIMtGaeb4jE++TTkT5dZT53jf/xsHQTiP5a0mzB8RFZRaWVQWvRjrpL+Dlw9YkS/jMQWrIGOyY4aABIKaUkIwOMD9T9UUsLjNTg4r5JE/DAU9x/Aqk0EkV3YqVRLAtr3l9LoBJQR6eVI59Tw+8vsgEigPlT2Y2L4fTWUkdrEiSjLwkk8LvhrDn9AO840/YnInPlHDICtAIsjcbqKMrtZFk557aEpUAoHQZdmi7EoHxOFtQKdpPiRAlMi+l0v8AtDOsQiqzdhGfP4ALFoRD8h5SQHZRj5+V2inY/I3zHVIe7A1QFfCsskCTwV5mtE8CJLUdrY/XuKwaHU0Nk5Otnx7m5emDKQJYIv16ieLjt6EfB2qcYDy/+hqy+iA+z1tjHOa929RUzTCCCDEeH8era+V6ZMPsNc+kvXS2x9BzZVEW+ghRVSEb42hVZ2pHLlqOxM+GXTV8iZMoapmsx2vxHWapQ== X-Forefront-Antispam-Report: CIP:12.22.5.234; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:mail.nvidia.com; PTR:InfoNoRecords; CAT:NONE; SFS:(13230001)(4636009)(46966006)(40470700004)(36840700001)(40460700003)(36860700001)(86362001)(47076005)(356005)(81166007)(316002)(82310400004)(54906003)(6916009)(8936002)(8676002)(70586007)(70206006)(2906002)(5660300002)(450100002)(4326008)(55016003)(2616005)(83380400001)(336012)(426003)(36756003)(1076003)(6666004)(186003)(26005)(6286002)(508600001)(7696005)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Feb 2022 09:35:28.1538 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 79a44887-8be3-445c-1ada-08d9ef9d5613 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: CO1NAM11FT022.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4835 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 In "dv_xmeta_en" devarg there is an option of dv_xmeta_en=3 which engages tunnel offload mode. In E-Switch configuration, that mode implicitly activates dv_xmeta_en=1. The update according to E-switch support is done immediately after the first parsing of the devargs, but there is another adjustment later. This patch moves the adjustment after the second parsing. Fixes: 4ec6360de37d ("net/mlx5: implement tunnel offload") Cc: stable@dpdk.org Signed-off-by: Michael Baum Acked-by: Matan Azrad --- drivers/net/mlx5/linux/mlx5_os.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c index e157795b63..69d3e1e3ad 100644 --- a/drivers/net/mlx5/linux/mlx5_os.c +++ b/drivers/net/mlx5/linux/mlx5_os.c @@ -977,10 +977,6 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev, strerror(rte_errno)); goto error; } - if (config->dv_miss_info) { - if (switch_info->master || switch_info->representor) - config->dv_xmeta_en = MLX5_XMETA_MODE_META16; - } sh = mlx5_alloc_shared_dev_ctx(spawn, config); if (!sh) return NULL; @@ -1242,6 +1238,10 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev, /* Override some values set by hardware configuration. */ mlx5_args(config, dpdk_dev->devargs); /* Update final values for devargs before check sibling config. */ + if (config->dv_miss_info) { + if (switch_info->master || switch_info->representor) + config->dv_xmeta_en = MLX5_XMETA_MODE_META16; + } #if !defined(HAVE_IBV_FLOW_DV_SUPPORT) || !defined(HAVE_MLX5DV_DR) if (config->dv_flow_en) { DRV_LOG(WARNING, "DV flow is not supported."); -- 2.25.1