{"id":2225524,"url":"http://patchwork.ozlabs.org/api/covers/2225524/?format=json","web_url":"http://patchwork.ozlabs.org/project/ubuntu-kernel/cover/20260421062928.2968600-1-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-1-gerald.yang@canonical.com>","list_archive_url":null,"date":"2026-04-21T06:29:21","name":"[SRU,N,0/1] Revert \"netfilter: conntrack: fix erronous removal of offload bit\"","submitter":{"id":77781,"url":"http://patchwork.ozlabs.org/api/people/77781/?format=json","name":"Gerald Yang","email":"gerald.yang@canonical.com"},"mbox":"http://patchwork.ozlabs.org/project/ubuntu-kernel/cover/20260421062928.2968600-1-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/covers/2225524/comments/","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=XQ/qzRy1;\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 4g0CC24bcgz1yJG\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 1wF4cL-00054A-QE; Tue, 21 Apr 2026 06:29:53 +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 1wF4cK-00052p-MD\n for kernel-team@lists.ubuntu.com; Tue, 21 Apr 2026 06:29:52 +0000","from mail-pl1-f198.google.com (mail-pl1-f198.google.com\n [209.85.214.198])\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 73CF23F79C\n for ; Tue, 21 Apr 2026 06:29:52 +0000 (UTC)","by mail-pl1-f198.google.com with SMTP id\n d9443c01a7336-2b2e91add2aso33823775ad.1\n for ; Mon, 20 Apr 2026 23:29:52 -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.47\n for \n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Mon, 20 Apr 2026 23:29:48 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com;\n s=20251003; t=1776752992;\n bh=dC9y5JalAURcR8RxFI/BfVyOcIZFsYcFc0pLEvksp34=;\n h=From:To:Subject:Date:Message-ID:MIME-Version;\n b=XQ/qzRy1+cL1kTex0Fs+Ub5TaiFMspCO8lD3HspVqakJjU6o9fzfO859C3ezMGIFc\n FwJxKaLVDx3DcOnE92qco1BDPt/WXXBACfUbMZ8ym7oAktcSbAtzKanEYXRtuCJMBr\n W5mJYAejGd11lZW13omsG3KWCwQtVc+ACpof04Q6UOrj73r0H86UKlvEq0glRAp0u0\n zUn0rfo/+4sJL+FQH4S1QmiBfRRnOCnAU+42bHxhAA4FI16rTlREdt1ytZl6iCE8Eg\n CoRbfwA/wVpuh17Pkz29wgRLebxGDi8477hTtvR9BS0wjY9qcBmaEf6k92kDRtwI19\n N0Z5J05+QoxUX1SJmYPOTcpT2i4dbHLMhbRCbVBBQEIU3uS38YTzEVukmniZDsRXPw\n l+EhZSrcDe1SWCb4PZ86xj6tNTmniQ4NulgMAzaSZOWbb7o5bojvqS2YqeUJkQA7G8\n V1+ATFoqpwvA4OM2f3d1ws2gQjzccaGQm67m7XbKel/GN55iwX3GaoRI0oY/odDIFu\n lXEaAtPVahJH3YwVzou0Gq6xCiqQ3hRHsAtLdCczITLuaqajX1INGnDtTlSg3zdhBg\n kCPJVd1hyX1LG5XGOf+PCEFZUPOkXS29yZ3x+r942blz9yFOmollqIZR0RiS2QDmOP\n BY/8G16Qx3VkjKULu/UaHFBA=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1776752990; x=1777357790;\n h=content-transfer-encoding:mime-version:message-id:date:subject:to\n :from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id\n :reply-to;\n bh=dC9y5JalAURcR8RxFI/BfVyOcIZFsYcFc0pLEvksp34=;\n b=JAnJeKT/RhnNqNhEzbJN89Vq0tpMjcWrbX5s37I7lrZjaXhS3MYZFdfrV7eG2Fuy/l\n qXwMOY3YsNYR2ZpOSlV4vL+8Dsd1F0mMJXmNezZKcT+lotNazDxLWhVuAXRT/V5XgSAf\n 9YFPNJigH9NAplaBWbnXo5DcxPsC+SSnKKNkpN1HZfwiimgMrTLUdR8HrWcu0SsOkGDm\n GY4ip9iNNlTdOvjXD3x0kf5MekI74WFBQDW6YkRUon6LaVLnO8lQ8eYw0rv7mIp5bjOJ\n gM8xyfRftDmInzjp/WQHNiAjlniTfL8TGQWGHgiLYMxyL3fmrDTRT70x6aYyXeAOVzxa\n i/Xg==","X-Gm-Message-State":"AOJu0Yw1bcCR6Z7uI/bnIe2Iz590W9oz5M3SCkpfCXoGNmGVxlkvR1RO\n tShrsDafdSkN6qP+QyLjHsnCScD45A/ea6K8zolByIp7rZZuHg+6Xfsp0vPvK0o4HWeX3wIVnJi\n cI855S1w82BcF0+qi1X0s8HcdTww0cNZ+sSk4uRGl1BkiYbhxeWgSy44a1/v9jN1H3rCsdLR1aM\n ZF8fgcwpbikkhUrQ==","X-Gm-Gg":"AeBDiethjE1riPCkTJViUNUtJaB7grgC0qZ98KvQ3mmaWlJCl4BtQTBiChAbcGfSnAu\n iyHynnmdoJ8aDkNQGwhutrhmv8U00eA87Lgv64WHH48Iz5t02xEdlsxjlQpu66N/vzpU4JGTzer\n 3RISE4//QW57ogIt8TqW4uLBwmCn6iALgihR+C3XNdS9GHsvbwV0uUiXxuKA0C+wP2TzP+qmTMg\n WD+1MH8zkAYw2F6CeAvG/GZD1iCuf5JeFvnywsuAUBmCYDKiRUT5V2lTES2F/GsM5Va0wq/LwcS\n Idh/WxACFymXC2a+m/k5aY7xKUxjc9KdjJOXaXgmZP/+giLKx4+wpLAAbwoEN1dN1PhVJ/GyViu\n RkdFXVo2I3wlJ/7HyaBl9F96tTmpcZ1CPEsFTneDHQ9dw2fMGpfbBnFsY/QL+fYmxLw5EWUb06e\n uP+Eeu/FX/GW8FWw==","X-Received":["by 2002:a17:903:11ce:b0:2b4:5ff5:e51f with SMTP id\n d9443c01a7336-2b5f9f51dfemr179795405ad.36.1776752990311;\n Mon, 20 Apr 2026 23:29:50 -0700 (PDT)","by 2002:a17:903:11ce:b0:2b4:5ff5:e51f with SMTP id\n d9443c01a7336-2b5f9f51dfemr179794875ad.36.1776752989215;\n Mon, 20 Apr 2026 23:29:49 -0700 (PDT)"],"From":"Gerald Yang ","To":"kernel-team@lists.ubuntu.com","Subject":"[SRU][N][PATCH 0/1] Revert \"netfilter: conntrack: fix erronous\n removal of offload bit\"","Date":"Tue, 21 Apr 2026 14:29:21 +0800","Message-ID":"<20260421062928.2968600-1-gerald.yang@canonical.com>","X-Mailer":"git-send-email 2.43.0","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\n[Impact]\n\nWith this commit:\nnetfilter: conntrack: fix erronous removal of offload bit\n\nWe hit the regression on PS6/7, all the nodes with this commit hit soft lockup every 1-2 days and need to reboot the nodes to recover, e.g.:\n\n[1022567.831263] watchdog: BUG: soft lockup - CPU#352 stuck for 26s! [kworker/u789:13:1036823]\n[1022567.831271] Modules linked in: scsi_transport_iscsi mlx5_vfio_pci vfio_pci_core vfio_iommu_type1 vfio iommufd vhost_net tap xfs act_csum act_pedit act_ct nf_flow_table act_tunnel_key xt_CT xt_tcpudp nft_compat dm_crypt ebtable_filter ebtables ip6table_raw ip6table_mangle ip6table_nat ip6table_filter ip6_tables iptable_raw iptable_mangle iptable_nat iptable_filter nf_tables veth nf_conntrack_netlink vhost_vsock vmw_vsock_virtio_transport_common vhost vsock nvme_fabrics nvme_keyring act_mirred act_skbedit act_vlan cls_matchall 8021q garp mrp geneve ip6_udp_tunnel udp_tunnel nfnetlink_cttimeout nfnetlink act_gact cls_flower sch_ingress openvswitch nsh nf_conncount nf_nat bridge stp llc bonding sunrpc binfmt_misc intel_rapl_msr intel_rapl_common amd64_edac edac_mce_amd kvm_amd kvm irqbypass rapl ipmi_ssif nls_iso8859_1 joydev input_leds ipmi_si ipmi_devintf k10temp ccp ipmi_msghandler mac_hid mlx5_vdpa vringh vhost_iotlb vdpa dm_service_time sch_fq_codel dm_multipath scsi_dh_rdac scsi_dh_emc scsi_dh_alua nf_conntrack\n[1022567.831352] nf_defrag_ipv6 nf_defrag_ipv4 efi_pstore ip_tables x_tables autofs4 btrfs blake2b_generic raid456 async_raid6_recov async_memcpy async_pq async_xor async_tx xor raid6_pq libcrc32c raid1 raid0 mlx5_ib ib_uverbs macsec ib_core raid10 hid_generic usbhid ses hid enclosure dax_hmem mlx5_core crct10dif_pclmul crc32_pclmul cxl_acpi polyval_clmulni cxl_port mlxfw polyval_generic ghash_clmulni_intel sha256_ssse3 sha1_ssse3 cxl_core psample nvme mpt3sas ahci raid_class nvme_core tls ast tg3 scsi_transport_sas libahci pci_hyperv_intf nvme_auth i2c_algo_bit xhci_pci xhci_pci_renesas i2c_piix4 aesni_intel crypto_simd cryptd\n[1022567.831407] CPU: 352 PID: 1036823 Comm: kworker/u789:13 Kdump: loaded Tainted: G L 6.8.0-106-generic #106~22.04.1+hf399032v20260316b0-Ubuntu\n[1022567.831411] Hardware name: Lenovo ThinkSystem SR665 V3/SB27B75430, BIOS KAE140F-5.70 09/03/2025\n[1022567.831413] Workqueue: events_power_efficient nf_flow_offload_work_gc [nf_flow_table]\n[1022567.831425] RIP: 0010:rhashtable_walk_next+0x17/0xd0\n[1022567.831433] Code: 00 00 00 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 55 48 89 e5 41 57 41 56 41 55 41 54 53 4c 8b 37 48 89 fb 4c 8b 7f 10 <4c> 8b 6f 08 45 0f b6 66 38 41 80 fc 01 0f 87 e4 b1 98 00 41 83 e4\n[1022567.831435] RSP: 0018:ff732ea21e2cbda8 EFLAGS: 00000202\n[1022567.831438] RAX: ff2b1e3b98ea4058 RBX: ff732ea21e2cbde0 RCX: 0000000000000000\n[1022567.831440] RDX: 0000000000000000 RSI: 0000000000000000 RDI: ff732ea21e2cbde0\n[1022567.831441] RBP: ff732ea21e2cbdd0 R08: 0000000000000000 R09: 0000000000000000\n[1022567.831442] R10: 0000000000000000 R11: 0000000000000000 R12: ff2b1cb8611cbee8\n[1022567.831444] R13: ff2b1cb8611cbe40 R14: ff2b1cb8611cbe48 R15: ff2b1e3b98ea4058\n[1022567.831445] FS: 0000000000000000(0000) GS:ff2b1fb3bb000000(0000) knlGS:0000000000000000\n[1022567.831447] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033\n[1022567.831449] CR2: 0000775a42eee000 CR3: 0000019530ce8003 CR4: 0000000000f71ef0\n[1022567.831450] PKRU: 55555554\n[1022567.831452] Call Trace:\n[1022567.831454] \n[1022567.831461] nf_flow_offload_work_gc+0x5a/0xf0 [nf_flow_table]\n[1022567.831468] process_one_work+0x181/0x3a0\n[1022567.831475] worker_thread+0x306/0x440\n[1022567.831479] ? __pfx_worker_thread+0x10/0x10\n[1022567.831481] kthread+0xef/0x120\n[1022567.831485] ? __pfx_kthread+0x10/0x10\n[1022567.831487] ret_from_fork+0x44/0x70\n[1022567.831492] ? __pfx_kthread+0x10/0x10\n[1022567.831494] ret_from_fork_asm+0x1b/0x30\n[1022567.831502] \n[1022568.208115] R13: 0000000000000002 R14: 0000000000000002 R15: 0003a1fef9c1d979\n[1022568.216666] ? cpuidle_enter_state+0xca/0x720\n[1022568.222092] ? tick_nohz_stop_tick+0x70/0x210\n[1022568.227521] cpuidle_enter+0x2e/0x50\n[1022568.232060] call_cpuidle+0x23/0x60\n[1022568.236472] cpuidle_idle_call+0x11d/0x190\n[1022568.241562] do_idle+0x87/0xf0\n[1022568.245472] cpu_startup_entry+0x2a/0x30\n[1022568.250357] start_secondary+0x129/0x160\n[1022568.255243] secondary_startup_64_no_verify+0x184/0x18b\n[1022568.261586] \n\n[Fix]\n\nWithout this commit, we spent few weeks to confirm PS6/7 nodes running without any lockup.\nThis commit is a follow-up fix for:\nnetfilter: conntrack: rework offload nf_conn timeout extension logic\n\nBut the call path and logic starting from flow_offload_fixup_ct changed between these 2 commits.\nOnly manually backport this commit without all the changes in the middle causes issue, and the commit message also says what it fixes is harmless.\n\n[Test Plan]\n\nWe have run a test kernel without this commit on PS6/7 for almost 2 weeks without hitting any soft lockup.\n\n[Where problems could occur]\n\nThe commit we revert, its commit message says what it fixes is harmless,\nand we have already run the kernel without it for almost 2 weeks without any issue, the risk is very low.\n\nGerald Yang (1):\n Revert \"netfilter: conntrack: fix erronous removal of offload bit\"\n\n net/netfilter/nf_flow_table_core.c | 10 ++++------\n 1 file changed, 4 insertions(+), 6 deletions(-)"}