Message ID | 1684277999-18029-11-git-send-email-yifeid@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=HT5lk8f3; 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 4QLWtg4zkHz20dn for <incoming@patchwork.ozlabs.org>; Wed, 17 May 2023 09:00:59 +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 <kernel-team-bounces@lists.ubuntu.com>) id 1pz3f1-0000VG-Km; Tue, 16 May 2023 23:00:51 +0000 Received: from mail-sn1nam02on2069.outbound.protection.outlook.com ([40.107.96.69] helo=NAM02-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 <yifeid@nvidia.com>) id 1pz3ev-0000Gt-KN for kernel-team@lists.ubuntu.com; Tue, 16 May 2023 23:00:45 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cR1BVRjocJoGlZvrnr+BROrBojpj2YdLlBv6j2lcJOnZc+AllMwW8EWl7DfV5ELSaMS5O00gReBD5yxZv5HNKJiwjvOQNqJJX4NfgNVHXCF/4FzD3lV3cUz6rap6GS4cjKybLFfLVqYtP2QJpBJQjANCm5JF6t04oygSS9gFNuEzcKsSKYemGpUNYvGY5UhHkOjznKTZQTjpxNtU4SeIKmvOu9OaxSAG7JLjRsl29+9TG3Fr9ouUjoMKEtJRr/92XvR4WJUri+STCAmE2lAnyl+Icm6yA3C4GC82JHpnUZaoie/qwW4MCZQNlWLwcMdiGwJL4zfMd1FonAjp29zJFQ== 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=rGKhL+7YWjNkzM5T4DBYDZUh/6U1e9ZHTjsf71FIg5k=; b=KhcP8YWeMJXWJuTK4vsrVLh3jNduXeh901OuUyH2mhB8f4dHiDrycCKCyRshwSjWKT02JhNX9isaMNnkJ7M04gDRIA/iuwPtbvRCZZHg8r9UNBK+sZL3FVsjfTQe+0fHAcnO7AUQnu34rq13OHEDqWfrY8KrMmcugIWrUAvxyawGMTfu3qXq5tPSK+yEn70lqN4xLp2CWeQ2CzN9rBj7RhWQbMgg/GKomDIp2Z342ln46jrufG25wRIpja4lmjrKgPzqam+VqLuw+ChuPyHc36X/fM5orEdP2P6YIGmkovN2UF9cr0d1CxqSfFCAvUQyGNVV5sgLMaCAUCTcPMl1Qg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=canonical.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject 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=rGKhL+7YWjNkzM5T4DBYDZUh/6U1e9ZHTjsf71FIg5k=; b=HT5lk8f35mJj/et94pFds3FTbGD+x00pAbX6d5L3eChVOvaXATZBFl3eDksqsCn+n8nFpVMgkkVN2B32FqlOIPDsq6gwCpnHmQTNGWIG/yGpH6GRuxAgQS9k2Tld7ot2ytHed6sqBndxaDnkXj5DH8zsj+tRrYAR9miYu+ScJZ6uqLgzvl0i6AJdCvF7vvDvoVXG1GuxYQYln3ADWw7ogpbiC8CWlmuynUMpWhiB0ld0aPd2Rc3jMk6SMO9ufWyzPkC9BDSPQ3LC6JwxvyIokoF1IiB+hVPlGz6sbKgw09GG9ZX3zn2pqaWo4qYXB005g/Ui47RmHxcLv3BNEb2/jQ== Received: from DS7PR03CA0337.namprd03.prod.outlook.com (2603:10b6:8:55::25) by BL1PR12MB5948.namprd12.prod.outlook.com (2603:10b6:208:39b::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6387.30; Tue, 16 May 2023 23:00:42 +0000 Received: from DM6NAM11FT037.eop-nam11.prod.protection.outlook.com (2603:10b6:8:55:cafe::b6) by DS7PR03CA0337.outlook.office365.com (2603:10b6:8:55::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6387.33 via Frontend Transport; Tue, 16 May 2023 23:00:41 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by DM6NAM11FT037.mail.protection.outlook.com (10.13.172.122) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.17 via Frontend Transport; Tue, 16 May 2023 23:00:41 +0000 Received: from rnnvmail202.nvidia.com (10.129.68.7) 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.5; Tue, 16 May 2023 16:00:21 -0700 Received: from rnnvmail202.nvidia.com (10.129.68.7) by rnnvmail202.nvidia.com (10.129.68.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Tue, 16 May 2023 16:00:21 -0700 Received: from mtl123.mtl.labs.mlnx (10.127.8.10) by mail.nvidia.com (10.129.68.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37 via Frontend Transport; Tue, 16 May 2023 16:00:20 -0700 Received: from sw-mtx-008.mtx.labs.mlnx. (sw-mtx-008.mtx.labs.mlnx [10.9.150.35]) by mtl123.mtl.labs.mlnx (8.14.4/8.14.4) with ESMTP id 34GMxxSo019536; Wed, 17 May 2023 02:00:17 +0300 From: Tony Duan <yifeid@nvidia.com> To: <kernel-team@lists.ubuntu.com> Subject: [SRU][J:linux-bluefield][PATCH v2 10/10] netfilter: nf_conntrack: allow early drop of offloaded UDP conns Date: Tue, 16 May 2023 17:59:59 -0500 Message-ID: <1684277999-18029-11-git-send-email-yifeid@nvidia.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1684277999-18029-1-git-send-email-yifeid@nvidia.com> References: <1684277999-18029-1-git-send-email-yifeid@nvidia.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT037:EE_|BL1PR12MB5948:EE_ X-MS-Office365-Filtering-Correlation-Id: 4070e674-321c-47db-4ec6-08db56615f7d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QKEvwGD1B31lHwkvBBbXL0+uNrNW8NMw9KfAeGPZPsp56onPY4vS+LGdNfzQnO6+rX0fHlVHGprA0KRidX+/5Lsw8f7l6w7uWXD0ZdJiIaZkCdBjqLk/pXjs/RSvg2PNJD8aUHGlycYr/mJ3jiCzBjEKioTShmL7YQrqZaNi33Q4jazaCYpBca05eCv+h4klf0XEzkXSGPL1kLtiWFtM6W5/S3Yekx6KULLv3y5AAnQrsENLNSn5lrZrMkUXu3wKLtRuFBPKdc6JAtuZQy+r+U8wHvs9ouTlXWirmVALtVVJilUJROzMx2H5GHtQfz07C+Vs0Mo5hjVl6Q7cTAR1upozQFV/9UPEPudHwk+lkVh3724HLHNatKYdYZJXUORwo2URCtTzxjRHh/Q8cSVCHvaKp9p6WZwD4525HMInjSulabID3xFwLWfyaJhBXkczOlPZko2+uahJ8UFfoCNArBibLlYnA+IUCED5qrdcjRkGTlj4E1GVhATUFE2V866uCeCzdoWfSTI7HlsNkF9GP80oc+oN/ZBlOa0rRzbPXFcKRvmHGUUw3PkJ1ouX9tKOWThFH0V/Jqz8BMBtlrG+FfhKkNmJTHynLqvCZaHFzc+im8Z7OT28sjJsYHvY+T1cGeiKxZiYeV9wr0f+hZt2BQO3d4CX+YrZXfwW0CIgo05B8Ium1IpGSfowMguyxuxS+PItwzVYkpoQGzoc+KMRnOcaDKvuDwfwU3uvnTegqbr+zobkdXrp7A/ddSAAoKzgCOKQKzCr1HC/WDJ8eq438qrMv19HoOaW3Oc09sQHDKU= 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:(13230028)(4636009)(396003)(376002)(39860400002)(136003)(346002)(451199021)(46966006)(40470700004)(36840700001)(356005)(7636003)(86362001)(82310400005)(82740400003)(36756003)(40460700003)(5660300002)(4326008)(316002)(8676002)(186003)(336012)(8936002)(26005)(6916009)(40480700001)(47076005)(41300700001)(2616005)(2906002)(54906003)(478600001)(70206006)(70586007)(966005)(83380400001)(36860700001)(6666004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 May 2023 23:00:41.5358 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4070e674-321c-47db-4ec6-08db56615f7d 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: DM6NAM11FT037.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5948 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, cascardo@canonical.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 |
net/sched: act_ct: offload UDP NEW connections
|
expand
|
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c index aec432f..8f5bf25 100644 --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c @@ -1355,9 +1355,6 @@ static unsigned int early_drop_list(struct net *net, hlist_nulls_for_each_entry_rcu(h, n, head, hnnode) { tmp = nf_ct_tuplehash_to_ctrack(h); - if (test_bit(IPS_OFFLOAD_BIT, &tmp->status)) - continue; - if (nf_ct_is_expired(tmp)) { nf_ct_gc_expired(tmp); continue; @@ -1424,11 +1421,14 @@ static bool gc_worker_skip_ct(const struct nf_conn *ct) static bool gc_worker_can_early_drop(const struct nf_conn *ct) { const struct nf_conntrack_l4proto *l4proto; + u8 protonum = nf_ct_protonum(ct); + if (test_bit(IPS_OFFLOAD_BIT, &ct->status) && protonum != IPPROTO_UDP) + return false; if (!test_bit(IPS_ASSURED_BIT, &ct->status)) return true; - l4proto = nf_ct_l4proto_find(nf_ct_protonum(ct)); + l4proto = nf_ct_l4proto_find(protonum); if (l4proto->can_early_drop && l4proto->can_early_drop(ct)) return true; @@ -1485,7 +1485,8 @@ static void gc_worker(struct work_struct *work) if (test_bit(IPS_OFFLOAD_BIT, &tmp->status)) { nf_ct_offload_timeout(tmp); - continue; + if (!nf_conntrack_max95) + continue; } if (expired_count > GC_SCAN_EXPIRED_MAX) {