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 DBCA7428E2; Fri, 7 Apr 2023 08:03:21 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 76A9542BC9; Fri, 7 Apr 2023 08:03:18 +0200 (CEST) Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam02on2069.outbound.protection.outlook.com [40.107.95.69]) by mails.dpdk.org (Postfix) with ESMTP id 8E65D42BC9 for ; Fri, 7 Apr 2023 08:03:17 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j4DttjpfQu8ooEgQKrQIQeU5pg2ixxNLvOkZh/K6l9F7X7WXvSTwBwg+Nztv8OVTP2Xwgp/SIt+chh0x4q21BVTGIyxZmG0wRZPgLIx1F4gHmCWIyoSGipobPSTbqMl0/aR8JQZwUrMIoU5dH9nmnpPVPOqHZTkTMoJIBfFWAHTGwLqUHfNc+rs2YHm3HScFYr+JGS5SL8x9u+YIHe7H7vrsJWyUIZcQ/unslbEDawuRxgaxQwFOOchVkw+cMbmpUBBv4Fb4QojcXAKYHKI22ZjDmr2UYYY2n5gQO5q+kzHdo9CPKfkbl9zLU4BHJpajHhPyAZzRrQtg6mRWT1HKEQ== 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=ae4whlPDEh8bHUM2pcJtk2ebeJQkhMv6vRQmRhrKIhE=; b=FIzNCwu807IrV+V2/dc70OlAdrFGJwBi4IGTrnRkMz1AQZ/fFurNLS0IvNtGYsVRbJsOqxkSaV8bUUR4fiHlX6qxrRUmI7bq4vPsA0Ls0xPk19I8RO3L+9FQulUT+8F2gOKnzz0lC370eUBaSCi5eCBYdMhpbTZIwekNdHvVnvNXBZA29LzGp2mLR6NHZuTMNPQauyHPVinuD8rRPJ74r/azSrhodETt77++AQkpS30VX9gZojSIp95WuuKRv7bd47IFU5SIO0MSuk2W3RFlXZSxtWH3Zd7TuJXFVgDOKj8hk+mDRV8mJH2nNwe2uEku85geBdycWAv4qKz+vxWQqw== 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=ae4whlPDEh8bHUM2pcJtk2ebeJQkhMv6vRQmRhrKIhE=; b=T6Ac9CGEEoWMvQMGPq6Vmo1wUPamHQZ22pN4eCEeAy0wSfUSH20jj6b3MBtkD+RnPvQmJ44kU+Xvtoo3DxDZFPAk+XlmI7biCSRpGEdLtawihRd4wWOl9xRCzaSoXOKXEorvJSloCRp50Q06GosvNZPHvvr1FoxX1WGFHWfc6Jo= Received: from DS7PR03CA0273.namprd03.prod.outlook.com (2603:10b6:5:3ad::8) by DM4PR12MB7574.namprd12.prod.outlook.com (2603:10b6:8:10e::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6254.35; Fri, 7 Apr 2023 06:03:15 +0000 Received: from DM6NAM11FT096.eop-nam11.prod.protection.outlook.com (2603:10b6:5:3ad:cafe::fd) by DS7PR03CA0273.outlook.office365.com (2603:10b6:5:3ad::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.34 via Frontend Transport; Fri, 7 Apr 2023 06:03:15 +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=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DM6NAM11FT096.mail.protection.outlook.com (10.13.173.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6298.19 via Frontend Transport; Fri, 7 Apr 2023 06:03:15 +0000 Received: from SATLEXMB05.amd.com (10.181.40.146) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Fri, 7 Apr 2023 01:03:10 -0500 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB05.amd.com (10.181.40.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Fri, 7 Apr 2023 01:03:06 -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; Fri, 7 Apr 2023 01:02:36 -0500 From: Nipun Gupta To: , , CC: , , , Nipun Gupta Subject: [PATCH 4/6] bus/cdx: support plug unplug and dev iterator Date: Fri, 7 Apr 2023 11:31:50 +0530 Message-ID: <20230407060152.16335-5-nipun.gupta@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230407060152.16335-1-nipun.gupta@amd.com> References: <20230124140746.594066-1-nipun.gupta@amd.com> <20230407060152.16335-1-nipun.gupta@amd.com> MIME-Version: 1.0 Content-Type: text/plain X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT096:EE_|DM4PR12MB7574:EE_ X-MS-Office365-Filtering-Correlation-Id: 5178236f-06fe-4006-5112-08db372dc6ff X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LMo2eJyAsgBtxPLJtoUDpaTaKZl/T8AQbriaQFZZi6wsoJRREbmg9gBUb/ubJ02UnIR91NtXjQQYcbaN++FnlFQMjDcBWXtsdnyejvDP33MYnc8o3TMm9kAnugLFviUuiboVAbQJhFV8qvmVooOZDQfUBDH4XC6WI956I0zs2HZtpgpNbApqTJzoPTELIKn86yKDfg0PDrvGTYzX0R1r+iEiJOh4SnD+ORFxFae4pSAEKiGnBoReV13BLqeTGJ0J+6in+hhlP1Kb6zL/7Ylnm5c3Wu9AHHnhwgFnq0mB51WxDpCaOiPyY+PjSnOkotQiWfSOZFQt4mrxmDmmVMm6z99rKCe04PyLBgazKRzHLVtDP9iuzNHFvJNeUY7W/gKTqTSzjq0f4ZJQ0lx4Ce8gNiAP2mmoAgMjzYmPSTMFFPnLlROGZkbEQQQnq6pbJS+bNmkLhaQa4H70eZpJDFA7RKHcFXubhWtZqO9MC7GEddNldMjK4XFXyvmeN2UGMcCvsggZ+cbuREUEsf7lRBiPiJcPVe6BXYmj0oX24rpVOJkLxRkYsIH2qkyWReQvwN4xYVM5kBIK9diL//aAAcL2mvrZS7PzDvIABmAc4U2ffg6HUthpxpihVFwU43pSlXlzBYgScUaDChMO7cjAiGdCUbztyJd2pWN9Bk0yWQ0LJ8WrsLCB0IwCtGeiST9V4yag8UmwsfbeoZf1WYBWNq20ifqyg+BfwhPbE5XjHeziF2s= X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230028)(4636009)(39860400002)(136003)(396003)(376002)(346002)(451199021)(40470700004)(36840700001)(46966006)(186003)(82310400005)(2616005)(47076005)(36860700001)(81166007)(356005)(36756003)(40460700003)(70586007)(44832011)(5660300002)(8676002)(82740400003)(8936002)(40480700001)(86362001)(4326008)(41300700001)(70206006)(83380400001)(336012)(110136005)(2906002)(426003)(54906003)(26005)(316002)(6666004)(478600001)(1076003)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Apr 2023 06:03:15.3953 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5178236f-06fe-4006-5112-08db372dc6ff 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=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT096.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB7574 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 the CDX bus. Also, CDX dev iterator support has been added for the CDX bus. Signed-off-by: Nipun Gupta --- drivers/bus/cdx/cdx.c | 142 +++++++++++++++++++++++++++++++--- drivers/bus/cdx/rte_bus_cdx.h | 1 + 2 files changed, 133 insertions(+), 10 deletions(-) diff --git a/drivers/bus/cdx/cdx.c b/drivers/bus/cdx/cdx.c index 9732a32eb1..8c72de9fe4 100644 --- a/drivers/bus/cdx/cdx.c +++ b/drivers/bus/cdx/cdx.c @@ -69,6 +69,7 @@ #include #include #include +#include #include #include #include @@ -82,6 +83,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. @@ -89,7 +99,7 @@ /* Add a device to CDX bus */ static void -rte_cdx_add_device(struct rte_cdx_device *cdx_dev) +cdx_add_device(struct rte_cdx_device *cdx_dev) { TAILQ_INSERT_TAIL(&rte_cdx_bus.device_list, cdx_dev, next); } @@ -259,7 +269,7 @@ cdx_scan_one(const char *dirname, const char *dev_name) } dev->id.device_id = (uint16_t)tmp; - rte_cdx_add_device(dev); + cdx_add_device(dev); return 0; @@ -276,7 +286,7 @@ cdx_scan_one(const char *dirname, const char *dev_name) * list. */ static int -rte_cdx_scan(void) +cdx_scan(void) { struct dirent *e; DIR *dir; @@ -356,7 +366,7 @@ cdx_unmap_resource(void *requested_addr, size_t size) * Match the CDX Driver and Device using device id and vendor id. */ static int -rte_cdx_match(const struct rte_cdx_driver *cdx_drv, +cdx_match(const struct rte_cdx_driver *cdx_drv, const struct rte_cdx_device *cdx_dev) { const struct rte_cdx_id *id_table; @@ -382,7 +392,7 @@ rte_cdx_match(const struct rte_cdx_driver *cdx_drv, * driver. */ static int -rte_cdx_probe_one_driver(struct rte_cdx_driver *dr, +cdx_probe_one_driver(struct rte_cdx_driver *dr, struct rte_cdx_device *dev) { const char *dev_name = dev->device.name; @@ -393,7 +403,7 @@ rte_cdx_probe_one_driver(struct rte_cdx_driver *dr, return -EINVAL; /* The device is not blocked; Check if driver supports it */ - if (!rte_cdx_match(dr, dev)) + if (!cdx_match(dr, dev)) /* Match of device and driver failed */ return 1; @@ -421,6 +431,7 @@ rte_cdx_probe_one_driver(struct rte_cdx_driver *dr, } else { dev->device.driver = &dr->driver; } + dev->driver = dr; return ret; @@ -447,7 +458,7 @@ cdx_probe_all_drivers(struct rte_cdx_device *dev) return -EINVAL; FOREACH_DRIVER_ON_CDXBUS(dr) { - rc = rte_cdx_probe_one_driver(dr, dev); + rc = cdx_probe_one_driver(dr, dev); if (rc < 0) /* negative value is an error */ return rc; @@ -566,6 +577,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) { @@ -595,7 +671,7 @@ cdx_dma_unmap(struct rte_device *dev, void *addr, uint64_t iova, size_t len) } static enum rte_iova_mode -rte_cdx_get_iommu_class(void) +cdx_get_iommu_class(void) { if (TAILQ_EMPTY(&rte_cdx_bus.device_list)) return RTE_IOVA_DC; @@ -603,15 +679,61 @@ rte_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 = rte_cdx_scan, + .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 = rte_cdx_get_iommu_class, + .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), diff --git a/drivers/bus/cdx/rte_bus_cdx.h b/drivers/bus/cdx/rte_bus_cdx.h index a6170347dd..a715dee50b 100644 --- a/drivers/bus/cdx/rte_bus_cdx.h +++ b/drivers/bus/cdx/rte_bus_cdx.h @@ -78,6 +78,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 */ -- 2.17.1