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 A8352A0A0E for ; Mon, 10 May 2021 18:07:59 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 926E24003E; Mon, 10 May 2021 18:07:59 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2058.outbound.protection.outlook.com [40.107.94.58]) by mails.dpdk.org (Postfix) with ESMTP id 5DAD04003E for ; Mon, 10 May 2021 18:07:58 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UW6oUw3UWlFzY2aX/zOgle27KhQVHyXP0TU6eaZkr0UezVXXWj5SiAxCV2DrEGwmkUXd7SZ27BsNsAhuuJ6Smdkik6BLW7pIku+lqeCdaJwqn5PeNw92IhwRhTyuUq5lzo7jBOH/51T0vyHr8As9CvwWFpWCBnG85Jxv5a/hGg0xuGp52tfLP8dgqkO4GIROZBTXX9xBZFMBAnga586VFCpXNrvkDFI/MFsJdsrhva1a33tkhLZ2K6l6EYLcBKmlTQmWkFLKj+G7T4+GYpGHiRWW04fbAsDu2G+Wug5IfuJ6/DThacJG1tfug2Ake3ILWvnL0ZrF9q9kun5CEICQ8Q== 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=d2H/sBHab1o95lwQIyY3CwR194J9EdKdVqtL/aMOx2s=; b=LyjM1Kc9TCI5H8MNegJWNquWS49BIa/SkSNFBLw72BuX/64kD1xSwsIWeh3RX71GWvMDrsqnj1KBnPP1LCd37HNsG2HsS2TCUoC275yGfRrWVRPBwPgTrKFlAfPdosI5KIb2ht2qUBeZ2IBqW0HmfdWHjpZI2NaYiQ1b/+eLk7JZ8EyG9PyzDIZwcyDNtqGMEq/ikR4OYkphaVXDB9asQkoMwPywEVHQLdfgnrDWaFSx1aP2EnjzqWr5Pix93veK8wdHoynMgiN087/xh1FEtTylWHlRudd2XXHfApOhRxB56uPH7/ZaaPnBjiCADuUnRC1GfTt9jP9SM4sjfCUY8A== 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=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=d2H/sBHab1o95lwQIyY3CwR194J9EdKdVqtL/aMOx2s=; b=GE7/Qgs599tfVKRxFWfaTTXBzhP3TCjm1Ybi1TfP94/2Rb7sPWhIyVRMtpy3EJb7PhOpeiUUuB6FZeeQqoIcKRld1fPgEtYkVBeFBjbPJYD8XluvbfziHQAKsIKoHYeQI1wHLiz38XoslfqBIni0j3Q03qC4rDCMaxh0QLfRcP6sOygqyPSRJR66sm7b84GvapBwlQ38zizvINn6nj9uLSxxPo2v4sOZG//b0zWobzKHQxPfHGds7+LHtgUllc/qY+udfrmYngT7OSVisImU7WElaDjQDIgMLo8lOdkAvDq4KVA6DiFm8iewcdFCqVayX3LyIPU/GDxrFbZEOkSVBQ== Received: from BN6PR11CA0061.namprd11.prod.outlook.com (2603:10b6:404:f7::23) by BY5PR12MB3859.namprd12.prod.outlook.com (2603:10b6:a03:1a8::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.26; Mon, 10 May 2021 16:07:55 +0000 Received: from BN8NAM11FT016.eop-nam11.prod.protection.outlook.com (2603:10b6:404:f7:cafe::78) by BN6PR11CA0061.outlook.office365.com (2603:10b6:404:f7::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:07:55 +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 BN8NAM11FT016.mail.protection.outlook.com (10.13.176.97) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:07:54 +0000 Received: from nvidia.com (172.20.145.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 10 May 2021 16:07:50 +0000 From: Xueming Li To: Pallavi Kadam CC: Luca Boccassi , Dmitry Kozlyuk , Ranjit Menon , "Tal Shnaiderman" , Narcisa Vasile , dpdk stable Date: Mon, 10 May 2021 23:59:56 +0800 Message-ID: <20210510160258.30982-47-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510160258.30982-1-xuemingl@nvidia.com> References: <20210510160258.30982-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.145.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 17ac506f-74f8-473e-1401-08d913cdc55b X-MS-TrafficTypeDiagnostic: BY5PR12MB3859: 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: oqXT2X32Iy1d2TcwxGEno8RIrkocjEmpjDjdZHJGvRKBZKUCM3cKUyY3HZIsITtnZL9RG2wog75gKG9NL2O26xFyt0VfCEzzvzSL5hq4/JKm+9MUCXvqkuQ/xgSkJs3S2h/4ClDhj6MS2j4MsVv1nM3WxCcO5EgvqTcDmgtkiJZHEABgtqnXxNje8cdVraPWXRcDPUrxArdUuJ7H5PsgwzxBfDdlqYu7E7Trl7rrh7tmBVddF9Nwy0fWRdoXSL+TJVDQGkug6f2C8nbUv8tzWaWhxXs+AkJvMQf7FZdDP4M9Pt9cNaIZdlINXhVHcCI5bAgWsOe2n8QLn2V/Dae6K53N3+r6ItRhN0ACV8lcBiNjJ14yokM5/RI4lrDQqWj19aEYLV490wPcGAdtF4eh5YVpsXDk1A7qn3+19U/IXQ5TAOxbQ8tWQDWNtvqtNeLKXra3EEqHMGYb0Ftk1UynpJwxhf78maa5tGdH6kh3gDti3cJVlUIhUZqT2Y0aPy48YMdP/7Q5848GZU7Y4Ochxg9DJM9LrJ20LCGabADLkOfWzRHBz1JQl7LfvbDx6vWiGe6pRTAZ1SHlYS8smSY8zlrlnWx4ud1GZlE25Fi3dcE0QsS+chARxaIvs4Dp+cilLdLgcYkNaQAMEDNTgoa2vD7/oAvNzXIdhrn7pIyhglde4qAiBhIQdTOPso9set2uXGT/0SC8Ca6eGI3Gx1otdhEYoCjayyLTWsqAjO7nao11zUD9ikBcUb7HhhHwzD6kqml+4D5r1m0LUGqqlLGR6w== 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)(136003)(39860400002)(396003)(346002)(376002)(36840700001)(46966006)(16526019)(4326008)(70586007)(70206006)(8936002)(55016002)(53546011)(2616005)(82740400003)(26005)(83380400001)(2906002)(966005)(86362001)(47076005)(1076003)(336012)(54906003)(186003)(316002)(6916009)(36860700001)(6286002)(8676002)(7636003)(36756003)(7696005)(5660300002)(82310400003)(426003)(356005)(478600001)(36906005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:07:54.8050 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 17ac506f-74f8-473e-1401-08d913cdc55b 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: BN8NAM11FT016.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB3859 Subject: [dpdk-stable] patch 'bus/pci: skip probing some Windows NDIS devices' 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 05/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/75c0d71c9f47c541375815b9b02d9185e32b10e1 Thanks. Xueming Li --- >From 75c0d71c9f47c541375815b9b02d9185e32b10e1 Mon Sep 17 00:00:00 2001 From: Pallavi Kadam Date: Wed, 10 Feb 2021 12:36:54 -0800 Subject: [PATCH] bus/pci: skip probing some Windows NDIS devices Cc: Luca Boccassi [ upstream commit de04405b336ed01e234db39fc211b4592b79c2b3 ] Implement rte_pci_map_device() to distinguish between the devices bound to netuio and NDIS devices. Only return success for the netuio devices. Fixes: c76ec01b4591 ("bus/pci: support netuio on Windows") Suggested-by: Dmitry Kozlyuk Signed-off-by: Pallavi Kadam Reviewed-by: Ranjit Menon Acked-by: Tal Shnaiderman Acked-by: Narcisa Vasile Tested-by: Narcisa Vasile --- drivers/bus/pci/windows/pci.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/bus/pci/windows/pci.c b/drivers/bus/pci/windows/pci.c index f662584528..00e7849b05 100644 --- a/drivers/bus/pci/windows/pci.c +++ b/drivers/bus/pci/windows/pci.c @@ -23,20 +23,22 @@ DEFINE_DEVPROPKEY(DEVPKEY_Device_Numa_Node, 0x540b947e, 0x8b40, 0x45bc, * the registry hive for PCI devices. */ -/* The functions below are not implemented on Windows, +/* Some of the functions below are not implemented on Windows, * but need to be defined for compilation purposes */ /* Map pci device */ int -rte_pci_map_device(struct rte_pci_device *dev __rte_unused) +rte_pci_map_device(struct rte_pci_device *dev) { - /* This function is not implemented on Windows. - * We really should short-circuit the call to these functions by - * clearing the RTE_PCI_DRV_NEED_MAPPING flag - * in the rte_pci_driver flags. + /* Only return success for devices bound to netuio. + * Devices that are bound to netuio are mapped at + * the bus probing stage. */ - return 0; + if (dev->kdrv == RTE_PCI_KDRV_NIC_UIO) + return 0; + else + return -1; } /* Unmap pci device */ -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-10 23:59:27.897172400 +0800 +++ 0048-bus-pci-skip-probing-some-Windows-NDIS-devices.patch 2021-05-10 23:59:26.390000000 +0800 @@ -1 +1 @@ -From de04405b336ed01e234db39fc211b4592b79c2b3 Mon Sep 17 00:00:00 2001 +From 75c0d71c9f47c541375815b9b02d9185e32b10e1 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit de04405b336ed01e234db39fc211b4592b79c2b3 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org