From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3EC592EEE91 for ; Tue, 30 Jun 2026 08:42:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.171 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782808949; cv=none; b=fsHvgQabs8U2ASyksQvi0BVL+R8Y5cVFILybB5vKMuWxz2slSl5K2b9iXQbX26kJcy6HUUDPsDN9o3FB1zdcK+7YW6uaEbLoM76segbOgCRRqnltmZMAfKwRGa32F8/NCMqOBPsHO1bmZ4TIFxvgPPXDLCfsRk2dZnkSDmeEJVg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782808949; c=relaxed/simple; bh=j8zqaB7T04hBpqZcwzgtw7u5iuAAhaaqsYCQfcZUNBo=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=NOun/GsZ54yTJcrq1JBv0+AP8SIXqoHJCaxq4dvoaOnl8m4ZKNUd4XaeYQatX8XTHN94pYq+J7WUWDUopeHs3KMyPQiB2jyjP8AWERjebG7Z3cL1ggR6qGc5k8qNB/qLZ1/P5RGbUSHc/2Q5hHgZdzUJX/AwjwIXRMoAMIg4zJ8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=UJFsstUP; arc=none smtp.client-ip=209.85.210.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="UJFsstUP" Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-8475eca3a66so1909574b3a.2 for ; Tue, 30 Jun 2026 01:42:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782808947; x=1783413747; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=d7EeC63NFPzYUKRtuwuPqf7M5up4qWTV1M2HoxWcbP8=; b=UJFsstUPwLa724WNigvYHuUP+tM480v4gNbcwvmcolSgODF7338lMEfnbHD6cGk/Ym 7S9ZMWNUyIOTc0lQkPM+edE2wZo+469yFBuhvbbSA+Z6ILYCl3CgWdHamALQNnJLxiUG e5FpRhdkuwhyQhrDWyY6ZI3oazdVxEcMHYqCPswmrI7bQZH67Lrh1SHCtk3Gu2BTRwPa xXfaou3yadsV1000g8ipqNgOnDj0e6yzOppaPl5Ou2gtJIDQwYbL/LZvgkIXha4Vn+6D df7bljFeXUI2qTFw/SLk1D5usNVwqFz4a99B74cNY7PGvgifYzP1lIbpm1LeA7C19si+ 02Gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782808947; x=1783413747; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=d7EeC63NFPzYUKRtuwuPqf7M5up4qWTV1M2HoxWcbP8=; b=Tb4SC/pxZLtoYOxVXH3E3pPBxwYPKUK6nOzJR1/rSJU8PMDxzv+nxYCKQTNw8J/71I F/OhSU82KHDLBbeT9yvEtG2Ok2LKG1GixTedCZL+EZcHCW47TDGedCh78HuNVd+PcmOt 7/L22eRDFbQ82izskv81MdkN9pk8rRyVmyEQZ+hk6Gjm4eRbO4HZ3VL+zMbRJFbluYJU m4U/dJ40j6AkryFo6nM/LaR/9/uYpKOu4mnCLw5z8CAHbsw/y2PXaviY6vdoqJsiAKwD PqDsX+Yw5icKbc/AkPrBbV8U2BE4lnGL5YxH23rXghRj8vi1Cj+9ZihcrlZEp1psOUEd aZBQ== X-Forwarded-Encrypted: i=1; AFNElJ9/Xr0M17QJGAT0Pau8N090iut+5qBBYUtiwLJkrvWxGYVY9VTkP8Xh2r7sc+l6vGI5tIS6WGBRkQ6Dka8=@vger.kernel.org X-Gm-Message-State: AOJu0YyB//ffSeMol2N0RtNjD3f3wjoPPVA41jGehPZueSDsgKEXTs9d Cvh3a2Vvkaxg2nzxFmN8igG28Pt9B70EkA8Ma9eWAECFFCB1hBj8GHh2 X-Gm-Gg: AfdE7cml9qdDNjShgrfLZKYjl+l9fUyQ5rQaHTYV3/IVgqyqJ7PayT/DABsmAXF1bD3 a2FUFJ4c9o7RINUVEW49RUokkh/ukTsHL6re3xbpO1ubFm5Ay0lGCXBkwLdCNqlEWlqtsaIX8oT mdExsMeHH9BfUYbrDCQLU6lGU1lHACGEv63j3gQieRhF0c/tONXv57UEJYodPVjJZ4cLRPN0JVM TDTLx3CZddJlkPYNRg6bAeVnq8CIZtvdDe98G65+NC6pQ4oGMvGKHGDhpn9SD+o44igLz4FHptX dK/9fHb4Ix5CGN3trbOAGfMcF2KrtHHGAmgih3xqN0RiejIGxDNwpy842kL7IL9iy6o6fo7mWcH nxN03rMSrcQw/GkQSToM0MKJXMxCK4uKZn+nGAFhRXH3+Vl/CG7v3LzFVvzONB3ee5r636kZOaZ tcMafsoDTBkvQBq02BD6hsUJ1xMzCEpzrw9moeRA== X-Received: by 2002:a05:6a00:3e21:b0:845:cd11:37e8 with SMTP id d2e1a72fcca58-8479f1155ecmr2288803b3a.24.1782808947354; Tue, 30 Jun 2026 01:42:27 -0700 (PDT) Received: from online.mioffice.cn ([43.224.245.228]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-847a02d1597sm1456636b3a.31.2026.06.30.01.42.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2026 01:42:26 -0700 (PDT) From: Pengfei Zhang To: dsahern@kernel.org, idosch@nvidia.com Cc: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, horms@kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, chenzhangqi@xiaomi.com, baohua@kernel.org, zhangpengfei16@xiaomi.com, Pengfei Zhang Subject: [PATCH v2 net-next] ipv4: fib: fix route re-dump in inet_dump_fib() on multi-batch dump Date: Tue, 30 Jun 2026 16:42:20 +0800 Message-ID: <20260630084220.2711025-1-zhangfeionline@gmail.com> X-Mailer: git-send-email 2.54.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit inet_dump_fib() saves its progress in cb->args[1] as a positional index within the current hash chain. Between batches, a concurrent fib_new_table() can insert a new table at the chain head, shifting all existing entries. On resume the saved index lands on a different table, causing already-dumped tables to be re-dumped and the originally suspended table to restart from the beginning. Fix by storing tb->tb_id in cb->args[1] instead of a positional index, mirroring the fix applied to inet6_dump_fib() in commit 9facb861dc6b ("ipv6: fib6: fix NULL deref in fib6_walk_continue() on multi-batch dump"). Signed-off-by: Pengfei Zhang --- v2: - Drop Fixes tag (not needed for net-next) - Fix variable declaration order (reverse xmas tree) - Reference IPv6 fix commit hash v1: https://lore.kernel.org/netdev/20260626085636.1524451-1-zhangfeionline@gmail.com/ net/ipv4/fib_frontend.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c index 42212970d..248895e7e 100644 --- a/net/ipv4/fib_frontend.c +++ b/net/ipv4/fib_frontend.c @@ -1019,10 +1019,11 @@ static int inet_dump_fib(struct sk_buff *skb, struct netlink_callback *cb) .dump_routes = true, .dump_exceptions = true, }; - unsigned int e = 0, s_e, h, s_h; struct hlist_head *head; int dumped = 0, err = 0; struct fib_table *tb; + unsigned int h, s_h; + u32 s_id; rcu_read_lock(); if (cb->strict_check) { @@ -1054,29 +1055,28 @@ static int inet_dump_fib(struct sk_buff *skb, struct netlink_callback *cb) } s_h = cb->args[0]; - s_e = cb->args[1]; + s_id = cb->args[1]; err = 0; - for (h = s_h; h < FIB_TABLE_HASHSZ; h++, s_e = 0) { - e = 0; + for (h = s_h; h < FIB_TABLE_HASHSZ; h++, s_id = 0) { head = &net->ipv4.fib_table_hash[h]; hlist_for_each_entry_rcu(tb, head, tb_hlist) { - if (e < s_e) - goto next; + if (s_id && tb->tb_id != s_id) + continue; + + s_id = 0; if (dumped) memset(&cb->args[2], 0, sizeof(cb->args) - 2 * sizeof(cb->args[0])); + cb->args[1] = tb->tb_id; err = fib_table_dump(tb, skb, cb, &filter); if (err < 0) goto out; dumped = 1; -next: - e++; } } out: - cb->args[1] = e; cb->args[0] = h; unlock: -- 2.54.0