From patchwork Mon May 8 11:18:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gupta, Nipun" X-Patchwork-Id: 126762 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 426B542A94; Mon, 8 May 2023 13:19:05 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 661F242D35; Mon, 8 May 2023 13:18:56 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2042.outbound.protection.outlook.com [40.107.92.42]) by mails.dpdk.org (Postfix) with ESMTP id 22EC142D38 for ; Mon, 8 May 2023 13:18:54 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=d3P5+0Dbi3W2+Sj8ZmyYOoY3q7vzzomCjDDRpmNnA4VQZH0epOdaQK1eyDk2YUhKU4OtmuwEl7V9iZuFwyiLY/CKW8kMiGOSVbMoZ1RB5nKQ0AB/RcJ27oRYgCdo+erMbpwhnj9CJwO6Hhle6iQ0o7B/d2keNasDVla/tCZ7ZlG2a3e+11iDm+qoiX641BOQfDYdVwadii7v5fP3y9X70t0XdytY4yMunQD/0bVxwRLSDK/qGzs0RasNCw/whGWVJA5sgprmDmm+Z67Ynj5PTFq+l0PvOzUezXKvXOBd/KPiM6EVJcEVF3zVBkCKqBux2rRqMtdJBITMB0V16qmA/g== 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=GBqkQop4jNZxBaHULpWywUcKNeajmq0i5o2wOvDRkNc=; b=TOfniiZ6AXAbPJcBtL3307csTk/ZlGgD2MoEXo3K1ucXpz+pkVc7k8ibb15KCAGUCNenHHQSetsJLweCIDGBL2QSaI/Z6Stj4OraBZS2ZVbf4ih2iAkbMGT5ZQgQLr9WvtMsqdJiegc+fkXfZh2StRFJXCFl9Kl0jz1MuAk5L8TWnC/fMfWOvrQegACEgXljpX6pOv3TOmSv8MG0hDY28/Ybvw17Uo3E5Tn02Hv70EzL/bEHwUgZVdtVMb0XzXTUpnoFCX1kWo3Mgy+qtnunIdkMlzaYJTWcuWh7k81nFEp3aQLa6ueG7pd1/QSIQn1mleg0YZrY2eChFJHhE2xxPQ== 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=GBqkQop4jNZxBaHULpWywUcKNeajmq0i5o2wOvDRkNc=; b=AsBB8diy8sOwO6AKcFArWvTFCTrqS/bKlInlSl6eFMKsCPkUtCNE3rAy+VhQ8Pd09PFqfwCWMgN0sSbB/FQ7VFhQw2PMsJGySsa+Jg+319f4FVazzbwv/XA/M7sNyVNNGOIM6IutEp+qo2wm3w0mSwcjUXkqHPAQLnwK09DRCqo= Received: from BN7PR02CA0015.namprd02.prod.outlook.com (2603:10b6:408:20::28) by CYYPR12MB8654.namprd12.prod.outlook.com (2603:10b6:930:c9::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6363.32; Mon, 8 May 2023 11:18:51 +0000 Received: from BN8NAM11FT060.eop-nam11.prod.protection.outlook.com (2603:10b6:408:20:cafe::58) by BN7PR02CA0015.outlook.office365.com (2603:10b6:408:20::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6363.32 via Frontend Transport; Mon, 8 May 2023 11:18:50 +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 BN8NAM11FT060.mail.protection.outlook.com (10.13.177.211) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6363.33 via Frontend Transport; Mon, 8 May 2023 11:18:50 +0000 Received: from SATLEXMB05.amd.com (10.181.40.146) 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; Mon, 8 May 2023 06:18:50 -0500 Received: from SATLEXMB03.amd.com (10.181.40.144) 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; Mon, 8 May 2023 06:18:50 -0500 Received: from xhdipdslab41.xilinx.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2375.34 via Frontend Transport; Mon, 8 May 2023 06:18:48 -0500 From: Nipun Gupta To: , , CC: , , , Nipun Gupta Subject: [PATCH v4 4/4] bus/cdx: support plug unplug and dev iterator Date: Mon, 8 May 2023 16:48:12 +0530 Message-ID: <20230508111812.2655-5-nipun.gupta@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230508111812.2655-1-nipun.gupta@amd.com> References: <20230124140746.594066-1-nipun.gupta@amd.com> <20230508111812.2655-1-nipun.gupta@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT060:EE_|CYYPR12MB8654:EE_ X-MS-Office365-Filtering-Correlation-Id: 335aa2b8-f0dc-4b01-9591-08db4fb6002e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7jvcVrOPicoORR+BtjynHTjphMga7fEs50zQ2l26PxTbLXitohDEApzEGMu5q9gugZJAQuW4t5mmQIQK/S1CVlwgOZnaIGJ2uds1XZXMiAiqRQpFeV3X89pLKPTEMPknD3bNNZyFOVAHtdS1z2szETLPvo53MksBS/LFe1fZt4EUHEHQUI3RfuyZYFqwCecIyoViFzZWA9T5Hr/ND2JxdEqDjcH9Aiu2wwwOlTlPui542U7C5VYkPvZTJ1R6XvUscdbDtNl7jDDOdIlLEwYlUCfIY38cKNK8MDq9+xw8ol7tSrWA4V60Ma3as93YFaNJ0QJ4EcMieZ+8/Suuhr6z2HmuFLgySSUZ1ushKHXCEXj4Pyb4U5Fwsq/lRS7/GpVw6jK2axOuscvQrefU6fZCYohb4A4YcwPhB9oQkm2YT+veqqoa2hnjIMVkCp/nbogFRiRuOnL9MvkTU3j+pmycaj6digBBcRKfq22Ex+Hd1kPKGcTHoedeOFPozSjhzd29tiV+rVG0D3r3WFES+tz43Ek5UGDjYte9a+d5KAJXHAHOKH7vuEzniaXpWGwMWkwOc9bUcqdiMBFxYWMAxUrR5QFRSocw22Qtpv4hZwSoOOrSAGP0lopQcH678v+cQC5vZK0WK2fNc7GU0YOG0LRkS5NYjTi6TDj2xFIrB/iHm+ACUhoGAfQxnxZh2JFSxZuV79LrzB3M6Vejw6yiuvqzz+rbpN3bxn/Xghgc+4+oFUo= 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)(376002)(346002)(39860400002)(136003)(396003)(451199021)(46966006)(40470700004)(36840700001)(8676002)(8936002)(5660300002)(44832011)(336012)(426003)(82310400005)(86362001)(2616005)(36860700001)(47076005)(186003)(1076003)(26005)(82740400003)(356005)(81166007)(40460700003)(478600001)(54906003)(110136005)(6666004)(41300700001)(40480700001)(316002)(70586007)(4326008)(36756003)(70206006)(2906002)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 May 2023 11:18:50.8283 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 335aa2b8-f0dc-4b01-9591-08db4fb6002e 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: BN8NAM11FT060.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYYPR12MB8654 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/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 fdeaf46664..3d89e7c054 100644 --- a/drivers/bus/cdx/bus_cdx_driver.h +++ b/drivers/bus/cdx/bus_cdx_driver.h @@ -69,6 +69,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 6c9ceaaf7f..0a30b8648a 100644 --- a/drivers/bus/cdx/cdx.c +++ b/drivers/bus/cdx/cdx.c @@ -68,6 +68,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. @@ -399,6 +409,7 @@ cdx_probe_one_driver(struct rte_cdx_driver *dr, } else { dev->device.driver = &dr->driver; } + dev->driver = dr; return ret; @@ -516,6 +527,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) { @@ -553,15 +629,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),