{"id":2225523,"url":"http://patchwork.ozlabs.org/api/patches/2225523/?format=json","web_url":"http://patchwork.ozlabs.org/project/ubuntu-kernel/patch/20260421062928.2968600-2-gerald.yang@canonical.com/","project":{"id":15,"url":"http://patchwork.ozlabs.org/api/projects/15/?format=json","name":"Ubuntu Kernel","link_name":"ubuntu-kernel","list_id":"kernel-team.lists.ubuntu.com","list_email":"kernel-team@lists.ubuntu.com","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20260421062928.2968600-2-gerald.yang@canonical.com>","list_archive_url":null,"date":"2026-04-21T06:29:22","name":"[SRU,N,1/1] Revert \"netfilter: conntrack: fix erronous removal of offload bit\"","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"984cc0fef701094291fb669ca4906cc9a4a946e0","submitter":{"id":77781,"url":"http://patchwork.ozlabs.org/api/people/77781/?format=json","name":"Gerald Yang","email":"gerald.yang@canonical.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/ubuntu-kernel/patch/20260421062928.2968600-2-gerald.yang@canonical.com/mbox/","series":[{"id":500743,"url":"http://patchwork.ozlabs.org/api/series/500743/?format=json","web_url":"http://patchwork.ozlabs.org/project/ubuntu-kernel/list/?series=500743","date":"2026-04-21T06:29:21","name":"Revert \"netfilter: conntrack: fix erronous removal of offload bit\"","version":1,"mbox":"http://patchwork.ozlabs.org/series/500743/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2225523/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2225523/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (4096-bit key;\n unprotected) header.d=canonical.com header.i=@canonical.com\n header.a=rsa-sha256 header.s=20251003 header.b=WXBUl0St;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com\n (client-ip=185.125.189.65; helo=lists.ubuntu.com;\n envelope-from=kernel-team-bounces@lists.ubuntu.com;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g0CC2475hz1yCv\n\tfor ; Tue, 21 Apr 2026 16:30:05 +1000 (AEST)","from localhost ([127.0.0.1] helo=lists.ubuntu.com)\n\tby lists.ubuntu.com with esmtp (Exim 4.86_2)\n\t(envelope-from )\n\tid 1wF4cM-00054J-6j; Tue, 21 Apr 2026 06:29:54 +0000","from smtp-relay-internal-1.internal ([10.131.114.114]\n helo=smtp-relay-internal-1.canonical.com)\n by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)\n (Exim 4.86_2) (envelope-from )\n id 1wF4cL-00052y-9A\n for kernel-team@lists.ubuntu.com; Tue, 21 Apr 2026 06:29:53 +0000","from mail-pl1-f199.google.com (mail-pl1-f199.google.com\n [209.85.214.199])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest\n SHA256)\n (No client certificate requested)\n by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 29C203F79C\n for ; Tue, 21 Apr 2026 06:29:53 +0000 (UTC)","by mail-pl1-f199.google.com with SMTP id\n d9443c01a7336-2b2ec17dc21so44092445ad.2\n for ; Mon, 20 Apr 2026 23:29:53 -0700 (PDT)","from localhost.localdomain (118-163-61-247.hinet-ip.hinet.net.\n [118.163.61.247]) by smtp.gmail.com with ESMTPSA id\n d9443c01a7336-2b5fa9ff3a8sm114969895ad.12.2026.04.20.23.29.49\n for \n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Mon, 20 Apr 2026 23:29:50 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com;\n s=20251003; t=1776752993;\n bh=O1bd6sxMW99d2rqmIkoU9obHqTjbKSMfHyTnjRg8pWk=;\n h=From:To:Subject:Date:Message-ID:In-Reply-To:References:\n MIME-Version;\n b=WXBUl0StXGDI+7bYT4L1k8HhKQqQiUo2OBjZzcLK5Ewgzldqg2HOJsC2F/7GDPz7B\n o+L+OlC5l4LfG3zax5Izy4V0zoqAfpvgPRT4cNG58i0g/SNXccnm8Zen3xG6HScRVG\n deTmuNFsjetEXJPZY4FcTLz8ttFceEh0hmzheb8p0aM25fZakO76cHfwwkMg7Nqs7d\n UTz+rlSxxEQKqkB9mReORelPBY+m6XDyd6LcWcIBlHJkTSfBxhwkcoW7GROgPVeOYZ\n YGqVKOk54zjFK7mgDcBhRHBeG1zeMCT11Dk/7XbPozF1JmThQ31u33L10sMQt+tUTC\n D7gw1DYN1S0fqg8VpT+uKbseqa4jy1tB64tmXign49ed7voD4vMlZUsNM4qL64U9Nr\n 1tmPDXptT+6t6zx0XBENATXTu08sWeCun7VKFx9+D9c2uoRWg+i9fUEAnpwWEfS2t2\n ZdokRwk+54TeiGxGtfF6g8BEb8SVAdkxvEQtaQ3P8eNJhpCEtD+eHt2vosUdYPbRjB\n Gexssp6U7NoipurPVtuXm1P8dM/fv49Lp0ps19d/8OxGTVtdH20IWm2IoeRLLn/U1V\n P8SJB7EZT082MJIgoMoM+srEIpZop9dgsaqgZlVXWBD+AcGZPbe+ROStHnmAr/Xpg0\n f5MHC3jwHKXEzDmByoMfrBLc=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1776752991; x=1777357791;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to\n :cc:subject:date:message-id:reply-to;\n bh=O1bd6sxMW99d2rqmIkoU9obHqTjbKSMfHyTnjRg8pWk=;\n b=RIZAfDWXAQZcD8u8mK1RoRpS8gsYejEmPDmIyAnq+/+SiIe3u3eQ3ie1nNsCzvFfhp\n smZ7XPV7CrMPfyqCQBk/5qKFHAYqSBrr3l7z7eeA99SNSK5x15NEwGsKty0FMzbjNtnx\n adipRAgybU/5009n5t5HJJcw4/vdSXVNSOM58BTFrzvYUNKce1AUb8XMsFnJTPiCWcCE\n 0U626WZiWacopWwdgE5X2hrYw50uULz56T4y97ycltN/8nnezC2lsQVuFm64Dw5FueFg\n 719OaZ5oFqW9U2xmi2fVyZC9OOIqUVvyyxt2P7U5NnIJTLPZga01BwAnwKUjgRuoxxrH\n qtQA==","X-Gm-Message-State":"AOJu0YyTichD4NB48z1tJBqDBkgRN/Gyw8plI/gXQRsg9tO1NBuAif4u\n ZrKJDSIHnrmXZI6Ev7t9r8zwwqRAvHbt5WKBLSTRUgi7ojefXHXlWF9YUGCcuG/ABPA7EohXDyG\n 5JdCzNfBPiZWUqTmo/app1dKlFaE0o10yoqVnKQ5xyhRMrTHQlN50in2hjkr936z+agrSbYofdM\n qRTXghWDciZdWwpQ==","X-Gm-Gg":"AeBDiet1XXk/sE+8hgsiUiqkKiBKi7hSIS9F3jxd2CXInYs0dERYyN9+nDAam7slwyg\n hFUf8/9KwobLeGzJpGGCdX+h/uNkPOcMMXyuB/+x7QJ+m+jaWnfNILG96yZGZnS8dQ7drUeivE7\n RAVweYS6MZQ8WLR4JsdB1ohSlnPs21UgoGGyhcutYbONMa7PoP8eyMBLHkwUu8c6J0H7vMgGTF6\n 5cE8n9i5J6ZlMeOPlpyHSqvrI16r7YuxPI6L3RriFjIK7dcmBlEMTaKDx/XwvWykup4CGVqPbIP\n 7eAMyz5T0xd5rOdxrspcUFU1IVV9ZapDpNIX9fcJw3sU7fGVKmTHlxLKZSubNFxwUuqT9r1WUPH\n O6J8yyxu+FIEKfoeS0j4ie8ZBQ49wFIhCdTHjX9uSfQ3AaHeKaUx2Wr97quhNeur3aMl2PbBaKM\n E4CBk8UC2tiXLGeg==","X-Received":["by 2002:a17:902:f712:b0:2b7:88d8:efde with SMTP id\n d9443c01a7336-2b788d8f36cmr12093615ad.7.1776752991278;\n Mon, 20 Apr 2026 23:29:51 -0700 (PDT)","by 2002:a17:902:f712:b0:2b7:88d8:efde with SMTP id\n d9443c01a7336-2b788d8f36cmr12093405ad.7.1776752990871;\n Mon, 20 Apr 2026 23:29:50 -0700 (PDT)"],"From":"Gerald Yang ","To":"kernel-team@lists.ubuntu.com","Subject":"[SRU][N][PATCH 1/1] Revert \"netfilter: conntrack: fix erronous\n removal of offload bit\"","Date":"Tue, 21 Apr 2026 14:29:22 +0800","Message-ID":"<20260421062928.2968600-2-gerald.yang@canonical.com>","X-Mailer":"git-send-email 2.43.0","In-Reply-To":"<20260421062928.2968600-1-gerald.yang@canonical.com>","References":"<20260421062928.2968600-1-gerald.yang@canonical.com>","MIME-Version":"1.0","X-BeenThere":"kernel-team@lists.ubuntu.com","X-Mailman-Version":"2.1.20","Precedence":"list","List-Id":"Kernel team discussions ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"kernel-team-bounces@lists.ubuntu.com","Sender":"\"kernel-team\" "},"content":"BugLink: https://bugs.launchpad.net/bugs/2149762\n\nThis reverts commit b2ba1678debebb1ce9104d3d028f942464ddc031.\n\nThis commit causes a regression, all nodes on PS6/7 running with this\ncommit hit soft lockup every 1-2 days, and need a reboot to recover.\n\nThis commit is a follow-up fix for:\nnetfilter: conntrack: rework offload nf_conn timeout extension logic\n\nBut the call path and logic between these two commits are changed,\nand it's not a clean cherry-pick. Only backport this commit without\nthe changes in the middle causes soft lockup issue, and the commit\nmessage says what it fixes is harmless.\n\nWe have run a test kernel without this commit for almost 2 weeks\nwithout hitting soft lockup. So we need to revert it.\n\nSigned-off-by: Gerald Yang \n---\n net/netfilter/nf_flow_table_core.c | 10 ++++------\n 1 file changed, 4 insertions(+), 6 deletions(-)","diff":"diff --git a/net/netfilter/nf_flow_table_core.c b/net/netfilter/nf_flow_table_core.c\nindex 7968cabd8f32..96f29f80d1bd 100644\n--- a/net/netfilter/nf_flow_table_core.c\n+++ b/net/netfilter/nf_flow_table_core.c\n@@ -343,8 +343,8 @@ static void flow_offload_del(struct nf_flowtable *flow_table,\n void flow_offload_teardown(struct flow_offload *flow)\n {\n \tclear_bit(IPS_OFFLOAD_BIT, &flow->ct->status);\n-\tif (!test_and_set_bit(NF_FLOW_TEARDOWN, &flow->flags))\n-\t\tflow_offload_fixup_ct(flow->ct);\n+\tset_bit(NF_FLOW_TEARDOWN, &flow->flags);\n+\tflow_offload_fixup_ct(flow->ct);\n }\n EXPORT_SYMBOL_GPL(flow_offload_teardown);\n \n@@ -518,12 +518,10 @@ static void nf_flow_offload_gc_step(struct nf_flowtable *flow_table,\n \n \tif (nf_flow_has_expired(flow) ||\n \t nf_ct_is_dying(flow->ct) ||\n-\t nf_flow_custom_gc(flow_table, flow)) {\n+\t nf_flow_custom_gc(flow_table, flow))\n \t\tflow_offload_teardown(flow);\n-\t\tteardown = true;\n-\t} else if (!teardown) {\n+\telse if (!teardown)\n \t\tnf_flow_table_extend_ct_timeout(flow->ct);\n-\t}\n \n \tif (teardown) {\n \t\tif (test_bit(NF_FLOW_HW, &flow->flags)) {\n","prefixes":["SRU","N","1/1"]}