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 33426A04B1 for ; Thu, 5 Nov 2020 13:41:09 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8BD9DC810; Thu, 5 Nov 2020 13:41:07 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by dpdk.org (Postfix) with ESMTP id D2BF1C810 for ; Thu, 5 Nov 2020 13:41:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604580065; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gKVfPkIMvYzY46J9L8U42MXFPLJfqTQzSzguFGUKIIU=; b=JHws7ruKIlt/93UDm8u6ac45yGmQ/BvaWzi2F2ZAePe9N1hDMLFMqiexei1GLZT9FJfpKw e9wV7fJ0GgIcxOMC3g5plSl/Yhf+ek1hFzWzvlGcitMHpKrj+LcjEzasudpXEyqr5SQ2a5 jBfAcStD8ifjyXkhYKsSIj0CM0j+gos= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-65-UkeB4AkzOYKIIrhaQlnx1A-1; Thu, 05 Nov 2020 07:41:01 -0500 X-MC-Unique: UkeB4AkzOYKIIrhaQlnx1A-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3E6C564158; Thu, 5 Nov 2020 12:41:00 +0000 (UTC) Received: from rh.redhat.com (ovpn-113-249.ams2.redhat.com [10.36.113.249]) by smtp.corp.redhat.com (Postfix) with ESMTP id 39C4A5F9C0; Thu, 5 Nov 2020 12:40:58 +0000 (UTC) From: Kevin Traynor To: Igor Romanov Cc: Andrew Rybchenko , dpdk stable Date: Thu, 5 Nov 2020 12:39:25 +0000 Message-Id: <20201105124015.306404-18-ktraynor@redhat.com> In-Reply-To: <20201105124015.306404-1-ktraynor@redhat.com> References: <20201105124015.306404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Subject: [dpdk-stable] patch 'net/sfc/base: fix tunnel configuration' has been queued to LTS release 18.11.11 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 LTS release 18.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 11/10/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. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/4c73507f1a7e8a21e9c14e49a71bd099eca7b9fb Thanks. Kevin. --- >From 4c73507f1a7e8a21e9c14e49a71bd099eca7b9fb 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 @@ -422,5 +422,5 @@ 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; @@ -447,6 +447,12 @@ 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; + } /* -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-05 12:38:54.600384130 +0000 +++ 0018-net-sfc-base-fix-tunnel-configuration.patch 2020-11-05 12:38:54.180895973 +0000 @@ -1 +1 @@ -From 33f4e56dda2764eb62970a2c83f224fef43456c1 Mon Sep 17 00:00:00 2001 +From 4c73507f1a7e8a21e9c14e49a71bd099eca7b9fb Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 33f4e56dda2764eb62970a2c83f224fef43456c1 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 3a034412cd..1cc072f0d9 100644 +index edb6be028f..c92c02cfa2 100644