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 9EB5F454E9 for ; Tue, 25 Jun 2024 02:03:27 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9A45942799; Tue, 25 Jun 2024 02:03:27 +0200 (CEST) Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by mails.dpdk.org (Postfix) with ESMTP id 4ADF240EDD for ; Tue, 25 Jun 2024 02:03:26 +0200 (CEST) Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-421a1b834acso40636615e9.3 for ; Mon, 24 Jun 2024 17:03:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719273806; x=1719878606; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xSKzX8iZ4jclvUHthItM28Tk5IxSzs5glFWzRqzncEU=; b=lyByV9GunLCdQszXPYoGXjVm5IbTPXihyNGVJGAU1ei+69nk3fmC9On8Gn0gmm4T3q tzoWDKR1RLYHBYu3lGeCXT/FQbgmNwI0KQNn1Ss1HXJmcnI9kg32iP4nY8MJLi+OdreT euTlu8JfDrCskG5pX7Nbt/YjqBWFauE2Js3hSKs4mq6YQszsUzHkE2zYWy+erRGIDLKd 5O84Uv5si/FlstRE3CSGufnYny6uCkujRPyn9XSxzigJNJtOt3VV0Qv7Yp2czxItOaJr hRTEXHi9mcsRQdfynagWCgpjXoVECjJNcNmjIrW7NgK89050awxvU3moIfxqXEozVhDW vBeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719273806; x=1719878606; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xSKzX8iZ4jclvUHthItM28Tk5IxSzs5glFWzRqzncEU=; b=qwKL/MZUnt7YMEubGXwghrJ/daSkNVuuFHcHAAYI7SHS7HEmaMZUAQPPS8OKmotkXv TC9Z/VE1C3T7WgcqyubG/k2zMpRH7GlMObvM7GZHVQGLfqLilIR5CU12zrFKVaId0VOs VtKbgKBPxnEobvFylcMqRDj8ZrtIzmryKu7VQ2XPB4BG7KsQ+Obc01TNbVsYq54GSDHA ykGpHLIhF+XbjeSmyv/LdozlL1OjKeBKVaCnqKRH7SThne5lT2JezHBhbLsy75fzZCWx gfqAZeca4fZxxhmBOBHQ+ZDhKNO1+Pn4AJulI3UHfCG6xMgH4bM16Yqzh9z5Sr9YFqzR wazA== X-Gm-Message-State: AOJu0YzL9G3lC2R6x+9NS+YeLz8B1rdTGimxrxy+N9G5fcoi4Wb/8Zmk ltNWFUal3dhY5MrwZaLylmRhWZZbStjj+BJVLaUuXI7jK6dIdP2oFk3ykI8g X-Google-Smtp-Source: AGHT+IGC+R5SpK/IrByRZkSMfs9b1+/l4cqK0GoNTHbP3HB0QwvPV9xAlro6QCH7xT0gyScKiJ0M1g== X-Received: by 2002:adf:fa52:0:b0:360:9176:f8fb with SMTP id ffacd0b85a97d-366e94d87e2mr3731970f8f.4.1719273805864; Mon, 24 Jun 2024 17:03:25 -0700 (PDT) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4247d21226asm192564305e9.47.2024.06.24.17.03.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jun 2024 17:03:25 -0700 (PDT) From: luca.boccassi@gmail.com To: Mingjin Ye Cc: dpdk stable Subject: patch 'bus/vdev: revert fix devargs in secondary process' has been queued to stable release 22.11.6 Date: Tue, 25 Jun 2024 00:59:06 +0100 Message-Id: <20240624235907.885628-80-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240624235907.885628-1-luca.boccassi@gmail.com> References: <20240624235907.885628-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 22.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/27/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/6a3050209505a7b82cc8f20591a54fab5cd86bc2 Thanks. Luca Boccassi --- >From 6a3050209505a7b82cc8f20591a54fab5cd86bc2 Mon Sep 17 00:00:00 2001 From: Mingjin Ye Date: Thu, 14 Mar 2024 09:36:28 +0000 Subject: [PATCH] bus/vdev: revert fix devargs in secondary process [ upstream commit 22ce39b3aadb109cbefabb91aad44c94e8c2a5e6 ] The ASan tool detected a memory leak in the vdev driver alloc_devargs. The previous commit was that when inserting a vdev device, the primary process alloc devargs and the secondary process looks for devargs. This causes the device to not be created if the secondary process does not initialise the vdev device. And, this is not the root cause. Therefore the following commit was reverted accordingly. After restoring this commit, the memory leak still exists. Bugzilla ID: 1450 Fixes: 6666628362c9 ("bus/vdev: fix devargs in secondary process") Signed-off-by: Mingjin Ye --- drivers/bus/vdev/vdev.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/drivers/bus/vdev/vdev.c b/drivers/bus/vdev/vdev.c index 14cf856237..38d05a9fe9 100644 --- a/drivers/bus/vdev/vdev.c +++ b/drivers/bus/vdev/vdev.c @@ -263,22 +263,6 @@ alloc_devargs(const char *name, const char *args) return devargs; } -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, struct rte_vdev_device **p_dev, @@ -291,10 +275,7 @@ insert_vdev(const char *name, const char *args, if (name == NULL) return -EINVAL; - if (rte_eal_process_type() == RTE_PROC_PRIMARY) - devargs = alloc_devargs(name, args); - else - devargs = vdev_devargs_lookup(name); + devargs = alloc_devargs(name, args); if (!devargs) return -ENOMEM; -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-06-25 00:22:17.610348157 +0100 +++ 0080-bus-vdev-revert-fix-devargs-in-secondary-process.patch 2024-06-25 00:22:13.313188258 +0100 @@ -1 +1 @@ -From 22ce39b3aadb109cbefabb91aad44c94e8c2a5e6 Mon Sep 17 00:00:00 2001 +From 6a3050209505a7b82cc8f20591a54fab5cd86bc2 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 22ce39b3aadb109cbefabb91aad44c94e8c2a5e6 ] + @@ -20 +21,0 @@ -Cc: stable@dpdk.org