From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id A8BBAA0093
for <public@inbox.dpdk.org>; Tue, 19 May 2020 14:59:36 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id A0FDC1C1E4;
Tue, 19 May 2020 14:59:36 +0200 (CEST)
Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com
[209.85.128.42]) by dpdk.org (Postfix) with ESMTP id 0116A1D627
for <stable@dpdk.org>; Tue, 19 May 2020 14:59:33 +0200 (CEST)
Received: by mail-wm1-f42.google.com with SMTP id m12so2985828wmc.0
for <stable@dpdk.org>; Tue, 19 May 2020 05:59:33 -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=oCw6e5QzPR1WRPR8KDktv6W1YrSF8t4LKJY7WNIdwVQ=;
b=TolZWDmlkUiE8JuqYzljsQzKOYaay4lptXfsd1wLyAXRSZaI8r92ciS8rZfBD0+VdX
Zu1s9w2sAwuTGUB8XIzrHycKkkKnd787/LgzIDaKt8A3LSRLOQPcCO/Cfxk8yu/wgrq7
FrnVXm79df6tZeFVTRNiyuG2ON5C3rK7dFW/cfgJGE5aYlZoQ1Pu2j6Tt2w9DZMJiOu7
whMO5G5F0+XdhwegXqM4Du2lIhg9EkBzqk7DhSUpnRX2bg+o7s+UISKWAPbe/hWWbnaN
BfvFNwvBt8kCsVGlJbkNetm6QOsVnRmDlpg1e6g218ZkeoJdQkv5DHCVKwyEe3h61ut2
A4nw==
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=oCw6e5QzPR1WRPR8KDktv6W1YrSF8t4LKJY7WNIdwVQ=;
b=aa5Bbs/LFUbvEELT8JFpoqZaakwStsITYJGQiIZgFbm9GBhxSYmLyG6ydpF7zIM5D3
8RptO/ceF6lnH76ooM+vXLxp3LVtQ+9hwVhNo12oV6bTvXuDG0daqB41cMLMVBkIlw6d
yyXal885vi01w1xy4TtXdBlMUlkUAMKxiuzSXZiY1P1vZokatNQ5CDmNFAxMflqCBNbR
QWwqM+C5Itofx43wyplPZVIdrPc6hghmmKgIv/E288SUgqQHbaeKso4rnv60sSGsFpwl
rcwOUnQh/F1opBVZe3PG2IIwPwlYzO35mHHA/N9PYiKyUTDcUhlZR0OjD8HDK81PuMtq
uCcg==
X-Gm-Message-State: AOAM532Z8hHd72lkhOLunJpcHnKoybYfTscBZkxGM4rgJuNTHUOx33yy
U7U7bmqwBxpB1YQ+oFGbJnXfxLkZ6dNePbJ+
X-Google-Smtp-Source: ABdhPJyTpMM3avWY66jVcEjF6gSlzdNSbyDsusQGrug1tLHMmpbr8S7I6lw/ec25MZDxKfCH03L+1w==
X-Received: by 2002:a7b:c24b:: with SMTP id b11mr5311413wmj.101.1589893173665;
Tue, 19 May 2020 05:59:33 -0700 (PDT)
Received: from localhost ([2a01:4b00:f419:6f00:7a8e:ed70:5c52:ea3])
by smtp.gmail.com with ESMTPSA id 61sm8370406wrp.92.2020.05.19.05.59.33
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 19 May 2020 05:59:33 -0700 (PDT)
From: luca.boccassi@gmail.com
To: Igor Romanov <igor.romanov@oktetlabs.ru>
Cc: Andrew Rybchenko <arybchenko@solarflare.com>, dpdk stable <stable@dpdk.org>
Date: Tue, 19 May 2020 13:53:50 +0100
Message-Id: <20200519125804.104349-40-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/base: reduce filter priorities to
implemented only' 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 <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
Sender: "stable" <stable-bounces@dpdk.org>
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 0e4497208aee109be9a50699d1595520ce6e2ddf Mon Sep 17 00:00:00 2001
From: Igor Romanov <igor.romanov@oktetlabs.ru>
Date: Tue, 10 Mar 2020 09:48:36 +0000
Subject: [PATCH] net/sfc/base: reduce filter priorities to implemented only
[ upstream commit 5b1dd95e270bfc4a824aad8fd560ce97f06679d1 ]
Only implemented filter priorities are manual and auto. Remove
unused priorities since exposing unimplemented functionality
is of no benefit.
Tx filter specification default priority is changed to manual,
since required priority does not differ from it in the implementation.
Fixes: f9565517ff4f ("net/sfc/base: import filters support")
Signed-off-by: Igor Romanov <igor.romanov@oktetlabs.ru>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
---
drivers/net/sfc/base/efx.h | 6 +-----
drivers/net/sfc/base/efx_filter.c | 2 +-
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/net/sfc/base/efx.h b/drivers/net/sfc/base/efx.h
index 53ddaa987c..c609c700fa 100644
--- a/drivers/net/sfc/base/efx.h
+++ b/drivers/net/sfc/base/efx.h
@@ -2950,16 +2950,12 @@ typedef uint8_t efx_filter_flags_t;
typedef uint32_t efx_filter_match_flags_t;
typedef enum efx_filter_priority_s {
- EFX_FILTER_PRI_HINT = 0, /* Performance hint */
- EFX_FILTER_PRI_AUTO, /* Automatic filter based on device
+ EFX_FILTER_PRI_AUTO = 0, /* Automatic filter based on device
* address list or hardware
* requirements. This may only be used
* by the filter implementation for
* each NIC type. */
EFX_FILTER_PRI_MANUAL, /* Manually configured filter */
- EFX_FILTER_PRI_REQUIRED, /* Required for correct behaviour of the
- * client (e.g. SR-IOV, HyperV VMQ etc.)
- */
} efx_filter_priority_t;
/*
diff --git a/drivers/net/sfc/base/efx_filter.c b/drivers/net/sfc/base/efx_filter.c
index 7efb380641..575f6228be 100644
--- a/drivers/net/sfc/base/efx_filter.c
+++ b/drivers/net/sfc/base/efx_filter.c
@@ -314,7 +314,7 @@ efx_filter_spec_init_tx(
EFSYS_ASSERT3P(etp, !=, NULL);
memset(spec, 0, sizeof (*spec));
- spec->efs_priority = EFX_FILTER_PRI_REQUIRED;
+ spec->efs_priority = EFX_FILTER_PRI_MANUAL;
spec->efs_flags = EFX_FILTER_FLAG_TX;
spec->efs_dmaq_id = (uint16_t)etp->et_index;
}
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2020-05-19 13:56:20.468700212 +0100
+++ 0040-net-sfc-base-reduce-filter-priorities-to-implemented.patch 2020-05-19 13:56:18.243502251 +0100
@@ -1,8 +1,10 @@
-From 5b1dd95e270bfc4a824aad8fd560ce97f06679d1 Mon Sep 17 00:00:00 2001
+From 0e4497208aee109be9a50699d1595520ce6e2ddf Mon Sep 17 00:00:00 2001
From: Igor Romanov <igor.romanov@oktetlabs.ru>
Date: Tue, 10 Mar 2020 09:48:36 +0000
Subject: [PATCH] net/sfc/base: reduce filter priorities to implemented only
+[ upstream commit 5b1dd95e270bfc4a824aad8fd560ce97f06679d1 ]
+
Only implemented filter priorities are manual and auto. Remove
unused priorities since exposing unimplemented functionality
is of no benefit.
@@ -11,7 +13,6 @@
since required priority does not differ from it in the implementation.
Fixes: f9565517ff4f ("net/sfc/base: import filters support")
-Cc: stable@dpdk.org
Signed-off-by: Igor Romanov <igor.romanov@oktetlabs.ru>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>