From nobody Fri Apr 10 12:36:02 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C1210C32772 for ; Tue, 23 Aug 2022 16:29:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244476AbiHWQ3N (ORCPT ); Tue, 23 Aug 2022 12:29:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47582 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244223AbiHWQ2i (ORCPT ); Tue, 23 Aug 2022 12:28:38 -0400 Received: from syslogsrv (unknown [217.20.186.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 04A5F11C962; Tue, 23 Aug 2022 05:56:11 -0700 (PDT) Received: from fg200.ow.s ([172.20.254.44] helo=localhost.localdomain) by syslogsrv with esmtp (Exim 4.90_1) (envelope-from ) id 1oQSGV-000FXN-Gm; Tue, 23 Aug 2022 14:40:15 +0300 From: Maksym Glubokiy To: Taras Chornyi , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Serhiy Boiko , Maksym Glubokiy , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH net-next 1/3] net: prestera: acl: extract matchall logic into a separate file Date: Tue, 23 Aug 2022 14:39:56 +0300 Message-Id: <20220823113958.2061401-2-maksym.glubokiy@plvision.eu> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220823113958.2061401-1-maksym.glubokiy@plvision.eu> References: <20220823113958.2061401-1-maksym.glubokiy@plvision.eu> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Serhiy Boiko This commit adds more clarity to handling of TC_CLSMATCHALL_REPLACE and TC_CLSMATCHALL_DESTROY events by calling newly added *_mall_*() handlers instead of directly calling SPAN API. This also extracts matchall rules management out of SPAN API since SPAN is a hardware module which is used to implement 'matchall egress mirred' action only. Signed-off-by: Taras Chornyi Signed-off-by: Serhiy Boiko Signed-off-by: Maksym Glubokiy --- .../net/ethernet/marvell/prestera/Makefile | 2 +- .../ethernet/marvell/prestera/prestera_flow.c | 9 +-- .../marvell/prestera/prestera_matchall.c | 66 +++++++++++++++++++ .../marvell/prestera/prestera_matchall.h | 15 +++++ .../ethernet/marvell/prestera/prestera_span.c | 60 +---------------- .../ethernet/marvell/prestera/prestera_span.h | 10 +-- 6 files changed, 96 insertions(+), 66 deletions(-) create mode 100644 drivers/net/ethernet/marvell/prestera/prestera_matchall= .c create mode 100644 drivers/net/ethernet/marvell/prestera/prestera_matchall= .h diff --git a/drivers/net/ethernet/marvell/prestera/Makefile b/drivers/net/e= thernet/marvell/prestera/Makefile index d395f4131648..df14cee80153 100644 --- a/drivers/net/ethernet/marvell/prestera/Makefile +++ b/drivers/net/ethernet/marvell/prestera/Makefile @@ -4,6 +4,6 @@ prestera-objs :=3D prestera_main.o prestera_hw.o prestera_= dsa.o \ prestera_rxtx.o prestera_devlink.o prestera_ethtool.o \ prestera_switchdev.o prestera_acl.o prestera_flow.o \ prestera_flower.o prestera_span.o prestera_counter.o \ - prestera_router.o prestera_router_hw.o + prestera_router.o prestera_router_hw.o prestera_matchall.o =20 obj-$(CONFIG_PRESTERA_PCI) +=3D prestera_pci.o diff --git a/drivers/net/ethernet/marvell/prestera/prestera_flow.c b/driver= s/net/ethernet/marvell/prestera/prestera_flow.c index 2262693bd5cf..3f81eef167fa 100644 --- a/drivers/net/ethernet/marvell/prestera/prestera_flow.c +++ b/drivers/net/ethernet/marvell/prestera/prestera_flow.c @@ -7,8 +7,9 @@ #include "prestera.h" #include "prestera_acl.h" #include "prestera_flow.h" -#include "prestera_span.h" #include "prestera_flower.h" +#include "prestera_matchall.h" +#include "prestera_span.h" =20 static LIST_HEAD(prestera_block_cb_list); =20 @@ -17,9 +18,9 @@ static int prestera_flow_block_mall_cb(struct prestera_fl= ow_block *block, { switch (f->command) { case TC_CLSMATCHALL_REPLACE: - return prestera_span_replace(block, f); + return prestera_mall_replace(block, f); case TC_CLSMATCHALL_DESTROY: - prestera_span_destroy(block); + prestera_mall_destroy(block); return 0; default: return -EOPNOTSUPP; @@ -263,7 +264,7 @@ static void prestera_setup_flow_block_unbind(struct pre= stera_port *port, =20 block =3D flow_block_cb_priv(block_cb); =20 - prestera_span_destroy(block); + prestera_mall_destroy(block); =20 err =3D prestera_flow_block_unbind(block, port); if (err) diff --git a/drivers/net/ethernet/marvell/prestera/prestera_matchall.c b/dr= ivers/net/ethernet/marvell/prestera/prestera_matchall.c new file mode 100644 index 000000000000..54573c6a6fe2 --- /dev/null +++ b/drivers/net/ethernet/marvell/prestera/prestera_matchall.c @@ -0,0 +1,66 @@ +// SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 +/* Copyright (c) 2019-2022 Marvell International Ltd. All rights reserved = */ + +#include +#include + +#include "prestera.h" +#include "prestera_hw.h" +#include "prestera_flow.h" +#include "prestera_flower.h" +#include "prestera_matchall.h" +#include "prestera_span.h" + +int prestera_mall_replace(struct prestera_flow_block *block, + struct tc_cls_matchall_offload *f) +{ + struct prestera_flow_block_binding *binding; + __be16 protocol =3D f->common.protocol; + struct flow_action_entry *act; + struct prestera_port *port; + int err; + + if (!flow_offload_has_one_action(&f->rule->action)) { + NL_SET_ERR_MSG(f->common.extack, + "Only singular actions are supported"); + return -EOPNOTSUPP; + } + + act =3D &f->rule->action.entries[0]; + + if (!prestera_netdev_check(act->dev)) { + NL_SET_ERR_MSG(f->common.extack, + "Only Marvell Prestera port is supported"); + return -EINVAL; + } + if (!tc_cls_can_offload_and_chain0(act->dev, &f->common)) + return -EOPNOTSUPP; + if (act->id !=3D FLOW_ACTION_MIRRED) + return -EOPNOTSUPP; + if (protocol !=3D htons(ETH_P_ALL)) + return -EOPNOTSUPP; + + port =3D netdev_priv(act->dev); + + list_for_each_entry(binding, &block->binding_list, list) { + err =3D prestera_span_rule_add(binding, port); + if (err) + goto rollback; + } + + return 0; + +rollback: + list_for_each_entry_continue_reverse(binding, + &block->binding_list, list) + prestera_span_rule_del(binding); + return err; +} + +void prestera_mall_destroy(struct prestera_flow_block *block) +{ + struct prestera_flow_block_binding *binding; + + list_for_each_entry(binding, &block->binding_list, list) + prestera_span_rule_del(binding); +} diff --git a/drivers/net/ethernet/marvell/prestera/prestera_matchall.h b/dr= ivers/net/ethernet/marvell/prestera/prestera_matchall.h new file mode 100644 index 000000000000..31ad4d02ecbb --- /dev/null +++ b/drivers/net/ethernet/marvell/prestera/prestera_matchall.h @@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */ +/* Copyright (c) 2022 Marvell International Ltd. All rights reserved. */ + +#ifndef _PRESTERA_MATCHALL_H_ +#define _PRESTERA_MATCHALL_H_ + +#include + +struct prestera_flow_block; + +int prestera_mall_replace(struct prestera_flow_block *block, + struct tc_cls_matchall_offload *f); +void prestera_mall_destroy(struct prestera_flow_block *block); + +#endif /* _PRESTERA_MATCHALL_H_ */ diff --git a/drivers/net/ethernet/marvell/prestera/prestera_span.c b/driver= s/net/ethernet/marvell/prestera/prestera_span.c index 845e9d8c8cc7..766413b9ba1b 100644 --- a/drivers/net/ethernet/marvell/prestera/prestera_span.c +++ b/drivers/net/ethernet/marvell/prestera/prestera_span.c @@ -120,8 +120,8 @@ static int prestera_span_put(struct prestera_switch *sw= , u8 span_id) return 0; } =20 -static int prestera_span_rule_add(struct prestera_flow_block_binding *bind= ing, - struct prestera_port *to_port) +int prestera_span_rule_add(struct prestera_flow_block_binding *binding, + struct prestera_port *to_port) { struct prestera_switch *sw =3D binding->port->sw; u8 span_id; @@ -145,7 +145,7 @@ static int prestera_span_rule_add(struct prestera_flow_= block_binding *binding, return 0; } =20 -static int prestera_span_rule_del(struct prestera_flow_block_binding *bind= ing) +int prestera_span_rule_del(struct prestera_flow_block_binding *binding) { int err; =20 @@ -161,60 +161,6 @@ static int prestera_span_rule_del(struct prestera_flow= _block_binding *binding) return 0; } =20 -int prestera_span_replace(struct prestera_flow_block *block, - struct tc_cls_matchall_offload *f) -{ - struct prestera_flow_block_binding *binding; - __be16 protocol =3D f->common.protocol; - struct flow_action_entry *act; - struct prestera_port *port; - int err; - - if (!flow_offload_has_one_action(&f->rule->action)) { - NL_SET_ERR_MSG(f->common.extack, - "Only singular actions are supported"); - return -EOPNOTSUPP; - } - - act =3D &f->rule->action.entries[0]; - - if (!prestera_netdev_check(act->dev)) { - NL_SET_ERR_MSG(f->common.extack, - "Only Marvell Prestera port is supported"); - return -EINVAL; - } - if (!tc_cls_can_offload_and_chain0(act->dev, &f->common)) - return -EOPNOTSUPP; - if (act->id !=3D FLOW_ACTION_MIRRED) - return -EOPNOTSUPP; - if (protocol !=3D htons(ETH_P_ALL)) - return -EOPNOTSUPP; - - port =3D netdev_priv(act->dev); - - list_for_each_entry(binding, &block->binding_list, list) { - err =3D prestera_span_rule_add(binding, port); - if (err) - goto rollback; - } - - return 0; - -rollback: - list_for_each_entry_continue_reverse(binding, - &block->binding_list, list) - prestera_span_rule_del(binding); - return err; -} - -void prestera_span_destroy(struct prestera_flow_block *block) -{ - struct prestera_flow_block_binding *binding; - - list_for_each_entry(binding, &block->binding_list, list) - prestera_span_rule_del(binding); -} - int prestera_span_init(struct prestera_switch *sw) { struct prestera_span *span; diff --git a/drivers/net/ethernet/marvell/prestera/prestera_span.h b/driver= s/net/ethernet/marvell/prestera/prestera_span.h index f0644521f78a..4958ce820b52 100644 --- a/drivers/net/ethernet/marvell/prestera/prestera_span.h +++ b/drivers/net/ethernet/marvell/prestera/prestera_span.h @@ -8,13 +8,15 @@ =20 #define PRESTERA_SPAN_INVALID_ID -1 =20 +struct prestera_port; struct prestera_switch; -struct prestera_flow_block; +struct prestera_flow_block_binding; =20 int prestera_span_init(struct prestera_switch *sw); void prestera_span_fini(struct prestera_switch *sw); -int prestera_span_replace(struct prestera_flow_block *block, - struct tc_cls_matchall_offload *f); -void prestera_span_destroy(struct prestera_flow_block *block); + +int prestera_span_rule_add(struct prestera_flow_block_binding *binding, + struct prestera_port *to_port); +int prestera_span_rule_del(struct prestera_flow_block_binding *binding); =20 #endif /* _PRESTERA_SPAN_H_ */ --=20 2.25.1 From nobody Fri Apr 10 12:36:02 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9E0F1C32772 for ; Tue, 23 Aug 2022 16:29:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244610AbiHWQ3X (ORCPT ); Tue, 23 Aug 2022 12:29:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44732 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244584AbiHWQ24 (ORCPT ); Tue, 23 Aug 2022 12:28:56 -0400 Received: from syslogsrv (unknown [217.20.186.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E0FBB11D50C; Tue, 23 Aug 2022 05:56:17 -0700 (PDT) Received: from fg200.ow.s ([172.20.254.44] helo=localhost.localdomain) by syslogsrv with esmtp (Exim 4.90_1) (envelope-from ) id 1oQSGX-000FXN-SF; Tue, 23 Aug 2022 14:40:18 +0300 From: Maksym Glubokiy To: Taras Chornyi , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Serhiy Boiko , Maksym Glubokiy , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 2/3] net: prestera: add support for egress traffic mirroring Date: Tue, 23 Aug 2022 14:39:57 +0300 Message-Id: <20220823113958.2061401-3-maksym.glubokiy@plvision.eu> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220823113958.2061401-1-maksym.glubokiy@plvision.eu> References: <20220823113958.2061401-1-maksym.glubokiy@plvision.eu> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Serhiy Boiko This enables adding matchall rules for egress: tc filter add .. egress .. matchall skip_sw \ action mirred egress mirror dev .. Signed-off-by: Serhiy Boiko Signed-off-by: Maksym Glubokiy --- .../ethernet/marvell/prestera/prestera_hw.c | 30 ++++++++++++++----- .../ethernet/marvell/prestera/prestera_hw.h | 5 ++-- .../marvell/prestera/prestera_matchall.c | 7 +++-- .../ethernet/marvell/prestera/prestera_span.c | 10 ++++--- .../ethernet/marvell/prestera/prestera_span.h | 6 ++-- 5 files changed, 39 insertions(+), 19 deletions(-) diff --git a/drivers/net/ethernet/marvell/prestera/prestera_hw.c b/drivers/= net/ethernet/marvell/prestera/prestera_hw.c index e0e9ae34ceea..8430db3384f9 100644 --- a/drivers/net/ethernet/marvell/prestera/prestera_hw.c +++ b/drivers/net/ethernet/marvell/prestera/prestera_hw.c @@ -78,9 +78,11 @@ enum prestera_cmd_type_t { PRESTERA_CMD_TYPE_STP_PORT_SET =3D 0x1000, =20 PRESTERA_CMD_TYPE_SPAN_GET =3D 0x1100, - PRESTERA_CMD_TYPE_SPAN_BIND =3D 0x1101, - PRESTERA_CMD_TYPE_SPAN_UNBIND =3D 0x1102, + PRESTERA_CMD_TYPE_SPAN_INGRESS_BIND =3D 0x1101, + PRESTERA_CMD_TYPE_SPAN_INGRESS_UNBIND =3D 0x1102, PRESTERA_CMD_TYPE_SPAN_RELEASE =3D 0x1103, + PRESTERA_CMD_TYPE_SPAN_EGRESS_BIND =3D 0x1104, + PRESTERA_CMD_TYPE_SPAN_EGRESS_UNBIND =3D 0x1105, =20 PRESTERA_CMD_TYPE_POLICER_CREATE =3D 0x1500, PRESTERA_CMD_TYPE_POLICER_RELEASE =3D 0x1501, @@ -1432,27 +1434,39 @@ int prestera_hw_span_get(const struct prestera_port= *port, u8 *span_id) return 0; } =20 -int prestera_hw_span_bind(const struct prestera_port *port, u8 span_id) +int prestera_hw_span_bind(const struct prestera_port *port, u8 span_id, + bool ingress) { struct prestera_msg_span_req req =3D { .port =3D __cpu_to_le32(port->hw_id), .dev =3D __cpu_to_le32(port->dev_id), .id =3D span_id, }; + enum prestera_cmd_type_t cmd_type; + + if (ingress) + cmd_type =3D PRESTERA_CMD_TYPE_SPAN_INGRESS_BIND; + else + cmd_type =3D PRESTERA_CMD_TYPE_SPAN_EGRESS_BIND; + + return prestera_cmd(port->sw, cmd_type, &req.cmd, sizeof(req)); =20 - return prestera_cmd(port->sw, PRESTERA_CMD_TYPE_SPAN_BIND, - &req.cmd, sizeof(req)); } =20 -int prestera_hw_span_unbind(const struct prestera_port *port) +int prestera_hw_span_unbind(const struct prestera_port *port, bool ingress) { struct prestera_msg_span_req req =3D { .port =3D __cpu_to_le32(port->hw_id), .dev =3D __cpu_to_le32(port->dev_id), }; + enum prestera_cmd_type_t cmd_type; =20 - return prestera_cmd(port->sw, PRESTERA_CMD_TYPE_SPAN_UNBIND, - &req.cmd, sizeof(req)); + if (ingress) + cmd_type =3D PRESTERA_CMD_TYPE_SPAN_INGRESS_UNBIND; + else + cmd_type =3D PRESTERA_CMD_TYPE_SPAN_EGRESS_UNBIND; + + return prestera_cmd(port->sw, cmd_type, &req.cmd, sizeof(req)); } =20 int prestera_hw_span_release(struct prestera_switch *sw, u8 span_id) diff --git a/drivers/net/ethernet/marvell/prestera/prestera_hw.h b/drivers/= net/ethernet/marvell/prestera/prestera_hw.h index 56e043146dd2..a589450e9f27 100644 --- a/drivers/net/ethernet/marvell/prestera/prestera_hw.h +++ b/drivers/net/ethernet/marvell/prestera/prestera_hw.h @@ -243,8 +243,9 @@ int prestera_hw_counter_clear(struct prestera_switch *s= w, u32 block_id, =20 /* SPAN API */ int prestera_hw_span_get(const struct prestera_port *port, u8 *span_id); -int prestera_hw_span_bind(const struct prestera_port *port, u8 span_id); -int prestera_hw_span_unbind(const struct prestera_port *port); +int prestera_hw_span_bind(const struct prestera_port *port, u8 span_id, + bool ingress); +int prestera_hw_span_unbind(const struct prestera_port *port, bool ingress= ); int prestera_hw_span_release(struct prestera_switch *sw, u8 span_id); =20 /* Router API */ diff --git a/drivers/net/ethernet/marvell/prestera/prestera_matchall.c b/dr= ivers/net/ethernet/marvell/prestera/prestera_matchall.c index 54573c6a6fe2..3fc13176e046 100644 --- a/drivers/net/ethernet/marvell/prestera/prestera_matchall.c +++ b/drivers/net/ethernet/marvell/prestera/prestera_matchall.c @@ -43,7 +43,7 @@ int prestera_mall_replace(struct prestera_flow_block *blo= ck, port =3D netdev_priv(act->dev); =20 list_for_each_entry(binding, &block->binding_list, list) { - err =3D prestera_span_rule_add(binding, port); + err =3D prestera_span_rule_add(binding, port, block->ingress); if (err) goto rollback; } @@ -53,7 +53,7 @@ int prestera_mall_replace(struct prestera_flow_block *blo= ck, rollback: list_for_each_entry_continue_reverse(binding, &block->binding_list, list) - prestera_span_rule_del(binding); + prestera_span_rule_del(binding, block->ingress); return err; } =20 @@ -62,5 +62,6 @@ void prestera_mall_destroy(struct prestera_flow_block *bl= ock) struct prestera_flow_block_binding *binding; =20 list_for_each_entry(binding, &block->binding_list, list) - prestera_span_rule_del(binding); + prestera_span_rule_del(binding, block->ingress); + } diff --git a/drivers/net/ethernet/marvell/prestera/prestera_span.c b/driver= s/net/ethernet/marvell/prestera/prestera_span.c index 766413b9ba1b..f0e9d6ea88c5 100644 --- a/drivers/net/ethernet/marvell/prestera/prestera_span.c +++ b/drivers/net/ethernet/marvell/prestera/prestera_span.c @@ -121,7 +121,8 @@ static int prestera_span_put(struct prestera_switch *sw= , u8 span_id) } =20 int prestera_span_rule_add(struct prestera_flow_block_binding *binding, - struct prestera_port *to_port) + struct prestera_port *to_port, + bool ingress) { struct prestera_switch *sw =3D binding->port->sw; u8 span_id; @@ -135,7 +136,7 @@ int prestera_span_rule_add(struct prestera_flow_block_b= inding *binding, if (err) return err; =20 - err =3D prestera_hw_span_bind(binding->port, span_id); + err =3D prestera_hw_span_bind(binding->port, span_id, ingress); if (err) { prestera_span_put(sw, span_id); return err; @@ -145,11 +146,12 @@ int prestera_span_rule_add(struct prestera_flow_block= _binding *binding, return 0; } =20 -int prestera_span_rule_del(struct prestera_flow_block_binding *binding) +int prestera_span_rule_del(struct prestera_flow_block_binding *binding, + bool ingress) { int err; =20 - err =3D prestera_hw_span_unbind(binding->port); + err =3D prestera_hw_span_unbind(binding->port, ingress); if (err) return err; =20 diff --git a/drivers/net/ethernet/marvell/prestera/prestera_span.h b/driver= s/net/ethernet/marvell/prestera/prestera_span.h index 4958ce820b52..493b68524bcb 100644 --- a/drivers/net/ethernet/marvell/prestera/prestera_span.h +++ b/drivers/net/ethernet/marvell/prestera/prestera_span.h @@ -16,7 +16,9 @@ int prestera_span_init(struct prestera_switch *sw); void prestera_span_fini(struct prestera_switch *sw); =20 int prestera_span_rule_add(struct prestera_flow_block_binding *binding, - struct prestera_port *to_port); -int prestera_span_rule_del(struct prestera_flow_block_binding *binding); + struct prestera_port *to_port, + bool ingress); +int prestera_span_rule_del(struct prestera_flow_block_binding *binding, + bool ingress); =20 #endif /* _PRESTERA_SPAN_H_ */ --=20 2.25.1 From nobody Fri Apr 10 12:36:02 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2D528C32772 for ; Tue, 23 Aug 2022 15:44:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243072AbiHWPoH (ORCPT ); Tue, 23 Aug 2022 11:44:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37898 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242123AbiHWPnb (ORCPT ); Tue, 23 Aug 2022 11:43:31 -0400 Received: from syslogsrv (unknown [217.20.186.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 32D3D29A700; Tue, 23 Aug 2022 04:41:23 -0700 (PDT) Received: from fg200.ow.s ([172.20.254.44] helo=localhost.localdomain) by syslogsrv with esmtp (Exim 4.90_1) (envelope-from ) id 1oQSGZ-000FXN-QU; Tue, 23 Aug 2022 14:40:19 +0300 From: Maksym Glubokiy To: Taras Chornyi , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Maksym Glubokiy , Serhiy Boiko , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 3/3] net: prestera: manage matchall and flower priorities Date: Tue, 23 Aug 2022 14:39:58 +0300 Message-Id: <20220823113958.2061401-4-maksym.glubokiy@plvision.eu> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220823113958.2061401-1-maksym.glubokiy@plvision.eu> References: <20220823113958.2061401-1-maksym.glubokiy@plvision.eu> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" matchall rules can be added only to chain 0 and their priorities have limitations: - new matchall ingress rule's priority must be higher (lower value) than any existing flower rule; - new matchall egress rule's priority must be lower (higher value) than any existing flower rule. The opposite works for flower rule adding: - new flower ingress rule's priority must be lower (higher value) than any existing matchall rule; - new flower egress rule's priority must be higher (lower value) than any existing matchall rule. This is a hardware limitation and thus must be properly handled in driver by reporting errors to the user when newly added rule has such a priority that cannot be installed into the hardware. To achieve this, the driver must maintain both min/max matchall priorities for every flower block when user adds/deletes a matchall rule, as well as both min/max flower priorities for chain 0 for every adding/deletion of flower rules for chain 0. Cc: Serhiy Boiko Signed-off-by: Maksym Glubokiy --- .../ethernet/marvell/prestera/prestera_acl.c | 43 ++++++++++++++ .../ethernet/marvell/prestera/prestera_acl.h | 2 + .../ethernet/marvell/prestera/prestera_flow.c | 3 + .../ethernet/marvell/prestera/prestera_flow.h | 5 ++ .../marvell/prestera/prestera_flower.c | 48 +++++++++++++++ .../marvell/prestera/prestera_flower.h | 2 + .../marvell/prestera/prestera_matchall.c | 58 +++++++++++++++++++ .../marvell/prestera/prestera_matchall.h | 2 + 8 files changed, 163 insertions(+) diff --git a/drivers/net/ethernet/marvell/prestera/prestera_acl.c b/drivers= /net/ethernet/marvell/prestera/prestera_acl.c index 3d4b85f2d541..0fa7541f0d7e 100644 --- a/drivers/net/ethernet/marvell/prestera/prestera_acl.c +++ b/drivers/net/ethernet/marvell/prestera/prestera_acl.c @@ -54,6 +54,10 @@ struct prestera_acl_ruleset { struct prestera_acl_ruleset_ht_key ht_key; struct rhashtable rule_ht; struct prestera_acl *acl; + struct { + u32 min; + u32 max; + } prio; unsigned long rule_count; refcount_t refcount; void *keymask; @@ -162,6 +166,9 @@ prestera_acl_ruleset_create(struct prestera_acl *acl, ruleset->pcl_id =3D PRESTERA_ACL_PCL_ID_MAKE((u8)uid, chain_index); ruleset->index =3D uid; =20 + ruleset->prio.min =3D UINT_MAX; + ruleset->prio.max =3D 0; + err =3D rhashtable_insert_fast(&acl->ruleset_ht, &ruleset->ht_node, prestera_acl_ruleset_ht_params); if (err) @@ -365,6 +372,26 @@ prestera_acl_ruleset_block_unbind(struct prestera_acl_= ruleset *ruleset, block->ruleset_zero =3D NULL; } =20 +static void +prestera_acl_ruleset_prio_refresh(struct prestera_acl *acl, + struct prestera_acl_ruleset *ruleset) +{ + struct prestera_acl_rule *rule; + + ruleset->prio.min =3D UINT_MAX; + ruleset->prio.max =3D 0; + + list_for_each_entry(rule, &acl->rules, list) { + if (ruleset->ingress !=3D rule->ruleset->ingress) + continue; + if (ruleset->ht_key.chain_index !=3D rule->chain_index) + continue; + + ruleset->prio.min =3D min(ruleset->prio.min, rule->priority); + ruleset->prio.max =3D max(ruleset->prio.max, rule->priority); + } +} + void prestera_acl_rule_keymask_pcl_id_set(struct prestera_acl_rule *rule, u16 p= cl_id) { @@ -389,6 +416,13 @@ u32 prestera_acl_ruleset_index_get(const struct preste= ra_acl_ruleset *ruleset) return ruleset->index; } =20 +void prestera_acl_ruleset_prio_get(struct prestera_acl_ruleset *ruleset, + u32 *prio_min, u32 *prio_max) +{ + *prio_min =3D ruleset->prio.min; + *prio_max =3D ruleset->prio.max; +} + bool prestera_acl_ruleset_is_offload(struct prestera_acl_ruleset *ruleset) { return ruleset->offload; @@ -429,6 +463,13 @@ void prestera_acl_rule_destroy(struct prestera_acl_rul= e *rule) kfree(rule); } =20 +static void prestera_acl_ruleset_prio_update(struct prestera_acl_ruleset *= ruleset, + u32 prio) +{ + ruleset->prio.min =3D min(ruleset->prio.min, prio); + ruleset->prio.max =3D max(ruleset->prio.max, prio); +} + int prestera_acl_rule_add(struct prestera_switch *sw, struct prestera_acl_rule *rule) { @@ -468,6 +509,7 @@ int prestera_acl_rule_add(struct prestera_switch *sw, =20 list_add_tail(&rule->list, &sw->acl->rules); ruleset->rule_count++; + prestera_acl_ruleset_prio_update(ruleset, rule->priority); return 0; =20 err_acl_block_bind: @@ -492,6 +534,7 @@ void prestera_acl_rule_del(struct prestera_switch *sw, list_del(&rule->list); =20 prestera_acl_rule_entry_destroy(sw->acl, rule->re); + prestera_acl_ruleset_prio_refresh(sw->acl, ruleset); =20 /* unbind block (all ports) */ if (!ruleset->ht_key.chain_index && !ruleset->rule_count) diff --git a/drivers/net/ethernet/marvell/prestera/prestera_acl.h b/drivers= /net/ethernet/marvell/prestera/prestera_acl.h index 03fc5b9dc925..d45ee88e8287 100644 --- a/drivers/net/ethernet/marvell/prestera/prestera_acl.h +++ b/drivers/net/ethernet/marvell/prestera/prestera_acl.h @@ -195,6 +195,8 @@ int prestera_acl_ruleset_bind(struct prestera_acl_rules= et *ruleset, int prestera_acl_ruleset_unbind(struct prestera_acl_ruleset *ruleset, struct prestera_port *port); u32 prestera_acl_ruleset_index_get(const struct prestera_acl_ruleset *rule= set); +void prestera_acl_ruleset_prio_get(struct prestera_acl_ruleset *ruleset, + u32 *prio_min, u32 *prio_max); void prestera_acl_rule_keymask_pcl_id_set(struct prestera_acl_rule *rule, u16 pcl_id); diff --git a/drivers/net/ethernet/marvell/prestera/prestera_flow.c b/driver= s/net/ethernet/marvell/prestera/prestera_flow.c index 3f81eef167fa..9f4267f326b0 100644 --- a/drivers/net/ethernet/marvell/prestera/prestera_flow.c +++ b/drivers/net/ethernet/marvell/prestera/prestera_flow.c @@ -90,6 +90,9 @@ prestera_flow_block_create(struct prestera_switch *sw, INIT_LIST_HEAD(&block->template_list); block->net =3D net; block->sw =3D sw; + block->mall.prio_min =3D UINT_MAX; + block->mall.prio_max =3D 0; + block->mall.bound =3D false; block->ingress =3D ingress; =20 return block; diff --git a/drivers/net/ethernet/marvell/prestera/prestera_flow.h b/driver= s/net/ethernet/marvell/prestera/prestera_flow.h index 0c9e13263261..a85a3eb40279 100644 --- a/drivers/net/ethernet/marvell/prestera/prestera_flow.h +++ b/drivers/net/ethernet/marvell/prestera/prestera_flow.h @@ -22,6 +22,11 @@ struct prestera_flow_block { struct prestera_acl_ruleset *ruleset_zero; struct flow_block_cb *block_cb; struct list_head template_list; + struct { + u32 prio_min; + u32 prio_max; + bool bound; + } mall; unsigned int rule_count; bool ingress; }; diff --git a/drivers/net/ethernet/marvell/prestera/prestera_flower.c b/driv= ers/net/ethernet/marvell/prestera/prestera_flower.c index 19d3b55c578e..f38e8b3a543e 100644 --- a/drivers/net/ethernet/marvell/prestera/prestera_flower.c +++ b/drivers/net/ethernet/marvell/prestera/prestera_flower.c @@ -5,6 +5,7 @@ #include "prestera_acl.h" #include "prestera_flow.h" #include "prestera_flower.h" +#include "prestera_matchall.h" =20 struct prestera_flower_template { struct prestera_acl_ruleset *ruleset; @@ -360,6 +361,49 @@ static int prestera_flower_parse(struct prestera_flow_= block *block, f->common.extack); } =20 +static int prestera_flower_prio_check(struct prestera_flow_block *block, + struct flow_cls_offload *f) +{ + u32 mall_prio_min; + u32 mall_prio_max; + int err; + + err =3D prestera_mall_prio_get(block, &mall_prio_min, &mall_prio_max); + if (err =3D=3D -ENOENT) + /* No matchall filters installed on this chain. */ + return 0; + + if (err) { + NL_SET_ERR_MSG(f->common.extack, "Failed to get matchall priorities"); + return err; + } + + if (f->common.prio <=3D mall_prio_max && block->ingress) { + NL_SET_ERR_MSG(f->common.extack, + "Failed to add in front of existing matchall rules"); + return -EOPNOTSUPP; + } + if (f->common.prio >=3D mall_prio_min && !block->ingress) { + NL_SET_ERR_MSG(f->common.extack, "Failed to add behind of existing match= all rules"); + return -EOPNOTSUPP; + } + + return 0; +} + +int prestera_flower_prio_get(struct prestera_flow_block *block, u32 chain_= index, + u32 *prio_min, u32 *prio_max) +{ + struct prestera_acl_ruleset *ruleset; + + ruleset =3D prestera_acl_ruleset_lookup(block->sw->acl, block, chain_inde= x); + if (IS_ERR(ruleset)) + return PTR_ERR(ruleset); + + prestera_acl_ruleset_prio_get(ruleset, prio_min, prio_max); + return 0; +} + int prestera_flower_replace(struct prestera_flow_block *block, struct flow_cls_offload *f) { @@ -368,6 +412,10 @@ int prestera_flower_replace(struct prestera_flow_block= *block, struct prestera_acl_rule *rule; int err; =20 + err =3D prestera_flower_prio_check(block, f); + if (err) + return err; + ruleset =3D prestera_acl_ruleset_get(acl, block, f->common.chain_index); if (IS_ERR(ruleset)) return PTR_ERR(ruleset); diff --git a/drivers/net/ethernet/marvell/prestera/prestera_flower.h b/driv= ers/net/ethernet/marvell/prestera/prestera_flower.h index 495f151e6fa9..1181115fe6fa 100644 --- a/drivers/net/ethernet/marvell/prestera/prestera_flower.h +++ b/drivers/net/ethernet/marvell/prestera/prestera_flower.h @@ -19,5 +19,7 @@ int prestera_flower_tmplt_create(struct prestera_flow_blo= ck *block, void prestera_flower_tmplt_destroy(struct prestera_flow_block *block, struct flow_cls_offload *f); void prestera_flower_template_cleanup(struct prestera_flow_block *block); +int prestera_flower_prio_get(struct prestera_flow_block *block, u32 chain_= index, + u32 *prio_min, u32 *prio_max); =20 #endif /* _PRESTERA_FLOWER_H_ */ diff --git a/drivers/net/ethernet/marvell/prestera/prestera_matchall.c b/dr= ivers/net/ethernet/marvell/prestera/prestera_matchall.c index 3fc13176e046..6f2b95a5263e 100644 --- a/drivers/net/ethernet/marvell/prestera/prestera_matchall.c +++ b/drivers/net/ethernet/marvell/prestera/prestera_matchall.c @@ -11,6 +11,54 @@ #include "prestera_matchall.h" #include "prestera_span.h" =20 +static int prestera_mall_prio_check(struct prestera_flow_block *block, + struct tc_cls_matchall_offload *f) +{ + u32 flower_prio_min; + u32 flower_prio_max; + int err; + + err =3D prestera_flower_prio_get(block, f->common.chain_index, + &flower_prio_min, &flower_prio_max); + if (err =3D=3D -ENOENT) + /* No flower filters installed on this chain. */ + return 0; + + if (err) { + NL_SET_ERR_MSG(f->common.extack, "Failed to get flower priorities"); + return err; + } + + if (f->common.prio <=3D flower_prio_max && !block->ingress) { + NL_SET_ERR_MSG(f->common.extack, "Failed to add in front of existing flo= wer rules"); + return -EOPNOTSUPP; + } + if (f->common.prio >=3D flower_prio_min && block->ingress) { + NL_SET_ERR_MSG(f->common.extack, "Failed to add behind of existing flowe= r rules"); + return -EOPNOTSUPP; + } + + return 0; +} + +int prestera_mall_prio_get(struct prestera_flow_block *block, + u32 *prio_min, u32 *prio_max) +{ + if (!block->mall.bound) + return -ENOENT; + + *prio_min =3D block->mall.prio_min; + *prio_max =3D block->mall.prio_max; + return 0; +} + +static void prestera_mall_prio_update(struct prestera_flow_block *block, + struct tc_cls_matchall_offload *f) +{ + block->mall.prio_min =3D min(block->mall.prio_min, f->common.prio); + block->mall.prio_max =3D max(block->mall.prio_max, f->common.prio); +} + int prestera_mall_replace(struct prestera_flow_block *block, struct tc_cls_matchall_offload *f) { @@ -40,6 +88,10 @@ int prestera_mall_replace(struct prestera_flow_block *bl= ock, if (protocol !=3D htons(ETH_P_ALL)) return -EOPNOTSUPP; =20 + err =3D prestera_mall_prio_check(block, f); + if (err) + return err; + port =3D netdev_priv(act->dev); =20 list_for_each_entry(binding, &block->binding_list, list) { @@ -48,6 +100,9 @@ int prestera_mall_replace(struct prestera_flow_block *bl= ock, goto rollback; } =20 + prestera_mall_prio_update(block, f); + + block->mall.bound =3D true; return 0; =20 rollback: @@ -64,4 +119,7 @@ void prestera_mall_destroy(struct prestera_flow_block *b= lock) list_for_each_entry(binding, &block->binding_list, list) prestera_span_rule_del(binding, block->ingress); =20 + block->mall.prio_min =3D UINT_MAX; + block->mall.prio_max =3D 0; + block->mall.bound =3D false; } diff --git a/drivers/net/ethernet/marvell/prestera/prestera_matchall.h b/dr= ivers/net/ethernet/marvell/prestera/prestera_matchall.h index 31ad4d02ecbb..fed08be80257 100644 --- a/drivers/net/ethernet/marvell/prestera/prestera_matchall.h +++ b/drivers/net/ethernet/marvell/prestera/prestera_matchall.h @@ -11,5 +11,7 @@ struct prestera_flow_block; int prestera_mall_replace(struct prestera_flow_block *block, struct tc_cls_matchall_offload *f); void prestera_mall_destroy(struct prestera_flow_block *block); +int prestera_mall_prio_get(struct prestera_flow_block *block, + u32 *prio_min, u32 *prio_max); =20 #endif /* _PRESTERA_MATCHALL_H_ */ --=20 2.25.1