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 8D6F9A0093 for ; Thu, 28 May 2020 18:24:35 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 84CE91DC20; Thu, 28 May 2020 18:24:35 +0200 (CEST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id 637431DC1A for ; Thu, 28 May 2020 18:24:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590683072; 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=0x56anttuZQd5gLb1tdC/P60jtnp1lPsvkFuWVt4kdQ=; b=UKlYNy2pEFfYLTj3AABGo+gv5+aX73S7SO8bj4aqEOhK64UtQzfFQjHHBM6HzYM9+YTxP/ NJeJ6rCBN3DblTN0XghprVdS0XEaBS0fEQUAm7bbc6ins3xZl52j/8zAs88Tau79P7cs9F 80/YZHZ4XenYJLFVbM+XXsYz/ZNWDZI= 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-66-nm6xlnAFOiWCi9D-cjUquA-1; Thu, 28 May 2020 12:24:30 -0400 X-MC-Unique: nm6xlnAFOiWCi9D-cjUquA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2A6F8800D24; Thu, 28 May 2020 16:24:29 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.235]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5EFE660C87; Thu, 28 May 2020 16:24:28 +0000 (UTC) From: Kevin Traynor To: Andrew Rybchenko Cc: dpdk stable Date: Thu, 28 May 2020 17:21:58 +0100 Message-Id: <20200528162322.7863-11-ktraynor@redhat.com> In-Reply-To: <20200528162322.7863-1-ktraynor@redhat.com> References: <20200528162322.7863-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/sfc: fix reported promiscuous/multicast mode' has been queued to LTS release 18.11.9 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.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/03/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/1ce3cca4f6b5095d15d69e2c9632365bab0851e6 Thanks. Kevin. --- >From 1ce3cca4f6b5095d15d69e2c9632365bab0851e6 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 960ab62c19..984914b4e1 100644 --- a/drivers/net/sfc/sfc_rx.c +++ b/drivers/net/sfc/sfc_rx.c @@ -647,4 +647,5 @@ retry: port->promisc = B_FALSE; + sa->eth_dev->data->promiscuous = 0; rc = sfc_set_rx_mode(sa); if (rc != 0) @@ -660,4 +661,5 @@ retry: port->allmulti = B_FALSE; + sa->eth_dev->data->all_multicast = 0; rc = sfc_set_rx_mode(sa); if (rc != 0) -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-28 17:12:59.752325414 +0100 +++ 0011-net-sfc-fix-reported-promiscuous-multicast-mode.patch 2020-05-28 17:12:59.049557577 +0100 @@ -1 +1 @@ -From 9d28d6b0b0bf4e7d9386c2ab56893d5cc95e78e5 Mon Sep 17 00:00:00 2001 +From 1ce3cca4f6b5095d15d69e2c9632365bab0851e6 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 9d28d6b0b0bf4e7d9386c2ab56893d5cc95e78e5 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 7afd2c8b33..f589ece757 100644 +index 960ab62c19..984914b4e1 100644 @@ -22 +23 @@ -@@ -720,4 +720,5 @@ retry: +@@ -647,4 +647,5 @@ retry: @@ -28 +29 @@ -@@ -733,4 +734,5 @@ retry: +@@ -660,4 +661,5 @@ retry: