From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by smtp.lore.kernel.org (Postfix) with ESMTP id DE2B8C982C1 for ; Thu, 17 Sep 2026 07:50:29 +0000 (UTC) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 160AC402B8; Thu, 17 Sep 2026 09:50:08 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 697B0400D5 for ; Thu, 17 Sep 2026 09:50:06 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1789631406; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fjMeMW4tHsTH59zmyDvbLS9v+DxfxWh5Si+CrhpnXBI=; b=GOp40OA8AaofJvEH7zHl+mPtNQh3hRH53tmwaPoEOXMfryem0AtVmNpEgvs/FhlUNuPZlz 1QK2Ntri0nXsNZGL/3p9qVPQikoY03czfgqL99l1+A5DcAk/kZr7CNQHtwupTwo4x6M9u3 /7oJxLc7DqOZcZsz7EtlSX47FzLmP48= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-414-Nb69Qo61MCKBHXkRHj7sVg-1; Thu, 17 Sep 2026 03:50:02 -0400 X-MC-Unique: Nb69Qo61MCKBHXkRHj7sVg-1 X-Mimecast-MFC-AGG-ID: Nb69Qo61MCKBHXkRHj7sVg_1789631401 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 87FD6195FCE0; Thu, 17 Sep 2026 07:50:01 +0000 (UTC) Received: from dmarchan.redhat.corp (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 145AA427; Thu, 17 Sep 2026 07:49:59 +0000 (UTC) From: David Marchand To: hemant.agrawal@nxp.com, dev@dpdk.org Cc: Sachin Saxena Subject: [RFC v2 10/16] bus/fslmc: simplify device parsing in scan Date: Thu, 17 Sep 2026 09:49:10 +0200 Message-ID: <20260917074917.595603-11-david.marchand@redhat.com> In-Reply-To: <20260917074917.595603-1-david.marchand@redhat.com> References: <20260723135400.3621271-1-david.marchand@redhat.com> <20260917074917.595603-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: _P2xO7TWUpp0IzpbZ_LH9ev2Qyvdu_MyYuUE-uNl6l4_1789631401 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true 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 Refactor string manipulations and avoid unneeded allocation. Signed-off-by: David Marchand --- Changes since RFC v1: - declared dev_types as static const, - restored dev_id parsing for "unknown" devices, --- drivers/bus/fslmc/fslmc_bus.c | 87 ++++++++++++++++------------------- 1 file changed, 39 insertions(+), 48 deletions(-) diff --git a/drivers/bus/fslmc/fslmc_bus.c b/drivers/bus/fslmc/fslmc_bus.c index e4aed1bb1a..2f66484ad2 100644 --- a/drivers/bus/fslmc/fslmc_bus.c +++ b/drivers/bus/fslmc/fslmc_bus.c @@ -123,18 +123,47 @@ dump_device_list(void) static int scan_one_fslmc_device(char *dev_name) { - char *dup_dev_name, *t_ptr; + enum rte_dpaa2_dev_type dev_type = DPAA2_UNKNOWN; struct rte_dpaa2_device *dev = NULL; + static const struct { + const char *prefix; + enum rte_dpaa2_dev_type type; + } dev_types[] = { + { "dpni.", DPAA2_ETH }, + { "dpseci.", DPAA2_CRYPTO }, + { "dpcon.", DPAA2_CON }, + { "dpbp.", DPAA2_BPOOL }, + { "dpio.", DPAA2_IO }, + { "dpci.", DPAA2_CI }, + { "dpmcp.", DPAA2_MPORTAL }, + { "dpdmai.", DPAA2_QDMA }, + { "dpdmux.", DPAA2_MUX }, + { "dprtc.", DPAA2_DPRTC }, + { "dprc.", DPAA2_DPRC }, + }; + char *dev_id; int ret = -1; - if (!dev_name) + if (dev_name == NULL) return ret; - /* Creating a temporary copy to perform cut-parse over string */ - dup_dev_name = strdup(dev_name); - if (!dup_dev_name) { - DPAA2_BUS_ERR("Unable to allocate device name memory"); - return -ENOMEM; + for (unsigned int i = 0; i < RTE_DIM(dev_types); i++) { + if (strncmp(dev_types[i].prefix, dev_name, strlen(dev_types[i].prefix)) != 0) + continue; + dev_id = dev_name + strlen(dev_types[i].prefix); + dev_type = dev_types[i].type; + break; + } + + if (dev_type == DPAA2_UNKNOWN) { + char *ptr = strchr(dev_name, '.'); + + if (ptr == NULL) { + DPAA2_BUS_ERR("Invalid device found: (%s)", dev_name); + ret = 0; + goto cleanup; + } + dev_id = ptr + 1; } /* For all other devices, we allocate rte_dpaa2_device. @@ -145,11 +174,11 @@ scan_one_fslmc_device(char *dev_name) dev = calloc(1, sizeof(struct rte_dpaa2_device)); if (!dev) { DPAA2_BUS_ERR("Unable to allocate device object"); - free(dup_dev_name); return -ENOMEM; } dev->device.numa_node = SOCKET_ID_ANY; + dev->dev_type = dev_type; /* Allocate interrupt instance */ dev->intr_handle = @@ -160,46 +189,12 @@ scan_one_fslmc_device(char *dev_name) goto cleanup; } - /* Parse the device name and ID */ - t_ptr = strtok(dup_dev_name, "."); - if (!t_ptr) { - DPAA2_BUS_ERR("Invalid device found: (%s)", dup_dev_name); + if (sscanf(dev_id, "%hu", &dev->object_id) != 1) { + DPAA2_BUS_ERR("Failed to parse object ID"); ret = -EINVAL; goto cleanup; } - if (!strncmp("dpni", t_ptr, 4)) - dev->dev_type = DPAA2_ETH; - else if (!strncmp("dpseci", t_ptr, 6)) - dev->dev_type = DPAA2_CRYPTO; - else if (!strncmp("dpcon", t_ptr, 5)) - dev->dev_type = DPAA2_CON; - else if (!strncmp("dpbp", t_ptr, 4)) - dev->dev_type = DPAA2_BPOOL; - else if (!strncmp("dpio", t_ptr, 4)) - dev->dev_type = DPAA2_IO; - else if (!strncmp("dpci", t_ptr, 4)) - dev->dev_type = DPAA2_CI; - else if (!strncmp("dpmcp", t_ptr, 5)) - dev->dev_type = DPAA2_MPORTAL; - else if (!strncmp("dpdmai", t_ptr, 6)) - dev->dev_type = DPAA2_QDMA; - else if (!strncmp("dpdmux", t_ptr, 6)) - dev->dev_type = DPAA2_MUX; - else if (!strncmp("dprtc", t_ptr, 5)) - dev->dev_type = DPAA2_DPRTC; - else if (!strncmp("dprc", t_ptr, 4)) - dev->dev_type = DPAA2_DPRC; - else - dev->dev_type = DPAA2_UNKNOWN; - - t_ptr = strtok(NULL, "."); - if (!t_ptr) { - DPAA2_BUS_ERR("Skipping invalid device (%s)", dup_dev_name); - ret = 0; - goto cleanup; - } - sscanf(t_ptr, "%hu", &dev->object_id); if (rte_strscpy(dev->name, dev_name, sizeof(dev->name)) < 0) { DPAA2_BUS_ERR("Unable to copy device name: %s", rte_strerror(rte_errno)); ret = -rte_errno; @@ -211,12 +206,8 @@ scan_one_fslmc_device(char *dev_name) /* Add device in the fslmc device list */ insert_in_device_list(dev); - /* Don't need the duplicated device filesystem entry anymore */ - free(dup_dev_name); - return 0; cleanup: - free(dup_dev_name); if (dev) { rte_intr_instance_free(dev->intr_handle); free(dev); -- 2.54.0