Message ID | 20230223223251.1321608-3-witu@nvidia.com |
---|---|
State | New |
Headers | show
Return-Path: <kernel-team-bounces@lists.ubuntu.com> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=<UNKNOWN>) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=Nvidia.com header.i=@Nvidia.com header.a=rsa-sha256 header.s=selector2 header.b=SgywSCjk; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PN7Gg5PY2z2463 for <incoming@patchwork.ozlabs.org>; Fri, 24 Feb 2023 09:38:35 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from <kernel-team-bounces@lists.ubuntu.com>) id 1pVKEP-0002Bu-5S; Thu, 23 Feb 2023 22:38:29 +0000 Received: from mail-mw2nam12on2076.outbound.protection.outlook.com ([40.107.244.76] helo=NAM12-MW2-obe.outbound.protection.outlook.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from <bounces+SRS=Qc8Bi=6T@NVIDIA.onmicrosoft.com>) id 1pVKEN-0002Bl-FF for kernel-team@lists.ubuntu.com; Thu, 23 Feb 2023 22:38:27 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=l9pvzLfU94Wky61E/3pIjb66dSzs+mylsskc/gdHfiR5LVCY98Lu6YaOMdWRHaL7bYcTqnR8yZ6c0ZcOV7T287GTle0jxPoRKJaqYFcx65yns7IfMbuA3saKYMnkCXYxwDF8+87qcJuonkhpRwXqlf2n5I/JPgX71JHEAeD2hutlyeL7XarAMorPjKSyDZlS4IBULYWWYPswB7lW74I+tntFRqmovCePqRuMwvQJ1KaujQ07LAKzW/U0/Ji7fu+mSbNYxIu2kuiuk7My2JOgLmRPFRbfoZ5AqHeBBCf8vc0f/JGLUE++l0ZzUsCxB5W7TZJju4oXrvC/lQcCfm4O6w== 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=1KTkxqNHjW849NCKAf51c5SIByVelwoUaC6sOIC1J0k=; b=YfkZX7puYUHTKS98K+mpXKu+pymqP7kojlyhrXE1MbLxHmbBX0G6U0z6dGbdvoRYh0Hu0sNRtW0f4uYF4zOsZowcIbqy8pvMw2nHf1GioXuqp4uIZl1H2vHA2finjvsM4ZlqdHbYRtSzpzHdqnTJSICMRjHV6eyOhD0WDUhCYOnRZUMSL9DPQlJDvWVUSpdJe48IdJ1O30Dd8GjaqNIRhzHzGHVf7YxD/UR2QszGv/hqdzOI0UbWfwbTWzA3XB2yUGfZyCMo1ERC9FmX2e8Df1NgLf0N30n6TvW/K4aJzD8NYyCOY8HIBLN544zoqI62NHJaf4Wozpnm0ZFKuFNMmQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none (sender ip is 216.228.117.161) smtp.rcpttodomain=lists.ubuntu.com smtp.mailfrom=sw-mtx-003.mtx.labs.mlnx; dmarc=fail (p=reject sp=reject pct=100) action=oreject header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1KTkxqNHjW849NCKAf51c5SIByVelwoUaC6sOIC1J0k=; b=SgywSCjk2Oe8BsAqDg4kcVzq4Z63Hqx7r2YuMYF0cM80Y/+GHGuNLWh2mvkyxDVdW6jv8OA3dAlzG6G0vvuHKrulIeM9GxaGXNmRlxro7Rv8baa4PWrF6rRh9zFwxFOlEJinhgZEh+zN9Q/XcFdO3AcOMDdYt2Xt/q2gUFPaqIW28jPRp34w8iVG4bX59AbmiFFaNDgw/8ErMTxNjDhXxtTZhLwNl/UXfnmxP/Dw+9Bz6w6hTlEIX0kXh1ixIofl07vCaQAe5aidL0JjzVITO0QefV2EkZfdP8sR8y+LaLgtT96SdoXUrquW4kDYPY2ovN7Qzh6VLToXsmhO99b+ZA== Received: from MW4PR04CA0080.namprd04.prod.outlook.com (2603:10b6:303:6b::25) by PH7PR12MB6739.namprd12.prod.outlook.com (2603:10b6:510:1aa::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.19; Thu, 23 Feb 2023 22:38:24 +0000 Received: from CO1NAM11FT026.eop-nam11.prod.protection.outlook.com (2603:10b6:303:6b:cafe::e5) by MW4PR04CA0080.outlook.office365.com (2603:10b6:303:6b::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.21 via Frontend Transport; Thu, 23 Feb 2023 22:38:24 +0000 X-MS-Exchange-Authentication-Results: spf=none (sender IP is 216.228.117.161) smtp.mailfrom=sw-mtx-003.mtx.labs.mlnx; dkim=none (message not signed) header.d=none;dmarc=fail action=oreject header.from=nvidia.com; Received-SPF: None (protection.outlook.com: sw-mtx-003.mtx.labs.mlnx does not designate permitted sender hosts) Received: from mail.nvidia.com (216.228.117.161) by CO1NAM11FT026.mail.protection.outlook.com (10.13.175.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.24 via Frontend Transport; Thu, 23 Feb 2023 22:38:24 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Thu, 23 Feb 2023 14:32:57 -0800 Received: from rnnvmail203.nvidia.com (10.129.68.9) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Thu, 23 Feb 2023 14:32:57 -0800 Received: from mtl123.mtl.labs.mlnx (10.127.8.10) by mail.nvidia.com (10.129.68.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36 via Frontend Transport; Thu, 23 Feb 2023 14:32:56 -0800 Received: from sw-mtx-003.mtx.labs.mlnx (sw-mtx-003.mtx.labs.mlnx [10.9.151.14]) by mtl123.mtl.labs.mlnx (8.14.4/8.14.4) with ESMTP id 31NMWsGj006596; Fri, 24 Feb 2023 00:32:55 +0200 Received: from sw-mtx-003.mtx.labs.mlnx (localhost [127.0.0.1]) by sw-mtx-003.mtx.labs.mlnx (8.15.2/8.15.2/Debian-22ubuntu3) with ESMTP id 31NMWsS61321630; Fri, 24 Feb 2023 00:32:54 +0200 Received: (from root@localhost) by sw-mtx-003.mtx.labs.mlnx (8.15.2/8.15.2/Submit) id 31NMWs3W1321629; Fri, 24 Feb 2023 00:32:54 +0200 From: William Tu <witu@nvidia.com> To: <kernel-team@lists.ubuntu.com> Subject: [SRU][F:linux-bluefield][PATCH v2 2/2] netfilter: flowtable: add counter support in HW offload Date: Fri, 24 Feb 2023 00:32:51 +0200 Message-ID: <20230223223251.1321608-3-witu@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230223223251.1321608-1-witu@nvidia.com> References: <20230223223251.1321608-1-witu@nvidia.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT026:EE_|PH7PR12MB6739:EE_ X-MS-Office365-Filtering-Correlation-Id: 2b7433dc-086d-4488-7ae1-08db15eeac94 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +lFfnX1GmtWszLK7Z/HnJwuPZhC42YVKlii2bbIMpi4uhsukKKKFkyho2hVnzoT0tKQldj7WFXnklLocpon9B5ZEujfzpbsSVPjKuyUzRoka1aw+9Zfc8thpuFn18ejExuwgKDBvkOr5q2f0+JkKBaJMqG7pbfG/mV4qVK7QDHkWRTHB2aVgh3lKi8UrNl4iPrLGWkgBtFWEtLyMCZGI+gSFYwrvxXNqIkkTh6sXe1CLdRqUitFDheRyy4yHBd5kse72nxfTzFCnb75ZUOioVStOo4VQ5ucrIVsKkUY0T9WXicswtTuUk+C+tZ0f20pswIaM+1G2fiDye17BAB6LmtD8glLAP2nJfq/WjZZJOCxLR+iR7MM1ym0mVah0icLkhi4+cQ8SmjH9SIpuRCjzNPSEKdrU056e0mjb4Gxamhq0kgozcziViHU1JkTk7idb7kg8P2URAa3ZkN6IjQEg4CVbl8towvQ2uxIONuvVHg+LdbrGgVPBFuIjckraPrgMGVonCy6ZVXR+eysfc+AaEhUR7SBslLi9KrG4cXEEU5oPfb70/yPWz6LTyvexGV+XQEgOFMOVzYF1YJJ5Ygr9vlsYw6ysNtF0dTb3NTSIRaphTF5pRu7LmWJmIUggdVCBq/8HNu7EYeWVfSVRwEHyLYWRb6IvqlCXGn0vlPOh1Hux+9PUK8o4x8JR5NwQeRWlohCojxXtkKoa+7Dmf9FagMb4vvobw5lmrOO0aqtfyepIr7nYaN8EeJNUvnMHxHjSo38BAQXVzk2tvo92LMwO6XhFqgFQ52m3CZJuMHnRahqEJV3nOAoJJACNQIXCJax5 X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230025)(4636009)(39860400002)(396003)(136003)(346002)(376002)(451199018)(46966006)(40470700004)(356005)(40460700003)(8936002)(41300700001)(5660300002)(107886003)(2906002)(2616005)(42882007)(47076005)(35950700001)(54906003)(336012)(966005)(42186006)(70206006)(498600001)(6666004)(26005)(1076003)(70586007)(6916009)(8676002)(82740400003)(36756003)(82310400005)(316002)(40480700001)(7636003)(4326008)(34020700004)(83170400001)(84790400001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Feb 2023 22:38:24.3306 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2b7433dc-086d-4488-7ae1-08db15eeac94 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT026.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB6739 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions <kernel-team.lists.ubuntu.com> List-Unsubscribe: <https://lists.ubuntu.com/mailman/options/kernel-team>, <mailto:kernel-team-request@lists.ubuntu.com?subject=unsubscribe> List-Archive: <https://lists.ubuntu.com/archives/kernel-team> List-Post: <mailto:kernel-team@lists.ubuntu.com> List-Help: <mailto:kernel-team-request@lists.ubuntu.com?subject=help> List-Subscribe: <https://lists.ubuntu.com/mailman/listinfo/kernel-team>, <mailto:kernel-team-request@lists.ubuntu.com?subject=subscribe> Cc: bodong@nvidia.com, vlad@nvidia.com, dann.frazier@canonical.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" <kernel-team-bounces@lists.ubuntu.com> |
Series |
netfilter: flowtable: add counter support in HW offload Edit
|
expand
|
diff --git a/net/netfilter/nf_flow_table_offload.c b/net/netfilter/nf_flow_table_offload.c index 668bdb375205..bf786e5e516b 100644 --- a/net/netfilter/nf_flow_table_offload.c +++ b/net/netfilter/nf_flow_table_offload.c @@ -9,6 +9,7 @@ #include <net/netfilter/nf_flow_table.h> #include <net/netfilter/nf_tables.h> #include <net/netfilter/nf_conntrack.h> +#include <net/netfilter/nf_conntrack_acct.h> #include <net/netfilter/nf_conntrack_core.h> #include <net/netfilter/nf_conntrack_tuple.h> @@ -802,6 +803,17 @@ static void flow_offload_work_stats(struct flow_offload_work *offload) /* Clear HW_OFFLOAD right away when hw module is removed. */ if (!lastused) clear_bit(IPS_HW_OFFLOAD_BIT, &offload->flow->ct->status); + + if (offload->flowtable->flags & NF_FLOWTABLE_COUNTER) { + if (stats[0].pkts) + nf_ct_acct_add(offload->flow->ct, + FLOW_OFFLOAD_DIR_ORIGINAL, + stats[0].pkts, stats[0].bytes); + if (stats[1].pkts) + nf_ct_acct_add(offload->flow->ct, + FLOW_OFFLOAD_DIR_REPLY, + stats[1].pkts, stats[1].bytes); + } } static void flow_offload_work_handler(struct work_struct *work)