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 3A671A0C41 for ; Tue, 30 Nov 2021 17:39:54 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 35531410F7; Tue, 30 Nov 2021 17:39:54 +0100 (CET) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id 3092A410F7 for ; Tue, 30 Nov 2021 17:39:53 +0100 (CET) Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (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 smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 0D9D23F044 for ; Tue, 30 Nov 2021 16:39:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638290393; bh=71PoRN5RtPsjuahzaTMdiUSjsQfAG0wpAHOZ4zLb2y0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=GUjokIbax5L9eOTUAYUo7NLoDyQS0FFkHdHXzG9bFAhfcZT/nOMqC0HUK1cqJVR3x 8uSrk1vZSnpLyvmqkYRlBAylVETcHrGcQ/RUOcXeogALH1prtttoEdIIRGM5pC82tU cH9lTZetsKBFRslEMj1xZm7USC8EfUMXjBLQ2ZeK8uQh+8YetaqF9H+FJSuu9AuB1/ F/AFEDP09S8dU8bn6EpypM9pw2f78bnbIxN4qRpM+oSWQz+f9Rn9bSU20HQuMi4WYN 7gKa+hXZjFNT0Z8EhY7EY+3RhrnS6WtGXZEw3Jb1y6hnYrkg9caw87sH+wV5TmGjSA suFzxmWqc1g/g== Received: by mail-ed1-f72.google.com with SMTP id 30-20020a508e5e000000b003f02e458b17so10721181edx.17 for ; Tue, 30 Nov 2021 08:39:53 -0800 (PST) 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=71PoRN5RtPsjuahzaTMdiUSjsQfAG0wpAHOZ4zLb2y0=; b=OtRlZ0sN5b2Cc2D5DnW2j5N2tnkTIG1p+XM+dYYgsE482H1p2ZiyT6Oyue/pubYu0X RM41ZJNZLKzyj993qzKW7MpcVjZycPf9C3YpjI+GHl2RxhroISjFbVqFWLGIqaPv0D+g U0ayYpG8FXfhA9ldl2X/jM6GV4cFh8iQBjlq+EnX4NiEv8eLawMvI6clpIbIKi+tAkll 42ce5VYYNYjZx0yGj0EtuqyK7OLHnQ17ztlITmdACi9VK2qSP89JW8RhB8fJ6uaePvdb hhI5kNB4dr9CDLgQ6R0oTjgqWatImM9Z8Mn0XWBKSbY0u+pYp40wMRCIkRse4CCM46F+ 5IkQ== X-Gm-Message-State: AOAM531ZZl2Q+a5kF/h6s8ctzpOpKWK/BQ9lqvoorMLQEw7PcFBCNmyV xeHXkVENUUYrgo2LuNgHlelqLUPWTvRJp7XmtVtTsYMx54m9u5DtauLLq2T3bjWsM4CtGAdaH3p 6FcxLzvUII4SDAZtcZJkxy327 X-Received: by 2002:aa7:c719:: with SMTP id i25mr46388edq.157.1638290392396; Tue, 30 Nov 2021 08:39:52 -0800 (PST) X-Google-Smtp-Source: ABdhPJykGmlTgwVVw/ezhqiC9XtfzUSLhWerfg0EwLcceY1DdjNoX6Y0QnzibwSwoEmJxhovjn4RTQ== X-Received: by 2002:aa7:c719:: with SMTP id i25mr46356edq.157.1638290392192; Tue, 30 Nov 2021 08:39:52 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id w5sm13073870edc.58.2021.11.30.08.39.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 08:39:51 -0800 (PST) From: christian.ehrhardt@canonical.com To: Ciara Loftus Cc: Stephen Hemminger , dpdk stable Subject: patch 'net/af_xdp: disable secondary process support' has been queued to stable release 19.11.11 Date: Tue, 30 Nov 2021 17:34:35 +0100 Message-Id: <20211130163605.2460997-71-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> References: <20211130163605.2460997-1-christian.ehrhardt@canonical.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 19.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before December 10th 2021. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/6dbdbe50b13050a1121ac4882d29b325c155d2e1 Thanks. Christian Ehrhardt --- >From 6dbdbe50b13050a1121ac4882d29b325c155d2e1 Mon Sep 17 00:00:00 2001 From: Ciara Loftus Date: Fri, 8 Oct 2021 07:50:20 +0000 Subject: [PATCH] net/af_xdp: disable secondary process support [ upstream commit 0668d829085c4e92a6a1117e2b7cb8653eff8038 ] Since the AF_XDP PMD does not work for secondary processes as reported in Bugzilla 805, check for the process type at the beginning of probe and return ENOTSUP if the process type is secondary. It is planned that secondary processes will be supported by the PMD in full in a future release by using rte_mp_msg to pass the state to the secondary process that it requires in order to work. Bugzilla ID: 805 Fixes: f1debd77efaf ("net/af_xdp: introduce AF_XDP PMD") Reported-by: Stephen Hemminger Signed-off-by: Ciara Loftus Acked-by: Stephen Hemminger --- drivers/net/af_xdp/rte_eth_af_xdp.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c b/drivers/net/af_xdp/rte_eth_af_xdp.c index 1d7911db43..c50974f723 100644 --- a/drivers/net/af_xdp/rte_eth_af_xdp.c +++ b/drivers/net/af_xdp/rte_eth_af_xdp.c @@ -1305,16 +1305,11 @@ rte_pmd_af_xdp_probe(struct rte_vdev_device *dev) rte_vdev_device_name(dev)); name = rte_vdev_device_name(dev); - if (rte_eal_process_type() == RTE_PROC_SECONDARY && - strlen(rte_vdev_device_args(dev)) == 0) { - eth_dev = rte_eth_dev_attach_secondary(name); - if (eth_dev == NULL) { - AF_XDP_LOG(ERR, "Failed to probe %s\n", name); - return -EINVAL; - } - eth_dev->dev_ops = &ops; - rte_eth_dev_probing_finish(eth_dev); - return 0; + if (rte_eal_process_type() == RTE_PROC_SECONDARY) { + AF_XDP_LOG(ERR, "Failed to probe %s. " + "AF_XDP PMD does not support secondary processes.\n", + name); + return -ENOTSUP; } kvlist = rte_kvargs_parse(rte_vdev_device_args(dev), valid_arguments); -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-30 16:50:10.053737867 +0100 +++ 0071-net-af_xdp-disable-secondary-process-support.patch 2021-11-30 16:50:05.746873207 +0100 @@ -1 +1 @@ -From 0668d829085c4e92a6a1117e2b7cb8653eff8038 Mon Sep 17 00:00:00 2001 +From 6dbdbe50b13050a1121ac4882d29b325c155d2e1 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 0668d829085c4e92a6a1117e2b7cb8653eff8038 ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -22,19 +23,3 @@ - doc/guides/rel_notes/release_21_11.rst | 4 ++++ - drivers/net/af_xdp/rte_eth_af_xdp.c | 15 +++++---------- - 2 files changed, 9 insertions(+), 10 deletions(-) - -diff --git a/doc/guides/rel_notes/release_21_11.rst b/doc/guides/rel_notes/release_21_11.rst -index 30175246c7..48e0bb60a1 100644 ---- a/doc/guides/rel_notes/release_21_11.rst -+++ b/doc/guides/rel_notes/release_21_11.rst -@@ -85,6 +85,10 @@ New Features - * Default VLAN strip behavior was changed. VLAN tag won't be stripped - unless ``DEV_RX_OFFLOAD_VLAN_STRIP`` offload is enabled. - -+* **Updated AF_XDP PMD.** -+ -+ * Disabled secondary process support. -+ - * **Updated Broadcom bnxt PMD.** - - * Added flow offload support for Thor. + drivers/net/af_xdp/rte_eth_af_xdp.c | 15 +++++---------- + 1 file changed, 5 insertions(+), 10 deletions(-) + @@ -42 +27 @@ -index a619dd218d..b362ccdcd3 100644 +index 1d7911db43..c50974f723 100644 @@ -45 +30 @@ -@@ -1783,16 +1783,11 @@ rte_pmd_af_xdp_probe(struct rte_vdev_device *dev) +@@ -1305,16 +1305,11 @@ rte_pmd_af_xdp_probe(struct rte_vdev_device *dev)