Skip to content

Commit 1d7fa6c

Browse files
Geliang Tangkuba-moo
authored andcommitted
mptcp: pm: avoid code duplication to lookup endp
The helper __lookup_addr() can be used in mptcp_pm_nl_get_local_id() and mptcp_pm_nl_is_backup() to simplify the code, and avoid code duplication. Co-developed-by: Matthieu Baerts (NGI0) <[email protected]> Signed-off-by: Matthieu Baerts (NGI0) <[email protected]> Signed-off-by: Geliang Tang <[email protected]> Signed-off-by: Matthieu Baerts (NGI0) <[email protected]> Link: https://patch.msgid.link/20241115-net-next-mptcp-pm-lockless-dump-v1-2-f4a1bcb4ca2c@kernel.org Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 3fbb27b commit 1d7fa6c

File tree

1 file changed

+6
-14
lines changed

1 file changed

+6
-14
lines changed

net/mptcp/pm_netlink.c

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1143,17 +1143,13 @@ int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, struct mptcp_addr_info *skc
11431143
{
11441144
struct mptcp_pm_addr_entry *entry;
11451145
struct pm_nl_pernet *pernet;
1146-
int ret = -1;
1146+
int ret;
11471147

11481148
pernet = pm_nl_get_pernet_from_msk(msk);
11491149

11501150
rcu_read_lock();
1151-
list_for_each_entry_rcu(entry, &pernet->local_addr_list, list) {
1152-
if (mptcp_addresses_equal(&entry->addr, skc, entry->addr.port)) {
1153-
ret = entry->addr.id;
1154-
break;
1155-
}
1156-
}
1151+
entry = __lookup_addr(pernet, skc);
1152+
ret = entry ? entry->addr.id : -1;
11571153
rcu_read_unlock();
11581154
if (ret >= 0)
11591155
return ret;
@@ -1180,15 +1176,11 @@ bool mptcp_pm_nl_is_backup(struct mptcp_sock *msk, struct mptcp_addr_info *skc)
11801176
{
11811177
struct pm_nl_pernet *pernet = pm_nl_get_pernet_from_msk(msk);
11821178
struct mptcp_pm_addr_entry *entry;
1183-
bool backup = false;
1179+
bool backup;
11841180

11851181
rcu_read_lock();
1186-
list_for_each_entry_rcu(entry, &pernet->local_addr_list, list) {
1187-
if (mptcp_addresses_equal(&entry->addr, skc, entry->addr.port)) {
1188-
backup = !!(entry->flags & MPTCP_PM_ADDR_FLAG_BACKUP);
1189-
break;
1190-
}
1191-
}
1182+
entry = __lookup_addr(pernet, skc);
1183+
backup = entry && !!(entry->flags & MPTCP_PM_ADDR_FLAG_BACKUP);
11921184
rcu_read_unlock();
11931185

11941186
return backup;

0 commit comments

Comments
 (0)