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 D2E99A0C3F for ; Sat, 12 Jun 2021 01:08:58 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CD3604003F; Sat, 12 Jun 2021 01:08:58 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2053.outbound.protection.outlook.com [40.107.223.53]) by mails.dpdk.org (Postfix) with ESMTP id 988CF4003F for ; Sat, 12 Jun 2021 01:08:57 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=X/K7itDYqgeYXp6SBY1M1j12K+nBtnO6jBPGHV2LoUFmWztr6+Z5telALOw8AmezWFYV/8NiO2Epx74A+DHxWwTetFgycrY234Y1EelO3i+6+JM/7HMsOIAw/77mBXy4uEEpXKmeGIDio4ltilICJg5dOXljH7SL4HlBzqCYSncYJEPMolBDKL9vvT16OsISEbHhQeb7eHYGOOyucHFgXwTVGDR/Jg4PBSM7WsBvMJiHRkbpEjk8JaI3eXqLAZmMlN0F+waShf7oNUmC04mZsBn/MJw4ouRdAJ3M0LP150WkKrZmPe60DeZQDrWiJSZmwg2nct4k7hGMT+SdZKkFyA== 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=OQ6TGN7mzZU47FoRgUV5nrLo/6CISA83MNCYGbSAvf8=; b=leGJYI4oT1mo1HHdb11mUz4BzFGpuKOzlDECJVSobU1uAigFkFJHTikJPaWyVGvy0Ws/s3vNcSJLzhIfMJhw182hfV6Qk6myeAM/ict+K9A88HxDVEI5h2Vu7Mu6XyH9ix0eEFTL1WhngYwSIKAYN9yxBleh4fLwfoTSCr1efxZuKxr3FMP0Czz+cKQpJqdTWJaaF0NHGeFZIQWY9tYdDLYio0c+GLGHHr0PAEXv9XjpVJFjvAotq6FQEmdlOx7gupRSfAnEYMdRfAyjRuLBUaTiGWYy4pHA/4Ptd0jdfuVB/0DDYrt/k4/uLmsGL5GYLPFT1oQL5SYs4Vh2A4fxeA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=dpdk.org 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=OQ6TGN7mzZU47FoRgUV5nrLo/6CISA83MNCYGbSAvf8=; b=ccSA/zkwmnafa0iGyRbM14+xhg6w5FEGikKBsSOpjXM+i3AcpNDLyJ0arKSFSFeRMc736LVXsiR6Sxu2MuLMOtO1YedRwh/BrQZZ5Apu2oPO8+IAoCCAY6WIwRus8X2OPWott0NMro5ycQsub4aOmrqxUt/+eeIyhcH/jY0941Ls7OXdvOmpTj61MpF35Um+oxXaF+EyTX/d/fDLUNAgJ1yQadVIGF/+xX/0EgqN9uIs3i77w9lLPggL0b2aKrZGXNfK0KX2svLLn0RjGcZKLTduwG2OB/rQw2mRHf8pw7JBYCy4wVyxy0kHj734Y+98uoE6aTjn4q43FNIJwwn/7g== Received: from MWHPR03CA0016.namprd03.prod.outlook.com (2603:10b6:300:117::26) by BN7PR12MB2834.namprd12.prod.outlook.com (2603:10b6:408:31::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21; Fri, 11 Jun 2021 23:08:56 +0000 Received: from CO1NAM11FT065.eop-nam11.prod.protection.outlook.com (2603:10b6:300:117:cafe::f7) by MWHPR03CA0016.outlook.office365.com (2603:10b6:300:117::26) 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:08:56 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; 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 CO1NAM11FT065.mail.protection.outlook.com (10.13.174.62) 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:08:55 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 11 Jun 2021 23:08:54 +0000 From: Xueming Li To: Viacheslav Ovsiienko CC: Luca Boccassi , dpdk stable Date: Sat, 12 Jun 2021 07:02:18 +0800 Message-ID: <20210611230433.8208-44-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.5] 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: 312bb90c-c773-4b13-47d3-08d92d2de34e X-MS-TrafficTypeDiagnostic: BN7PR12MB2834: 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: lBwcgl3O6W6xhz/qk+NdGwlhUu7csceRg69uTHMiPbUBR+hERDX1tNT0sBdr0GaQGy4oXnTySqy5Eg6uXS7QmRyKIDnHXqjep7UKshUlupzqmtqto8pe8BlHvGA9AYiG/EAn2VgjWiAQ6oX0wOer8TNl5OW5XV0attjkUccZ8iH18AWFI2r4eN//6cVXmMXm8vkcYvtBwzHV5aLx0d9/TmynonyzAjKjKch6PDIAoWfLsQqvfb9F5v0VxfUXHPrVKtPXjOf9D83fqQ4haJCCnvUBVFRQnJPyU24M5tIPbYAjcnr2qeeaHIbe7L5zbTu2NLi2Uxf0qdZ+updjbrlFr2As7y5QtSx9Wcq0FMb1qTExr9BhGMaL90A0ueEAtkKn/WKpjiA9Du5QZjZvLvGEupcd5yU05Q/vLuisUDxVMqSpun2EjkdIOfrfGpHmXicieeZZ5NjPCAULoscIFneLCQfKc/Bihz6w1rg76GhtET0kLdYruK10psv+aV638PgIqPkl0ekDMCI2gaa+IcFEe6Dm2E7ZnsEbKxTGN7P0vneKEJnshl/EYnsJXhzUOKgoCAnxzKnylxOswZZEcSANx1eP4csl6Xy0OEcALqowh3lSnxJWDWxynqX9I14MTqW5PcZcea3baxRCG5d7JxIb4RDLVZu1nyCE0d7GtE4Ss2XlQhFFJrFm8keC/3u5I50IvyJVPd3X9EwdCm+EGBKTnvq+n1rijnU5SrhrEDtzDVvs6pCupdDiVQ7DyAOFGz4EPS8p9RrcKviV43vX8z2ZDBAUN/hD3yHCl0U+gP2ReHwdTGmwLzAZFqzNSQ4fzrev 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)(396003)(376002)(136003)(39860400002)(346002)(36840700001)(46966006)(1076003)(186003)(316002)(26005)(966005)(36756003)(4326008)(2906002)(6666004)(426003)(6636002)(336012)(83380400001)(55016002)(82310400003)(36906005)(54906003)(478600001)(37006003)(2616005)(6286002)(7636003)(86362001)(7696005)(6862004)(36860700001)(356005)(53546011)(5660300002)(70206006)(8676002)(8936002)(47076005)(16526019)(70586007)(82740400003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2021 23:08:55.8932 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 312bb90c-c773-4b13-47d3-08d92d2de34e 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: CO1NAM11FT065.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN7PR12MB2834 Subject: [dpdk-stable] patch 'net/mlx5: fix probing device in legacy bonding mode' 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/47b2b44b9fcc3aee99a3a93e24614f1910225098 Thanks. Xueming Li --- >From 47b2b44b9fcc3aee99a3a93e24614f1910225098 Mon Sep 17 00:00:00 2001 From: Viacheslav Ovsiienko Date: Wed, 21 Apr 2021 08:10:13 +0000 Subject: [PATCH] net/mlx5: fix probing device in legacy bonding mode Cc: Luca Boccassi [ upstream commit ecaee305b811036d297eda04ad7c91d8349de77e ] If the device was configured as legacy bond one (without involving E-Switch), the mlx5 PMD erroneously tried to deduce the vport index raising the fatal error and preventing device from being used. The patch checks whether there is E-Switch present and we should use vport index indeed. Fixes: 2eb4d0107acc ("net/mlx5: refactor PCI probing on Linux") Fixes: d5c06b1b10ae ("net/mlx5: query vport index match mode and parameters") Signed-off-by: Viacheslav Ovsiienko --- drivers/net/mlx5/linux/mlx5_os.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c index b907e6de16..8ba6f03de0 100644 --- a/drivers/net/mlx5/linux/mlx5_os.c +++ b/drivers/net/mlx5/linux/mlx5_os.c @@ -982,7 +982,8 @@ err_secondary: } if (devx_port.comp_mask & MLX5DV_DEVX_PORT_VPORT) { priv->vport_id = devx_port.vport_num; - } else if (spawn->pf_bond >= 0) { + } else if (spawn->pf_bond >= 0 && + (switch_info->representor || switch_info->master)) { DRV_LOG(ERR, "can't deduce vport index for port %d" " on bonding device %s", spawn->phys_port, -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-12 06:53:57.791637600 +0800 +++ 0044-net-mlx5-fix-probing-device-in-legacy-bonding-mode.patch 2021-06-12 06:53:56.210000000 +0800 @@ -1 +1 @@ -From ecaee305b811036d297eda04ad7c91d8349de77e Mon Sep 17 00:00:00 2001 +From 47b2b44b9fcc3aee99a3a93e24614f1910225098 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit ecaee305b811036d297eda04ad7c91d8349de77e ] @@ -16 +18,0 @@ -Cc: stable@dpdk.org @@ -24 +26 @@ -index 17d0533c1b..479ee7d8d1 100644 +index b907e6de16..8ba6f03de0 100644 @@ -27 +29 @@ -@@ -1097,7 +1097,8 @@ err_secondary: +@@ -982,7 +982,8 @@ err_secondary: