From:   Simon Horman <simon.horman@corigine.com>
To:     David Miller <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>
Cc:     Alexandre Belloni <alexandre.belloni@bootlin.com>,
        Andrew Lunn <andrew@lunn.ch>,
        Claudiu Manoil <claudiu.manoil@nxp.com>,
        Cong Wang <xiyou.wangcong@gmail.com>,
        Florian Fainelli <f.fainelli@gmail.com>,
        Ido Schimmel <idosch@nvidia.com>,
        Jamal Hadi Salim <jhs@mojatatu.com>,
        Jiri Pirko <jiri@resnulli.us>,
        Leon Romanovsky <leon@kernel.org>,
        Michael Chan <michael.chan@broadcom.com>,
        Oz Shlomo <ozsh@nvidia.com>, Petr Machata <petrm@nvidia.com>,
        Roi Dayan <roid@nvidia.com>,
        Saeed Mahameed <saeedm@nvidia.com>,
        Vivien Didelot <vivien.didelot@gmail.com>,
        Vlad Buslov <vladbu@nvidia.com>,
        Vladimir Oltean <vladimir.oltean@nxp.com>,
        Baowen Zheng <baowen.zheng@corigine.com>,
        Louis Peens <louis.peens@corigine.com>,
        UNGLinuxDriver@microchip.com, linux-kernel@vger.kernel.org,
        linux-rdma@vger.kernel.org, netdev@vger.kernel.org,
        oss-drivers@corigine.com, Simon Horman <simon.horman@corigine.com>
Subject: [PATCH v8 net-next 08/13] flow_offload: rename exts stats update functions with hw
Date:   Fri, 17 Dec 2021 19:16:24 +0100
Message-Id: <20211217181629.28081-9-simon.horman@corigine.com>
In-Reply-To: <20211217181629.28081-1-simon.horman@corigine.com>
References: <20211217181629.28081-1-simon.horman@corigine.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?01G+kvJKhdebo7LStpyI0R0HTGyEI08xTQ1ilQ6mL1/qQBEWFGSSrwYBC5k6?=
 =?us-ascii?Q?ueoeyaWy+7abyJKJ62FAjDRrUEZ7u9YQAUgcSaJCI8WOv/gesJE31tfgyqzJ?=
 =?us-ascii?Q?0vlpFXBh5kuwEeVcloxXm9fpM8uwJMiPYP0gJlNFXFpBPaxpwczzs3qln0C3?=
 =?us-ascii?Q?HCCeDNZ+VG9GyboHlFc9YlasRunNIoO0/c+KTYRCj2B8ElcFAmjAa4PxzFcu?=
 =?us-ascii?Q?wXoMRYPZoMYhqEn5fZRGx7SfdK6qv8HdWgFu1a6G04aoEIf7PP5T9lXwHbul?=
 =?us-ascii?Q?wDxzV2xH2z54q6iv1KDoBYOVbdMK7GLoWKnuEe6rmFj2jqVVI1GzpaRkZa5h?=
 =?us-ascii?Q?umFILDNt2MPQ0H3KWNoMnmzJ50nLVosUS2LXtl+eae79GR1KgT8M2YlAbT2q?=
 =?us-ascii?Q?5gYrGbb+kpojT0dFn6uWCZcQexF/XX+FbHv1SIyXVMl8H8Qd/O0GaFUlo/Zm?=
 =?us-ascii?Q?3AXezRfn/ay09ejt2F+NW7O7rLTR0u4gtuunZmoP1IrYMLY0crStEDvMMuM5?=
 =?us-ascii?Q?wzArStC5Ri9LlA/QZ2u3/LuzM6c9/5mrc54UsD5myprjgzHRplTTt7HbBOiW?=
 =?us-ascii?Q?fze6+XkjuF9uFgWPYq4LjRMWjGXEa9soiNEB+24/sgkt/P7SB8Yfz2hUCDH+?=
 =?us-ascii?Q?WZhxyhT6HtF5xAofJhep6Xz5orsEBDzgh12kEs5QnFP1BiCBsrZKMVjN6PtN?=
 =?us-ascii?Q?JF5jpdT+bBaU6+or/zZJNm8MY16U1RFYS0bgxeGcjeHDhyvsbh0pmCUWdJun?=
 =?us-ascii?Q?2RPJixBMphXqqggiyXJiFbQasH4PPeWH12q5XupkAJWHVFnc2IYLs/L56HD2?=
 =?us-ascii?Q?PfzKtAYEnXbaR+QSI+54XcSLwR3Q6Iz/HJxDetrJxCgic0FeVbXxMc2rYqWM?=
 =?us-ascii?Q?FwWFuktXdAWeZejK7dd86ji+/u/xJixjlC0cGIY+x2hPe9bdTS/rXvs7dtiM?=
 =?us-ascii?Q?kloOUQwl/LKHCpQBDK6rIReTZ129MPa/CN9J+Q5swzqDeTvGcFjhun+MwuOf?=
 =?us-ascii?Q?vxYxoB4+QoO3Ev0XZ6hPfn9nufKwn3j8Mi+llYHFxu7HkDBUVfh0o3y9qP/s?=
 =?us-ascii?Q?/JBtxEM3hH0EtGvaNFL5mftRxJzqsIK/7cSTsps8589I35/mHvAwlqv4nAkp?=
 =?us-ascii?Q?4PHXFHMU3oVQgl4IxWE7/1VrpkwB3mIReJrLl/3zeCVkYC9tNBL4w1d6NELt?=
 =?us-ascii?Q?bQg/oL1QbUb/N0FWP8fuxFggeuG3yNR9nCtCiPnvwggJp10FZP78Z/A3Rt8U?=
 =?us-ascii?Q?2ZjIvznSmLEQJENQE0hsyZYQrpz17OOj3jSvxe7IhtwsfBA7xraBmzH+yv6y?=
 =?us-ascii?Q?LvvetLGTpCmqZ0NLyKFQLMwiTYFJ0bi/3LtU7aD2uwNneVZa32mOKClLbn03?=
 =?us-ascii?Q?Df7CIYw5HaTIRyJyi9lwJn087d4jS7SDgJtIrPO5lOaT89pJyRncxecR+xz1?=
 =?us-ascii?Q?h+Gk3QF1RQti7H70S3Fq7lE5Oo/qz8J4tI/2BMTnrt9gqcQG9QLR9VxYqw9e?=
 =?us-ascii?Q?lfJ3wL2wgWW9yMDUNSZ6BMDHvhqaRvIC/4C+ViE/CEFnMxYOe1SmjvLj0+xU?=
 =?us-ascii?Q?b9IToemczzVSPZh469FFZv8dcH6mqDDU8SAPJozF49DPrRtoW7NdukjsO5YF?=
 =?us-ascii?Q?WrjI8/EMzJmCAWigAaztAaSmGiZ1UVnMsPf3oADHtSdaNGB5I3cR7zAK4qiZ?=
 =?us-ascii?Q?JN14izi5qNxtrluU/SQBg4nDqACTn/MRn9emxCAPQBawjIVAAO7oulxAR/8/?=
 =?us-ascii?Q?XYegcLIU/g=3D=3D?=
X-OriginatorOrg: corigine.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 560778a8-24d2-4f9f-43d4-08d9c1898580
X-MS-Exchange-CrossTenant-AuthSource: PH0PR13MB4842.namprd13.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Dec 2021 18:17:44.5684
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: B4tmCL9EtFbRsuunzGfp2tSWPiiXVfzYbM7Ufq/dtORx/NFEWmG/V8Ab/yGjetMZZKszocayJq1k/8km7V5V/htJqI66uPM5vtvZ7nbUSe0=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR13MB5589
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Baowen Zheng <baowen.zheng@corigine.com>

Rename exts stats update functions with hw for readability.

We make this change also to update stats from hw for an action
when it is offloaded to hw as a single action.

Signed-off-by: Baowen Zheng <baowen.zheng@corigine.com>
Signed-off-by: Simon Horman <simon.horman@corigine.com>
---
 include/net/pkt_cls.h    |  6 +++---
 net/sched/cls_flower.c   | 12 ++++++------
 net/sched/cls_matchall.c | 10 +++++-----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h
index 1bfb616ea759..efdfab8eb00c 100644
--- a/include/net/pkt_cls.h
+++ b/include/net/pkt_cls.h
@@ -266,9 +266,9 @@ static inline void tcf_exts_put_net(struct tcf_exts *exts)
 	for (i = 0; i < TCA_ACT_MAX_PRIO && ((a) = actions[i]); i++)
 
 static inline void
-tcf_exts_stats_update(const struct tcf_exts *exts,
-		      u64 bytes, u64 packets, u64 drops, u64 lastuse,
-		      u8 used_hw_stats, bool used_hw_stats_valid)
+tcf_exts_hw_stats_update(const struct tcf_exts *exts,
+			 u64 bytes, u64 packets, u64 drops, u64 lastuse,
+			 u8 used_hw_stats, bool used_hw_stats_valid)
 {
 #ifdef CONFIG_NET_CLS_ACT
 	int i;
diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c
index f4dad3be31c9..9a63bc49104f 100644
--- a/net/sched/cls_flower.c
+++ b/net/sched/cls_flower.c
@@ -501,12 +501,12 @@ static void fl_hw_update_stats(struct tcf_proto *tp, struct cls_fl_filter *f,
 	tc_setup_cb_call(block, TC_SETUP_CLSFLOWER, &cls_flower, false,
 			 rtnl_held);
 
-	tcf_exts_stats_update(&f->exts, cls_flower.stats.bytes,
-			      cls_flower.stats.pkts,
-			      cls_flower.stats.drops,
-			      cls_flower.stats.lastused,
-			      cls_flower.stats.used_hw_stats,
-			      cls_flower.stats.used_hw_stats_valid);
+	tcf_exts_hw_stats_update(&f->exts, cls_flower.stats.bytes,
+				 cls_flower.stats.pkts,
+				 cls_flower.stats.drops,
+				 cls_flower.stats.lastused,
+				 cls_flower.stats.used_hw_stats,
+				 cls_flower.stats.used_hw_stats_valid);
 }
 
 static void __fl_put(struct cls_fl_filter *f)
diff --git a/net/sched/cls_matchall.c b/net/sched/cls_matchall.c
index 2d2702915cfa..5b9264da46f8 100644
--- a/net/sched/cls_matchall.c
+++ b/net/sched/cls_matchall.c
@@ -336,11 +336,11 @@ static void mall_stats_hw_filter(struct tcf_proto *tp,
 
 	tc_setup_cb_call(block, TC_SETUP_CLSMATCHALL, &cls_mall, false, true);
 
-	tcf_exts_stats_update(&head->exts, cls_mall.stats.bytes,
-			      cls_mall.stats.pkts, cls_mall.stats.drops,
-			      cls_mall.stats.lastused,
-			      cls_mall.stats.used_hw_stats,
-			      cls_mall.stats.used_hw_stats_valid);
+	tcf_exts_hw_stats_update(&head->exts, cls_mall.stats.bytes,
+				 cls_mall.stats.pkts, cls_mall.stats.drops,
+				 cls_mall.stats.lastused,
+				 cls_mall.stats.used_hw_stats,
+				 cls_mall.stats.used_hw_stats_valid);
 }
 
 static int mall_dump(struct net *net, struct tcf_proto *tp, void *fh,
-- 
2.20.1