From patchwork Thu Jul 6 17:37:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suman Ghosh X-Patchwork-Id: 116811 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp2729676vqx; Thu, 6 Jul 2023 10:45:42 -0700 (PDT) X-Google-Smtp-Source: APBJJlEvNx2IDC9mjgd+yTO1N3zFdcsN6a6vv+y8MBpcwlP/YMXnU3C3b9zhBbesta0uey1Eqwv1 X-Received: by 2002:a9d:7dcb:0:b0:6b7:40b2:9d9 with SMTP id k11-20020a9d7dcb000000b006b740b209d9mr2519983otn.33.1688665541785; Thu, 06 Jul 2023 10:45:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688665541; cv=none; d=google.com; s=arc-20160816; b=qdqskOArVOCqfSMY6UVmZZmkHaKhWKzJGINaQYIUGT6GxApCYDjqxG14GCtdSVi6Ln hqXksb0tEcAiw8GLW0F8PEZP65NQz72EnXrWuvNcr41UuT7xhgbC728R7Q58oF0qOhJ+ XHjqrkpxbHFObLPcfWOHa8sX+HzOSy22dLqJSQVpH9U2r3l4u6EjlE5LP9nf7qBdXi5D RQjy8zhZn3IbJ06IfxquZc34MaoiF2c0KniGXwkAHu2W4dKPqRQVeSPkuYKPI0Gd81xH yfADDsnlpjCpH5YlpBf2PqH2mSYH737e2eVUQavYOObbCcYoz9rnPEueYE2K4ifKxAuw hWQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=IPtGxkbPmFGDLM3aZoleuH6KTP7fOT7Q4al0VCaPr1Y=; fh=P++xfw691riK3V71V+oOPM9ByOJXBDKRnR1He1Iagmo=; b=UaqWCjk67T7V9N18upO6VY1hQg0Pl4ja59YhlwaQYP853BCCIpmQLqlZYYNpxIC3qY mBoVudvl0n1giAuDEChm88GRRooIw3JBIRj6Lg++epFR1yIwps/Rd1aLRnf33J60ob7U ZFgj/ulEjBNXgxs1EBo7uKqRR+wlFb3AO0UB9BEmaIihmf2qVWKN4EjK2AFAo9PlD7sT GR3rtVEZ2P5kBUfY4RacKQVs9D13zx1N41p1cCoYIACM9Zev2R/4FFr+UiWoXpr8gT93 eq/yZp6yAJmiAYXLMd8XV0Atz300JiPW5Ej/GpDY3OLDI373ZITZfNkJVOvMQo6dIhy7 E2gg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@marvell.com header.s=pfpt0220 header.b=Dr9E7xhV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=REJECT dis=NONE) header.from=marvell.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w190-20020a6382c7000000b0055bc3848530si1984426pgd.250.2023.07.06.10.45.27; Thu, 06 Jul 2023 10:45:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@marvell.com header.s=pfpt0220 header.b=Dr9E7xhV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=REJECT dis=NONE) header.from=marvell.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231912AbjGFRhj (ORCPT + 99 others); Thu, 6 Jul 2023 13:37:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38618 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229683AbjGFRhh (ORCPT ); Thu, 6 Jul 2023 13:37:37 -0400 Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C10C810C; Thu, 6 Jul 2023 10:37:36 -0700 (PDT) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 366GmeOb030027; Thu, 6 Jul 2023 10:37:31 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=IPtGxkbPmFGDLM3aZoleuH6KTP7fOT7Q4al0VCaPr1Y=; b=Dr9E7xhVeMjCM9t2qJtFLsvwlf1FC+U++H9cS35QFUPa40X0DvVUM/x/xvB7hGwW/2nB Vwlz6uWUx5Co0yZaAj8ZTxZzgRn688zX47rpJcK98/PzSHqKNPGLabNFma7G2Saljd24 WOeXbPUjgiM3vaAI1v3W/p/SqvEdrOGaXGe1JrVBXJd/ANXpwN05X3tbisbqWs/Lw24l 16BN6TC5LMUjOsUqknDk8isgYL0gyWqtDtp62QsYULO5MZLave58FDFAY3Ebnzxj9gSA SlnIOVLoSB70HoQ5P9LtX3Fop40ENczQGTet6NfTEk7kq8BTJDpaWrV2S08TFcKMcQrT mw== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3rn3v96qm7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Thu, 06 Jul 2023 10:37:31 -0700 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.48; Thu, 6 Jul 2023 10:37:29 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.48 via Frontend Transport; Thu, 6 Jul 2023 10:37:29 -0700 Received: from localhost.localdomain (unknown [10.28.36.166]) by maili.marvell.com (Postfix) with ESMTP id 4604B3F703F; Thu, 6 Jul 2023 10:37:26 -0700 (PDT) From: Suman Ghosh To: , , , , , , , , , CC: Suman Ghosh Subject: [PATCH V4] octeontx2-pf: Add additional check for MCAM rules Date: Thu, 6 Jul 2023 23:07:23 +0530 Message-ID: <20230706173723.2226030-1-sumang@marvell.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Proofpoint-GUID: T8O4K1BYUc23-pzr--YFwKXx3ibUiVn_ X-Proofpoint-ORIG-GUID: T8O4K1BYUc23-pzr--YFwKXx3ibUiVn_ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-07-06_12,2023-07-06_02,2023-05-22_02 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770694159044234180?= X-GMAIL-MSGID: =?utf-8?q?1770694159044234180?= Due to hardware limitation, MCAM drop rule with ether_type == 802.1Q and vlan_id == 0 is not supported. Hence rejecting such rules. Fixes: dce677da57c0 ("octeontx2-pf: Add vlan-etype to ntuple filters") Signed-off-by: Suman Ghosh --- Changes since v3: - moved assignment of vlan_etype before the if check .../net/ethernet/marvell/octeontx2/nic/otx2_flows.c | 8 ++++++++ .../net/ethernet/marvell/octeontx2/nic/otx2_tc.c | 13 +++++++++++++ 2 files changed, 21 insertions(+) diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_flows.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_flows.c index 10e11262d48a..2d7713a1a153 100644 --- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_flows.c +++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_flows.c @@ -872,6 +872,14 @@ static int otx2_prepare_flow_request(struct ethtool_rx_flow_spec *fsp, return -EINVAL; vlan_etype = be16_to_cpu(fsp->h_ext.vlan_etype); + + /* Drop rule with vlan_etype == 802.1Q + * and vlan_id == 0 is not supported + */ + if (vlan_etype == ETH_P_8021Q && !fsp->m_ext.vlan_tci && + fsp->ring_cookie == RX_CLS_FLOW_DISC) + return -EINVAL; + /* Only ETH_P_8021Q and ETH_P_802AD types supported */ if (vlan_etype != ETH_P_8021Q && vlan_etype != ETH_P_8021AD) diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c index 044cc211424e..6c0fdc2bad73 100644 --- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c +++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c @@ -604,6 +604,19 @@ static int otx2_tc_prepare_flow(struct otx2_nic *nic, struct otx2_tc_flow *node, return -EOPNOTSUPP; } + if (!match.mask->vlan_id) { + struct flow_action_entry *act; + int i; + + flow_action_for_each(i, act, &rule->action) { + if (act->id == FLOW_ACTION_DROP) { + netdev_err(nic->netdev, "vlan tpid 0x%x with vlan_id %d is not supported for DROP rule.\n", + ntohs(match.key->vlan_tpid), match.key->vlan_id); + return -EOPNOTSUPP; + } + } + } + if (match.mask->vlan_id || match.mask->vlan_dei || match.mask->vlan_priority) {