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 40F4CA034F for ; Wed, 10 Nov 2021 07:59:44 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3498A40142; Wed, 10 Nov 2021 07:59:44 +0100 (CET) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2086.outbound.protection.outlook.com [40.107.236.86]) by mails.dpdk.org (Postfix) with ESMTP id A1AED410EF for ; Wed, 10 Nov 2021 07:59:42 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LvuvP9tTytPSuf+jloDwfh7CbUPn7oH8y7ljf7eRoZpWNvPQHBefUEeLf+JsxqgHrjwX1LD0V0iSMvdqUSudcyr+X3ltXa8azEj1/V1r3j2EBDZE4848zrRrjExOuza+xackYGdstj/xiBJjNzR0fdfrhcHMeBTYxMQuylwcQD6qodluioCFPrzEn86b4IJXqSGuJvR1vVt9gZNpYHIK2ED0Riu4Wc1CQTGVyxiDm6vF+f20jt50ROlyOaZrfRUiHMU3wOoKR72IphKztKn204kT/FJSX8abCYYJj5oKzZBpQYxt1Cozr6AfcSIAWa6oTOYWtrlUuswtc2zUaKz/AA== 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=8FKlJVMHEMuzmox1hNqiShFtMJufwwPn+GQK3QYyqus=; b=YhCRryIxTTQaWcijL+OOO8eLEvK3UZHwGESo+AWlEnwRGSzdmmGXI4BGYmjCE4p5/mSY2aWPWpKeXd7EsYzAuvUz0cw4ABbzvBtEBrPpPxcCm1x/EMRSg5rEDt+BQJg5OLBolIY0JaCyOYgH5DOh8CBw+Yk73bA2OO2AhmpCvx5VR2wdIi+iMXFSBlofSzXrDpEt02qcfHP25DQBrUITiFlCLPokqPbV1uxMeHb6O2m2X7HcdyZFlYrxVDPc1hTS7JajmPdh3LDdaJ0qj8wsFH8Sg8NLxlIbkIkXt1dg6jWIuZr2Kfno6MTA8SnSZIulw0d3RZCh0FuTUIRHuX/MFA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.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=8FKlJVMHEMuzmox1hNqiShFtMJufwwPn+GQK3QYyqus=; b=UZqhRR3G7WAoxttE1ZIJSow2nE48Yzmm/H4SCRaCs+aNx+7qXoK7id93fc5avKvCbTopaB7HjN9TAOo16/EXoHrYAZepQ9VOjVBDdU2vzi59GxveRujiUCE9Ep05Vg7pNhkgfpcW1YlD/w05/lWtXE9Li4JdR2spHEGHXS+g/0+rbgJFV2IhXC7vJ1w2MJVJqnmESxQny0HoFQ6hNTEjEhiDVr/7drh0KOgreQAybu9ytxEk8IUcfJ9U2+5/t7Ma5OJE9dERMCdpMMvHTbCOkg8mDjKBvHAuNqFVW+YfRuaoZdUntbpv8J7ixKHXUnqNDi7wQGfdA7FuBKi2vcWeMA== Received: from DM6PR08CA0056.namprd08.prod.outlook.com (2603:10b6:5:1e0::30) by MN2PR12MB3711.namprd12.prod.outlook.com (2603:10b6:208:161::24) 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:41 +0000 Received: from DM6NAM11FT038.eop-nam11.prod.protection.outlook.com (2603:10b6:5:1e0:cafe::a1) by DM6PR08CA0056.outlook.office365.com (2603:10b6:5:1e0::30) 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:40 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed) header.d=none;intel.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 DM6NAM11FT038.mail.protection.outlook.com (10.13.173.137) 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:40 +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:38 +0000 From: Xueming Li To: Anatoly Burakov CC: Luca Boccassi , Chenbo Xia , dpdk stable Date: Wed, 10 Nov 2021 14:32:11 +0800 Message-ID: <20211110063216.2744012-248-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: d354d57a-2b49-4d44-fe44-08d9a417aab0 X-MS-TrafficTypeDiagnostic: MN2PR12MB3711: 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: fkaCEkDhvG70cyc7mC8/ExtQ9/FksXZ269UFxcp9qTkZvWUaRGU+fbqDvKXhXTXEnJk1HxqkXUDZ87vyPAfRN8WwDZMl/wfX/8xDr0igOKVQQXvBWPHiDrHlNc5T0ns51IbhRswCg9rvstAfuwwkMPRA8IATde6lYCM4degA0BMGSoMvs+fwAjWMV4MzwDKaahAUxxqGrrGVhCPHqSlFwmQUylWxeMxHp4ayAeU7g20/Df7dG6Gbl5MwUfAElecP912Xaf06SetwfiCwVBu6HJ2+1AdNcwcvIRjy329ELRWP9xenYd/NJCh0/tgZlSZMhVkOmFOWnYGCouUClLVrbFZWP+tvU7KlxE4W+HzN+4MyOtEx0k3ub0vBw9rKMByWFB93uBGfFMpq8r6YQLI2oB8ZoWQixhaWVQj/5+Ng+eIqMmDC63Yk5HoOwCynG7IoXM+W7YhfPysA574lE9tropUtCp6qd2slTUAFfRfJ1j8kcc43IDFvOF80Zr6kiOj1qki8s6Y1RxX+dDVxMN2If3YEtLNIdWL789YkKjyTgzByS2EU/IouR9OgcEnMR0RfwQeSgjD9k9Qv5+D3c0he1zHfw8JKp7AIMu9GpvnT2Pytjcou8vufbFG+AnycI9oYfGYj/gwrUGyAafeG1guDFxfB6NlzMFrX3ZVhR8Gl/9zu6Bu96+Q3G5bnBtRP9E5fcxNsGsN1RUQ6Alq9zPWIXUkJ+n8Si6kSYFrwcsstEuuotHG6MGa4B5rElm5vup5rDVS3DFQooe2sORzES1v3KDMYayDxpoJyQbmqLwPBKX2sL0fkPhICWoe4ZBHHYAm7A4Q0lUXKxGk3rmne7jJeKA== 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)(36840700001)(46966006)(82310400003)(2906002)(186003)(70586007)(966005)(70206006)(54906003)(6666004)(4326008)(83380400001)(36860700001)(2616005)(26005)(6916009)(7696005)(8936002)(6286002)(508600001)(356005)(47076005)(8676002)(7636003)(426003)(53546011)(5660300002)(16526019)(86362001)(36906005)(4001150100001)(316002)(55016002)(19627235002)(336012)(36756003)(1076003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 06:59:40.3445 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d354d57a-2b49-4d44-fe44-08d9a417aab0 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: DM6NAM11FT038.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB3711 Subject: [dpdk-stable] patch 'vfio: fix FreeBSD documentation' 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/971626cbed459b97576c21daefd5a24ef3b61d31 Thanks. Xueming Li --- >From 971626cbed459b97576c21daefd5a24ef3b61d31 Mon Sep 17 00:00:00 2001 From: Anatoly Burakov Date: Thu, 28 Oct 2021 14:15:18 +0000 Subject: [PATCH] vfio: fix FreeBSD documentation Cc: Xueming Li [ upstream commit da6e4cdca1144e2cc6f9f495a34d3085e707b78a ] On FreeBSD, `rte_vfio_is_enabled()` and `rte_vfio_noiommu_is_enabled()` API calls will not return error, and will instead return 0. This is intentional, because the caller of this API does not care whether VFIO is supported at all, and will instead be interested in whether VFIO is enabled or not. However, the doxygen comments for these functions state that they will return an error on FreeBSD, which is incorrect. Fix the doxygen comment to call out the fact that these functions are only relevant on Linux, but remove the reference to returning errors. Fixes: 279b581c897d ("vfio: expose functions") Signed-off-by: Anatoly Burakov Acked-by: Chenbo Xia --- lib/librte_eal/include/rte_vfio.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/librte_eal/include/rte_vfio.h b/lib/librte_eal/include/rte_vfio.h index 2d90b36480..7bdb8932b2 100644 --- a/lib/librte_eal/include/rte_vfio.h +++ b/lib/librte_eal/include/rte_vfio.h @@ -150,8 +150,7 @@ int rte_vfio_enable(const char *modname); /** * Check whether a VFIO-related kmod is enabled. * - * This function is only relevant to linux and will return - * an error on BSD. + * This function is only relevant to Linux. * * @param modname * kernel module name. @@ -165,8 +164,7 @@ int rte_vfio_is_enabled(const char *modname); /** * Whether VFIO NOIOMMU mode is enabled. * - * This function is only relevant to linux and will return - * an error on BSD. + * This function is only relevant to Linux. * * @return * 1 if true. -- 2.33.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-10 14:17:12.760823204 +0800 +++ 0247-vfio-fix-FreeBSD-documentation.patch 2021-11-10 14:17:02.090744291 +0800 @@ -1 +1 @@ -From da6e4cdca1144e2cc6f9f495a34d3085e707b78a Mon Sep 17 00:00:00 2001 +From 971626cbed459b97576c21daefd5a24ef3b61d31 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit da6e4cdca1144e2cc6f9f495a34d3085e707b78a ] @@ -18 +20,0 @@ -Cc: stable@dpdk.org @@ -23 +25 @@ - lib/eal/include/rte_vfio.h | 6 ++---- + lib/librte_eal/include/rte_vfio.h | 6 ++---- @@ -26 +28 @@ -diff --git a/lib/eal/include/rte_vfio.h b/lib/eal/include/rte_vfio.h +diff --git a/lib/librte_eal/include/rte_vfio.h b/lib/librte_eal/include/rte_vfio.h @@ -28,2 +30,2 @@ ---- a/lib/eal/include/rte_vfio.h -+++ b/lib/eal/include/rte_vfio.h +--- a/lib/librte_eal/include/rte_vfio.h ++++ b/lib/librte_eal/include/rte_vfio.h