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 EEAF6455AD for ; Mon, 15 Jul 2024 17:28:51 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E98C140B8F; Mon, 15 Jul 2024 17:28:51 +0200 (CEST) Received: from mail-lj1-f179.google.com (mail-lj1-f179.google.com [209.85.208.179]) by mails.dpdk.org (Postfix) with ESMTP id 44B90402DD for ; Mon, 15 Jul 2024 17:28:51 +0200 (CEST) Received: by mail-lj1-f179.google.com with SMTP id 38308e7fff4ca-2ee9b098bd5so61431401fa.0 for ; Mon, 15 Jul 2024 08:28:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721057331; x=1721662131; 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=dRvWwmsik7/Qa/Q/2oDPhdlgjzsiFWafXE8i+1laHXo=; b=iF26uqckBaZWHdm+eDCCmWVdJYES3F0Npze5mf0oqylks0xLTWg9IlybMVEjcqwBlQ TVl4oV/opa8EgppPPqldVzwqw847idu0jQ0a6+/cWN82HCMEIoR46tuoSOU9WHn3fgJi YpI7Koz+yJxCCIYIV7p2ua+M/H3QEGEhU9t7eZvuMl8Myzn9GkJLo6/Oc6jhRfGzbulE s73t37CA1ewsxivobexS2JMxCr5YHn906A+WzvEfR6uxmVXqRP8q7e8l8KKTm+ka25/I ILFCt8lGMSMkQZfy5H/BB1zGX/HFKpjYH7V253NklK6lEdXyYQdecMW5q1w6UMhg9o7w KyFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721057331; x=1721662131; 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=dRvWwmsik7/Qa/Q/2oDPhdlgjzsiFWafXE8i+1laHXo=; b=NI/6LC5hicgZdlrnRqpVmV436gqj9ag85Fqr83Phyq6C5S8llZxocohhzPXKWBQwz8 gGj+176b/yR5XAoPJQ1gP2yOaWoOvOAwzutou4WADN8vryxFS/TyBvFNbotyZzOk/BEN BGq8DCFGm564NhOhr+7X8A9R8adpxTaQYeIYS7unxENY+lTcbHPuzEDPNhxiwgPmzGVD dE92V+L04/WA5hwc9BRm+8iwJw4JU7rATM/XAcEgf4LSm5BkRinMXCuGbLk21VTxPHIq Tns3N3flCdNdmGAnDqxLhs7Xzh45eclk8NK00F7+1dSDmLT73lF4y+TjIph0FRxrfm64 J0hQ== X-Forwarded-Encrypted: i=1; AJvYcCUvpPa/sH0uyhLLNSACjyjmBXRK/xcLaYRnrXqpp8qQZ5n57xJcn8m6DEkgop+BVY5cbtTmkzpX2w+gBaZNlBE= X-Gm-Message-State: AOJu0YyOmNyWt5llWfejHBkMCNoeeKxqwb4cE9vuzx/xHapTK6WNceJy 9OihPmTzSiMBlXhDPoNE44z/fQdbuKmJaWNSLg2+WOhySUEVaeI2jT5yFTl1 X-Google-Smtp-Source: AGHT+IGPK+xWxvcu3j3t6V+uiP/Ww830KB99Wz2fDyKu4TYVx+YGANA3a3UbEH5rJTbufPqUspWRdQ== X-Received: by 2002:a2e:a992:0:b0:2ec:5b8f:c797 with SMTP id 38308e7fff4ca-2eef2d0a387mr2870221fa.0.1721057330628; Mon, 15 Jul 2024 08:28:50 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:7aef:1aaa:3dff:d546]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3680dafbec3sm6712695f8f.85.2024.07.15.08.28.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jul 2024 08:28:50 -0700 (PDT) From: luca.boccassi@gmail.com To: Wenwu Ma Cc: Bruce Richardson , dpdk stable Subject: patch 'dma/idxd: fix setup with Ubuntu 24.04' has been queued to stable release 22.11.6 Date: Mon, 15 Jul 2024 16:26:11 +0100 Message-Id: <20240715152704.2229503-33-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240715152704.2229503-1-luca.boccassi@gmail.com> References: <20240624235907.885628-81-luca.boccassi@gmail.com> <20240715152704.2229503-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 07/17/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/c74c897cfed45faaec981b9d31ee40b203aad7f4 Thanks. Luca Boccassi --- >From c74c897cfed45faaec981b9d31ee40b203aad7f4 Mon Sep 17 00:00:00 2001 From: Wenwu Ma Date: Fri, 28 Jun 2024 17:54:00 +0800 Subject: [PATCH] dma/idxd: fix setup with Ubuntu 24.04 [ upstream commit d569af3d4e8ef896591f4e50f7bd1c1274c86e15 ] In Ubuntu 24.04 and with Linux kernel >= v6.7, DSA's workqueue has a driver_name file in sysfs. DPDK needs to write a correct value to this file when configuring a device instance using the dpdk_idxd_cfg.py script, otherwise it will fail to be configured, this patch fixes the issue. Link: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=7af1e0aceeb3 Signed-off-by: Wenwu Ma Acked-by: Bruce Richardson --- drivers/dma/idxd/dpdk_idxd_cfg.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/dma/idxd/dpdk_idxd_cfg.py b/drivers/dma/idxd/dpdk_idxd_cfg.py index 41b4d13b9c..3f0de59e91 100755 --- a/drivers/dma/idxd/dpdk_idxd_cfg.py +++ b/drivers/dma/idxd/dpdk_idxd_cfg.py @@ -98,8 +98,10 @@ def configure_dsa(dsa_id, args): "priority": 1, "max_batch_size": 1024, "size": int(max_work_queues_size / nb_queues)} - wqcfg.update(parse_wq_opts(args.wq_option)) wq_dir = SysfsDir(os.path.join(dsa_dir.path, f"wq{dsa_id}.{q}")) + if os.path.exists(os.path.join(wq_dir.path, f"driver_name")): + wqcfg.update({"driver_name": "user"}) + wqcfg.update(parse_wq_opts(args.wq_option)) wq_dir.write_values(wqcfg) # enable device and then queues -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-15 16:19:36.364946782 +0100 +++ 0033-dma-idxd-fix-setup-with-Ubuntu-24.04.patch 2024-07-15 16:19:34.528205609 +0100 @@ -1 +1 @@ -From d569af3d4e8ef896591f4e50f7bd1c1274c86e15 Mon Sep 17 00:00:00 2001 +From c74c897cfed45faaec981b9d31ee40b203aad7f4 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d569af3d4e8ef896591f4e50f7bd1c1274c86e15 ] + @@ -12,2 +13,0 @@ -Cc: stable@dpdk.org - @@ -22 +22 @@ -index c0c833ade9..5c9572b49d 100755 +index 41b4d13b9c..3f0de59e91 100755 @@ -25 +25 @@ -@@ -104,8 +104,10 @@ def configure_dsa(dsa_id, args): +@@ -98,8 +98,10 @@ def configure_dsa(dsa_id, args):