From:   Volodymyr Mytnyk <volodymyr.mytnyk@plvision.eu>
To:     netdev@vger.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>,
        Jakub Kicinski <kuba@kernel.org>, linux-kernel@vger.kernel.org,
        Serhiy Boiko <serhiy.boiko@marvell.com>
Subject: [PATCH net-next 3/3] net: prestera: acl: add rule stats support
Date:   Tue, 23 Nov 2021 18:58:02 +0200
Message-Id: <1637686684-2492-4-git-send-email-volodymyr.mytnyk@plvision.eu>
In-Reply-To: <1637686684-2492-1-git-send-email-volodymyr.mytnyk@plvision.eu>
References: <1637686684-2492-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?A5ICtpKamxyZSkDE/MeqmVdSrfdPfkQmPdcQ2OWrf6oJ8IgmrGMuqq14IUZS?=
 =?us-ascii?Q?rZKYXQNWaGJSKoI8NGu8Fl6vqZRKPldCj00mZwj72rAx+MUkQfrQlM7S0SM1?=
 =?us-ascii?Q?6GMdFy2enmuw2659HsZ+qHufXKAg08BBMNMnqPagYmtD4n0p/PYyyMzLMEFo?=
 =?us-ascii?Q?pOd7gexz0bWm/BDD5rhwqssAgQFzm7DOlQ1obMf2XdiU79FSKgOnFJhVl5N6?=
 =?us-ascii?Q?AdXPCGqLEZU+Xlji7ljSll9w3/zHe8Wjg5v7goFp7NWH/rumilsSZcDa5xxp?=
 =?us-ascii?Q?NIBu1vFXCS7VSDR7SY7cigjFeTK/UW37gTFwpYOhzf9DfRaoXj5FnpLt03oT?=
 =?us-ascii?Q?XTCYqstsUQ4XqXP3Uw8Zy1EOIGYfMbn2waI1mJCU/zblqJGbxTq5JLcjdUto?=
 =?us-ascii?Q?wwmOm0R2vMExMxCkWGigtfZhVE1oSZ/HlgNYVoa/aqfyWScEpLSdJ6IRaZ8+?=
 =?us-ascii?Q?+Ej+3LkdKE4HhvQKczLE/TP1nfAuE/fcSwkCTnYJdqVBsG1r8dJEs48/qGDn?=
 =?us-ascii?Q?8ujjzT8nFTTTZxjnevn/2lBqy7LVb6J2CR8arpt5kwjooogXXgth8vvSver0?=
 =?us-ascii?Q?FNCzsEgw2KYzoNURhybRiXFTFQ2SthAHALkjC7RD6HHhjdjcfJbDK/7WOVDX?=
 =?us-ascii?Q?KkJzR3BF0YneNs+BxdTfNRdNoEasfbUZvMBZ9HARZexHxGemYFlQ9gJuQaEB?=
 =?us-ascii?Q?OFsj2G+ewsG5ZEEBXhtN0A7qrbNRGi6tgPuZ/DyrpjqdxLRcnSO1kslycAZF?=
 =?us-ascii?Q?I+6/bzN4AXZvI/h98YoSMChZL82MUZUKW4iY3rm6qrLudiDTbRjvkbr3BxVu?=
 =?us-ascii?Q?ialhrm3J3McE8P1a0lyq2vF2nvBXO2A5+zovuXa/XX/v7hucuXeLxGV2bkHs?=
 =?us-ascii?Q?Or9GaVKGycm3BAILL9TRPlYmtgV6tl9M0NpiQ/2ogtznYHvqYlNjLGyYGGuZ?=
 =?us-ascii?Q?c53GTSHW7/qajKBcSvUqQR8hHnFVGoM8dsDrapoT3+/iDFLm8+DbdtshfpJR?=
 =?us-ascii?Q?XcFTpSyoc1tZ9oGh3EGmWPg8Ps2QeGZP2kM2wrshNpUIqwCLLLRoH+6iCsNJ?=
 =?us-ascii?Q?nj10OhMFfe3Mhj2XtiEAwjWuuhBFjfwCXtqEYcTFZW6oG/8zKb+OPqdkAr2h?=
 =?us-ascii?Q?ryZbCDvs5nuw9MG9aLtbg9AU8OSQLeQ98neWsIzyHZWe5VHV5ycbDqJRw3Nb?=
 =?us-ascii?Q?vBa+Vo/Rbw8l9USjTG3LfMyO7gNn8uxeu79YC6kODSS3W+FVm4ZBQHVzH/s8?=
 =?us-ascii?Q?yWXrY489GAmzvCvVcO5sIzE6MbQ6ziKHBi+u9aJu3OZ5g01FfIqC/QSfOmeh?=
 =?us-ascii?Q?GyAkNG9YSjIwE5uyfldTlfG5gyEoZ2D59w88KQQdPDFXIZ33dQpdAPYXQcg3?=
 =?us-ascii?Q?RU2HXVgnJCyD5uAXKOMt+FkBgZVEz4ZLE0Mx5x7cqK7DOHFxuW5wGzd+iWHT?=
 =?us-ascii?Q?pdC/AURB3AgzRT0UP0w3vcgH/wdhZa2U0yrJ5nYLkmD+CZYzCzthfX8NTJLF?=
 =?us-ascii?Q?pY8OdCny+M4J5zOtMNEp5+8AVj5dsNzmftE0ogNOEezuqcvWVORIo2ykhmmK?=
 =?us-ascii?Q?niK/vSnTI5EOBD1pOY4Cm77Dgt6eevMQcStbNKY4sklDWRCd78QqCmxrIFh3?=
 =?us-ascii?Q?8j+6ea3nK1/QUxb5o+jpeOsY52npQl6Bzpo9gzgxzL36CmeV4yLNeqZOvsaT?=
 =?us-ascii?Q?ClAiOA=3D=3D?=
X-OriginatorOrg: plvision.eu
X-MS-Exchange-CrossTenant-Network-Message-Id: d50097d5-66a2-4539-3f36-08d9aea2b1ef
X-MS-Exchange-CrossTenant-AuthSource: VI1P190MB0734.EURP190.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2021 17:00:04.4131
 (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: ojEVNKeNy+ASMUhd4JUdwsgFXQEin9be8wM/Eez61WpVGMQ6xcHS24kxiTB4y+yux7IjIyX9cR+CUAZ1459T5uAjFu03uqcq5RvfoV/FfQ4=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1P190MB0830
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(-)

diff --git a/drivers/net/ethernet/marvell/prestera/prestera_acl.c b/drivers/net/ethernet/marvell/prestera/prestera_acl.c
index f0119d72427f..f8eb99967bbb 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;
 	};
 };
 
@@ -358,6 +362,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)
@@ -412,9 +420,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;
 }
@@ -460,6 +479,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,
@@ -470,7 +495,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,
@@ -499,8 +525,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 a1a99f026b87..f2a46816c003 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