This change introduces a parallel path in the kernel for retrieving
the local id, flags, if_index for an addr entry in the context of
an MPTCP connection that's being managed by a userspace PM. The
userspace and in-kernel PM modes deviate in their procedures for
obtaining this information.
Signed-off-by: Kishen Maloor <kishen.maloor@intel.com>
---
net/mptcp/pm_netlink.c | 97 ++++++++++++++++++++++++++++--------------
net/mptcp/protocol.h | 2 +-
net/mptcp/subflow.c | 2 +-
3 files changed, 67 insertions(+), 34 deletions(-)
diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
index ac5d152fbb77..7058d55e3a0a 100644
--- a/net/mptcp/pm_netlink.c
+++ b/net/mptcp/pm_netlink.c
@@ -1230,31 +1230,47 @@ int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, struct sock_common *skc)
pernet = net_generic(sock_net((struct sock *)msk), pm_nl_pernet_id);
- rcu_read_lock();
- list_for_each_entry_rcu(entry, &pernet->local_addr_list, list) {
- if (addresses_equal(&entry->addr, &skc_local, entry->addr.port)) {
- ret = entry->addr.id;
- break;
- }
- }
- rcu_read_unlock();
- if (ret >= 0)
- return ret;
-
/* address not found, add to local list */
- entry = kmalloc(sizeof(*entry), GFP_ATOMIC);
- if (!entry)
- return -ENOMEM;
-
- entry->addr = skc_local;
- entry->addr.id = 0;
- entry->addr.port = 0;
- entry->ifindex = 0;
- entry->flags = 0;
- entry->lsk_ref = NULL;
- ret = mptcp_pm_nl_append_new_local_addr(pernet, entry);
- if (ret < 0)
- kfree(entry);
+ if (mptcp_pm_is_kernel(msk)) {
+ rcu_read_lock();
+ list_for_each_entry_rcu(entry, &pernet->local_addr_list, list) {
+ if (addresses_equal(&entry->addr, &skc_local, entry->addr.port)) {
+ ret = entry->addr.id;
+ break;
+ }
+ }
+ rcu_read_unlock();
+
+ if (ret >= 0)
+ return ret;
+
+ entry = kmalloc(sizeof(*entry), GFP_ATOMIC);
+ if (!entry)
+ return -ENOMEM;
+
+ entry->addr = skc_local;
+ entry->addr.id = 0;
+ entry->addr.port = 0;
+ entry->ifindex = 0;
+ entry->flags = 0;
+ entry->lsk_ref = NULL;
+ ret = mptcp_pm_nl_append_new_local_addr(pernet, entry);
+ if (ret < 0)
+ kfree(entry);
+ } else if (mptcp_pm_is_userspace(msk)) {
+ struct mptcp_pm_addr_entry new_entry;
+ __be16 msk_sport = ((struct inet_sock *)
+ inet_sk((struct sock *)msk))->inet_sport;
+
+ memset(&new_entry, 0, sizeof(struct mptcp_pm_addr_entry));
+ new_entry.addr = skc_local;
+ new_entry.addr.id = 0;
+
+ if (new_entry.addr.port == msk_sport)
+ new_entry.addr.port = 0;
+
+ ret = mptcp_userspace_pm_append_new_local_addr(msk, &new_entry);
+ }
return ret;
}
@@ -1488,22 +1504,39 @@ static int mptcp_nl_cmd_add_addr(struct sk_buff *skb, struct genl_info *info)
return 0;
}
-int mptcp_pm_get_flags_and_ifindex_by_id(struct net *net, unsigned int id,
+int mptcp_pm_get_flags_and_ifindex_by_id(struct mptcp_sock *msk, unsigned int id,
u8 *flags, int *ifindex)
{
- struct mptcp_pm_addr_entry *entry;
+ struct mptcp_pm_addr_entry *entry, *match = NULL;
+ struct sock *sk = (struct sock *)msk;
+ struct net *net = sock_net(sk);
*flags = 0;
*ifindex = 0;
if (id) {
- rcu_read_lock();
- entry = __lookup_addr_by_id(net_generic(net, pm_nl_pernet_id), id);
- if (entry) {
- *flags = entry->flags;
- *ifindex = entry->ifindex;
+ if (mptcp_pm_is_kernel(msk)) {
+ rcu_read_lock();
+ entry = __lookup_addr_by_id(net_generic(net, pm_nl_pernet_id), id);
+ if (entry) {
+ *flags = entry->flags;
+ *ifindex = entry->ifindex;
+ }
+ rcu_read_unlock();
+ } else {
+ mptcp_data_lock(sk);
+ list_for_each_entry(entry, &msk->local_addr_list, list) {
+ if (id == entry->addr.id) {
+ match = entry;
+ break;
+ }
+ }
+ mptcp_data_unlock(sk);
+ if (match) {
+ *flags = match->flags;
+ *ifindex = match->ifindex;
+ }
}
- rcu_read_unlock();
}
return 0;
diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index 6b7e51a2bd09..b6af57d5ff5b 100644
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -771,7 +771,7 @@ mptcp_pm_del_add_timer(struct mptcp_sock *msk,
struct mptcp_pm_add_entry *
mptcp_lookup_anno_list_by_saddr(struct mptcp_sock *msk,
struct mptcp_addr_info *addr);
-int mptcp_pm_get_flags_and_ifindex_by_id(struct net *net, unsigned int id,
+int mptcp_pm_get_flags_and_ifindex_by_id(struct mptcp_sock *msk, unsigned int id,
u8 *flags, int *ifindex);
int mptcp_pm_announce_addr(struct mptcp_sock *msk,
diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c
index d3691b95401a..19df5293334f 100644
--- a/net/mptcp/subflow.c
+++ b/net/mptcp/subflow.c
@@ -1416,7 +1416,7 @@ int __mptcp_subflow_connect(struct sock *sk, const struct mptcp_addr_info *loc,
local_id = err;
}
- mptcp_pm_get_flags_and_ifindex_by_id(sock_net(sk), local_id,
+ mptcp_pm_get_flags_and_ifindex_by_id(msk, local_id,
&flags, &ifindex);
subflow->remote_key = msk->remote_key;
subflow->local_key = msk->local_key;
--
2.31.1
Kishen Maloor <kishen.maloor@intel.com> 于2022年2月3日周四 11:14写道：
>
> This change introduces a parallel path in the kernel for retrieving
> the local id, flags, if_index for an addr entry in the context of
> an MPTCP connection that's being managed by a userspace PM. The
> userspace and in-kernel PM modes deviate in their procedures for
> obtaining this information.
>
> Signed-off-by: Kishen Maloor <kishen.maloor@intel.com>
> ---
> net/mptcp/pm_netlink.c | 97 ++++++++++++++++++++++++++++--------------
> net/mptcp/protocol.h | 2 +-
> net/mptcp/subflow.c | 2 +-
> 3 files changed, 67 insertions(+), 34 deletions(-)
>
> diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
> index ac5d152fbb77..7058d55e3a0a 100644
> --- a/net/mptcp/pm_netlink.c
> +++ b/net/mptcp/pm_netlink.c
> @@ -1230,31 +1230,47 @@ int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, struct sock_common *skc)
>
> pernet = net_generic(sock_net((struct sock *)msk), pm_nl_pernet_id);
>
> - rcu_read_lock();
> - list_for_each_entry_rcu(entry, &pernet->local_addr_list, list) {
> - if (addresses_equal(&entry->addr, &skc_local, entry->addr.port)) {
> - ret = entry->addr.id;
> - break;
> - }
> - }
> - rcu_read_unlock();
> - if (ret >= 0)
> - return ret;
> -
> /* address not found, add to local list */
I think this comment should be moved into 'if (mptcp_pm_is_kernel(msk))' too.
> - entry = kmalloc(sizeof(*entry), GFP_ATOMIC);
> - if (!entry)
> - return -ENOMEM;
> -
> - entry->addr = skc_local;
> - entry->addr.id = 0;
> - entry->addr.port = 0;
> - entry->ifindex = 0;
> - entry->flags = 0;
> - entry->lsk_ref = NULL;
> - ret = mptcp_pm_nl_append_new_local_addr(pernet, entry);
> - if (ret < 0)
> - kfree(entry);
> + if (mptcp_pm_is_kernel(msk)) {
> + rcu_read_lock();
> + list_for_each_entry_rcu(entry, &pernet->local_addr_list, list) {
> + if (addresses_equal(&entry->addr, &skc_local, entry->addr.port)) {
> + ret = entry->addr.id;
> + break;
> + }
> + }
> + rcu_read_unlock();
> +
> + if (ret >= 0)
> + return ret;
> +
> + entry = kmalloc(sizeof(*entry), GFP_ATOMIC);
> + if (!entry)
> + return -ENOMEM;
> +
> + entry->addr = skc_local;
> + entry->addr.id = 0;
> + entry->addr.port = 0;
> + entry->ifindex = 0;
> + entry->flags = 0;
> + entry->lsk_ref = NULL;
> + ret = mptcp_pm_nl_append_new_local_addr(pernet, entry);
> + if (ret < 0)
> + kfree(entry);
> + } else if (mptcp_pm_is_userspace(msk)) {
> + struct mptcp_pm_addr_entry new_entry;
> + __be16 msk_sport = ((struct inet_sock *)
> + inet_sk((struct sock *)msk))->inet_sport;
> +
> + memset(&new_entry, 0, sizeof(struct mptcp_pm_addr_entry));
> + new_entry.addr = skc_local;
> + new_entry.addr.id = 0;
> +
> + if (new_entry.addr.port == msk_sport)
> + new_entry.addr.port = 0;
> +
> + ret = mptcp_userspace_pm_append_new_local_addr(msk, &new_entry);
> + }
>
> return ret;
> }
> @@ -1488,22 +1504,39 @@ static int mptcp_nl_cmd_add_addr(struct sk_buff *skb, struct genl_info *info)
> return 0;
> }
>
> -int mptcp_pm_get_flags_and_ifindex_by_id(struct net *net, unsigned int id,
> +int mptcp_pm_get_flags_and_ifindex_by_id(struct mptcp_sock *msk, unsigned int id,
> u8 *flags, int *ifindex)
> {
> - struct mptcp_pm_addr_entry *entry;
> + struct mptcp_pm_addr_entry *entry, *match = NULL;
> + struct sock *sk = (struct sock *)msk;
> + struct net *net = sock_net(sk);
>
> *flags = 0;
> *ifindex = 0;
>
> if (id) {
> - rcu_read_lock();
> - entry = __lookup_addr_by_id(net_generic(net, pm_nl_pernet_id), id);
> - if (entry) {
> - *flags = entry->flags;
> - *ifindex = entry->ifindex;
> + if (mptcp_pm_is_kernel(msk)) {
> + rcu_read_lock();
> + entry = __lookup_addr_by_id(net_generic(net, pm_nl_pernet_id), id);
> + if (entry) {
> + *flags = entry->flags;
> + *ifindex = entry->ifindex;
> + }
> + rcu_read_unlock();
> + } else {
> + mptcp_data_lock(sk);
> + list_for_each_entry(entry, &msk->local_addr_list, list) {
> + if (id == entry->addr.id) {
> + match = entry;
> + break;
> + }
> + }
> + mptcp_data_unlock(sk);
> + if (match) {
> + *flags = match->flags;
> + *ifindex = match->ifindex;
> + }
> }
> - rcu_read_unlock();
> }
>
> return 0;
> diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
> index 6b7e51a2bd09..b6af57d5ff5b 100644
> --- a/net/mptcp/protocol.h
> +++ b/net/mptcp/protocol.h
> @@ -771,7 +771,7 @@ mptcp_pm_del_add_timer(struct mptcp_sock *msk,
> struct mptcp_pm_add_entry *
> mptcp_lookup_anno_list_by_saddr(struct mptcp_sock *msk,
> struct mptcp_addr_info *addr);
> -int mptcp_pm_get_flags_and_ifindex_by_id(struct net *net, unsigned int id,
> +int mptcp_pm_get_flags_and_ifindex_by_id(struct mptcp_sock *msk, unsigned int id,
> u8 *flags, int *ifindex);
>
> int mptcp_pm_announce_addr(struct mptcp_sock *msk,
> diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c
> index d3691b95401a..19df5293334f 100644
> --- a/net/mptcp/subflow.c
> +++ b/net/mptcp/subflow.c
> @@ -1416,7 +1416,7 @@ int __mptcp_subflow_connect(struct sock *sk, const struct mptcp_addr_info *loc,
> local_id = err;
> }
>
> - mptcp_pm_get_flags_and_ifindex_by_id(sock_net(sk), local_id,
> + mptcp_pm_get_flags_and_ifindex_by_id(msk, local_id,
> &flags, &ifindex);
> subflow->remote_key = msk->remote_key;
> subflow->local_key = msk->local_key;
> --
> 2.31.1
>
>
© 2016 - 2026 Red Hat, Inc.