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 76821A0093 for ; Tue, 19 May 2020 14:59:15 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 67DD41C1E4; Tue, 19 May 2020 14:59:15 +0200 (CEST) Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by dpdk.org (Postfix) with ESMTP id 8170C1D625 for ; Tue, 19 May 2020 14:59:12 +0200 (CEST) Received: by mail-wr1-f47.google.com with SMTP id l18so15807588wrn.6 for ; Tue, 19 May 2020 05:59:12 -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=BD21Jpv1XrSz3fZ9dX+nXZ2gnokxIcySc302vK+fvFo=; b=A1JFD4daDfVb8irD6jBJ/7WkdYbVBZ3OZmNqx1CnV6PGlFTdM27XVxYe6NE2lLdLqq uqt31QWJELxeDryZsyi7QU/xBCvimQV1EH9IPVyP3vRd+z3mmusu7hpbu0qmPhOkkHzA eRrknIl7AVPX4rgg2dmkDH2sVUBSKWMN4gY4VEvbe4BcyPGrUMmffebkh9SK7PwguYNM /YdVnEqr9B5aymnNniwPQ9mo4cBEpz+e81xHclnqtIGLewWW8yAmAL0xTF5h+zsuYNQi DqNcUxk8QPQtxlub7D8I40Kf+7OdbPerQxM71KEfJ53s/L/UCpNVLuPyM91IDf0XOzl3 lIiw== 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=BD21Jpv1XrSz3fZ9dX+nXZ2gnokxIcySc302vK+fvFo=; b=AiVSaG8AHUxFst2Azc7wPrb1PAwtdLzsGVW37BxS4FmZUUwzTG/XabtD7cTBM9gb+n rrIYG8XDX2LsyDyBgZ+1RG1YV9qr3M0Qyoz/NG4GuEJfuE6pJbp+UVkha9fqc9sgTbax mwekD50qmi/YZILaSAgGiFegeTIXlOyZb8Ozhw9lHwjChzj5y+MAh+mP+qU1xRnapF+g jPkPWE+UCsABjO+EnF4YUqRGo9HlFVV88y02wEqlELoKNu8TA1pchS3AcZonEuMBg4/5 Bo1/kyQ9ZGD0ZrYltXfLNBuOtsq4RP4i0kEfkQ0r+CMF32DjLBzWfo3fTtHndOr9ybf6 jp9A== X-Gm-Message-State: AOAM531ztUJcj+skRAa09RsadDvRvdS0J9k21uTmJEsYhZQIx9MwwrYF YAlRW6xD8RIITN6ae3ootyU= X-Google-Smtp-Source: ABdhPJzUL8O+/c2elrb5qCUGqCxABQ5J6Yx1R2fAnDQsUrDp2FitQJ69ZuApGF4R6ygfxxWproFW2A== X-Received: by 2002:adf:dcc8:: with SMTP id x8mr25369140wrm.404.1589893152267; Tue, 19 May 2020 05:59:12 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id a14sm3707907wme.21.2020.05.19.05.59.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 05:59:11 -0700 (PDT) From: luca.boccassi@gmail.com To: Andrew Rybchenko Cc: dpdk stable Date: Tue, 19 May 2020 13:53:36 +0100 Message-Id: <20200519125804.104349-26-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519125804.104349-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/sfc: fix reported promiscuous/multicast mode' has been queued to stable release 19.11.3 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/21/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 556cdccab20203c0f49086a9ec287b1508bdacf1 Mon Sep 17 00:00:00 2001 From: Andrew Rybchenko Date: Wed, 4 Mar 2020 15:01:04 +0000 Subject: [PATCH] net/sfc: fix reported promiscuous/multicast mode [ upstream commit 9d28d6b0b0bf4e7d9386c2ab56893d5cc95e78e5 ] Requested promiscuous or all-multicast mode may be dropped on port start if FW denies to enable it (e.g. because of no permission in the case of VF). Return applied value on get. Fixes: f5258439ee5d ("net/sfc: avoid failure on port start if Rx mode is rejected") Signed-off-by: Andrew Rybchenko --- drivers/net/sfc/sfc_rx.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/sfc/sfc_rx.c b/drivers/net/sfc/sfc_rx.c index 7afd2c8b33..f589ece757 100644 --- a/drivers/net/sfc/sfc_rx.c +++ b/drivers/net/sfc/sfc_rx.c @@ -719,6 +719,7 @@ retry: sfc_warn(sa, "promiscuous mode will be disabled"); port->promisc = B_FALSE; + sa->eth_dev->data->promiscuous = 0; rc = sfc_set_rx_mode(sa); if (rc != 0) return rc; @@ -732,6 +733,7 @@ retry: sfc_warn(sa, "all-multicast mode will be disabled"); port->allmulti = B_FALSE; + sa->eth_dev->data->all_multicast = 0; rc = sfc_set_rx_mode(sa); if (rc != 0) return rc; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 13:56:19.877104693 +0100 +++ 0026-net-sfc-fix-reported-promiscuous-multicast-mode.patch 2020-05-19 13:56:18.211501675 +0100 @@ -1,14 +1,15 @@ -From 9d28d6b0b0bf4e7d9386c2ab56893d5cc95e78e5 Mon Sep 17 00:00:00 2001 +From 556cdccab20203c0f49086a9ec287b1508bdacf1 Mon Sep 17 00:00:00 2001 From: Andrew Rybchenko Date: Wed, 4 Mar 2020 15:01:04 +0000 Subject: [PATCH] net/sfc: fix reported promiscuous/multicast mode +[ upstream commit 9d28d6b0b0bf4e7d9386c2ab56893d5cc95e78e5 ] + Requested promiscuous or all-multicast mode may be dropped on port start if FW denies to enable it (e.g. because of no permission in the case of VF). Return applied value on get. Fixes: f5258439ee5d ("net/sfc: avoid failure on port start if Rx mode is rejected") -Cc: stable@dpdk.org Signed-off-by: Andrew Rybchenko ---