From patchwork Mon Jul 3 17:00:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suman Ghosh X-Patchwork-Id: 115434 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp674811vqx; Mon, 3 Jul 2023 10:20:16 -0700 (PDT) X-Google-Smtp-Source: APBJJlFOfKuHFAmF4tzL4Esg8Qh4l8EP8Vh4Mjk045lJawbGEbku8ON8dyc9BgctinUTN6AkgBsJ X-Received: by 2002:a17:902:eb89:b0:1b8:17e8:5482 with SMTP id q9-20020a170902eb8900b001b817e85482mr11565103plg.1.1688404816075; Mon, 03 Jul 2023 10:20:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688404816; cv=none; d=google.com; s=arc-20160816; b=hCubpOxGVVXmTMZjw/Up8+uKAir1A99GhjPxJEMmhHbgPdmbHkBIiAOAfi0xbZvMYu jeRGjBYKZlYMTlOrOWoCI8oLzApn33+qBgJ021tCAvPUGpAiBy7GVzt+6WIjQNufhu+Y bpiHJmwpxXKMpcMfr3e9ej/gglrZMEa58bVZfxbGswNGFay0k/OhvzkiBu8/AAzklRHt nnB+luNssCHD/NwxdnsvwMcrlDfUV6A3gh8DpbhcMmbRU3RyzsK4Ovgm1qcJNShzYGrK Ys8W7qtZeriNng2cN9OIDnItMTeh33Ee8zjAF3lqz/Ic6Ww5rNsCNJ5rySmsai8xgfLq ZbhA== 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=0CNLZyZHsPtMZ/I6Jnu98QhOJXKD5S2GrMCc85IJ0jc=; fh=YYjse4cKO3V7oC5ZTdKFQ/RruD0+NCnpHdo4UIrnU7I=; b=gFx9XNRS83jlNReGXx7DJdZRUMp8WU5Q18J1t43NNIIlT+O0QNmJE7A3enTsByf5qq Bw3nm4xZgUCvQC07vut+cp/uSA6042C7/Y+d3/lnUW7joz5IncdBHA3ht3YBaZKmcO4/ JBA668JA3ts24EF4J7faqrixfeBRQYTqURc1yIaCbc96RyjSXy4YgCM7PFcECBgfXBPR EFEbFvRdpQTIYY23MEyfi4z/Ba//zlasUfFqUECFaP/zQ2BI6lAJdBrJwVRTirdTCmQv P/yGLspxRCb8Ci9jrMrK+s4L0QFY94gjbtMJ4BE28zVO+vMu4d/NedHBupfrHwHm9zQ6 WLJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@marvell.com header.s=pfpt0220 header.b=KEDrqQez; 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 w5-20020a170902e88500b001b89b63b877si1985308plg.446.2023.07.03.10.20.02; Mon, 03 Jul 2023 10:20:16 -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=KEDrqQez; 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 S230360AbjGCRBS (ORCPT + 99 others); Mon, 3 Jul 2023 13:01:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35226 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229644AbjGCRBQ (ORCPT ); Mon, 3 Jul 2023 13:01:16 -0400 Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 89D80E58; Mon, 3 Jul 2023 10:01:15 -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 363EaXo8009834; Mon, 3 Jul 2023 10:01:07 -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=0CNLZyZHsPtMZ/I6Jnu98QhOJXKD5S2GrMCc85IJ0jc=; b=KEDrqQezJBwMrEU0oIIUPuXWDxPor1Rn5DVbY36D12e3+fjg0d+4kqg8T5Sy3GrOP3U1 BBEah6PfafJWJ2uz6UppsjtHldeBMSjhmJqXYxSIdO04Acj8EeAN/m//GYgbmjuE5RL6 J2YTjPzgGGstw9LqpXIeaODGeiYBNmNF0xnIey6WPsrmLDuenu+O3J/xb+5RXgersCFr zXk5H0hRDqswvc2t2xRNY0mzcdBptzpyMStZ0qa8WierNP7igGsvUUyPNkkPkgQVpGwx 0E0lMipe7Zy9e2OpOsuaIcF3pBBDC7Vi9HoftB/RNIwWJfj53I9KDKTPqYTR4zHfyWo5 fQ== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3rjknj5bty-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Mon, 03 Jul 2023 10:01:06 -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 10:01:04 -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 10:01:04 -0700 Received: from localhost.localdomain (unknown [10.28.36.166]) by maili.marvell.com (Postfix) with ESMTP id D2F703F707F; Mon, 3 Jul 2023 10:01:00 -0700 (PDT) From: Suman Ghosh To: , , , , , , , , , CC: Suman Ghosh Subject: [PATCH V3] octeontx2-pf: Add additional check for MCAM rules Date: Mon, 3 Jul 2023 22:30:54 +0530 Message-ID: <20230703170054.2152662-1-sumang@marvell.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Proofpoint-GUID: r-PiGNkEuPQOnkGXfCjkHEJlkMo0GISD X-Proofpoint-ORIG-GUID: r-PiGNkEuPQOnkGXfCjkHEJlkMo0GISD 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_13,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?1770420768418844456?= X-GMAIL-MSGID: =?utf-8?q?1770420768418844456?= 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 v2: - Added "fixes" tag .../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) {