summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKuniyuki Iwashima <kuniyu@google.com>2025-07-16 22:08:16 +0000
committerJakub Kicinski <kuba@kernel.org>2025-07-17 16:25:21 -0700
commitb9c89fa128fa41e56300434dfca1138459b29384 (patch)
treebd5b6056c01ffe8d7be8ebd2b7c8106029f49e29
parent32d5eaabf186112eb2023aacb860c47ff7e7fdbf (diff)
neighbour: Use rcu_dereference() in pneigh_get_{first,next}().
Now pneigh_entry is guaranteed to be alive during the RCU critical section even without holding tbl->lock. Let's use rcu_dereference() in pneigh_get_{first,next}(). Note that neigh_seq_start() still holds tbl->lock for the normal neighbour entry. Signed-off-by: Kuniyuki Iwashima <kuniyu@google.com> Link: https://patch.msgid.link/20250716221221.442239-12-kuniyu@google.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-rw-r--r--net/core/neighbour.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index 3ef797212618..b76ff416b9a7 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -3309,10 +3309,10 @@ static struct pneigh_entry *pneigh_get_first(struct seq_file *seq)
state->flags |= NEIGH_SEQ_IS_PNEIGH;
for (bucket = 0; bucket <= PNEIGH_HASHMASK; bucket++) {
- pn = rcu_dereference_protected(tbl->phash_buckets[bucket], 1);
+ pn = rcu_dereference(tbl->phash_buckets[bucket]);
while (pn && !net_eq(pneigh_net(pn), net))
- pn = rcu_dereference_protected(pn->next, 1);
+ pn = rcu_dereference(pn->next);
if (pn)
break;
}
@@ -3330,17 +3330,17 @@ static struct pneigh_entry *pneigh_get_next(struct seq_file *seq,
struct neigh_table *tbl = state->tbl;
do {
- pn = rcu_dereference_protected(pn->next, 1);
+ pn = rcu_dereference(pn->next);
} while (pn && !net_eq(pneigh_net(pn), net));
while (!pn) {
if (++state->bucket > PNEIGH_HASHMASK)
break;
- pn = rcu_dereference_protected(tbl->phash_buckets[state->bucket], 1);
+ pn = rcu_dereference(tbl->phash_buckets[state->bucket]);
while (pn && !net_eq(pneigh_net(pn), net))
- pn = rcu_dereference_protected(pn->next, 1);
+ pn = rcu_dereference(pn->next);
if (pn)
break;
}