From patchwork Mon Jul 10 10:30:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suman Ghosh X-Patchwork-Id: 117836 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp4931893vqx; Mon, 10 Jul 2023 03:48:40 -0700 (PDT) X-Google-Smtp-Source: APBJJlH5SspAFhZ6jgi8cdIZHg+N7O2cF6d+smgIF/IaMvBmF1dHjGJ/Hm0MVwKyzUCOt6Qf737O X-Received: by 2002:a05:6a20:1450:b0:12c:d9cc:340e with SMTP id a16-20020a056a20145000b0012cd9cc340emr11119717pzi.5.1688986119876; Mon, 10 Jul 2023 03:48:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688986119; cv=none; d=google.com; s=arc-20160816; b=1B+3hOq7oXzJuUrTjyCRTYRMXJAT6gf5qNzQN2fz5GYvfuttjwnpXr+Vs6uJBLxXXH 2uLKzRSf/GKFe6kdmPt3tMRaYK7T3Fwo+RHH+dvlQA5NyrOlp5XV7msLOjyuvqrOFvi+ 2QDU7ayV35S4Dq/y68miL7XwivV7UCRwmmn7ML3ZVY3s1rGvSWuEyBenYIe1Gmij4JoB jg3W2X9LA+YUaz5zD2hvMvcD4L2qPD3enjmU+PJ5NAvrSJBpV39XrOYIDHJ0372b2z68 EOcWMNucYh9wNX56WWwAuPnkXkZb7bTuGby1MHi7KIIuBOKJTuJ5uLnZ3YQ4j7aMWghM rKFQ== 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=Ht0zG3SbuK8XFLIxJVSHU6f9E9fnWCCCBF1cwN6I8+k=; fh=P++xfw691riK3V71V+oOPM9ByOJXBDKRnR1He1Iagmo=; b=xgNuO8rcjrsdrZj+7z8/H0UwmEl7R0b+F4aGyq1K8RUtbxWmIqll47z14R7E1h49+j SZvumD0ntaNrSmdK+wfON1xow+ftUUiapibgJDQ1nizhe4hM/rpuH+e7VURonbrd36oc AfVGp151A30DAIcuMdfw6uinUZXHXA1/atB7MTf1TbdsJMQEminxK/V/+0n7gwTKpgnH zVpqW+fBUKQeU8vt9/n66a3iSbvi4ogOfMDPFp8jXpCNb51DE3jMkXfgLkI9aGag5Zf4 LOugWYgzwWSpWEOFcI7Vtgc5aPEuohrc8tGbVkB5Jq+Jy37TtiM53eHRum/tg8gcEo9S WOlA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@marvell.com header.s=pfpt0220 header.b=C4xTBNk4; 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 kz4-20020a170902f9c400b001b5219acbbfsi8520935plb.359.2023.07.10.03.48.27; Mon, 10 Jul 2023 03:48:39 -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=C4xTBNk4; 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 S232199AbjGJKbZ (ORCPT + 99 others); Mon, 10 Jul 2023 06:31:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42084 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232817AbjGJKbP (ORCPT ); Mon, 10 Jul 2023 06:31:15 -0400 Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6791AE2; Mon, 10 Jul 2023 03:30:50 -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 36A6C3Ak021884; Mon, 10 Jul 2023 03:30:36 -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=Ht0zG3SbuK8XFLIxJVSHU6f9E9fnWCCCBF1cwN6I8+k=; b=C4xTBNk4+rsv4RdMFMwHpmE68X+RvLYqqA36/koS52T+7ucEdhqNR1B1KKZUOVpwiLq2 ls8pLwgeVHfRRnsG6BClgvgX83nzuVEOFRsraa/iY/ydu3N0uPqGKOoxbvs2Oi9aZXOZ 6pp83opENIZUspeaBHzaxHXxYA9+YsXWK2a8XySPsZdepw6ef+yNKPsTNcGW41zGJeD8 g5jmxZOS4CND8Hsiu0k/kL5uYriVSfZEsm5bexHIrS24feJh7uRhRo5Nk+rk9m82I91L EM7SVbM6hw8Lq8LzuuBsRI60efjkk4TwKfMtEPE9SYXo4v551iSEPGzIqBF/YHnBy+AY TQ== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3rq7ajv3qg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Mon, 10 Jul 2023 03:30:36 -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, 10 Jul 2023 03:30:34 -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, 10 Jul 2023 03:30:34 -0700 Received: from localhost.localdomain (unknown [10.28.36.166]) by maili.marvell.com (Postfix) with ESMTP id 0F27C3F7069; Mon, 10 Jul 2023 03:30:30 -0700 (PDT) From: Suman Ghosh To: , , , , , , , , , CC: Suman Ghosh Subject: [net PATCH V5] octeontx2-pf: Add additional check for MCAM rules Date: Mon, 10 Jul 2023 16:00:27 +0530 Message-ID: <20230710103027.2244139-1-sumang@marvell.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: -qDacU7kfu9c9CqdMDMTKKPRdi4zztPP X-Proofpoint-GUID: -qDacU7kfu9c9CqdMDMTKKPRdi4zztPP 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-10_08,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: INBOX X-GMAIL-THRID: 1770694159044234180 X-GMAIL-MSGID: 1771030309538303602 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 v4: - Reformatted text in file otx2_tc.c as per review comment. .../ethernet/marvell/octeontx2/nic/otx2_flows.c | 8 ++++++++ .../net/ethernet/marvell/octeontx2/nic/otx2_tc.c | 15 +++++++++++++++ 2 files changed, 23 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..d3498f3ecaac 100644 --- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c +++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c @@ -604,6 +604,21 @@ 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) {