From patchwork Fri Apr 21 14:54:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gupta, Nipun" X-Patchwork-Id: 126402 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 23851429AE; Fri, 21 Apr 2023 16:55:00 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7A14442D33; Fri, 21 Apr 2023 16:54:44 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2080.outbound.protection.outlook.com [40.107.237.80]) by mails.dpdk.org (Postfix) with ESMTP id 8AC4F42D31 for ; Fri, 21 Apr 2023 16:54:42 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=J68tfXbt16XwUvy2hSmHl3P8G8GXz9FlXY59R+3TPwfDPlwLJueGruS9Fsg9AbMtCDxgqIy/farlZrmBruMC7N0YT6KlifU+seWKcGjC+OX6rkvEmexFe1RcYRCjz+Zbds7vbpD+iYV2RSyR6OZFf0kGLQYxQ4EnYFCiAHkUOsFLM3JBhTH030PJtUP0zWAj1EUvmpSKFeIQCjGmTO+VbhA+ChxhGF6focuvayh1VllLQ1xcZZBfFpf71x3a2YSL+MwzE1Down0QcoMbCZF2KjUkQAkNJ/6XpuE/JNdZyEcUKqUENoYBwyfN7zHbATBMACxqKvk1yxAbHkgqtOaFnQ== 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=CVlwPUE5rNTw4hZldOrw9dwECPNwxFmw5VZEUrUROB6Jvdx9vXth7AZDo0fosDMvP4ogJaMSqAt9QZWBszfev8FTL6jPq91HVgpjoJo76GjXaHssMBbCseajHOV3TSALZTAdE+FT6B6PZb9v7nwEv5zLgk8F5ML/cptL1BLe3dpJuv/zM9cDot9eAU3r3hcJCb/AQWPGuSMfN4FbubRS3EeMettjJisyIXHK/FZYWHrbKajiVpgHJy6vIGjsj9Ic5QnyvLncurYBgLP2+96C5J7IGy6odwI4VFqsVFs56U/1K7VH42mxIvOK5TI1ZVvQWqep/66kifuxiTuDqTc+/A== 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=rFhAvdz1o2550HE293sWqY2/S/+hY1JgxbSbjkZhBUguSgn0P+5HQp+LFowB3W+FHfa/0WZqkgHu63vNBWZwkKIzYPLSFMLGV+AxN1925dTIQb/4GNvwjGYTwhu3fofCtg/oZAqRP2khPzCIns/QNtdLgNKwr5JJFqcmoqunKa8= Received: from MW3PR05CA0013.namprd05.prod.outlook.com (2603:10b6:303:2b::18) by BN9PR12MB5226.namprd12.prod.outlook.com (2603:10b6:408:11f::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.22; Fri, 21 Apr 2023 14:54:40 +0000 Received: from CO1NAM11FT054.eop-nam11.prod.protection.outlook.com (2603:10b6:303:2b:cafe::4d) by MW3PR05CA0013.outlook.office365.com (2603:10b6:303:2b::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6340.11 via Frontend Transport; Fri, 21 Apr 2023 14:54:40 +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 CO1NAM11FT054.mail.protection.outlook.com (10.13.174.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6319.26 via Frontend Transport; Fri, 21 Apr 2023 14:54:39 +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; Fri, 21 Apr 2023 09:54:39 -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; Fri, 21 Apr 2023 09:54:38 -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, 21 Apr 2023 09:54:36 -0500 From: Nipun Gupta To: , , , CC: , , Nipun Gupta Subject: [PATCH v3 4/5] bus/cdx: support plug unplug and dev iterator Date: Fri, 21 Apr 2023 20:24:05 +0530 Message-ID: <20230421145406.12831-5-nipun.gupta@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230421145406.12831-1-nipun.gupta@amd.com> References: <20230124140746.594066-1-nipun.gupta@amd.com> <20230421145406.12831-1-nipun.gupta@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT054:EE_|BN9PR12MB5226:EE_ X-MS-Office365-Filtering-Correlation-Id: 5622d119-6770-4342-5ac0-08db42785584 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jcn6GVWRUlKvMWqMvGk8OGM8KScCr7OMp+/C2dUmJFlZBcSKX3kPNE6gcXmTDWF0jIJEzDX2K5mcxyacYWwdjpiHVjiLbOE4bbdXMwE3g7pag9QOPmoU/l7G/PdGCbj09hX0O9GrULJX7mJLKHi0uG2vCE/FaDFmGslr1wCSS8R1VhAWdxeAu3xxI/HrCuwiPN0rLrkFmR4dem1OhEF9kEU13YFEwjAcwbKutFC9IJr92ClDIHhIzEqXsym9cfeKYb/ZeUKw1mh1eUH0vbVRpxPozjjTSOSikt23U1sbnXGhkUyG7oWT/y4HcftyjwGewHesXztDqJURY57lTxu4R+/HI6v8U5Yj2ZY8KFu/XP9FQh+L9nBlH1JRTg1CXdefTijd+0HMB14ZqR80tWM/tLfE/s7qzTW/tzjT1zoaoVngnhSbg9c0z9y7t932mji6gfVppAsGPeemAyTmDP+RA/5KcIJJhNxRa2rn7uWoKhqR/iX2UR53MypSBDBa/6PGmkDctbOj4g54K5J6SjGjbGSD78JjLLJZyxVBOCQpV9280O/8dRg84r7Y/jIFKpj8Y2U1jydBH7FeiSwCJ2kmjVnS0vTuazQ4N9w8zUuLZ+fMURuj4uN9yZ5RTUAJi9uUaKoALdJGmK9Zp8AkmDAXtYBifEsPySd2JBWauBdP0LrKnK7pVin7a/8ch5Fd11kTpu7ITgbvq0zj3e/+mNvkoS/1T2WxoqTOYwJovchdtLw= 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)(396003)(39860400002)(346002)(136003)(376002)(451199021)(36840700001)(46966006)(40470700004)(47076005)(36860700001)(110136005)(2616005)(426003)(336012)(82310400005)(26005)(1076003)(36756003)(6666004)(478600001)(54906003)(86362001)(81166007)(6636002)(316002)(40480700001)(70586007)(40460700003)(356005)(70206006)(4326008)(82740400003)(41300700001)(8936002)(8676002)(44832011)(186003)(2906002)(5660300002)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Apr 2023 14:54:39.9584 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5622d119-6770-4342-5ac0-08db42785584 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: CO1NAM11FT054.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN9PR12MB5226 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),