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 1BC8AA034F for ; Wed, 10 Nov 2021 07:59:42 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1356B40142; Wed, 10 Nov 2021 07:59:42 +0100 (CET) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2064.outbound.protection.outlook.com [40.107.92.64]) by mails.dpdk.org (Postfix) with ESMTP id CAB6A40142 for ; Wed, 10 Nov 2021 07:59:40 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=H+L/y14HkdtjHF4dY+h05pkHs0sLIwovssZM5D5iGSRmgAQlHIdxYVPHImfnl+/ZrDgdoGmtv9k2FalX/Rb98YNqtUg7UtrLicuQq7LF1k0XqeWhCFQ4dqGDTy10BrEJCOsUVrEvTy8TOwxacJZ7bidRtQ1Vo4bshSHDfhPp63jYhl4Y9zrrTD6jMy3m/t5dSXbOtHjoac0o/dcpdarHLZUoxQPoso/1kUnA1pQEGYgwG9guo5ikP/gdb86orqBrLZxgUksUnrAJozGxnzsk8r2zwmes87sjEf7dPUYAj2P8AV0umvqvomQ4I1vNgAj0upGcl5HhEQjOrGFBCQhO9Q== 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=s29Z/uzsCi3N7FKz14En8WvRGr/iYp3yZVkbigxUrdE=; b=bQfYg8j5XujJRdJWtn0w5c16opICF4wIsEs9KjIOwGU+LDyA92TI2/yQ/mvgopGcP4eGoplPHOY2eh5uZ678cfg4XmCUVWoSAyM+Mt/fNkBlI3vAbXGCp91YdXJAM+icfNZCmOMfqBuIG4ybDJEAbYCV8BAFtzbT/QodHSss+pTwqIKi9jjFcaDikKJFboW7tf3ioL7ZW6rfiw0czoumK453LA/EtXZ8trt/MnD9s06V/SREurhsCLf63WBVNcaKQx9cKYjG+LtcE0bJ84lRgMMa4uq9fBw5QQQH8Stw9IldvWVixE68U+52sBMUFB/Y09bC9cbi4aCjkO424rTj1A== 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=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=s29Z/uzsCi3N7FKz14En8WvRGr/iYp3yZVkbigxUrdE=; b=L4Y0Z9/VwkX6JXKFY8lzYi3zOjbOCPsNffbtIRncNeM2sLMuKJtF+EeCytBVffohQP/2zQyWeFLmBZx4nsxl7GoKhcoAbynko8WgHjQ9KT+VVnkj1O6VGbnBRhT2S0RLacIAHlZoFjf+82cNP+U6Gv33U+XS7N+KmaX/jNcSRqcLT3NJ4xN9h0MPuNFtwYcaJlMiqB2vwlQ86tF/5NmsRDsvOis6XIzw4qeVpJ1eylff2yTTFlWOCG9q/SzDiEtC7nB7EwQNvcGB/UjOQj+o6QicvWMxE2WBGMcZ2c4WVLiuR1dqmwgKOrrH1zeJUkZNWo1yEp6/W+otGOQyH/CwsA== Received: from DM6PR11CA0009.namprd11.prod.outlook.com (2603:10b6:5:190::22) by CH2PR12MB4822.namprd12.prod.outlook.com (2603:10b6:610:6::26) 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:59:39 +0000 Received: from DM6NAM11FT047.eop-nam11.prod.protection.outlook.com (2603:10b6:5:190:cafe::f1) by DM6PR11CA0009.outlook.office365.com (2603:10b6:5:190::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.15 via Frontend Transport; Wed, 10 Nov 2021 06:59:39 +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 DM6NAM11FT047.mail.protection.outlook.com (10.13.172.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4690.15 via Frontend Transport; Wed, 10 Nov 2021 06:59:38 +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.18; Wed, 10 Nov 2021 06:59:37 +0000 From: Xueming Li To: Anatoly Burakov CC: Luca Boccassi , dpdk stable Date: Wed, 10 Nov 2021 14:32:10 +0800 Message-ID: <20211110063216.2744012-247-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.5] 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: 24db1f4a-e436-4bbc-2c59-08d9a417a996 X-MS-TrafficTypeDiagnostic: CH2PR12MB4822: 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: MJCcKFtc8sjznf7w1I5bLQwNBEnwKp7RoKBpRnHl8hyoLNDpO8BxOwMJk9VpavWqpDM1A3FUKe/G0tKRxv79CReA0IxB3u0VP38awm4FQuu7Cpp3PVrqYh/1MeKXJQYndonT035rDKl+aYOU0WneIbhxFj5rTRVU99NcVPeQeAd1OS62/zScl+WAY8XzPjLyYAlFI3OXtjrwEs5sSwKvQTOauOyH5jv++8mMzw3YJi4/sCU9+3PWyKvcwAcky/oqDDs9nuyk70z0N72PuXlwcYo/uB2CeixQ4Y4DY+Ba2sAaE3drWgB28GTOQ8oeXFj1Az2l2ypnj6wyGkaN8/wl9nkKI/bm3EabJ/YIb8dmfTd+XX7Q1Rc8/REqWcYswSGTK8T1D6+BxDMOsCHGp2DURBblcj97QiI3dt0OStPiwoONxPYSgOG95NSlQxKxI6+eVPmDhlkhbiaHmPuS8b7Y20QT7yRmqqFyJlst8IKbIcmtEOh++mHNTyC8mEWDD7Y0yfZE0XzG2A3z8m43oEafz/In/U/e5QE4CZK6BL1XrG0aFk9ypeq8clnjdPr3e5/CedNqUI5ilcjHeCs+XufZ41qUxbaB7QqAV/pZNPXJOg6utYDMx/7JDYMzTP5bSFhwZa4mTW1Q8GQcpLm4V+vc9IUgvZV96AteQeBUyKDkapxh+gXsSCaAW6H9VCd3F0DRzy0ercFOy01StRYG+2jVzwYsuEmmNRo8JXY9FL6ryqgk4V5Fb03/nhwjmzjNP0S7TdfcAn1lRckqGBTj2y2XW8wruWGoL182L+fYRT8hRq2p9dlAWsNNF7g+DxwuALq6HgIHF3EGEenRuQipyKG6iA== 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)(55016002)(6666004)(6286002)(966005)(83380400001)(36906005)(336012)(86362001)(53546011)(356005)(2906002)(2616005)(54906003)(426003)(7696005)(36756003)(7636003)(8676002)(8936002)(4001150100001)(16526019)(70206006)(1076003)(70586007)(19627235002)(6916009)(316002)(47076005)(36860700001)(82310400003)(186003)(4326008)(508600001)(26005)(5660300002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 06:59:38.4830 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 24db1f4a-e436-4bbc-2c59-08d9a417a996 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: DM6NAM11FT047.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4822 Subject: [dpdk-stable] patch 'vfio: fix FreeBSD clear group stub' 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/bef6f8c951463c9c99449553b2ab95c812643309 Thanks. Xueming Li --- >From bef6f8c951463c9c99449553b2ab95c812643309 Mon Sep 17 00:00:00 2001 From: Anatoly Burakov Date: Thu, 28 Oct 2021 14:15:17 +0000 Subject: [PATCH] vfio: fix FreeBSD clear group stub Cc: Xueming Li [ upstream commit bf8b792f3b8519fecf3585ffac15da6f7bca2de9 ] On FreeBSD, `rte_vfio_clear_group()` was returning 0 even though this function is not valid for FreeBSD, and is called out to return error in doxygen comments. Fix the return value to match documentation. Fixes: c564a2a20093 ("vfio: expose clear group function for internal usages") Signed-off-by: Anatoly Burakov --- lib/librte_eal/freebsd/eal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/librte_eal/freebsd/eal.c b/lib/librte_eal/freebsd/eal.c index 957273a9bb..053ae65365 100644 --- a/lib/librte_eal/freebsd/eal.c +++ b/lib/librte_eal/freebsd/eal.c @@ -1041,7 +1041,7 @@ int rte_vfio_noiommu_is_enabled(void) int rte_vfio_clear_group(__rte_unused int vfio_group_fd) { - return 0; + return -1; } int -- 2.33.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-10 14:17:12.720041765 +0800 +++ 0246-vfio-fix-FreeBSD-clear-group-stub.patch 2021-11-10 14:17:02.090744291 +0800 @@ -1 +1 @@ -From bf8b792f3b8519fecf3585ffac15da6f7bca2de9 Mon Sep 17 00:00:00 2001 +From bef6f8c951463c9c99449553b2ab95c812643309 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit bf8b792f3b8519fecf3585ffac15da6f7bca2de9 ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -16 +18 @@ - lib/eal/freebsd/eal.c | 2 +- + lib/librte_eal/freebsd/eal.c | 2 +- @@ -19,5 +21,5 @@ -diff --git a/lib/eal/freebsd/eal.c b/lib/eal/freebsd/eal.c -index 2c2baaa691..5cea368efe 100644 ---- a/lib/eal/freebsd/eal.c -+++ b/lib/eal/freebsd/eal.c -@@ -1045,7 +1045,7 @@ int rte_vfio_noiommu_is_enabled(void) +diff --git a/lib/librte_eal/freebsd/eal.c b/lib/librte_eal/freebsd/eal.c +index 957273a9bb..053ae65365 100644 +--- a/lib/librte_eal/freebsd/eal.c ++++ b/lib/librte_eal/freebsd/eal.c +@@ -1041,7 +1041,7 @@ int rte_vfio_noiommu_is_enabled(void)