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 90E6843829 for ; Fri, 8 Mar 2024 15:33:31 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8494F42F0D; Fri, 8 Mar 2024 15:33:31 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 5599140E2D for ; Fri, 8 Mar 2024 15:33:30 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709908409; 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=ydkxfle/YK45yl+8JYQQaLZhOXbajvm80JIWBaSYtMs=; b=P0WNYvIWfrLCAssgKHZId9ERO4pXR675lFSR95NC5T228X/ti19U+HvhFB7CZ6oXb9FEdD cPm7a+OKpzHRp8rve9KtX9cp8pPeW+O76bYWqAReVWJxITNvzFLQ0Ohl72zi9VPTrLWzK2 R5UaCiZHzBl/JPOpQJF1Yvczv/Jcb2M= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-283-lA2vQSpANdSECdM1sZfjcg-1; Fri, 08 Mar 2024 09:33:08 -0500 X-MC-Unique: lA2vQSpANdSECdM1sZfjcg-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6F3B11C05EA3; Fri, 8 Mar 2024 14:32:46 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9797537FC; Fri, 8 Mar 2024 14:32:39 +0000 (UTC) From: Kevin Traynor To: Mingjin Ye Cc: Anatoly Burakov , dpdk stable Subject: patch 'bus/vdev: fix devargs in secondary process' has been queued to stable release 21.11.7 Date: Fri, 8 Mar 2024 14:28:17 +0000 Message-ID: <20240308142824.528417-29-ktraynor@redhat.com> In-Reply-To: <20240308142824.528417-1-ktraynor@redhat.com> References: <20240308142824.528417-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/13/24. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/f49c39dd0114d18f0b69169726cf1883598ea9f1 Thanks. Kevin --- >From f49c39dd0114d18f0b69169726cf1883598ea9f1 Mon Sep 17 00:00:00 2001 From: Mingjin Ye Date: Fri, 1 Sep 2023 07:24:09 +0000 Subject: [PATCH] bus/vdev: fix devargs in secondary process [ upstream commit 6666628362c94a0b567a39a0177539c12c97d999 ] When a device is created by a secondary process, an empty devargs is temporarily generated and bound to it. This causes the device to not be associated with the correct devargs, and the empty devargs are not released when the resource is freed. This patch fixes the issue by matching the devargs when inserting a device in secondary process. Fixes: dda987315ca2 ("vdev: make virtual bus use its device struct") Fixes: a16040453968 ("eal: extract vdev infra") Signed-off-by: Mingjin Ye Acked-by: Anatoly Burakov --- drivers/bus/vdev/vdev.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/drivers/bus/vdev/vdev.c b/drivers/bus/vdev/vdev.c index 272ea704e5..c9f07af493 100644 --- a/drivers/bus/vdev/vdev.c +++ b/drivers/bus/vdev/vdev.c @@ -266,4 +266,20 @@ alloc_devargs(const char *name, const char *args) } +static struct rte_devargs * +vdev_devargs_lookup(const char *name) +{ + struct rte_devargs *devargs; + char dev_name[32]; + + RTE_EAL_DEVARGS_FOREACH("vdev", devargs) { + devargs->bus->parse(devargs->name, &dev_name); + if (strcmp(dev_name, name) == 0) { + VDEV_LOG(INFO, "devargs matched %s", dev_name); + return devargs; + } + } + return NULL; +} + static int insert_vdev(const char *name, const char *args, @@ -278,5 +294,9 @@ insert_vdev(const char *name, const char *args, return -EINVAL; - devargs = alloc_devargs(name, args); + if (rte_eal_process_type() == RTE_PROC_PRIMARY) + devargs = alloc_devargs(name, args); + else + devargs = vdev_devargs_lookup(name); + if (!devargs) return -ENOMEM; -- 2.43.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-08 13:47:49.882258672 +0000 +++ 0029-bus-vdev-fix-devargs-in-secondary-process.patch 2024-03-08 13:47:49.037686720 +0000 @@ -1 +1 @@ -From 6666628362c94a0b567a39a0177539c12c97d999 Mon Sep 17 00:00:00 2001 +From f49c39dd0114d18f0b69169726cf1883598ea9f1 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 6666628362c94a0b567a39a0177539c12c97d999 ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -25 +26 @@ -index 05582f1727..14cf856237 100644 +index 272ea704e5..c9f07af493 100644 @@ -28 +29 @@ -@@ -264,4 +264,20 @@ alloc_devargs(const char *name, const char *args) +@@ -266,4 +266,20 @@ alloc_devargs(const char *name, const char *args) @@ -49 +50 @@ -@@ -276,5 +292,9 @@ insert_vdev(const char *name, const char *args, +@@ -278,5 +294,9 @@ insert_vdev(const char *name, const char *args,