From patchwork Sun Apr 11 11:45:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roi Dayan X-Patchwork-Id: 1464791 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: 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=CcQn7YFO; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FJ96j23jqz9sVw; Sun, 11 Apr 2021 21:45:47 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1lVYX9-0004FO-OA; Sun, 11 Apr 2021 11:45:43 +0000 Received: from mail-mw2nam10on2058.outbound.protection.outlook.com ([40.107.94.58] helo=NAM10-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 ) id 1lVYX6-0004E0-4Y for kernel-team@lists.ubuntu.com; Sun, 11 Apr 2021 11:45:40 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gGCkKUN9TyGQJsgTMGAYA7WYAdII0y2RhAT5K+gAFbnp58v0x+j1y43OsIwYjR4GQ7cWm2RCCcrkXKjSXp6ViP4LmREfMXp27IRTSck7p6ryvi89tz085Q3WLpDCxXz6DahZ2fDd7n1auamrF7DCTF4PDGT/s+qygE5zN/xGVHlJOIX8CmxwQFQkHqHDVlbUT9LPYuJZut/vur84R/OdfoBGK0cD58twbQZTPlZbfDpHOpcemYkEjV6hytzdCsuxe+kIsGLehaie5LJQdEN95Ny1lxybiTvywFe+YN5qJN3fJyJE175LzDXxLs34iyXOthy82Ohiuk6zTWKKfCY7/w== 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-SenderADCheck; bh=0ZEY7gBiYkLmOrKYATFEAmCtxqEKaEMUJrUdWUvYnPg=; b=XIQjHd4/vyX3HxZAK+0giXBB5VxFKjiq8n4P3lTAJfFR1bnvVnkF7mcV3IsBQMevC6RJJk7UBAYdLFWfqcf8aQCPoQB4vSejc62dMGopPQ3UDtG8SfA7V5f/uo8al2kXQ8lfH3Wzm1g69J0b0jGUwJwXSU8qNLLXzFBIDDJJscFYoBYomfb4ZK4Eqgi9yzZGK2ijSF+QvaJpwtFat8JeafH9zghIAR8A+lO5SnyOkpKBayenZZAkq6EXBSh5/nVfrbCc8YE9PVCz2lM+UYCPYHRveg4LR80dNgXAVLtuIsrviHLPlR+86H7YQCZpTx23vCGOLEVK2s0xjvYwPSmbDw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.32) smtp.rcpttodomain=canonical.com smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none pct=100) action=none 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=0ZEY7gBiYkLmOrKYATFEAmCtxqEKaEMUJrUdWUvYnPg=; b=CcQn7YFO+/iZfq/S3BYPxBCHOmXivWqdQgetWa3W8kt63+CII9sswqfSnOQji9XXdjVF4l2/cigmzy+PThDG4QgdBWey3w88HBvJ+SHk1v04RpaI17b7zhwzlHAXfCLZLbNyri6dDesqfVVz8sxPog7fryUSjWeXtM9eH4ysM104RWlxwiwXERO7BK8hU5xAs5gMBe/K4aE0sB8RLiWSt2CRh977rMHULZGqsdrdEOm73BnlFoKxvSrUg6oq0BO7j6weuKTX4QaBuQe81PpUiey+qqudnDhZu5qHp++lEyX7W0n+WnkPUhIs1UsgMol+fCCZ9bwoFC1UBH8YOWZEug== Received: from DM6PR11CA0063.namprd11.prod.outlook.com (2603:10b6:5:14c::40) by BL0PR12MB2420.namprd12.prod.outlook.com (2603:10b6:207:4c::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.22; Sun, 11 Apr 2021 11:45:37 +0000 Received: from DM6NAM11FT023.eop-nam11.prod.protection.outlook.com (2603:10b6:5:14c:cafe::44) by DM6PR11CA0063.outlook.office365.com (2603:10b6:5:14c::40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.17 via Frontend Transport; Sun, 11 Apr 2021 11:45:36 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.32) smtp.mailfrom=nvidia.com; canonical.com; dkim=none (message not signed) header.d=none;canonical.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.32 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.32; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.32) by DM6NAM11FT023.mail.protection.outlook.com (10.13.173.96) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4020.17 via Frontend Transport; Sun, 11 Apr 2021 11:45:36 +0000 Received: from HQMAIL109.nvidia.com (172.20.187.15) by HQMAIL109.nvidia.com (172.20.187.15) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Sun, 11 Apr 2021 04:45:35 -0700 Received: from dev-r-vrt-138.mtr.labs.mlnx (172.20.145.6) by mail.nvidia.com (172.20.187.15) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Sun, 11 Apr 2021 04:45:34 -0700 From: Roi Dayan To: Subject: [SRU][F:linux-bluefield][PATCH 1/2] netfilter: conntrack: Move nf_ct_offload_timeout to header file Date: Sun, 11 Apr 2021 14:45:22 +0300 Message-ID: <20210411114523.2003441-2-roid@nvidia.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210411114523.2003441-1-roid@nvidia.com> References: <20210411114523.2003441-1-roid@nvidia.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 781968e1-c4b3-472b-5bd5-08d8fcdf528d X-MS-TrafficTypeDiagnostic: BL0PR12MB2420: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1013; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oM6x0VeDDlT3rJba79kvI3qG2SAy8PSnxRsJy6OPfcTG/OhiSeleR16QQxaOpZKqiRjNEC0bpv7e9Ro3C1UzSNSRImWgfO6gso/WHa8R5nliEPTLMLIFMXQuYlaoct1jv2/kMmwpK9uGIsm7TTh6qG46WedQt1r077DPvzqefXL36/AzSDzcgvIdjuHLV+m9zpz0AHEPuKVqOZ12babnh8W0dLgepSv2jBvV/2iIEBc/sEyjajWp/1Q1rc0V4QSzDoTo0e9Bt3Pd1qxKcpBlj/8obP7udR3NC+xl+Aioo4r/UpPeS/0hAWcaIo1BigXPxs0vaVTKKBPbBEbwlZ3DoftlreO/75h1kyBP+NKxBT3Ys7Xr3h8HoIE9+XzfhW3Fl8Fd6XDSH46RqB5cTVsFPbpSle9j/2jstTcJTXR58fk63T9uLK0yg445T1aaUkz8O5BKHtyM8iW5KHLlB2inF+UU0ta7Kw5ZQg9HHAObfDt0+yFtkoDmRud1qPMgTe3XgVPPa6yQgft7X7G1viCB3GwsYEYgdruYInzf8NjAib42XCGrhwzTVOLW3SP2UFZpMYTCEmbTv+Y8sY964CzK8QH4wAphQ4d47O5dW6ed5Ae6tLKrEzB6WBXOHrCD9/hM1IYMr3ioa1MkZthySWBOYcGKnmIHgEwAQIh/t5ms7Zw3Fd9W6y182TQMGLvFWspxucAWB4lGAxbA7cN/+tpzzFQKgRfpKW8vcZmPTdxT5qU= X-Forefront-Antispam-Report: CIP:216.228.112.32; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid01.nvidia.com; CAT:NONE; SFS:(4636009)(396003)(136003)(39860400002)(376002)(346002)(46966006)(36840700001)(70586007)(316002)(70206006)(336012)(6916009)(8676002)(4326008)(83380400001)(478600001)(2616005)(82740400003)(186003)(82310400003)(54906003)(7636003)(8936002)(36756003)(1076003)(26005)(426003)(2906002)(47076005)(36860700001)(356005)(5660300002)(86362001)(6666004)(966005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Apr 2021 11:45:36.4818 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 781968e1-c4b3-472b-5bd5-08d8fcdf528d X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.32]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT023.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR12MB2420 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vladimir Sokolovsky , Daniel Jurgens Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Roi Dayan BugLink: https://bugs.launchpad.net/bugs/1922672 To be used by callers from other modules. [ Rename DAY to NF_CT_DAY to avoid possible symbol name pollution issue --Pablo ] Signed-off-by: Roi Dayan Reviewed-by: Oz Shlomo Signed-off-by: Pablo Neira Ayuso (cherry picked from commit 73f9407b3eb893bc8a82293cc8d4dfa3db079c0b) Signed-off-by: Roi Dayan --- include/net/netfilter/nf_conntrack.h | 12 ++++++++++++ net/netfilter/nf_conntrack_core.c | 12 ------------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h index 90690e37a56f..c7bfddfc65b0 100644 --- a/include/net/netfilter/nf_conntrack.h +++ b/include/net/netfilter/nf_conntrack.h @@ -279,6 +279,18 @@ static inline bool nf_ct_should_gc(const struct nf_conn *ct) !nf_ct_is_dying(ct); } +#define NF_CT_DAY (86400 * HZ) + +/* Set an arbitrary timeout large enough not to ever expire, this save + * us a check for the IPS_OFFLOAD_BIT from the packet path via + * nf_ct_is_expired(). + */ +static inline void nf_ct_offload_timeout(struct nf_conn *ct) +{ + if (nf_ct_expires(ct) < NF_CT_DAY / 2) + ct->timeout = nfct_time_stamp + NF_CT_DAY; +} + struct kernel_param; int nf_conntrack_set_hashsize(const char *val, const struct kernel_param *kp); diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c index 1546b59fdc24..7af2c9f5481e 100644 --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c @@ -1344,18 +1344,6 @@ static bool gc_worker_can_early_drop(const struct nf_conn *ct) return false; } -#define DAY (86400 * HZ) - -/* Set an arbitrary timeout large enough not to ever expire, this save - * us a check for the IPS_OFFLOAD_BIT from the packet path via - * nf_ct_is_expired(). - */ -static void nf_ct_offload_timeout(struct nf_conn *ct) -{ - if (nf_ct_expires(ct) < DAY / 2) - ct->timeout = nfct_time_stamp + DAY; -} - static void gc_worker(struct work_struct *work) { unsigned int min_interval = max(HZ / GC_MAX_BUCKETS_DIV, 1u); From patchwork Sun Apr 11 11:45:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roi Dayan X-Patchwork-Id: 1464789 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: 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=DraY6PvA; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FJ96j2RHcz9sWK; Sun, 11 Apr 2021 21:45:49 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1lVYXC-0004G9-2A; Sun, 11 Apr 2021 11:45:46 +0000 Received: from mail-eopbgr700055.outbound.protection.outlook.com ([40.107.70.55] helo=NAM04-SN1-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 ) id 1lVYX7-0004EJ-Sq for kernel-team@lists.ubuntu.com; Sun, 11 Apr 2021 11:45:42 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bw0tPaSuxCdT7uVBfXVTJZrIGGjFxTcDSrXo9ipIsa0/r2jDJjdbKpuW9Pf1YoDeQa5G/4TdLrS0fwMIoJawC8QHKUsLLw5euMyqluBAOeLqL5KLTbU9Slyyhzxu5tVFv5HBtwqHb8nRz8v9yNK2P8rL/jgz251qlfEiBzXDQ+f02QaC7KEa9wZV/lhQQ8jklZROvNTBPSZcIjnEmK61O4oUsLJuZERkXIYMjjlMwjxVd0sXv68bERo8D7Q8CUXVEH5Or+iEhDL44jVUoNe5GQGugz/77fZOSOjhlgXV5dzfXXwB4wF7DIDDgvnIyuWcwJMOlgCjsv6xURD1qMCLlQ== 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-SenderADCheck; bh=/2H8kob0/pZIN8EwkDMVPV98uq8m13Z71+MYXAeme8g=; b=F8mNwdd17H/gRlUuOT7TA5L45IvN+If7wKLQB9W/NsHO9+Zupz2YHPl1topQEoa2yQd8TSoXvbjJ/5XZqL054sqo6ZIOO8NUL4jcFzWrPqbG5jYKjDEGXBbUolWdlBYBRecyzdzflNCvzPw+qMb2qOzMSB2b4XD1NNWB+fQjd+RAilYOLVkgMV0j9Fy9tSuUYrN8JZJExI1JMJFDSo+ePlodRY+7XBb/BV8TlxllUWIknifxdtsO/AgDBqGCE5ad/BM1Dq0dtPi7ic9cm3oA8ctXO/+8VjNhqAZs+Xj5cY43eCFLEe9CfAC29e1g4CK9vsR6PU2+QVge/UD6EduGgg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.32) smtp.rcpttodomain=canonical.com smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none pct=100) action=none 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=/2H8kob0/pZIN8EwkDMVPV98uq8m13Z71+MYXAeme8g=; b=DraY6PvAdvraXldpqpUI0DXM9Kd0UsUKpykqY1Ur4hZ8vG1zyA9ay0wH82NY3fhrDcAjmcXEeRsNpCYunzD4XVPQ20ucWFvfu7uK5Vmx6cyfN7j1O+jr+MPgDYtB91BxydDvv497BdPgkNjgk4btgQyXGJLwGxsKjiVwvrkNNErdwJfHAPpGImayr2OLxycXcC0loUf5vVo62Lvuycg5PzevH/XNE4lluKqv8eRYWcBo8Hm74jeHKobofS7PNqcLcHokqEWkOmvRpC8KdJeH8AsddPrcDUpMw1m6eGgBv7B1/xeTYVQpDsWbSRTWerSvxnrrTOV/SG3t3K7vIrfs4g== Received: from DM6PR14CA0069.namprd14.prod.outlook.com (2603:10b6:5:18f::46) by DM6PR12MB3644.namprd12.prod.outlook.com (2603:10b6:5:118::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.21; Sun, 11 Apr 2021 11:45:38 +0000 Received: from DM6NAM11FT068.eop-nam11.prod.protection.outlook.com (2603:10b6:5:18f:cafe::19) by DM6PR14CA0069.outlook.office365.com (2603:10b6:5:18f::46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.17 via Frontend Transport; Sun, 11 Apr 2021 11:45:38 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.32) smtp.mailfrom=nvidia.com; canonical.com; dkim=none (message not signed) header.d=none;canonical.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.32 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.32; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.32) by DM6NAM11FT068.mail.protection.outlook.com (10.13.173.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4020.17 via Frontend Transport; Sun, 11 Apr 2021 11:45:38 +0000 Received: from HQMAIL109.nvidia.com (172.20.187.15) by HQMAIL109.nvidia.com (172.20.187.15) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Sun, 11 Apr 2021 04:45:37 -0700 Received: from dev-r-vrt-138.mtr.labs.mlnx (172.20.145.6) by mail.nvidia.com (172.20.187.15) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Sun, 11 Apr 2021 04:45:36 -0700 From: Roi Dayan To: Subject: [SRU][F:linux-bluefield][PATCH 2/2] netfilter: flowtable: Set offload timeout when adding flow Date: Sun, 11 Apr 2021 14:45:23 +0300 Message-ID: <20210411114523.2003441-3-roid@nvidia.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210411114523.2003441-1-roid@nvidia.com> References: <20210411114523.2003441-1-roid@nvidia.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9e1f8e96-c089-4da1-65a2-08d8fcdf538f X-MS-TrafficTypeDiagnostic: DM6PR12MB3644: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:949; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ILt+OjWvBRMJICEvHFL1YBajmZmisK4KYfQRtM4Xv9DVR1RNXIP5QxvIXh5NXb/x6uYiZBX5IzSuZYy9sSD1GRg6tIuxW384YSjmV2fVbomBvd+NzcJ++sfB1NE+xqhOfHZ5+Mc1yGFot2VjLznL0MUx/1+bkXRBWhOQ7EzF2/0Mw2Gdo+LpBDoYoO5UJhpLjDqZOoBLITXvPQipnFQf34svE5iruuJ/DTD1x3nuNC6k9rpoiaMSii5eNsJLuRNSp8HSR8vCqBcmieuYYmLNLw40s07CEkO9VR7VDTmdUqHv3dEFLlIXjOCthQFJUtBmQZC/IKprtA7oBpyNoeBf+1+0FgWGNqbwx44Czh2c97BMzpvAMzLklIf98pJmw2bdp6T1BcqXCmaqhQOxfy7ATUv/lO1Ib7OrfAbE7YDg9uRux1YvOhuvdaqD0t+DUwgyqCeyBf8qxcIkWDpXjJw+G16i2jOXvsge3kT4o5PFEJck0dteSKsHzN4SO1nK7+AmqQKZInu+2mWc7UtPhrjA9URZYAWXPqrLc9wRfHT5ZkO9EuDsassK+56HGHPI3SYLtrVA3oI7ylqz2YvWTAJP2RgL0lO6Tgq2Bds13IR3UqjPxMY5Ehr7klNC6/6bkCfA3s/xRU+aepZAuvc6oGLgvhJsrgVA1R+PUSAB//zB6u2l5OLTiYqGsCbrXsnCUfkpBFaGzFNSmFj/JMmUfTjVT3TZyn3jnzdwW1ZbyMZix7E= X-Forefront-Antispam-Report: CIP:216.228.112.32; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid01.nvidia.com; CAT:NONE; SFS:(4636009)(376002)(396003)(39860400002)(346002)(136003)(36840700001)(46966006)(70206006)(70586007)(6666004)(7636003)(356005)(316002)(82740400003)(47076005)(6916009)(4326008)(83380400001)(36756003)(86362001)(5660300002)(8936002)(336012)(966005)(426003)(2616005)(8676002)(1076003)(2906002)(478600001)(186003)(54906003)(26005)(82310400003)(36860700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Apr 2021 11:45:38.1678 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9e1f8e96-c089-4da1-65a2-08d8fcdf538f X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.32]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT068.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3644 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vladimir Sokolovsky , Daniel Jurgens Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Roi Dayan BugLink: https://bugs.launchpad.net/bugs/1922672 On heavily loaded systems the GC can take time to go over all existing conns and reset their timeout. At that time other calls like from nf_conntrack_in() can call of nf_ct_is_expired() and see the conn as expired. To fix this when we set the offload bit we should also reset the timeout instead of counting on GC to finish first iteration over all conns before the initial timeout. Fixes: 90964016e5d3 ("netfilter: nf_conntrack: add IPS_OFFLOAD status bit") Signed-off-by: Roi Dayan Signed-off-by: Pablo Neira Ayuso (cherry picked from commit 4203b19c27967d9eff6928f6a733f81892ffc592) Signed-off-by: Roi Dayan --- net/netfilter/nf_flow_table_core.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/netfilter/nf_flow_table_core.c b/net/netfilter/nf_flow_table_core.c index dcdc37d3a748..5144e317caab 100644 --- a/net/netfilter/nf_flow_table_core.c +++ b/net/netfilter/nf_flow_table_core.c @@ -244,6 +244,8 @@ int flow_offload_add(struct nf_flowtable *flow_table, struct flow_offload *flow) return err; } + nf_ct_offload_timeout(flow->ct); + if (nf_flowtable_hw_offload(flow_table)) { __set_bit(NF_FLOW_HW, &flow->flags); nf_flow_offload_add(flow_table, flow);