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 C1C60A0032 for ; Fri, 18 Feb 2022 13:39:56 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BB77540395; Fri, 18 Feb 2022 13:39:56 +0100 (CET) Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mails.dpdk.org (Postfix) with ESMTP id 84A3240141 for ; Fri, 18 Feb 2022 13:39:55 +0100 (CET) Received: by mail-wm1-f48.google.com with SMTP id l12-20020a7bc34c000000b003467c58cbdfso8520017wmj.2 for ; Fri, 18 Feb 2022 04:39:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IHd+ACj48zQOIv3EwUCf1N5szNd7h0TzgoJGvtkoY4o=; b=kZPrQZ+x5XeC+XUOJ05XAK0X57uYhQzAbXGWCvGZ1uYagLe1vk6XcS/35HFYz79K/8 10N+D2JNYDYyA1eneC0rzJM51KXxagD1uzbDWwjjfMFhFWYUijN5y8OnOvmr4swAU2dS kvyiEXe+cQj7b7QCz9WH6Wd5QIQBeyGd7Q9Xf3sx/VkirpsWAHhAN0P/CymnDlV2IY7l gvq5clGmhjjlsyOXNIrtxj69TnXy+3fTba4XtrZcAtwsCbwYokQrO6bivCzJxX3OG41U 4v9IjTpfvhrfI5a2QmvB/sFRBTZxlOBgZBK9qcMQqknsFGxHG84JSWCi9L/6us0jnF0T 6mvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IHd+ACj48zQOIv3EwUCf1N5szNd7h0TzgoJGvtkoY4o=; b=lWZn2Xn6272Kdmyxa4UVLNJRJ7e0yA7f1hUxWb5GXEGY50M2VsTnE47xdb3sGSsGHP i/rZAzrMtPfOtB4LTCv9cd//rQaQ2VAbOg7AXmYo6ZdzOiZIieMx3Q1979V1QuTEnvdy 9UdriU83YLbswKC7oB/rywFzq4p7yw9Z8+pWzWcTZv/0PoE7yHOZ88C4ATQK+TgOQqwp 2pPwlIzMUQ7hkR8RBnQA6rL1ry+cU1LKBNn1yRC6YEXXbvHEikycIHgfrXkhrhZP19lj T9vIm5cXGeGUSg4u+t8FkY384r37bape9ncKn2hVMclOL5w6LK8fwwr+C7w9ZT9sGH6M xySw== X-Gm-Message-State: AOAM530cNsq8Vl5gbXGWka7NGPH6mHxmBk0wMX0xxmlgo+iZV7mrhatz QDCY+FSgcl1zAkYE2LTjrf0CejsRTzLwVw== X-Google-Smtp-Source: ABdhPJzQlTYV5Ft8S5XZkb3yaeqrb2eEV6lBpnLnxyu57MOZIboZgSe3vXEcqp2FLUz/nbOCHKiKag== X-Received: by 2002:a1c:7704:0:b0:354:4d2b:9d5 with SMTP id t4-20020a1c7704000000b003544d2b09d5mr10430212wmi.155.1645187995205; Fri, 18 Feb 2022 04:39:55 -0800 (PST) Received: from localhost ([2a01:4b00:f41a:3600:360b:9754:2e3a:c344]) by smtp.gmail.com with ESMTPSA id o125sm4638553wme.37.2022.02.18.04.39.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Feb 2022 04:39:54 -0800 (PST) From: luca.boccassi@gmail.com To: Bruce Richardson Cc: Kevin Laatz , dpdk stable Subject: patch 'dma/idxd: fix paths to driver sysfs directory' has been queued to stable release 20.11.5 Date: Fri, 18 Feb 2022 12:37:35 +0000 Message-Id: <20220218123931.1749595-6-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220218123931.1749595-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-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 20.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/20/22. 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/0602aa0fd4cb91b55146a8922d04bba4cc666758 Thanks. Luca Boccassi --- >From 0602aa0fd4cb91b55146a8922d04bba4cc666758 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Tue, 11 Jan 2022 13:41:03 +0000 Subject: [PATCH] dma/idxd: fix paths to driver sysfs directory [ upstream commit 3277676319f61dbc14a38e5c9c79d97c59889855 ] Recent kernel changes[1][2] mean that we cannot guarantee that the paths in sysfs used for creating/binding a DSA or workqueue instance will be as given in the utility script, since they are now "compatibility-mode only". Update script to support both new paths and compatibility ones. [1] https://lore.kernel.org/all/162637445139.744545.6008938867943724701.stgit@djiang5-desk3.ch.intel.com/ [2] https://lore.kernel.org/all/162637468705.744545.4399080971745974435.stgit@djiang5-desk3.ch.intel.com/ Fixes: 01863b9d2354 ("raw/ioat: include example configuration script") Signed-off-by: Bruce Richardson Acked-by: Kevin Laatz --- drivers/raw/ioat/dpdk_idxd_cfg.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/drivers/raw/ioat/dpdk_idxd_cfg.py b/drivers/raw/ioat/dpdk_idxd_cfg.py index fdb636498c..e999a27d45 100755 --- a/drivers/raw/ioat/dpdk_idxd_cfg.py +++ b/drivers/raw/ioat/dpdk_idxd_cfg.py @@ -29,10 +29,17 @@ class SysfsDir: f.write(str(contents)) +def get_drv_dir(dtype): + "Get the sysfs path for the driver, either 'idxd' or 'user'" + drv_dir = "/sys/bus/dsa/drivers/" + dtype + if not os.path.exists(drv_dir): + return "/sys/bus/dsa/drivers/dsa" + return drv_dir + + def configure_dsa(dsa_id, queues): "Configure the DSA instance with appropriate number of queues" dsa_dir = SysfsDir(f"/sys/bus/dsa/devices/dsa{dsa_id}") - drv_dir = SysfsDir("/sys/bus/dsa/drivers/dsa") max_groups = dsa_dir.read_int("max_groups") max_engines = dsa_dir.read_int("max_engines") @@ -59,9 +66,12 @@ def configure_dsa(dsa_id, queues): "size": int(max_work_queues_size / nb_queues)}) # enable device and then queues - drv_dir.write_values({"bind": f"dsa{dsa_id}"}) + idxd_dir = SysfsDir(get_drv_dir("idxd")) + idxd_dir.write_values({"bind": f"dsa{dsa_id}"}) + + user_dir = SysfsDir(get_drv_dir("user")) for q in range(nb_queues): - drv_dir.write_values({"bind": f"wq{dsa_id}.{q}"}) + user_dir.write_values({"bind": f"wq{dsa_id}.{q}"}) def main(args): -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-18 12:37:38.458604070 +0000 +++ 0006-dma-idxd-fix-paths-to-driver-sysfs-directory.patch 2022-02-18 12:37:37.502787721 +0000 @@ -1 +1 @@ -From 3277676319f61dbc14a38e5c9c79d97c59889855 Mon Sep 17 00:00:00 2001 +From 0602aa0fd4cb91b55146a8922d04bba4cc666758 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3277676319f61dbc14a38e5c9c79d97c59889855 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -20,2 +21,2 @@ - drivers/dma/idxd/dpdk_idxd_cfg.py | 18 ++++++++++++++---- - 1 file changed, 14 insertions(+), 4 deletions(-) + drivers/raw/ioat/dpdk_idxd_cfg.py | 16 +++++++++++++--- + 1 file changed, 13 insertions(+), 3 deletions(-) @@ -23,5 +24,5 @@ -diff --git a/drivers/dma/idxd/dpdk_idxd_cfg.py b/drivers/dma/idxd/dpdk_idxd_cfg.py -index fcc27822ef..34537cb980 100755 ---- a/drivers/dma/idxd/dpdk_idxd_cfg.py -+++ b/drivers/dma/idxd/dpdk_idxd_cfg.py -@@ -29,9 +29,17 @@ class SysfsDir: +diff --git a/drivers/raw/ioat/dpdk_idxd_cfg.py b/drivers/raw/ioat/dpdk_idxd_cfg.py +index fdb636498c..e999a27d45 100755 +--- a/drivers/raw/ioat/dpdk_idxd_cfg.py ++++ b/drivers/raw/ioat/dpdk_idxd_cfg.py +@@ -29,10 +29,17 @@ class SysfsDir: @@ -39,9 +40 @@ - def reset_device(dsa_id): - "Reset the DSA device and all its queues" -- drv_dir = SysfsDir("/sys/bus/dsa/drivers/dsa") -+ drv_dir = SysfsDir(get_drv_dir("idxd")) - drv_dir.write_values({"unbind": f"dsa{dsa_id}"}) - - -@@ -58,7 +66,6 @@ def get_dsa_id(pci): - def configure_dsa(dsa_id, queues, prefix): + def configure_dsa(dsa_id, queues): @@ -54 +47 @@ -@@ -85,9 +92,12 @@ def configure_dsa(dsa_id, queues, prefix): +@@ -59,9 +66,12 @@ def configure_dsa(dsa_id, queues):