From patchwork Mon Jul 3 09:56:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suman Ghosh X-Patchwork-Id: 115285 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp411103vqx; Mon, 3 Jul 2023 03:12:55 -0700 (PDT) X-Google-Smtp-Source: APBJJlEVj/nXUb8XEIGlvEg75QtLVZse3iNBKu106PxLoobOn9IQ+kwEcWTC4FTcbS5Mnfavc1u0 X-Received: by 2002:a17:90b:1d83:b0:263:730b:f568 with SMTP id pf3-20020a17090b1d8300b00263730bf568mr11451115pjb.3.1688379175452; Mon, 03 Jul 2023 03:12:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688379175; cv=none; d=google.com; s=arc-20160816; b=e6XIQXGYHH9clAg55Ci17e7dIRITyoC/nWzwWLAm6T3P36JKo4a0i6NuxjJi6BxyVc w7dNI2nHpVmO45t3KMZYNADDfIlgDW2O2Ye45VjNloC28qqPpe3dxBvURqalbVQYtLK9 BXwhAxxKh2F/xygyeTgoTGzqPX0SAJ3TQYcFH+P/sKky26MxNuBkbkEMg+wcxJsF4G+N fC5LsQrtyAOz16cFfueChxhO/AxqjHpr6P97TDSjTvIYomKFBaXNnJTFG8VKFrLBDsA0 aGoSGqDoTd115fKP/y3WVBC+8SKmWCU32olxcAvY5LSDzSFlznVX9VYZOZZQB2bpPFN1 RF4g== 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=WYDMzLE60YbEI5+R2XflYqsOuUQedahohgc583ZN6m0=; fh=YYjse4cKO3V7oC5ZTdKFQ/RruD0+NCnpHdo4UIrnU7I=; b=eHwmhDQHmEbkFolWINfq58GKhEIXFRU6mQDhPcANoO42fzigrBnHBWPkDulnSjOuSf RvAeFmUvFR3qG9cryr9mvK+FEGHa2XMI+Q0bAumlHsMgTq0H0NCoQtZVOnGDCiSwTReo 5hlnJM8yCg41otfwdxSXW2vTAVsALSSvgW2e5Im8aebhenH6dX/faeVCcQDttwwsRWDd XLa52SsKhbThIUoxNYWB+SssjMJaEjSyNtdnRsY7xtoMLcupN9X08lDNWR8RTAR2eqjo IuK9JvTh7V/0sx2so/UxIVwhs6p+6YEqvXlRX7vVQIMkAjM+smSqU8sr62mckcgGsnFk amEA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@marvell.com header.s=pfpt0220 header.b=F4dbLV6D; 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 11-20020a17090a004b00b0025bdfe1bc66si19950754pjb.165.2023.07.03.03.12.38; Mon, 03 Jul 2023 03:12:55 -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=F4dbLV6D; 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 S231241AbjGCKAR (ORCPT + 99 others); Mon, 3 Jul 2023 06:00:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56182 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231802AbjGCKAC (ORCPT ); Mon, 3 Jul 2023 06:00:02 -0400 Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 806ADE79; Mon, 3 Jul 2023 02:56:23 -0700 (PDT) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 36373cuo019843; Mon, 3 Jul 2023 02:56:09 -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=WYDMzLE60YbEI5+R2XflYqsOuUQedahohgc583ZN6m0=; b=F4dbLV6D3NVckHU+pF+nJ5qOTTVVmiUq9ekqTrGA2Oz+mGLAJFkmNtCiFlSdlljLD/5D jDt8MiL5LikaeDOynOTa4cW3u+7/r47qt9/nKYciRFmKZNS0Fd5lLVWtydXcflWnmy6R bnXcz1zVEkC4freVeRRVXBbOwHNnuYb0BK3X26pR45345n2HrkDgTm2ktlBtIcYYmkYD ie+jZi1MBMBCMPFW+udeJ1I4nFyJ5d2hEQtOcbXPS4IhjSAnS7wI6jsYTPlSVpNdFtvW qkjBwsyjV2si1v8vXlVyvt5A7drjPL7UBRYVnq0O3Lg1o/ga4D4x8bjkAvgFigkjLGmy Pw== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3rjknj47kx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Mon, 03 Jul 2023 02:56:08 -0700 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.48; Mon, 3 Jul 2023 02:56:06 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.48 via Frontend Transport; Mon, 3 Jul 2023 02:56:06 -0700 Received: from localhost.localdomain (unknown [10.28.36.166]) by maili.marvell.com (Postfix) with ESMTP id 81B6D3F704B; Mon, 3 Jul 2023 02:56:03 -0700 (PDT) From: Suman Ghosh To: , , , , , , , , , CC: Suman Ghosh Subject: [net PATCH V2] octeontx2-pf: Add additional check for MCAM rules. Date: Mon, 3 Jul 2023 15:26:00 +0530 Message-ID: <20230703095600.2048397-1-sumang@marvell.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Proofpoint-GUID: v0qMJWj0MbiEzDfMj5chV-hBJXZM0fsN X-Proofpoint-ORIG-GUID: v0qMJWj0MbiEzDfMj5chV-hBJXZM0fsN 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-03_08,2023-06-30_01,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?1770391310493400943?= X-GMAIL-MSGID: =?utf-8?q?1770393882474521586?= Due to hardware limitation, MCAM drop rule with ether_type == 802.1Q and vlan_id == 0 is not supported. Hence rejecting such rules. Signed-off-by: Suman Ghosh --- Changes since v1: - Updated commit message .../net/ethernet/marvell/octeontx2/nic/otx2_flows.c | 7 +++++++ .../net/ethernet/marvell/octeontx2/nic/otx2_tc.c | 13 +++++++++++++ 2 files changed, 20 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..49ba27875111 100644 --- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_flows.c +++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_flows.c @@ -871,6 +871,13 @@ static int otx2_prepare_flow_request(struct ethtool_rx_flow_spec *fsp, if (be16_to_cpu(fsp->m_ext.vlan_etype) != 0xFFFF) return -EINVAL; + /* 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; + vlan_etype = be16_to_cpu(fsp->h_ext.vlan_etype); /* Only ETH_P_8021Q and ETH_P_802AD types supported */ if (vlan_etype != ETH_P_8021Q && 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) {