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 853BFA04DD for ; Wed, 18 Nov 2020 17:38:28 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B6A26DED; Wed, 18 Nov 2020 17:37:50 +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 D2991C926 for ; Wed, 18 Nov 2020 17:37:48 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605717467; 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=Vzy8yRPdCU8gtHOnrZwpGqoN1BL06KXDV6qfqXQIKP0=; b=b2mPCDd7n8NfzwPlwyuBYYX0h6fUDmWwM2LR1FINsGaNyPaLZgeod6KIDtQoTQHolOMTcm P/oyuEWnTj7a246DNzQwP1Qv8De0wWPnHhyRxyOduSv9PMu1jERmYmuMvkeqfflN5FCd50 TYTyllY0AQS9T8nTT2GK65RMkgLNzBw= 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-545-NjBbw-hAMRSx0jxp9H8d1w-1; Wed, 18 Nov 2020 11:37:44 -0500 X-MC-Unique: NjBbw-hAMRSx0jxp9H8d1w-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 C8A4E10766C5; Wed, 18 Nov 2020 16:37:42 +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 BC4A15C1A3; Wed, 18 Nov 2020 16:37:41 +0000 (UTC) From: Kevin Traynor To: Padraig Connolly Cc: Bernard Iremonger , dpdk stable Date: Wed, 18 Nov 2020 16:35:38 +0000 Message-Id: <20201118163558.1101823-52-ktraynor@redhat.com> In-Reply-To: <20201118163558.1101823-1-ktraynor@redhat.com> References: <20201118163558.1101823-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/i40e: fix QinQ flow pattern to allow non full mask' 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/24/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/27c0b284cdfcf1072e6c1f2020a28ab1d094d291 Thanks. Kevin. --- >From 27c0b284cdfcf1072e6c1f2020a28ab1d094d291 Mon Sep 17 00:00:00 2001 From: Padraig Connolly Date: Thu, 15 Oct 2020 10:28:58 +0100 Subject: [PATCH] net/i40e: fix QinQ flow pattern to allow non full mask [ upstream commit ff0df4e134cc6efe75e1ed103b2c7b316b8269e2 ] Issue reported by customer that only full mask was allowed on inner and outer VLAN tag, thus not allowing mask to set VLAN ID filter only. Removed check that enforces inner vlan and outer vlan equal I40E_TCI_MASK (full mask 0xffff). Fixes: d37705068ee8 ("net/i40e: parse QinQ pattern") Signed-off-by: Padraig Connolly Acked-by: Bernard Iremonger --- drivers/net/i40e/i40e_flow.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c index 088b92fdd1..e5c42144e0 100644 --- a/drivers/net/i40e/i40e_flow.c +++ b/drivers/net/i40e/i40e_flow.c @@ -4150,12 +4150,7 @@ i40e_flow_parse_qinq_pattern(__rte_unused struct rte_eth_dev *dev, /* Get filter specification */ - if ((o_vlan_mask != NULL) && (o_vlan_mask->tci == - rte_cpu_to_be_16(I40E_TCI_MASK)) && - (i_vlan_mask != NULL) && - (i_vlan_mask->tci == rte_cpu_to_be_16(I40E_TCI_MASK))) { - filter->outer_vlan = rte_be_to_cpu_16(o_vlan_spec->tci) - & I40E_TCI_MASK; - filter->inner_vlan = rte_be_to_cpu_16(i_vlan_spec->tci) - & I40E_TCI_MASK; + if (o_vlan_mask != NULL && i_vlan_mask != NULL) { + filter->outer_vlan = rte_be_to_cpu_16(o_vlan_spec->tci); + filter->inner_vlan = rte_be_to_cpu_16(i_vlan_spec->tci); } else { rte_flow_error_set(error, EINVAL, -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-18 16:33:38.922308386 +0000 +++ 0052-net-i40e-fix-QinQ-flow-pattern-to-allow-non-full-mas.patch 2020-11-18 16:33:37.976215092 +0000 @@ -1 +1 @@ -From ff0df4e134cc6efe75e1ed103b2c7b316b8269e2 Mon Sep 17 00:00:00 2001 +From 27c0b284cdfcf1072e6c1f2020a28ab1d094d291 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ff0df4e134cc6efe75e1ed103b2c7b316b8269e2 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index adc5da1c53..8e7a9989b3 100644 +index 088b92fdd1..e5c42144e0 100644 @@ -24 +25 @@ -@@ -4650,12 +4650,7 @@ i40e_flow_parse_qinq_pattern(__rte_unused struct rte_eth_dev *dev, +@@ -4150,12 +4150,7 @@ i40e_flow_parse_qinq_pattern(__rte_unused struct rte_eth_dev *dev,