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 EC88BA034F for ; Wed, 10 Nov 2021 07:49:24 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DCC5A40683; Wed, 10 Nov 2021 07:49:24 +0100 (CET) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2078.outbound.protection.outlook.com [40.107.94.78]) by mails.dpdk.org (Postfix) with ESMTP id 269424068B for ; Wed, 10 Nov 2021 07:49:24 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NnZcDT28GRBNTC92ODExDdpOeF4iSu4lUR2X7aw8sdUxQsq1uk72gbV3HZykbLXQgF7DXv2WDjJ4NzfZ1/TmFiutkLPMkDq2iTDDNHpjLtkypNUY+VxGsgMDInoBxqZiJ+6OIs2XULri3INso4oPyIdN++UvRm0QLrj6fNwNgGVSNI5aQWqCoXc7m9ZlxcXxgAyW6fDNxRMWLEqE8I4xhd6CBx5CaVPWy0VNvFih5pWv/HvVqc1wAooQF0iUtVRoEHwPOL8kpBM9KPagYUnSF0SmPwIa3nfWWS8DwrGhAV/Ov8uh7uLqeqXJOFzdQY05NvC0gmdkatIb1QaJ8kHBZw== 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=iYg/5LTaL85OQDDKj/f5VVwcmEOJi+eL9P4kUnI+Oqo=; b=FzuPAPW0oUBhZTqBkakWPgUWAS+Bub4eW/J/7yRiWKp8UnyTCQh+kA5p/3m0NvwkWhWIRg1OuzRrpEIhUzT18rLRCbuO35CpTa6TDBDUQX3ETlxZ1TzNVN/1oDTM9mBq/1IWvlYrqWWb4v/eozFq7uiy0QBpxlWH279e/3UmSXbUqSEA1wxn7E/JaVz20v11jpPBHO7pp8rEETa7Lv3s0MdBoakpPm++uYDrQN8bOz/aSuPqo9qPt+uIFWadxK7meyUCZYeqYlTBRECh+Xzu+UJlVnKDe9ty3ZptH089Xy2zZr/sbhF8Eyjl1KoWxeR4dKb1cSOSc/nhnjcx3btyEw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=cisco.com smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine 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=iYg/5LTaL85OQDDKj/f5VVwcmEOJi+eL9P4kUnI+Oqo=; b=j/EInZzXyh3T6CWYwTjcxSeXMxVL9ZrRm5cEmTGukv3mMTFujws9iTe3h9yOYpFx3NZQ3E87EjK0TiPiexSmKK09E9kMxoGWiWqZHd3VgZk9nOVcNB698likrLOz/wU0E4rbgn0ngCBCOs2SbXuCSDp0F06A7Akeqa8AojhKzQpm4lPrIKk29JPLdW1I62Qv2fLp2wyFII6Uf+OjvL5FlwrZZRupACKO9KYtcVULtSkynknapBfGhAwaXRRVy4Tq23SR7N4xP/B4PXZi8dUoZijdrnE6lhJCKc82Pql04llqx79kjFtWoqCokGpWYNUFPfzjyfCKucF/RQf7x/E4aQ== Received: from BN8PR12CA0004.namprd12.prod.outlook.com (2603:10b6:408:60::17) by CH2PR12MB4088.namprd12.prod.outlook.com (2603:10b6:610:a5::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.13; Wed, 10 Nov 2021 06:49:22 +0000 Received: from BN8NAM11FT034.eop-nam11.prod.protection.outlook.com (2603:10b6:408:60:cafe::66) by BN8PR12CA0004.outlook.office365.com (2603:10b6:408:60::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.10 via Frontend Transport; Wed, 10 Nov 2021 06:49:22 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; cisco.com; dkim=none (message not signed) header.d=none;cisco.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 BN8NAM11FT034.mail.protection.outlook.com (10.13.176.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4669.10 via Frontend Transport; Wed, 10 Nov 2021 06:49:20 +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.18; Wed, 10 Nov 2021 06:49:18 +0000 From: Xueming Li To: Hyong Youb Kim CC: Luca Boccassi , John Daley , dpdk stable Date: Wed, 10 Nov 2021 14:30:35 +0800 Message-ID: <20211110063216.2744012-152-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211110063216.2744012-1-xuemingl@nvidia.com> References: <20211110063216.2744012-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: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f6c2f677-9f16-494f-0b0b-08d9a4163986 X-MS-TrafficTypeDiagnostic: CH2PR12MB4088: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Qg33Ie2gy2UH8/pcKNSPhgSfs8tcPibQHaHFJ2DTjynXnMTvy2l/bPcc/mNwrMeyJqLRU2YyUXvbfEtoNZKL4gKzhym70OqjGEzkZaRhO0XBvtT9haG1UMQfA+bc12W0Pg+iZyjJiR5WxRZzJcCsayKCM7Mk84qH3QJ9aLF4arJFxK6BQWs9Zm8NhjfMXhAwq52wGzeeimUTU0r++biDp28fp8fAqVd86/0qgvTlQTPC+FGtowF0yrYDxQdbtTQhDJSdXiPjnRovYiDTbZNsy0WrI+jNKxqUWZHTrSgrKOX7k6Xz7w8Spq0S0OAUb2Tlcer7MWy7N0S1uvJ1FnVDWwJneg8rslnAV+UigDfyGG3Uet8t6+hLQesEGZixq7eC8etHpVV4B/H3fFE3BDU3iwZA6Uy6EhlINwT91g2WtCEixxzEehIHsGI46JI7eSIWV1EOXjP9C94j5bePO60VlDheBJeqEWtPmKRWxq0J3u3DYsIZDO5doGDFx7+iGV9klhYY87uWVUqERouHT9JmWd9DL9E4copLgnl1pQPE2h3t8YgTOeff8a9Xzh0YO39xfLTV6K2yspaumsyw9PLQY6duuJM4DcP21NiBaB9XVpEB2jiFkUhuKq6tsJziXyh4wibqSH0evBHFwLtPubSoeHoEV7H3E6BWDrSKlMcpSyEDdf7hiBg88urE200QtEW0ljZu+9D27WX3dmE/MtiRuzK2AHeXVYNwkT7nT+9p3xo/E5czxsNBRTtUCzuEuID3n0mhwOXLKh5Scr6tuLOTidy5ElodFhjrf6OuI2IaRCtD5vL/j4VPdLL6qzK1Q8grAVnnhF1CBECAzjLew2uo4g== 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)(46966006)(36840700001)(426003)(6916009)(356005)(508600001)(36860700001)(7696005)(53546011)(83380400001)(2906002)(2616005)(47076005)(6666004)(1076003)(86362001)(8936002)(16526019)(6286002)(4001150100001)(55016002)(70206006)(8676002)(336012)(36756003)(36906005)(26005)(186003)(54906003)(4326008)(82310400003)(5660300002)(70586007)(7636003)(316002)(966005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 06:49:20.9308 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f6c2f677-9f16-494f-0b0b-08d9a4163986 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: BN8NAM11FT034.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4088 Subject: [dpdk-stable] patch 'net/enic: fix filter mode detection' has been queued to stable release 20.11.4 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.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 11/12/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/573ac2bfe0b3c08e90eee1bd782ffa1d76223d60 Thanks. Xueming Li --- >From 573ac2bfe0b3c08e90eee1bd782ffa1d76223d60 Mon Sep 17 00:00:00 2001 From: Hyong Youb Kim Date: Tue, 12 Oct 2021 18:21:23 -0700 Subject: [PATCH] net/enic: fix filter mode detection Cc: Xueming Li [ upstream commit fb9274546120898933f225742d9e37530504e8f9 ] vnic_dev_capable_filter_mode() currently fails when CMD_CAPABILITY(CMD_ADD_FILTER) returns ERR_EPERM. In turn, this failure causes the driver initialization to fail. But, firmware may legitimately return ERR_EPERM. For example, VF vNIC returns ERR_EPERM when it does not support filtering at all. So, treat ERR_EPERM as "no filtering available" instead of an unexpected error. Fixes: 322b355f2183 ("net/enic/base: bring NIC interface functions up to date") Signed-off-by: Hyong Youb Kim Reviewed-by: John Daley --- drivers/net/enic/base/vnic_dev.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/net/enic/base/vnic_dev.c b/drivers/net/enic/base/vnic_dev.c index 6f48ea51de..2a5ea93bfe 100644 --- a/drivers/net/enic/base/vnic_dev.c +++ b/drivers/net/enic/base/vnic_dev.c @@ -644,8 +644,8 @@ static int vnic_dev_flowman_enable(struct vnic_dev *vdev, uint32_t *mode, return 1; } -/* Determine the "best" filtering mode VIC is capaible of. Returns one of 4 - * value or 0 on error: +/* Determine the "best" filtering mode VIC is capable of. Returns one of 4 + * value or 0 if filtering is unavailble: * FILTER_FLOWMAN- flowman api capable * FILTER_DPDK_1- advanced filters availabile * FILTER_USNIC_IP_FLAG - advanced filters but with the restriction that @@ -680,6 +680,14 @@ int vnic_dev_capable_filter_mode(struct vnic_dev *vdev, uint32_t *mode, args[0] = CMD_ADD_FILTER; args[1] = 0; err = vnic_dev_cmd_args(vdev, CMD_CAPABILITY, args, 2, 1000); + /* + * ERR_EPERM may be returned if, for example, vNIC is + * on a VF. It simply means no filtering is available + */ + if (err == -ERR_EPERM) { + *mode = 0; + return 0; + } if (err) return err; max_level = args[1]; -- 2.33.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-10 14:17:08.651494685 +0800 +++ 0151-net-enic-fix-filter-mode-detection.patch 2021-11-10 14:17:01.940745518 +0800 @@ -1 +1 @@ -From fb9274546120898933f225742d9e37530504e8f9 Mon Sep 17 00:00:00 2001 +From 573ac2bfe0b3c08e90eee1bd782ffa1d76223d60 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit fb9274546120898933f225742d9e37530504e8f9 ] @@ -15 +17,0 @@ -Cc: stable@dpdk.org @@ -24 +26 @@ -index ab6e05739b..9c42595ced 100644 +index 6f48ea51de..2a5ea93bfe 100644