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 612D842B9A; Thu, 25 May 2023 12:09:19 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 80D3C42D4F; Thu, 25 May 2023 12:09:05 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2061.outbound.protection.outlook.com [40.107.244.61]) by mails.dpdk.org (Postfix) with ESMTP id 0680142D33 for ; Thu, 25 May 2023 12:09:04 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PUV5b4ulZ/fpOFf324WOYKDpg6NV9Df00BFjahq5nFeKvrLaV5vNxOmHP81//T4Tixr/n2CG3VAWp4tKFSf1k1cvLKBdIlk9fpnJ0NmlhzPWAFfYnM5d0CLqZ7YtvN4ZTnOXJBk2hLYasDTLGEEeHAvPEBbEhzqpk+0EVPU3jay1/XFJEt0cshfAhdB+Ym0DUqFztXo/Igt6GQJtuaNR2yF5R3befPAKa2emmVG/Xy8W4zTkzzhjVkSvicIRrDl94R7xNzFcMaTVmUXo2kveaUotqkMruW7G1sCHO1J62IE2kvEvX2D8KEQiIkiHIjBndZh6ZyVZxCh47azo5F3ccw== 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=iki8/3NF5mq7AKAWUr/lEucr/h6p8sF2m+pJgI4gOTc=; b=loZikx/VUYP6GAtAWyLTAdLA4DHfcjlKVzZtf8oRM+Zdfqs+Gf0FVKM1OAD28Je0+iaMaD6TlOhDWiAvq+O+XY6p084edvNGyGtNukG+QWB9BvXZM52gMBS3oH31rLgao3PpMq32/ivl7DHhAAcQIDyR8t3XM1xl9tBocnF7iuwffoLsrYXBUcowieDmLyqSfVZ6DfokMVSrujWXB/j4b1XGTAShTwruhTXMFykjtInLUoAplYHucKo3cYwoIMT2ehYCPrWpxIMfc7OTlqTeli5gMx3eMPDpgh04RQX3nqXYL65zs5+uHV0nuoVg2M2C7ZSX9kHnWBq58XUsGUQi0g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=dpdk.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=iki8/3NF5mq7AKAWUr/lEucr/h6p8sF2m+pJgI4gOTc=; b=eMQ5i4RvlzWK+m2Oz/+/9TiPeEkK9+Ze6yHWd93WhrfYBKM1I6cPNo1FTChO353GJB34OyKAtkCVTI8AjqBjIgmUq0HbuPgY15CJQ1OctVFZxPR4zyIfK8oHT1bsb2/iYw7aBRlTFhE1A+fVwRgYqsDWgUtgjAxxgItlNWO/KJs= Received: from MW4P223CA0001.NAMP223.PROD.OUTLOOK.COM (2603:10b6:303:80::6) by IA1PR12MB6211.namprd12.prod.outlook.com (2603:10b6:208:3e5::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.28; Thu, 25 May 2023 10:09:01 +0000 Received: from CO1NAM11FT010.eop-nam11.prod.protection.outlook.com (2603:10b6:303:80:cafe::6f) by MW4P223CA0001.outlook.office365.com (2603:10b6:303:80::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.16 via Frontend Transport; Thu, 25 May 2023 10:09:01 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB03.amd.com; pr=C Received: from SATLEXMB03.amd.com (165.204.84.17) by CO1NAM11FT010.mail.protection.outlook.com (10.13.175.88) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6433.17 via Frontend Transport; Thu, 25 May 2023 10:09:01 +0000 Received: from SATLEXMB06.amd.com (10.181.40.147) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Thu, 25 May 2023 05:08:53 -0500 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB06.amd.com (10.181.40.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Thu, 25 May 2023 05:08:53 -0500 Received: from xhdipdslab41.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2375.34 via Frontend Transport; Thu, 25 May 2023 05:08:50 -0500 From: Nipun Gupta To: , , , , , CC: , , , Nipun Gupta Subject: [PATCH v5 5/5] bus/cdx: support plug unplug and dev iterator Date: Thu, 25 May 2023 15:38:21 +0530 Message-ID: <20230525100821.12148-6-nipun.gupta@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230525100821.12148-1-nipun.gupta@amd.com> References: <20230124140746.594066-1-nipun.gupta@amd.com> <20230525100821.12148-1-nipun.gupta@amd.com> MIME-Version: 1.0 Content-Type: text/plain X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT010:EE_|IA1PR12MB6211:EE_ X-MS-Office365-Filtering-Correlation-Id: 88d4021d-3c7b-4b70-2a4a-08db5d08103c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xIg2uyXUugdEyhKTKkUtxEDAO6QgBw0YJhc+66pddcJu4uQbfXsqZXcuFBrbaqpCKbEEVJmlzXb3Eedm5sSJXASAsfYoIYwUugYaUiMYQuoJKL8VGvpY6OGjlBBqmmA8gx8Yxwo8MdZWfQbigZsmJDVSx9eIJ8njhEp23E33ablaoPzVyf+nH8HseVOgn5ZBSEej9WzIDMh44brcFr4wdlqpSrGhVo8DRwvNBbbts6OQ4+ZACR4ykcLpcwHL60hjFmm2stmqrc19mY0M53SFpBq4bVsetlXB8vP0VMl5mEUsX1rL7rurdtdGmuB09E67xwM9X7e5QmD47D2kVbhy0BdvZvIiyU+l+FJNgOukH5LyNPdBtPCnikJys467LluBvF8D27IBSBnXLCzD1MmnDpSJVMaWIqmxyirTtQvN6y3FKkRGWNBZA2W1vBvZg4VbJ9u+kj5tyiumlDqtCqsljAabb952Xjwj1hjBjQhxF1McHhhhOr2/ZxY7wYbvmW8VQaEoMBuk2zkqU9ZNutNprsC2c04c9OEzuGW8I95LmoR6MVOLBAmBy+wH+3xz2tow7p6A1GPHhQxCyDo8JjRSMEvnqMWbZEwzWptiLQGCPejqdI8c717BRj8sS+hpqZS9+JO/UWaX8iwUt0rqLQhqG6C+Ykwpln+JkicTHqv03oi8UsrqXPQPW2R3J4batPlDzo/Aigxhn2ej8V4x7pihqCq98w7EJP+OA83E25uO+Bwzxnh9/ftix0IONWJIF4W1jX8P5UUn/6lMw273Mi3PlQ== X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB03.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230028)(4636009)(136003)(346002)(376002)(39860400002)(396003)(451199021)(46966006)(40470700004)(36840700001)(110136005)(82310400005)(82740400003)(86362001)(36860700001)(70586007)(70206006)(478600001)(54906003)(81166007)(356005)(47076005)(2906002)(2616005)(6666004)(36756003)(426003)(336012)(316002)(4326008)(1076003)(8676002)(8936002)(40480700001)(5660300002)(26005)(186003)(40460700003)(41300700001)(44832011)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2023 10:09:01.5150 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 88d4021d-3c7b-4b70-2a4a-08db5d08103c X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB03.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT010.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6211 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org This change adds support for plugging and unplugging CDX devices on AMD CDX bus. Also, CDX dev iterator support has been added for the CDX bus. Signed-off-by: Nipun Gupta Acked-by: Ferruh Yigit --- drivers/bus/cdx/bus_cdx_driver.h | 1 + drivers/bus/cdx/cdx.c | 122 +++++++++++++++++++++++++++++++ 2 files changed, 123 insertions(+) diff --git a/drivers/bus/cdx/bus_cdx_driver.h b/drivers/bus/cdx/bus_cdx_driver.h index a8c54d728e..1e86f55788 100644 --- a/drivers/bus/cdx/bus_cdx_driver.h +++ b/drivers/bus/cdx/bus_cdx_driver.h @@ -64,6 +64,7 @@ struct rte_cdx_id { struct rte_cdx_device { RTE_TAILQ_ENTRY(rte_cdx_device) next; /**< Next probed CDX device. */ struct rte_device device; /**< Inherit core device */ + struct rte_cdx_driver *driver; /**< CDX driver used in probing */ struct rte_cdx_id id; /**< CDX ID. */ struct rte_mem_resource mem_resource[CDX_MAX_RESOURCE]; /**< CDX Memory Resource */ diff --git a/drivers/bus/cdx/cdx.c b/drivers/bus/cdx/cdx.c index c691c38e04..b3d07fd638 100644 --- a/drivers/bus/cdx/cdx.c +++ b/drivers/bus/cdx/cdx.c @@ -66,6 +66,7 @@ #include #include #include +#include #include #include @@ -79,6 +80,15 @@ #define CDX_BUS_NAME cdx #define CDX_DEV_PREFIX "cdx-" +enum cdx_params { + RTE_CDX_PARAM_NAME, +}; + +static const char * const cdx_params_keys[] = { + [RTE_CDX_PARAM_NAME] = "name", + NULL, +}; + /** * @file * CDX probing using Linux sysfs. @@ -396,6 +406,7 @@ cdx_probe_one_driver(struct rte_cdx_driver *dr, } else { dev->device.driver = &dr->driver; } + dev->driver = dr; return ret; @@ -513,6 +524,71 @@ cdx_find_device(const struct rte_device *start, rte_dev_cmp_t cmp, return NULL; } +/* Remove a device from CDX bus */ +static void +cdx_remove_device(struct rte_cdx_device *cdx_dev) +{ + TAILQ_REMOVE(&rte_cdx_bus.device_list, cdx_dev, next); +} + +/* + * If vendor/device ID match, call the remove() function of the + * driver. + */ +static int +cdx_detach_dev(struct rte_cdx_device *dev) +{ + struct rte_cdx_driver *dr; + int ret = 0; + + if (dev == NULL) + return -EINVAL; + + dr = dev->driver; + + CDX_BUS_DEBUG("detach device %s using driver: %s", + dev->device.name, dr->driver.name); + + if (dr->remove) { + ret = dr->remove(dev); + if (ret < 0) + return ret; + } + + /* clear driver structure */ + dev->driver = NULL; + dev->device.driver = NULL; + + rte_cdx_unmap_device(dev); + + rte_intr_instance_free(dev->intr_handle); + dev->intr_handle = NULL; + + return 0; +} + +static int +cdx_plug(struct rte_device *dev) +{ + return cdx_probe_all_drivers(RTE_DEV_TO_CDX_DEV(dev)); +} + +static int +cdx_unplug(struct rte_device *dev) +{ + struct rte_cdx_device *cdx_dev; + int ret; + + cdx_dev = RTE_DEV_TO_CDX_DEV(dev); + ret = cdx_detach_dev(cdx_dev); + if (ret == 0) { + cdx_remove_device(cdx_dev); + rte_devargs_remove(dev->devargs); + free(cdx_dev); + } + return ret; +} + static int cdx_dma_map(struct rte_device *dev, void *addr, uint64_t iova, size_t len) { @@ -550,15 +626,61 @@ cdx_get_iommu_class(void) return RTE_IOVA_VA; } +static int +cdx_dev_match(const struct rte_device *dev, + const void *_kvlist) +{ + const struct rte_kvargs *kvlist = _kvlist; + const char *key = cdx_params_keys[RTE_CDX_PARAM_NAME]; + const char *name; + + /* no kvlist arg, all devices match */ + if (kvlist == NULL) + return 0; + + /* if key is present in kvlist and does not match, filter device */ + name = rte_kvargs_get(kvlist, key); + if (name != NULL && strcmp(name, dev->name)) + return -1; + + return 0; +} + +static void * +cdx_dev_iterate(const void *start, + const char *str, + const struct rte_dev_iterator *it __rte_unused) +{ + rte_bus_find_device_t find_device; + struct rte_kvargs *kvargs = NULL; + struct rte_device *dev; + + if (str != NULL) { + kvargs = rte_kvargs_parse(str, cdx_params_keys); + if (kvargs == NULL) { + CDX_BUS_ERR("cannot parse argument list %s", str); + rte_errno = EINVAL; + return NULL; + } + } + find_device = rte_cdx_bus.bus.find_device; + dev = find_device(start, cdx_dev_match, kvargs); + rte_kvargs_free(kvargs); + return dev; +} + struct rte_cdx_bus rte_cdx_bus = { .bus = { .scan = cdx_scan, .probe = cdx_probe, .find_device = cdx_find_device, + .plug = cdx_plug, + .unplug = cdx_unplug, .parse = cdx_parse, .dma_map = cdx_dma_map, .dma_unmap = cdx_dma_unmap, .get_iommu_class = cdx_get_iommu_class, + .dev_iterate = cdx_dev_iterate, }, .device_list = TAILQ_HEAD_INITIALIZER(rte_cdx_bus.device_list), .driver_list = TAILQ_HEAD_INITIALIZER(rte_cdx_bus.driver_list), -- 2.17.1