From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4BF44A04DD for ; Wed, 28 Oct 2020 11:48:44 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2F8D5CA06; Wed, 28 Oct 2020 11:48:42 +0100 (CET) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by dpdk.org (Postfix) with ESMTP id C906CC9D6 for ; Wed, 28 Oct 2020 11:48:40 +0100 (CET) Received: by mail-wm1-f54.google.com with SMTP id h22so4294737wmb.0 for ; Wed, 28 Oct 2020 03:48:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3PikPaolG+KmJUbPGXTk8yIelmH1fofIHsUidAZmH0I=; b=ivlMn+V2sK7NqFQnu1aaYDq4CfRJ3TkLTaHETJEvBYN0oLbYqgav8iVzRZgOq/P8e3 Vn6LGt8Mp09EDsY/3usxPIQg1zn7NTfotfLIVKnMd5JDrKQPgj6rwS5J1QMf9SZiQfd7 eBzFklTF+8qvZ3oHu73Jl9WVaqgfibnYVxkSg34ccwtBtim42Pxqa9xjtneJPPFEPxmR ozp/5IuONRKMSFVdWZaCe+01NmdwSB5UDEP4PLIMUVtDmUZL/6bP7KwIPsXfoEGZq79o BzNxjCCSX0JrUPOfpcrxtqZ/C6SA/7yz4/Tm+/EruvwAzIy5vq0khGQ0YOqrasNjwqOe 66tQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3PikPaolG+KmJUbPGXTk8yIelmH1fofIHsUidAZmH0I=; b=F+ddR2qntbFaS+jFy3tO14iEcSirg5QS1uoNszf5kioXh+/IuJEtkxWHmnq5WPcOFq x8dE7Ju6PXUY7bEkM9OM9/CqGt4CW17c42/QLI5jB6HZ+Vr0krdwXpG9vdsrc0cgJP0R HrJNNUJPR4zt/w/hHCo+JcYCVO6aoOzJVKSzqOsRMsE943x9g/rbFDmyI6letFHr+iPm mNdAEq6oSwWCF8uK3XbpvnMOFeg/U8AK/oTJvUqC4Kp388qqJ/e2Oa6jp9COqArFPHvt D1a8seOo/90i1kn6RaCB1IDQ8W6J7m5N1VgIDpKvM2XlHV+DwkX8rGjBSkJ9CiE/mTYm x4NQ== X-Gm-Message-State: AOAM5335f2q7OZUtcI267mhx/k1beBqpniMuDvJJotSNGYbYs+cC6mZl DaOUYvZEWzFwIiub3w1+duic/VPaD/xwaMiv X-Google-Smtp-Source: ABdhPJw15mHgZHKjpY60N2xAQ6Oh1KzVCW4ZwiMs+iIv6kyKE++Gegwb47qlHzvCq58eP3v+Llz2QA== X-Received: by 2002:a1c:6804:: with SMTP id d4mr7293238wmc.94.1603882120548; Wed, 28 Oct 2020 03:48:40 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id h128sm5879577wme.38.2020.10.28.03.48.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:48:39 -0700 (PDT) From: luca.boccassi@gmail.com To: Igor Romanov Cc: Andrew Rybchenko , dpdk stable Date: Wed, 28 Oct 2020 10:43:28 +0000 Message-Id: <20201028104606.3504127-49-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/sfc/base: fix tunnel configuration' has been queued to stable release 19.11.6 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.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 10/30/20. 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. Thanks. Luca Boccassi --- >From 32e242838581c3748fb36a1669c040ca5cc2304e Mon Sep 17 00:00:00 2001 From: Igor Romanov Date: Tue, 8 Sep 2020 10:20:22 +0100 Subject: [PATCH] net/sfc/base: fix tunnel configuration [ upstream commit 33f4e56dda2764eb62970a2c83f224fef43456c1 ] Tunnel configuration may fail because of insufficient access rights on a virtual function. Ignore the failure if a tunnel configuration with empty UDP ports is requested. Fixes: 17551f6dffcc ("net/sfc/base: add API to control UDP tunnel ports") Signed-off-by: Igor Romanov Signed-off-by: Andrew Rybchenko --- drivers/net/sfc/base/efx_tunnel.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/net/sfc/base/efx_tunnel.c b/drivers/net/sfc/base/efx_tunnel.c index edb6be028f..c92c02cfa2 100644 --- a/drivers/net/sfc/base/efx_tunnel.c +++ b/drivers/net/sfc/base/efx_tunnel.c @@ -421,7 +421,7 @@ ef10_tunnel_reconfigure( { efx_tunnel_cfg_t *etcp = &enp->en_tunnel_cfg; efx_rc_t rc; - boolean_t resetting; + boolean_t resetting = B_FALSE; efsys_lock_state_t state; efx_tunnel_cfg_t etc; @@ -446,8 +446,14 @@ ef10_tunnel_reconfigure( */ rc = efx_mcdi_set_tunnel_encap_udp_ports(enp, &etc, B_FALSE, &resetting); - if (rc != 0) - goto fail2; + if (rc != 0) { + /* + * Do not fail if the access is denied when no + * tunnel encap UDP ports are configured. + */ + if (rc != EACCES || etc.etc_udp_entries_num != 0) + goto fail2; + } /* * Although the caller should be able to handle MC reboot, -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:13.314537070 +0000 +++ 0049-net-sfc-base-fix-tunnel-configuration.patch 2020-10-28 10:35:11.512830142 +0000 @@ -1,14 +1,15 @@ -From 33f4e56dda2764eb62970a2c83f224fef43456c1 Mon Sep 17 00:00:00 2001 +From 32e242838581c3748fb36a1669c040ca5cc2304e Mon Sep 17 00:00:00 2001 From: Igor Romanov Date: Tue, 8 Sep 2020 10:20:22 +0100 Subject: [PATCH] net/sfc/base: fix tunnel configuration +[ upstream commit 33f4e56dda2764eb62970a2c83f224fef43456c1 ] + Tunnel configuration may fail because of insufficient access rights on a virtual function. Ignore the failure if a tunnel configuration with empty UDP ports is requested. Fixes: 17551f6dffcc ("net/sfc/base: add API to control UDP tunnel ports") -Cc: stable@dpdk.org Signed-off-by: Igor Romanov Signed-off-by: Andrew Rybchenko @@ -17,7 +18,7 @@ 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/net/sfc/base/efx_tunnel.c b/drivers/net/sfc/base/efx_tunnel.c -index 3a034412cd..1cc072f0d9 100644 +index edb6be028f..c92c02cfa2 100644 --- a/drivers/net/sfc/base/efx_tunnel.c +++ b/drivers/net/sfc/base/efx_tunnel.c @@ -421,7 +421,7 @@ ef10_tunnel_reconfigure(