Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2194814/?format=api
{ "id": 2194814, "url": "http://patchwork.ozlabs.org/api/patches/2194814/?format=api", "web_url": "http://patchwork.ozlabs.org/project/ubuntu-kernel/patch/20260210014702.3126-2-gerald.yang@canonical.com/", "project": { "id": 15, "url": "http://patchwork.ozlabs.org/api/projects/15/?format=api", "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": "<20260210014702.3126-2-gerald.yang@canonical.com>", "list_archive_url": null, "date": "2026-02-10T01:46:56", "name": "[SRU,N,1/2] netfilter: conntrack: remove skb argument from nf_ct_refresh", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "267de049ade026ccc3abd17a3aae32d6434460f9", "submitter": { "id": 77781, "url": "http://patchwork.ozlabs.org/api/people/77781/?format=api", "name": "Gerald Yang", "email": "gerald.yang@canonical.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/ubuntu-kernel/patch/20260210014702.3126-2-gerald.yang@canonical.com/mbox/", "series": [ { "id": 491588, "url": "http://patchwork.ozlabs.org/api/series/491588/?format=api", "web_url": "http://patchwork.ozlabs.org/project/ubuntu-kernel/list/?series=491588", "date": "2026-02-10T01:46:56", "name": "[SRU,N,1/2] netfilter: conntrack: remove skb argument from nf_ct_refresh", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/491588/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2194814/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2194814/checks/", "tags": {}, "related": [], "headers": { "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;\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=XKO60O4s;\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 4f94F96l47z1xwH\n\tfor <incoming@patchwork.ozlabs.org>; Tue, 10 Feb 2026 12:47:25 +1100 (AEDT)", "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 <kernel-team-bounces@lists.ubuntu.com>)\n\tid 1vpcqP-00070y-3i; Tue, 10 Feb 2026 01:47:13 +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 <gerald.yang@canonical.com>)\n id 1vpcqN-00070d-5q\n for kernel-team@lists.ubuntu.com; Tue, 10 Feb 2026 01:47:11 +0000", "from mail-pj1-f72.google.com (mail-pj1-f72.google.com\n [209.85.216.72])\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 F19D43F181\n for <kernel-team@lists.ubuntu.com>; Tue, 10 Feb 2026 01:47:10 +0000 (UTC)", "by mail-pj1-f72.google.com with SMTP id\n 98e67ed59e1d1-3562bdba6f7so6071446a91.2\n for <kernel-team@lists.ubuntu.com>; Mon, 09 Feb 2026 17:47:10 -0800 (PST)", "from noble-c.lxd (118-163-61-247.hinet-ip.hinet.net.\n [118.163.61.247]) by smtp.gmail.com with ESMTPSA id\n 41be03b00d2f7-c6dcb5e5f98sm12200413a12.17.2026.02.09.17.47.07\n for <kernel-team@lists.ubuntu.com>\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Mon, 09 Feb 2026 17:47:08 -0800 (PST)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com;\n s=20251003; t=1770688031;\n bh=HKNCV35tUWu5bMAjdccKTTyMXdV787qHFW5FDECFjUA=;\n h=From:To:Subject:Date:Message-ID:In-Reply-To:References:\n MIME-Version;\n b=XKO60O4s/KSsmVWeaRMKgaXkR4TcfMfR2w96RpG/TUyupGw6IzhSDLnyjeMQLMXlu\n 1Pti/ZC/ugYcrsmCtGBtyKdP0FEqF2fX9AYim+qPYGLoSjqUju5ZopyKy0oqZgJb3y\n 3n2UbZeBFx4cn8XqvcB6gVvnj8lQvotEm7IC7Wzw9gIDI5iJ8aafXdDCHmzrsNVa1f\n ANoAFNok+eT8uWtMYD7plvpmw8LkrHxP4Wf+hClBtXSnw7NErk2YeXFC/vi3yqk0Mg\n MSFT5fOEM5qI7JWoryB+ChWRK440yXPg7LLCG67LkBJHCoS686mfIciY5ZAYhbq8sM\n w7kVl4+vE+RMhyeqANY7v1ZuHn+9X/EDHYqmvmLXYQNPrOSo4t5CegY0wi0fNVCUKP\n NEwFw6A5Yi5k/xJ7QdFBZ35gzPN7q4avL8kjYE8M2G9LwIBdUb32z0BbVsvIYFBkFz\n rtEdsfxomU1CjmKmOn5i92BF1Cq8rXoF6vpqo+KgwlaKVf5HJmM99zRgK+rBdiKHSV\n rvceWNUU3b8lW6i3Bm57rOp8xpdVu1AiOw80C3PqB/kE+nf17VBLcH72c6+aeKFnSu\n p3DT8bKZfAhnFlUuwdH+oUf1L9DYapKYWvv/Kloqi9pIifG+E8P9BToMqkOIS5r4+h\n ngDp93yiLBrctEXB96vIjObA=", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20230601; t=1770688029; x=1771292829;\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=HKNCV35tUWu5bMAjdccKTTyMXdV787qHFW5FDECFjUA=;\n b=ZzO/ObkwX38V1jUsXo4pXi51mE6Olq470QW5Vdrhogda3694G8Tfbfk9x2C60iTpyJ\n x0hsK7aDNXx8Lxdc+/w+n5dz06Une90/O7fKp+DPBiiMdJAB5D1rgSAI5aKwZfvxK8p6\n eCBAT+dkQlcHMAjNa4osSj5yDj02R0By/HM4xEybKAbgGeQIvkNPV7mT/YzkWJHjliWQ\n nzwweIJ7OJ/jyZQsBnMrIJHheSWGH3VPbJ7VD/3y85rihdraMZEtrnfCC9GAi7s+x18T\n bytxXYHUN9+jKSWWSdttkz067G2Zok2w75hBR/Kzqxs8BV2SB7MFCbv5mICBwS/0VXnL\n tTEw==", "X-Gm-Message-State": "AOJu0Yxz7uIMJrnXpDd1bPdE0uG25zHzosTJ9jN6tn5FZLLscb2w42j3\n YCVk6wAMjmLGPCMLvxnt0yEf0OfJBoxuf2p4Ur2XBuUf5I0O5lMx2xjEYY7srIslqg0rcmlcEq0\n cxV+0DsmwuysAouNepq69AR0Um/LZt19II220/xklpx9WHtA5PepntUaPOmHDP1HtfJhoGPayL3\n 0xnbHUFFlPA41F9w==", "X-Gm-Gg": "AZuq6aKZ70KHDbtuQ/r23RhVjP8a2tilIW/DYLeHRGwOHk71bfAWNNJKnWAx+I1gQFL\n mfsH2d1CMbOIj3NA2A+vaO0ZxJYn2GBeqRVgsaGUArgcr+YH8xTZKfo9KeJXNmp5Dng43YyYrY4\n uMUOREGkTWqWAmTSi1iz7zy7HTzb0Uy4oYEmWRbMGBxh06jjeqQERUYKph0jr9nXVMdQwNXT9Ni\n 6KsNLaHbwfekLwKZWr1rgVCUqb6NNy+r/49J7h2e4H7F3b/zjDtqdikXrGbj2VHmdihyoGmkVSv\n iG/BAunUIB9yvC1V+9cDzSaupo8sA6viwis0nJFfgq3ovgjRqQoy2jiC+6+CVVAvHJ3YK3l4IYb\n 5V5AFImNbu2oTDTz03hqE5w3pu/yJOmeSMW90kgJv66SNUnZeauDMhn0zDDWNpKSbRg==", "X-Received": [ "by 2002:a05:6a21:68e:b0:366:187f:3365 with SMTP id\n adf61e73a8af0-39416c80942mr665535637.0.1770688029123;\n Mon, 09 Feb 2026 17:47:09 -0800 (PST)", "by 2002:a05:6a21:68e:b0:366:187f:3365 with SMTP id\n adf61e73a8af0-39416c80942mr665515637.0.1770688028578;\n Mon, 09 Feb 2026 17:47:08 -0800 (PST)" ], "From": "Gerald Yang <gerald.yang@canonical.com>", "To": "kernel-team@lists.ubuntu.com", "Subject": "[SRU][N][PATCH 1/2] netfilter: conntrack: remove skb argument from\n nf_ct_refresh", "Date": "Tue, 10 Feb 2026 01:46:56 +0000", "Message-ID": "<20260210014702.3126-2-gerald.yang@canonical.com>", "X-Mailer": "git-send-email 2.43.0", "In-Reply-To": "<20260210014702.3126-1-gerald.yang@canonical.com>", "References": "<20260210014702.3126-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 <kernel-team.lists.ubuntu.com>", "List-Unsubscribe": "<https://lists.ubuntu.com/mailman/options/kernel-team>,\n <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>,\n <mailto:kernel-team-request@lists.ubuntu.com?subject=subscribe>", "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>" }, "content": "From: Florian Westphal <fw@strlen.de>\n\nBugLink: https://bugs.launchpad.net/bugs/2139322\n\nIts not used (and could be NULL), so remove it.\nThis allows to use nf_ct_refresh in places where we don't have\nan skb without having to double-check that skb == NULL would be safe.\n\nSigned-off-by: Florian Westphal <fw@strlen.de>\nSigned-off-by: Pablo Neira Ayuso <pablo@netfilter.org>\n(cherry picked from commit 31768596b15aa8c9c55f078acad29d0238c8269b)\nSigned-off-by: Gerald Yang <gerald.yang@canonical.com>\n---\n include/net/netfilter/nf_conntrack.h | 8 +++-----\n net/netfilter/nf_conntrack_amanda.c | 2 +-\n net/netfilter/nf_conntrack_broadcast.c | 2 +-\n net/netfilter/nf_conntrack_core.c | 7 +++----\n net/netfilter/nf_conntrack_h323_main.c | 4 ++--\n net/netfilter/nf_conntrack_sip.c | 4 ++--\n net/netfilter/nft_ct.c | 2 +-\n 7 files changed, 13 insertions(+), 16 deletions(-)", "diff": "diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h\nindex 8cb70e7485e2..a85051121af8 100644\n--- a/include/net/netfilter/nf_conntrack.h\n+++ b/include/net/netfilter/nf_conntrack.h\n@@ -204,8 +204,7 @@ bool nf_ct_get_tuplepr(const struct sk_buff *skb, unsigned int nhoff,\n \t\t struct nf_conntrack_tuple *tuple);\n \n void __nf_ct_refresh_acct(struct nf_conn *ct, enum ip_conntrack_info ctinfo,\n-\t\t\t const struct sk_buff *skb,\n-\t\t\t u32 extra_jiffies, bool do_acct);\n+\t\t\t u32 extra_jiffies, unsigned int bytes);\n \n /* Refresh conntrack for this many jiffies and do accounting */\n static inline void nf_ct_refresh_acct(struct nf_conn *ct,\n@@ -213,15 +212,14 @@ static inline void nf_ct_refresh_acct(struct nf_conn *ct,\n \t\t\t\t const struct sk_buff *skb,\n \t\t\t\t u32 extra_jiffies)\n {\n-\t__nf_ct_refresh_acct(ct, ctinfo, skb, extra_jiffies, true);\n+\t__nf_ct_refresh_acct(ct, ctinfo, extra_jiffies, skb->len);\n }\n \n /* Refresh conntrack for this many jiffies */\n static inline void nf_ct_refresh(struct nf_conn *ct,\n-\t\t\t\t const struct sk_buff *skb,\n \t\t\t\t u32 extra_jiffies)\n {\n-\t__nf_ct_refresh_acct(ct, 0, skb, extra_jiffies, false);\n+\t__nf_ct_refresh_acct(ct, 0, extra_jiffies, 0);\n }\n \n /* kill conntrack and do accounting */\ndiff --git a/net/netfilter/nf_conntrack_amanda.c b/net/netfilter/nf_conntrack_amanda.c\nindex d011d2eb0848..7be4c35e4795 100644\n--- a/net/netfilter/nf_conntrack_amanda.c\n+++ b/net/netfilter/nf_conntrack_amanda.c\n@@ -106,7 +106,7 @@ static int amanda_help(struct sk_buff *skb,\n \n \t/* increase the UDP timeout of the master connection as replies from\n \t * Amanda clients to the server can be quite delayed */\n-\tnf_ct_refresh(ct, skb, master_timeout * HZ);\n+\tnf_ct_refresh(ct, master_timeout * HZ);\n \n \t/* No data? */\n \tdataoff = protoff + sizeof(struct udphdr);\ndiff --git a/net/netfilter/nf_conntrack_broadcast.c b/net/netfilter/nf_conntrack_broadcast.c\nindex cfa0fe0356de..a7552a46d6ac 100644\n--- a/net/netfilter/nf_conntrack_broadcast.c\n+++ b/net/netfilter/nf_conntrack_broadcast.c\n@@ -75,7 +75,7 @@ int nf_conntrack_broadcast_help(struct sk_buff *skb,\n \tnf_ct_expect_related(exp, 0);\n \tnf_ct_expect_put(exp);\n \n-\tnf_ct_refresh(ct, skb, timeout * HZ);\n+\tnf_ct_refresh(ct, timeout * HZ);\n out:\n \treturn NF_ACCEPT;\n }\ndiff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c\nindex 504c96c3d37b..299987f306c6 100644\n--- a/net/netfilter/nf_conntrack_core.c\n+++ b/net/netfilter/nf_conntrack_core.c\n@@ -2059,9 +2059,8 @@ EXPORT_SYMBOL_GPL(nf_conntrack_in);\n /* Refresh conntrack for this many jiffies and do accounting if do_acct is 1 */\n void __nf_ct_refresh_acct(struct nf_conn *ct,\n \t\t\t enum ip_conntrack_info ctinfo,\n-\t\t\t const struct sk_buff *skb,\n \t\t\t u32 extra_jiffies,\n-\t\t\t bool do_acct)\n+\t\t\t unsigned int bytes)\n {\n \t/* Only update if this is not a fixed timeout */\n \tif (test_bit(IPS_FIXED_TIMEOUT_BIT, &ct->status))\n@@ -2074,8 +2073,8 @@ void __nf_ct_refresh_acct(struct nf_conn *ct,\n \tif (READ_ONCE(ct->timeout) != extra_jiffies)\n \t\tWRITE_ONCE(ct->timeout, extra_jiffies);\n acct:\n-\tif (do_acct)\n-\t\tnf_ct_acct_update(ct, CTINFO2DIR(ctinfo), skb->len);\n+\tif (bytes)\n+\t\tnf_ct_acct_update(ct, CTINFO2DIR(ctinfo), bytes);\n }\n EXPORT_SYMBOL_GPL(__nf_ct_refresh_acct);\n \ndiff --git a/net/netfilter/nf_conntrack_h323_main.c b/net/netfilter/nf_conntrack_h323_main.c\nindex 5a9bce24f3c3..14f73872f647 100644\n--- a/net/netfilter/nf_conntrack_h323_main.c\n+++ b/net/netfilter/nf_conntrack_h323_main.c\n@@ -1385,7 +1385,7 @@ static int process_rcf(struct sk_buff *skb, struct nf_conn *ct,\n \tif (info->timeout > 0) {\n \t\tpr_debug(\"nf_ct_ras: set RAS connection timeout to \"\n \t\t\t \"%u seconds\\n\", info->timeout);\n-\t\tnf_ct_refresh(ct, skb, info->timeout * HZ);\n+\t\tnf_ct_refresh(ct, info->timeout * HZ);\n \n \t\t/* Set expect timeout */\n \t\tspin_lock_bh(&nf_conntrack_expect_lock);\n@@ -1433,7 +1433,7 @@ static int process_urq(struct sk_buff *skb, struct nf_conn *ct,\n \tinfo->sig_port[!dir] = 0;\n \n \t/* Give it 30 seconds for UCF or URJ */\n-\tnf_ct_refresh(ct, skb, 30 * HZ);\n+\tnf_ct_refresh(ct, 30 * HZ);\n \n \treturn 0;\n }\ndiff --git a/net/netfilter/nf_conntrack_sip.c b/net/netfilter/nf_conntrack_sip.c\nindex d0eac27f6ba0..ca748f8dbff1 100644\n--- a/net/netfilter/nf_conntrack_sip.c\n+++ b/net/netfilter/nf_conntrack_sip.c\n@@ -1553,7 +1553,7 @@ static int sip_help_tcp(struct sk_buff *skb, unsigned int protoff,\n \tif (dataoff >= skb->len)\n \t\treturn NF_ACCEPT;\n \n-\tnf_ct_refresh(ct, skb, sip_timeout * HZ);\n+\tnf_ct_refresh(ct, sip_timeout * HZ);\n \n \tif (unlikely(skb_linearize(skb)))\n \t\treturn NF_DROP;\n@@ -1624,7 +1624,7 @@ static int sip_help_udp(struct sk_buff *skb, unsigned int protoff,\n \tif (dataoff >= skb->len)\n \t\treturn NF_ACCEPT;\n \n-\tnf_ct_refresh(ct, skb, sip_timeout * HZ);\n+\tnf_ct_refresh(ct, sip_timeout * HZ);\n \n \tif (unlikely(skb_linearize(skb)))\n \t\treturn NF_DROP;\ndiff --git a/net/netfilter/nft_ct.c b/net/netfilter/nft_ct.c\nindex ab1214da99ff..f074dd8037f6 100644\n--- a/net/netfilter/nft_ct.c\n+++ b/net/netfilter/nft_ct.c\n@@ -931,7 +931,7 @@ static void nft_ct_timeout_obj_eval(struct nft_object *obj,\n \t */\n \tvalues = nf_ct_timeout_data(timeout);\n \tif (values)\n-\t\tnf_ct_refresh(ct, pkt->skb, values[0]);\n+\t\tnf_ct_refresh(ct, values[0]);\n }\n \n static int nft_ct_timeout_obj_init(const struct nft_ctx *ctx,\n", "prefixes": [ "SRU", "N", "1/2" ] }