From:   Volodymyr Mytnyk <volodymyr.mytnyk@plvision.eu>
To:     netdev@vger.kernel.org, Jakub Kicinski <kuba@kernel.org>
Cc:     Taras Chornyi <taras.chornyi@plvision.eu>,
        Mickey Rachamim <mickeyr@marvell.com>,
        Serhiy Pshyk <serhiy.pshyk@plvision.eu>,
        Volodymyr Mytnyk <vmytnyk@marvell.com>,
        Taras Chornyi <tchornyi@marvell.com>,
        "David S. Miller" <davem@davemloft.net>,
        linux-kernel@vger.kernel.org,
        Serhiy Boiko <serhiy.boiko@marvell.com>
Subject: [PATCH net-next v2 3/3] net: prestera: acl: add rule stats support
Date:   Tue, 30 Nov 2021 12:33:00 +0200
Message-Id: <1638268383-8498-4-git-send-email-volodymyr.mytnyk@plvision.eu>
In-Reply-To: <1638268383-8498-1-git-send-email-volodymyr.mytnyk@plvision.eu>
References: <1638268383-8498-1-git-send-email-volodymyr.mytnyk@plvision.eu>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?zjXYygEmDXhPdxKl98A/53sTAWN5Z5VDB/vZXslq9xg17TDwukVoksXjUgxv?=
 =?us-ascii?Q?F1shStap7ipHGwG6ZLdOSjrDe3PFPrMEypRQzReEJGTDKHNsNVe3EPDRi5Tb?=
 =?us-ascii?Q?uX6IvSlshW8klxF2gRIT3CfAIsJt/RnPx9ip0mKXffr2dLSLV4KzKPkNqgpK?=
 =?us-ascii?Q?vIPjWdr3ODnVm1vQuKf8FLXAQxlA3QKsrhVADaFNmy+YfRvIs3WBc4Xv0U34?=
 =?us-ascii?Q?IxjyXBY789mGW1IdIeYwHkgLpYUAUHmE1zus1G8ffvHeXpa6Vd+j5+ZquSs2?=
 =?us-ascii?Q?69xVsMBqFBIsxnFPEQYiG8TQbdMduAR6BYPBo5bKhdwp1/t9sSEo7EmrvInA?=
 =?us-ascii?Q?TtqlLPdd/cGdSZjU+YhIr3pMIIc1RizU9YaQV5kwVp4nllaDYo7sEd6XVzgd?=
 =?us-ascii?Q?DxjzODtxgc4Dp3uRzblV47oklobOiiYwS7H178Ox4VARIxOJo4hGBdkzOGRe?=
 =?us-ascii?Q?IjXa/x5M32Qc9T8C2AlqbW9WrKOZWZgfqv1AdXP7/DwwhDmXp1PSBwfuUBZx?=
 =?us-ascii?Q?M0mWUxzflSgUoKwaZMAeJhLE1yVZIKur2LolH3AVOPuB6DutGQzr9Q/vmVHO?=
 =?us-ascii?Q?FZLYsU2L32hbiJdIYj9jb6slx4dPpNXrl/3Iy9SIqg9P/89lZwPH8IM1OAKf?=
 =?us-ascii?Q?IYo1clBxMgPEipZXnngEK83s6qPBbbJe+B6+11qjb+3T9C3SFxptleI62mxk?=
 =?us-ascii?Q?FurwqWHBl/laZqpptPZ3s/bcblY+22IN7Sk+9qu/siCGlyS8KuNGi7l5g29a?=
 =?us-ascii?Q?xfOfqci3jCM8voy1LnVXWCGmFnN6dqM1Ayl8vVYKkuDiUfx+x1sGJGIpEvY+?=
 =?us-ascii?Q?KGv04MTQeIqqmaI0m1/Vi6N4Mr3EF3ZmI4bfsGg6JD3VEAxK1BltxD8FkX/J?=
 =?us-ascii?Q?mzAA5DgWPQeZjc/FNUjgr5zFHj84U6GboWhsG/KkUz9JyDxaovynW+6nVS45?=
 =?us-ascii?Q?nT0UBLz7hJa50oG8vVjPD+NjzaxjYw7mTkMwTw1tXxIQckZIr8kOGP8PS4kt?=
 =?us-ascii?Q?4HbM+0bTlm6rMtNNQbxrdnjGpVgZPSCb8MZedyyMqsrn3k7TZUuMjvlxtXST?=
 =?us-ascii?Q?JfZv/tepcUa1AizTy5OgLZSosUCY4WDr/+UerTCasQsFDJUz61k5ca99D1hR?=
 =?us-ascii?Q?J8PBy22cHPLekuNws8d5Fc0uF9zS6pk4dKUfO5py9ivXglmf1rEFFB+dee9S?=
 =?us-ascii?Q?s3nUjbdekvSsoLVrkBQlmtsG1D6x4As+OZJegAIwBHIGeYYEgd+8w3yGogJW?=
 =?us-ascii?Q?sPpZb0rlKGAse4zkRqJ62rivcOjCsER9I+wMY6pWrKhdNw4toi3YSApg6vKJ?=
 =?us-ascii?Q?i8Bk2Q31oBANf9ir2wD+GbTglOSxF7kfoOVfmmsC/lWWiw7y6FUz3Q+6DXZK?=
 =?us-ascii?Q?i9dR2SBtp36Jyu/vEZOAevMNztQoLqByLu3E4SKM1HIrHWmzw68CJvcS631m?=
 =?us-ascii?Q?syGMOJMrVy9jvdc0KENymzO7AdeUT7Whd2utVzIjzmWjkFSQXx98F4aAkk0w?=
 =?us-ascii?Q?kMXIRO8AxE+dBSeh/iknxtieVNmkb1Vejdx3CPUEjEHqB5DXxdcAkgVhD17C?=
 =?us-ascii?Q?J7EW2ImrDyp8cLuVygTw3ZGPW0NivIz81d9SfSfHQQBv7I3Cl4oNhu6b1hmY?=
 =?us-ascii?Q?8FwOQ9o+l0rJ96tURcmY9lvyPmvvTjFWExoGK47KfKu5sWLHoq0TpNyqroHX?=
 =?us-ascii?Q?lp4xXg=3D=3D?=
X-OriginatorOrg: plvision.eu
X-MS-Exchange-CrossTenant-Network-Message-Id: 8a2594dc-64e6-48bd-8c37-08d9b3ecfdd5
X-MS-Exchange-CrossTenant-AuthSource: VI1P190MB0734.EURP190.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Nov 2021 10:34:30.3483
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 03707b74-30f3-46b6-a0e0-ff0a7438c9c4
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: G4q1Hj5GFbaFO4Fu3UjbvdKaNlNAvGjFSMTEyEGywymyMLBMEZxobCrCRgSAbqao3U73mok0+YXvK2k8eB7CiYmIS6oHyJu/dy5TK1KlJVw=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1P190MB0064
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Volodymyr Mytnyk <vmytnyk@marvell.com>

Make flower to use counter API to get rule HW statistics.

Co-developed-by: Serhiy Boiko <serhiy.boiko@marvell.com>
Signed-off-by: Serhiy Boiko <serhiy.boiko@marvell.com>
Signed-off-by: Volodymyr Mytnyk <vmytnyk@marvell.com>
---
 .../net/ethernet/marvell/prestera/prestera_acl.c   | 46 ++++++++++++++++++++--
 .../net/ethernet/marvell/prestera/prestera_acl.h   |  5 +++
 2 files changed, 48 insertions(+), 3 deletions(-)

No changes in V2

diff --git a/drivers/net/ethernet/marvell/prestera/prestera_acl.c b/drivers/net/ethernet/marvell/prestera/prestera_acl.c
index bfa83c5abd16..da0b6525ef9a 100644
--- a/drivers/net/ethernet/marvell/prestera/prestera_acl.c
+++ b/drivers/net/ethernet/marvell/prestera/prestera_acl.c
@@ -33,6 +33,10 @@ struct prestera_acl_rule_entry {
 		struct {
 			u8 valid:1;
 		} accept, drop, trap;
+		struct {
+			u32 id;
+			struct prestera_counter_block *block;
+		} counter;
 	};
 };
 
@@ -335,6 +339,10 @@ int prestera_acl_rule_add(struct prestera_switch *sw,
 	rule->re_arg.vtcam_id = ruleset->vtcam_id;
 	rule->re_key.prio = rule->priority;
 
+	/* setup counter */
+	rule->re_arg.count.valid = true;
+	rule->re_arg.count.client = PRESTERA_HW_COUNTER_CLIENT_LOOKUP_0;
+
 	rule->re = prestera_acl_rule_entry_find(sw->acl, &rule->re_key);
 	err = WARN_ON(rule->re) ? -EEXIST : 0;
 	if (err)
@@ -389,9 +397,20 @@ int prestera_acl_rule_get_stats(struct prestera_acl *acl,
 				struct prestera_acl_rule *rule,
 				u64 *packets, u64 *bytes, u64 *last_use)
 {
+	u64 current_packets;
+	u64 current_bytes;
+	int err;
+
+	err = prestera_counter_stats_get(acl->sw->counter,
+					 rule->re->counter.block,
+					 rule->re->counter.id,
+					 &current_packets, &current_bytes);
+	if (err)
+		return err;
+
+	*packets = current_packets;
+	*bytes = current_bytes;
 	*last_use = jiffies;
-	*packets = 0;
-	*bytes = 0;
 
 	return 0;
 }
@@ -437,6 +456,12 @@ static int __prestera_acl_rule_entry2hw_add(struct prestera_switch *sw,
 		act_hw[act_num].id = PRESTERA_ACL_RULE_ACTION_TRAP;
 		act_num++;
 	}
+	/* counter */
+	if (e->counter.block) {
+		act_hw[act_num].id = PRESTERA_ACL_RULE_ACTION_COUNT;
+		act_hw[act_num].count.id = e->counter.id;
+		act_num++;
+	}
 
 	return prestera_hw_vtcam_rule_add(sw, e->vtcam_id, e->key.prio,
 					  e->key.match.key, e->key.match.mask,
@@ -447,7 +472,8 @@ static void
 __prestera_acl_rule_entry_act_destruct(struct prestera_switch *sw,
 				       struct prestera_acl_rule_entry *e)
 {
-	/* destroy action entry */
+	/* counter */
+	prestera_counter_put(sw->counter, e->counter.block, e->counter.id);
 }
 
 void prestera_acl_rule_entry_destroy(struct prestera_acl *acl,
@@ -476,8 +502,22 @@ __prestera_acl_rule_entry_act_construct(struct prestera_switch *sw,
 	e->drop.valid = arg->drop.valid;
 	/* trap */
 	e->trap.valid = arg->trap.valid;
+	/* counter */
+	if (arg->count.valid) {
+		int err;
+
+		err = prestera_counter_get(sw->counter, arg->count.client,
+					   &e->counter.block,
+					   &e->counter.id);
+		if (err)
+			goto err_out;
+	}
 
 	return 0;
+
+err_out:
+	__prestera_acl_rule_entry_act_destruct(sw, e);
+	return -EINVAL;
 }
 
 struct prestera_acl_rule_entry *
diff --git a/drivers/net/ethernet/marvell/prestera/prestera_acl.h b/drivers/net/ethernet/marvell/prestera/prestera_acl.h
index 8bfb7ad7307b..4e6006b4531f 100644
--- a/drivers/net/ethernet/marvell/prestera/prestera_acl.h
+++ b/drivers/net/ethernet/marvell/prestera/prestera_acl.h
@@ -5,6 +5,7 @@
 #define _PRESTERA_ACL_H_
 
 #include <linux/types.h>
+#include "prestera_counter.h"
 
 #define PRESTERA_ACL_KEYMASK_PCL_ID		0x3FF
 #define PRESTERA_ACL_KEYMASK_PCL_ID_USER			\
@@ -86,6 +87,10 @@ struct prestera_acl_rule_entry_arg {
 		struct {
 			u8 valid:1;
 		} accept, drop, trap;
+		struct {
+			u8 valid:1;
+			u32 client;
+		} count;
 	};
 };
 
-- 
2.7.4