From patchwork Fri Dec 17 18:16:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 12685425 X-Patchwork-Delegate: kuba@kernel.org 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 74258C433FE for ; Fri, 17 Dec 2021 18:17:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240315AbhLQSRu (ORCPT ); Fri, 17 Dec 2021 13:17:50 -0500 Received: from mail-dm6nam10lp2107.outbound.protection.outlook.com ([104.47.58.107]:36846 "EHLO NAM10-DM6-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S240279AbhLQSRq (ORCPT ); Fri, 17 Dec 2021 13:17:46 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ivdLH5cMi53K9yhNCjGHtkfBcxBQMx9mLkkt+h7Swv7ojWJp6GYzl6Dh4OG4HreJQ8k7fLdPem5v1nFnZ8gkBVo9Udhi19PXwH5HgAICL129Yj5Gxx3unDe+FFveatu0ub0XPD6zQHSOvsLNwr5reZhxyswRZL7EIoXz2LodgzjYrw3LYrzG3b6c4ES4wzX142PaK2g307AjVwbjg4tBnTp5Ksf44rScHp3D4x80ynb/dzVP5WQG8qDX0J6+paNiPAfnpMuozkMYK/prCx9V5vS3rf09FWa5K3/EmHHFe+m/I2EjLLbClSBODMQvfSAy56QWIcZYrLd5uKLiXVnjFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=6but3WQbAbaDUq49Xg+Hl2ofSBrTrp1BQNNd3rahVWI=; b=fd3ovZO+VjHy68v+pCK4HZWKu8C7SGYyESsMroWzJfDZQLZAs1d/QQ5OfifGj75gUg6KKblkNFld4kfodCzjgYyCjNwZw/FToKRnLEstbsCSqIMgoH0tp/m7cw/MOAe3Yb69f5mkvhPw9kuT+0dwunNsVdhaoPlGeX6T8KRMnE0nQNbbZu/usu2/8Azo5h+Fl/lKX58s0z5AS4STa2GN0tRgiInnQzJin0JGhK4+ViTbYY555XPU+SuBPYrRCYKlvuV58dYrFN07RzAVpwmRvBU2k+183/hyhf3wmRUyz6Cm0r+GJ+F/MwiZtygNaG0JEmzTxEDDFwGS4tA9yVW52w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=6but3WQbAbaDUq49Xg+Hl2ofSBrTrp1BQNNd3rahVWI=; b=ZAKBeYosfWmND6VCNqardWWG80Y/zuSFEqj7akMuMfweuHjhKC1jwqrnHD9AbupEOA1h+eweuKyZPvEudSn8EpmtSmPgyQv/pZHi8ypFAYr+7F7HD+DMqMZBM3zRw6GEajQKSLB+RPgq0A5oAPSMr+5MBSX9+rpS2/XSVDyBa9I= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from PH0PR13MB4842.namprd13.prod.outlook.com (2603:10b6:510:78::6) by PH0PR13MB5589.namprd13.prod.outlook.com (2603:10b6:510:142::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4823.9; Fri, 17 Dec 2021 18:17:44 +0000 Received: from PH0PR13MB4842.namprd13.prod.outlook.com ([fe80::a01a:4940:c69a:e04c]) by PH0PR13MB4842.namprd13.prod.outlook.com ([fe80::a01a:4940:c69a:e04c%9]) with mapi id 15.20.4801.014; Fri, 17 Dec 2021 18:17:44 +0000 From: Simon Horman To: David Miller , Jakub Kicinski Cc: Alexandre Belloni , Andrew Lunn , Claudiu Manoil , Cong Wang , Florian Fainelli , Ido Schimmel , Jamal Hadi Salim , Jiri Pirko , Leon Romanovsky , Michael Chan , Oz Shlomo , Petr Machata , Roi Dayan , Saeed Mahameed , Vivien Didelot , Vlad Buslov , Vladimir Oltean , Baowen Zheng , Louis Peens , UNGLinuxDriver@microchip.com, linux-kernel@vger.kernel.org, linux-rdma@vger.kernel.org, netdev@vger.kernel.org, oss-drivers@corigine.com, Simon Horman 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> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211217181629.28081-1-simon.horman@corigine.com> References: <20211217181629.28081-1-simon.horman@corigine.com> X-ClientProxiedBy: AM0PR06CA0097.eurprd06.prod.outlook.com (2603:10a6:208:fa::38) To PH0PR13MB4842.namprd13.prod.outlook.com (2603:10b6:510:78::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 560778a8-24d2-4f9f-43d4-08d9c1898580 X-MS-TrafficTypeDiagnostic: PH0PR13MB5589:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:619; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pVUjMxnHtASkTJDpi4l9x2PIGhJiBQDOp2w6XhKWyVysd0Gzo7QAYJPfco4NlUYHy4ggoc1D7glia89RBAl6N+jbyitELzrwkP8NxPRNCBau/vjw/hUGYKjTep7wjJBL6QCmxz1vDUexj/suSc/xTIdUngcbwhKAoxWgn4knrgGP0/GY8hBkSpPKH+JkSZmspb7qk1zsTLV+ipcWEUs44PuDUrG7v0Btc90e7StTJJZjkV4fQOfLOElf2BSaTm1BHKA5hkp7vD1Wjwmbcr9SS+5y52Aa/EJsfPAp0qtWYG0V5wA4EAAqxomQfvneDz+Usv2IlpEzDXxFukiB6w1Odd6FfLNwJqtE9/1v2OHWR0xdKVOgEzZbFLSD0P5erkYeVOtKMSIWahKLO7gz8j8Nnspbe5RJzP37M6FJf/kHjvS8igxtHvz186qdT6+QQFlNsdLw4ur1tdS186pcZXDd7PeYvw262fvkxwk+On5wWclfP3OJaZtLkLEVIVvfqvoy6RUWzl4iiNtPNVNDo1N8Iret2pd/ncnI1diuPDQNerm44fIY5m2uu/2FPS6RTdY8DunEruMxHYO2zI1pp1JvEn5QWcek/VCxd9SzjE2OsREGGxIwoMKHgurAwdtK2TVjKnCWol4TPnu/K6CGeDsw6w== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PH0PR13MB4842.namprd13.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(376002)(346002)(366004)(39840400004)(396003)(136003)(508600001)(107886003)(52116002)(6666004)(6512007)(86362001)(2616005)(6486002)(186003)(83380400001)(1076003)(8676002)(316002)(6506007)(2906002)(54906003)(66946007)(15650500001)(44832011)(110136005)(7416002)(4326008)(8936002)(66476007)(66556008)(5660300002)(36756003)(38100700002)(20210929001);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 01G+kvJKhdebo7LStpyI0R0HTGyEI08xTQ1ilQ6mL1/qQBEWFGSSrwYBC5k6ueoeyaWy+7abyJKJ62FAjDRrUEZ7u9YQAUgcSaJCI8WOv/gesJE31tfgyqzJ0vlpFXBh5kuwEeVcloxXm9fpM8uwJMiPYP0gJlNFXFpBPaxpwczzs3qln0C3HCCeDNZ+VG9GyboHlFc9YlasRunNIoO0/c+KTYRCj2B8ElcFAmjAa4PxzFcuwXoMRYPZoMYhqEn5fZRGx7SfdK6qv8HdWgFu1a6G04aoEIf7PP5T9lXwHbulwDxzV2xH2z54q6iv1KDoBYOVbdMK7GLoWKnuEe6rmFj2jqVVI1GzpaRkZa5humFILDNt2MPQ0H3KWNoMnmzJ50nLVosUS2LXtl+eae79GR1KgT8M2YlAbT2q5gYrGbb+kpojT0dFn6uWCZcQexF/XX+FbHv1SIyXVMl8H8Qd/O0GaFUlo/Zm3AXezRfn/ay09ejt2F+NW7O7rLTR0u4gtuunZmoP1IrYMLY0crStEDvMMuM5wzArStC5Ri9LlA/QZ2u3/LuzM6c9/5mrc54UsD5myprjgzHRplTTt7HbBOiWfze6+XkjuF9uFgWPYq4LjRMWjGXEa9soiNEB+24/sgkt/P7SB8Yfz2hUCDH+WZhxyhT6HtF5xAofJhep6Xz5orsEBDzgh12kEs5QnFP1BiCBsrZKMVjN6PtNJF5jpdT+bBaU6+or/zZJNm8MY16U1RFYS0bgxeGcjeHDhyvsbh0pmCUWdJun2RPJixBMphXqqggiyXJiFbQasH4PPeWH12q5XupkAJWHVFnc2IYLs/L56HD2PfzKtAYEnXbaR+QSI+54XcSLwR3Q6Iz/HJxDetrJxCgic0FeVbXxMc2rYqWMFwWFuktXdAWeZejK7dd86ji+/u/xJixjlC0cGIY+x2hPe9bdTS/rXvs7dtiMkloOUQwl/LKHCpQBDK6rIReTZ129MPa/CN9J+Q5swzqDeTvGcFjhun+MwuOfvxYxoB4+QoO3Ev0XZ6hPfn9nufKwn3j8Mi+llYHFxu7HkDBUVfh0o3y9qP/s/JBtxEM3hH0EtGvaNFL5mftRxJzqsIK/7cSTsps8589I35/mHvAwlqv4nAkp4PHXFHMU3oVQgl4IxWE7/1VrpkwB3mIReJrLl/3zeCVkYC9tNBL4w1d6NELtbQg/oL1QbUb/N0FWP8fuxFggeuG3yNR9nCtCiPnvwggJp10FZP78Z/A3Rt8U2ZjIvznSmLEQJENQE0hsyZYQrpz17OOj3jSvxe7IhtwsfBA7xraBmzH+yv6yLvvetLGTpCmqZ0NLyKFQLMwiTYFJ0bi/3LtU7aD2uwNneVZa32mOKClLbn03Df7CIYw5HaTIRyJyi9lwJn087d4jS7SDgJtIrPO5lOaT89pJyRncxecR+xz1h+Gk3QF1RQti7H70S3Fq7lE5Oo/qz8J4tI/2BMTnrt9gqcQG9QLR9VxYqw9elfJ3wL2wgWW9yMDUNSZ6BMDHvhqaRvIC/4C+ViE/CEFnMxYOe1SmjvLj0+xUb9IToemczzVSPZh469FFZv8dcH6mqDDU8SAPJozF49DPrRtoW7NdukjsO5YFWrjI8/EMzJmCAWigAaztAaSmGiZ1UVnMsPf3oADHtSdaNGB5I3cR7zAK4qiZJN14izi5qNxtrluU/SQBg4nDqACTn/MRn9emxCAPQBawjIVAAO7oulxAR/8/XYegcLIU/g== 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: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org From: Baowen Zheng 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 Signed-off-by: Simon Horman --- 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,