From patchwork Tue Apr 2 02:36:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 1073638 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=netronome.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="dmUNX6CF"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44YCyq4sq9z9sSn for ; Tue, 2 Apr 2019 13:36:51 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728818AbfDBCgp (ORCPT ); Mon, 1 Apr 2019 22:36:45 -0400 Received: from mail-qk1-f195.google.com ([209.85.222.195]:33984 "EHLO mail-qk1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726168AbfDBCgo (ORCPT ); Mon, 1 Apr 2019 22:36:44 -0400 Received: by mail-qk1-f195.google.com with SMTP id n68so7028852qka.1 for ; Mon, 01 Apr 2019 19:36:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UT9xQqS+vKnXsZNxiYWYAXyGrqQeghJ6yO1efYz5iPM=; b=dmUNX6CFVGve4iJTl+dlbegKOj238W3Qr/5sPhY7aMxoDWNf/ytUZJ3sh9M8cSq3m2 sHNNi1BzZR/8sqCKGZQkRj9rl1Iq4wYsy6wOYXO1rbBhzzkzinGt58slMlXV0xa0pFm5 5NdwKybrTizC3iCQmKHSqmwzqNNiffg6sRlmRtiJtU06GgQfgfovCSOO4KdJoiq7VVnb 4Wad6G6AUsNhYTwnOjaZ4epzXL7E3sDeZrgNyMGlz/8kZu8W5jh8xCYBhnABsbd90DzI SbFgRdCf++6Uzm0fEekxISGpzGqE6BnoA0hnMnnxNoU0cpZPSK62ErYxR5RaJV5VPaaC xxww== 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=UT9xQqS+vKnXsZNxiYWYAXyGrqQeghJ6yO1efYz5iPM=; b=Qtd28Ot8KuPAyfwSJknXoeSbP3BZxly/gspR3Hs0GR6Rrohjg77mXHMOupevJp9dc+ Wn4LVpaFoZ2Wao0tisyhmqOOpk7OjLMLHHpNLmiVFWSWRfbJDOg7pKKoB3SfY0bgVFTv I870xO1x0dNGEFWKpa7xnxUHamfcUgZZYSSwZLPkm0v7gdbKoZD8reOY53qkJ7ylYGIA u7r4i4u6XJleI/kOXJ+ihoNtWhduVHHpJeiUhpsejKSAXYY8MWDPS1Z4u4GLVILQ1YwF NvOJ/OBdHMu7F/pQkwEt106JvrlVYqKV45ap3RowSCZbrH7OahY1/FPN0PJ1Yx8BrHpu /yTQ== X-Gm-Message-State: APjAAAV6dyPdQTZfG02YIyKY0d4bw54TIXpgnIq6xNKO3ipx+I3K6VqS /SUKjKYxURHR9ydPcXBJrTy+EA== X-Google-Smtp-Source: APXvYqxW1eQW5XCiA3+AJNzTH9qegXESuv7FNEbeUVcbFY272qx85yngfm6w9jyxu9QfFgGl0oCXqA== X-Received: by 2002:a37:6617:: with SMTP id a23mr48379851qkc.161.1554172603877; Mon, 01 Apr 2019 19:36:43 -0700 (PDT) Received: from jkicinski-Precision-T1700.netronome.com ([66.60.152.14]) by smtp.gmail.com with ESMTPSA id l59sm6813784qte.6.2019.04.01.19.36.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Apr 2019 19:36:43 -0700 (PDT) From: Jakub Kicinski To: davem@davemloft.net Cc: netdev@vger.kernel.org, oss-drivers@netronome.com, Pieter Jansen van Vuuren , Louis Peens Subject: [PATCH stable/5.0 1/2] nfp: flower: replace CFI with vlan present Date: Mon, 1 Apr 2019 19:36:33 -0700 Message-Id: <20190402023634.7669-2-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190402023634.7669-1-jakub.kicinski@netronome.com> References: <20190401.183149.620326099169596498.davem@davemloft.net> <20190402023634.7669-1-jakub.kicinski@netronome.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Pieter Jansen van Vuuren Replace vlan CFI bit with a vlan present bit that indicates the presence of a vlan tag. Previously the driver incorrectly assumed that an vlan id of 0 is not matchable, therefore we indicate vlan presence with a vlan present bit. Fixes: 5571e8c9f241 ("nfp: extend flower matching capabilities") Signed-off-by: Pieter Jansen van Vuuren Signed-off-by: Louis Peens --- drivers/net/ethernet/netronome/nfp/flower/cmsg.h | 2 +- drivers/net/ethernet/netronome/nfp/flower/match.c | 14 ++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/netronome/nfp/flower/cmsg.h b/drivers/net/ethernet/netronome/nfp/flower/cmsg.h index 15f41cfef9f1..bf06458288f3 100644 --- a/drivers/net/ethernet/netronome/nfp/flower/cmsg.h +++ b/drivers/net/ethernet/netronome/nfp/flower/cmsg.h @@ -26,7 +26,7 @@ #define NFP_FLOWER_LAYER2_GENEVE_OP BIT(6) #define NFP_FLOWER_MASK_VLAN_PRIO GENMASK(15, 13) -#define NFP_FLOWER_MASK_VLAN_CFI BIT(12) +#define NFP_FLOWER_MASK_VLAN_PRESENT BIT(12) #define NFP_FLOWER_MASK_VLAN_VID GENMASK(11, 0) #define NFP_FLOWER_MASK_MPLS_LB GENMASK(31, 12) diff --git a/drivers/net/ethernet/netronome/nfp/flower/match.c b/drivers/net/ethernet/netronome/nfp/flower/match.c index cdf75595f627..571cc8ced33e 100644 --- a/drivers/net/ethernet/netronome/nfp/flower/match.c +++ b/drivers/net/ethernet/netronome/nfp/flower/match.c @@ -26,14 +26,12 @@ nfp_flower_compile_meta_tci(struct nfp_flower_meta_tci *frame, FLOW_DISSECTOR_KEY_VLAN, target); /* Populate the tci field. */ - if (flow_vlan->vlan_id || flow_vlan->vlan_priority) { - tmp_tci = FIELD_PREP(NFP_FLOWER_MASK_VLAN_PRIO, - flow_vlan->vlan_priority) | - FIELD_PREP(NFP_FLOWER_MASK_VLAN_VID, - flow_vlan->vlan_id) | - NFP_FLOWER_MASK_VLAN_CFI; - frame->tci = cpu_to_be16(tmp_tci); - } + tmp_tci = NFP_FLOWER_MASK_VLAN_PRESENT; + tmp_tci |= FIELD_PREP(NFP_FLOWER_MASK_VLAN_PRIO, + flow_vlan->vlan_priority) | + FIELD_PREP(NFP_FLOWER_MASK_VLAN_VID, + flow_vlan->vlan_id); + frame->tci = cpu_to_be16(tmp_tci); } } From patchwork Tue Apr 2 02:36:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 1073639 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=netronome.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="mUjhFnal"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44YCyr2BgPz9sSm for ; Tue, 2 Apr 2019 13:36:52 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728828AbfDBCgr (ORCPT ); Mon, 1 Apr 2019 22:36:47 -0400 Received: from mail-qt1-f194.google.com ([209.85.160.194]:33927 "EHLO mail-qt1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728814AbfDBCgq (ORCPT ); Mon, 1 Apr 2019 22:36:46 -0400 Received: by mail-qt1-f194.google.com with SMTP id k2so13567409qtm.1 for ; Mon, 01 Apr 2019 19:36:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=w5ccmt6VN/GkUE5yMnbXmMcRi50s7yzTI7EP9vo7xcc=; b=mUjhFnaldFmR0wwsBz/GJF4Cw2nqGmdtH3HAi58iVq1fSsqvl0kneEEDG57kBTlPKt M3ejcExQrSfMWrBR4bL7DTROhW1+T0B+hKv4X47iPcNxb0FoJ1KP9T0EgPvHFnkFvn5P gC1pns1e9Hr3C096dVXogcEcWR1qNDV/QOMEHJaL6sdo/8cM1ypWhIffeINQJHH8JQBE UrJXYk36P8dseMUEWT+qxckU2Yo+SlLQ2pWO0YRCuAzrHslZhxd0UlDAyFY74OwykhPi yIqDdVJa7Mz25f/r2zio94pADiPQYCyOlOmgyBKVWzBmzytjpoq7qLantb2sci4fxLP9 ZXDQ== 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=w5ccmt6VN/GkUE5yMnbXmMcRi50s7yzTI7EP9vo7xcc=; b=TvsJlA4kT8yss9bUHm43hVngy+kCOo3RemORkLxAefphM6VZDQMxb1dUyYFLiHHM17 xdtCzeLzg/8Hm8TtAZgljHMeOrClI8b3Z85jvVtnZMdzZlUkIa+SIlGnpwmzR3qUvgaA tcYt+Qq2jiIVlol2ALqD4Qn+pD0s1MpMaFRI3aUUXV86Ie4rFIZh//6TyDzetIdu2vDv U0uMItfr8Tmgk6Bp5mo78KA6N+v2HxoiT/xKt0uQCTJHkJhHpHQBw2Uk5DZ0hUOk+r27 RTBAvNaz7Kgsy8P1lsY/bIKQIChfRvHqIkUMzB2ProB33xlOHNNo6m1Bbh1rgwFcYiuH huZQ== X-Gm-Message-State: APjAAAW+BeqKZ/kSfPL5XpTqvsV3w2j+6eNFbfMhBN2pTElxFxaLizNy ariKMEO27K+qn04QY+DjMb3dPxxvquI= X-Google-Smtp-Source: APXvYqx2eZKTUTl7Wa3DoEVabKYFmMUCQkJ9A4Bo9nMa4Ig+fOfbHnEwjQIVSMWX99gjZ+iuWRUK1w== X-Received: by 2002:aed:38aa:: with SMTP id k39mr12823996qte.166.1554172605156; Mon, 01 Apr 2019 19:36:45 -0700 (PDT) Received: from jkicinski-Precision-T1700.netronome.com ([66.60.152.14]) by smtp.gmail.com with ESMTPSA id l59sm6813784qte.6.2019.04.01.19.36.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Apr 2019 19:36:44 -0700 (PDT) From: Jakub Kicinski To: davem@davemloft.net Cc: netdev@vger.kernel.org, oss-drivers@netronome.com, Pieter Jansen van Vuuren , Louis Peens Subject: [PATCH stable/5.0 2/2] nfp: flower: remove vlan CFI bit from push vlan action Date: Mon, 1 Apr 2019 19:36:34 -0700 Message-Id: <20190402023634.7669-3-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190402023634.7669-1-jakub.kicinski@netronome.com> References: <20190401.183149.620326099169596498.davem@davemloft.net> <20190402023634.7669-1-jakub.kicinski@netronome.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Pieter Jansen van Vuuren We no longer set CFI when pushing vlan tags, therefore we remove the CFI bit from push vlan. Fixes: 1a1e586f54bf ("nfp: add basic action capabilities to flower offloads") Signed-off-by: Pieter Jansen van Vuuren Signed-off-by: Louis Peens --- drivers/net/ethernet/netronome/nfp/flower/action.c | 3 +-- drivers/net/ethernet/netronome/nfp/flower/cmsg.h | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/net/ethernet/netronome/nfp/flower/action.c b/drivers/net/ethernet/netronome/nfp/flower/action.c index 8d54b36afee8..2bbc5b8f92c2 100644 --- a/drivers/net/ethernet/netronome/nfp/flower/action.c +++ b/drivers/net/ethernet/netronome/nfp/flower/action.c @@ -49,8 +49,7 @@ nfp_fl_push_vlan(struct nfp_fl_push_vlan *push_vlan, tmp_push_vlan_tci = FIELD_PREP(NFP_FL_PUSH_VLAN_PRIO, tcf_vlan_push_prio(action)) | - FIELD_PREP(NFP_FL_PUSH_VLAN_VID, tcf_vlan_push_vid(action)) | - NFP_FL_PUSH_VLAN_CFI; + FIELD_PREP(NFP_FL_PUSH_VLAN_VID, tcf_vlan_push_vid(action)); push_vlan->vlan_tci = cpu_to_be16(tmp_push_vlan_tci); } diff --git a/drivers/net/ethernet/netronome/nfp/flower/cmsg.h b/drivers/net/ethernet/netronome/nfp/flower/cmsg.h index bf06458288f3..ab07d76b4186 100644 --- a/drivers/net/ethernet/netronome/nfp/flower/cmsg.h +++ b/drivers/net/ethernet/netronome/nfp/flower/cmsg.h @@ -82,7 +82,6 @@ #define NFP_FL_OUT_FLAGS_TYPE_IDX GENMASK(2, 0) #define NFP_FL_PUSH_VLAN_PRIO GENMASK(15, 13) -#define NFP_FL_PUSH_VLAN_CFI BIT(12) #define NFP_FL_PUSH_VLAN_VID GENMASK(11, 0) #define IPV6_FLOW_LABEL_MASK cpu_to_be32(0x000fffff)