* [MPTCP] Re: [MPTCP][PATCH v9 mptcp-next 1/9] mptcp: create the listening socket for new port
@ 2021-01-08 22:56 Mat Martineau
0 siblings, 0 replies; 3+ messages in thread
From: Mat Martineau @ 2021-01-08 22:56 UTC (permalink / raw)
To: mptcp
[-- Attachment #1: Type: text/plain, Size: 7468 bytes --]
On Tue, 5 Jan 2021, Geliang Tang wrote:
> This patch created a listening socket when an address with a port-number
> is added by PM netlink. Then binded the new port to the socket, and
> listened for the connection.
>
> When the address is removed or the addresses are flushed by PM netlink,
> release the listening socket.
>
> Signed-off-by: Geliang Tang <geliangtang(a)gmail.com>
> ---
> net/mptcp/pm_netlink.c | 96 +++++++++++++++++++++++++++++++++++++++++-
> net/mptcp/protocol.c | 2 +-
> net/mptcp/protocol.h | 4 ++
> net/mptcp/subflow.c | 6 +--
> 4 files changed, 102 insertions(+), 6 deletions(-)
>
> diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
> index 7dd0dba770fe..d42c659c586a 100644
> --- a/net/mptcp/pm_netlink.c
> +++ b/net/mptcp/pm_netlink.c
> @@ -26,6 +26,7 @@ struct mptcp_pm_addr_entry {
> struct list_head list;
> struct mptcp_addr_info addr;
> struct rcu_head rcu;
> + struct socket *lsk;
> };
>
> struct mptcp_pm_add_entry {
> @@ -673,6 +674,53 @@ static int mptcp_pm_nl_append_new_local_addr(struct pm_nl_pernet *pernet,
> return ret;
> }
>
> +static int mptcp_pm_nl_create_listen_socket(struct sock *sk,
> + struct mptcp_pm_addr_entry *entry)
> +{
> + struct sockaddr_storage addr;
> + struct mptcp_sock *msk;
> + struct socket *ssock;
> + int backlog = 1024;
> + int err;
> +
> + err = sock_create_kern(sock_net(sk), entry->addr.family,
> + SOCK_STREAM, IPPROTO_MPTCP, &entry->lsk);
> + if (err)
> + return err;
> +
> + msk = mptcp_sk(entry->lsk->sk);
> + if (!msk) {
> + err = -EINVAL;
> + goto out;
> + }
> +
> + ssock = __mptcp_nmpc_socket(msk);
> + if (!ssock) {
> + err = -EINVAL;
> + goto out;
> + }
> +
> + mptcp_info2sockaddr(&entry->addr, &addr, entry->addr.family);
> + err = kernel_bind(ssock, (struct sockaddr *)&addr,
> + sizeof(struct sockaddr_in));
> + if (err) {
> + pr_warn("kernel_bind error, err=%d", err);
> + goto out;
> + }
> +
> + err = kernel_listen(ssock, backlog);
> + if (err) {
> + pr_warn("kernel_listen error, err=%d", err);
> + goto out;
> + }
> +
> + return 0;
> +
> +out:
> + sock_release(entry->lsk);
> + return err;
> +}
> +
> int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, struct sock_common *skc)
> {
> struct mptcp_pm_addr_entry *entry;
> @@ -717,6 +765,8 @@ int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, struct sock_common *skc)
> entry->addr.ifindex = 0;
> entry->addr.flags = 0;
> entry->addr.id = 0;
> + entry->addr.port = 0;
> + entry->lsk = NULL;
> ret = mptcp_pm_nl_append_new_local_addr(pernet, entry);
> if (ret < 0)
> kfree(entry);
> @@ -886,9 +936,19 @@ static int mptcp_nl_cmd_add_addr(struct sk_buff *skb, struct genl_info *info)
> }
>
> *entry = addr;
> + if (entry->addr.port) {
> + ret = mptcp_pm_nl_create_listen_socket(skb->sk, entry);
> + if (ret) {
> + GENL_SET_ERR_MSG(info, "create listen socket error");
> + kfree(entry);
> + return ret;
> + }
> + }
> ret = mptcp_pm_nl_append_new_local_addr(pernet, entry);
> if (ret < 0) {
> GENL_SET_ERR_MSG(info, "too many addresses or duplicate one");
> + if (entry->lsk)
> + sock_release(entry->lsk);
> kfree(entry);
> return ret;
> }
> @@ -972,6 +1032,38 @@ static int mptcp_nl_remove_subflow_and_signal_addr(struct net *net,
> return 0;
> }
>
> +struct addr_entry_release_work {
> + struct rcu_work rwork;
> + struct mptcp_pm_addr_entry *entry;
> +};
> +
> +static void mptcp_pm_release_addr_entry(struct work_struct *work)
> +{
> + struct addr_entry_release_work *w;
> + struct mptcp_pm_addr_entry *entry;
> +
> + w = container_of(to_rcu_work(work), struct addr_entry_release_work, rwork);
> + entry = w->entry;
> + if (entry) {
> + if (entry->lsk)
> + sock_release(entry->lsk);
> + kfree(entry);
> + }
> + kfree(w);
> +}
> +
> +static void mptcp_pm_free_addr_entry(struct mptcp_pm_addr_entry *entry)
> +{
> + struct addr_entry_release_work *w;
> +
> + w = kmalloc(sizeof(*w), GFP_ATOMIC);
> + if (w) {
> + INIT_RCU_WORK((struct rcu_work *)w, mptcp_pm_release_addr_entry);
> + w->entry = entry;
> + queue_rcu_work(system_wq, (struct rcu_work *)w);
Rather than casting the second arg, please use &w->rwork
Thanks,
Mat
> + }
> +}
> +
> static int mptcp_nl_cmd_del_addr(struct sk_buff *skb, struct genl_info *info)
> {
> struct nlattr *attr = info->attrs[MPTCP_PM_ATTR_ADDR];
> @@ -1001,7 +1093,7 @@ static int mptcp_nl_cmd_del_addr(struct sk_buff *skb, struct genl_info *info)
> spin_unlock_bh(&pernet->lock);
>
> mptcp_nl_remove_subflow_and_signal_addr(sock_net(skb->sk), &entry->addr);
> - kfree_rcu(entry, rcu);
> + mptcp_pm_free_addr_entry(entry);
>
> return ret;
> }
> @@ -1015,7 +1107,7 @@ static void __flush_addrs(struct net *net, struct list_head *list)
> struct mptcp_pm_addr_entry, list);
> mptcp_nl_remove_subflow_and_signal_addr(net, &cur->addr);
> list_del_rcu(&cur->list);
> - kfree_rcu(cur, rcu);
> + mptcp_pm_free_addr_entry(cur);
> }
> }
>
> diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
> index 49384c453950..b15ce0fd996a 100644
> --- a/net/mptcp/protocol.c
> +++ b/net/mptcp/protocol.c
> @@ -49,7 +49,7 @@ static void __mptcp_check_send_data_fin(struct sock *sk);
> * completed yet or has failed, return the subflow socket.
> * Otherwise return NULL.
> */
> -static struct socket *__mptcp_nmpc_socket(const struct mptcp_sock *msk)
> +struct socket *__mptcp_nmpc_socket(const struct mptcp_sock *msk)
> {
> if (!msk->subflow || READ_ONCE(msk->can_ack))
> return NULL;
> diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
> index f6ed8dc0a073..7b4ba6597416 100644
> --- a/net/mptcp/protocol.h
> +++ b/net/mptcp/protocol.h
> @@ -469,11 +469,15 @@ void mptcp_subflow_shutdown(struct sock *sk, struct sock *ssk, int how);
> void __mptcp_close_ssk(struct sock *sk, struct sock *ssk,
> struct mptcp_subflow_context *subflow);
> void mptcp_subflow_reset(struct sock *ssk);
> +struct socket *__mptcp_nmpc_socket(const struct mptcp_sock *msk);
>
> /* called with sk socket lock held */
> int __mptcp_subflow_connect(struct sock *sk, const struct mptcp_addr_info *loc,
> const struct mptcp_addr_info *remote);
> int mptcp_subflow_create_socket(struct sock *sk, struct socket **new_sock);
> +void mptcp_info2sockaddr(const struct mptcp_addr_info *info,
> + struct sockaddr_storage *addr,
> + unsigned short family);
>
> static inline void mptcp_subflow_tcp_fallback(struct sock *sk,
> struct mptcp_subflow_context *ctx)
> diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c
> index 8dc4d9f86773..21d569054e01 100644
> --- a/net/mptcp/subflow.c
> +++ b/net/mptcp/subflow.c
> @@ -1073,9 +1073,9 @@ void mptcpv6_handle_mapped(struct sock *sk, bool mapped)
> }
> #endif
>
> -static void mptcp_info2sockaddr(const struct mptcp_addr_info *info,
> - struct sockaddr_storage *addr,
> - unsigned short family)
> +void mptcp_info2sockaddr(const struct mptcp_addr_info *info,
> + struct sockaddr_storage *addr,
> + unsigned short family)
> {
> memset(addr, 0, sizeof(*addr));
> addr->ss_family = family;
> --
> 2.29.2
> _______________________________________________
> mptcp mailing list -- mptcp(a)lists.01.org
> To unsubscribe send an email to mptcp-leave(a)lists.01.org
>
--
Mat Martineau
Intel
^ permalink raw reply [flat|nested] 3+ messages in thread
* [MPTCP] Re: [MPTCP][PATCH v9 mptcp-next 1/9] mptcp: create the listening socket for new port
@ 2021-01-09 2:09 Geliang Tang
0 siblings, 0 replies; 3+ messages in thread
From: Geliang Tang @ 2021-01-09 2:09 UTC (permalink / raw)
To: mptcp
[-- Attachment #1: Type: text/plain, Size: 9097 bytes --]
Hi Mat,
Mat Martineau <mathew.j.martineau(a)linux.intel.com> 于2021年1月9日周六 上午6:56写道：
>
> On Tue, 5 Jan 2021, Geliang Tang wrote:
>
> > This patch created a listening socket when an address with a port-number
> > is added by PM netlink. Then binded the new port to the socket, and
> > listened for the connection.
> >
> > When the address is removed or the addresses are flushed by PM netlink,
> > release the listening socket.
> >
> > Signed-off-by: Geliang Tang <geliangtang(a)gmail.com>
> > ---
> > net/mptcp/pm_netlink.c | 96 +++++++++++++++++++++++++++++++++++++++++-
> > net/mptcp/protocol.c | 2 +-
> > net/mptcp/protocol.h | 4 ++
> > net/mptcp/subflow.c | 6 +--
> > 4 files changed, 102 insertions(+), 6 deletions(-)
> >
> > diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
> > index 7dd0dba770fe..d42c659c586a 100644
> > --- a/net/mptcp/pm_netlink.c
> > +++ b/net/mptcp/pm_netlink.c
> > @@ -26,6 +26,7 @@ struct mptcp_pm_addr_entry {
> > struct list_head list;
> > struct mptcp_addr_info addr;
> > struct rcu_head rcu;
> > + struct socket *lsk;
> > };
> >
> > struct mptcp_pm_add_entry {
> > @@ -673,6 +674,53 @@ static int mptcp_pm_nl_append_new_local_addr(struct pm_nl_pernet *pernet,
> > return ret;
> > }
> >
> > +static int mptcp_pm_nl_create_listen_socket(struct sock *sk,
> > + struct mptcp_pm_addr_entry *entry)
> > +{
> > + struct sockaddr_storage addr;
> > + struct mptcp_sock *msk;
> > + struct socket *ssock;
> > + int backlog = 1024;
> > + int err;
> > +
> > + err = sock_create_kern(sock_net(sk), entry->addr.family,
> > + SOCK_STREAM, IPPROTO_MPTCP, &entry->lsk);
> > + if (err)
> > + return err;
> > +
> > + msk = mptcp_sk(entry->lsk->sk);
> > + if (!msk) {
> > + err = -EINVAL;
> > + goto out;
> > + }
> > +
> > + ssock = __mptcp_nmpc_socket(msk);
> > + if (!ssock) {
> > + err = -EINVAL;
> > + goto out;
> > + }
> > +
> > + mptcp_info2sockaddr(&entry->addr, &addr, entry->addr.family);
> > + err = kernel_bind(ssock, (struct sockaddr *)&addr,
> > + sizeof(struct sockaddr_in));
> > + if (err) {
> > + pr_warn("kernel_bind error, err=%d", err);
> > + goto out;
> > + }
> > +
> > + err = kernel_listen(ssock, backlog);
> > + if (err) {
> > + pr_warn("kernel_listen error, err=%d", err);
> > + goto out;
> > + }
> > +
> > + return 0;
> > +
> > +out:
> > + sock_release(entry->lsk);
> > + return err;
> > +}
> > +
> > int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, struct sock_common *skc)
> > {
> > struct mptcp_pm_addr_entry *entry;
> > @@ -717,6 +765,8 @@ int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, struct sock_common *skc)
> > entry->addr.ifindex = 0;
> > entry->addr.flags = 0;
> > entry->addr.id = 0;
> > + entry->addr.port = 0;
> > + entry->lsk = NULL;
> > ret = mptcp_pm_nl_append_new_local_addr(pernet, entry);
> > if (ret < 0)
> > kfree(entry);
> > @@ -886,9 +936,19 @@ static int mptcp_nl_cmd_add_addr(struct sk_buff *skb, struct genl_info *info)
> > }
> >
> > *entry = addr;
> > + if (entry->addr.port) {
> > + ret = mptcp_pm_nl_create_listen_socket(skb->sk, entry);
> > + if (ret) {
> > + GENL_SET_ERR_MSG(info, "create listen socket error");
> > + kfree(entry);
> > + return ret;
> > + }
> > + }
> > ret = mptcp_pm_nl_append_new_local_addr(pernet, entry);
> > if (ret < 0) {
> > GENL_SET_ERR_MSG(info, "too many addresses or duplicate one");
> > + if (entry->lsk)
> > + sock_release(entry->lsk);
> > kfree(entry);
> > return ret;
> > }
> > @@ -972,6 +1032,38 @@ static int mptcp_nl_remove_subflow_and_signal_addr(struct net *net,
> > return 0;
> > }
> >
> > +struct addr_entry_release_work {
> > + struct rcu_work rwork;
> > + struct mptcp_pm_addr_entry *entry;
> > +};
> > +
> > +static void mptcp_pm_release_addr_entry(struct work_struct *work)
> > +{
> > + struct addr_entry_release_work *w;
> > + struct mptcp_pm_addr_entry *entry;
> > +
> > + w = container_of(to_rcu_work(work), struct addr_entry_release_work, rwork);
> > + entry = w->entry;
> > + if (entry) {
> > + if (entry->lsk)
> > + sock_release(entry->lsk);
> > + kfree(entry);
> > + }
> > + kfree(w);
> > +}
> > +
> > +static void mptcp_pm_free_addr_entry(struct mptcp_pm_addr_entry *entry)
> > +{
> > + struct addr_entry_release_work *w;
> > +
> > + w = kmalloc(sizeof(*w), GFP_ATOMIC);
> > + if (w) {
> > + INIT_RCU_WORK((struct rcu_work *)w, mptcp_pm_release_addr_entry);
> > + w->entry = entry;
> > + queue_rcu_work(system_wq, (struct rcu_work *)w);
>
> Rather than casting the second arg, please use &w->rwork
>
May I send a squash-to patch to fix this?
-Geliang
>
> Thanks,
>
> Mat
>
>
> > + }
> > +}
> > +
> > static int mptcp_nl_cmd_del_addr(struct sk_buff *skb, struct genl_info *info)
> > {
> > struct nlattr *attr = info->attrs[MPTCP_PM_ATTR_ADDR];
> > @@ -1001,7 +1093,7 @@ static int mptcp_nl_cmd_del_addr(struct sk_buff *skb, struct genl_info *info)
> > spin_unlock_bh(&pernet->lock);
> >
> > mptcp_nl_remove_subflow_and_signal_addr(sock_net(skb->sk), &entry->addr);
> > - kfree_rcu(entry, rcu);
> > + mptcp_pm_free_addr_entry(entry);
> >
> > return ret;
> > }
> > @@ -1015,7 +1107,7 @@ static void __flush_addrs(struct net *net, struct list_head *list)
> > struct mptcp_pm_addr_entry, list);
> > mptcp_nl_remove_subflow_and_signal_addr(net, &cur->addr);
> > list_del_rcu(&cur->list);
> > - kfree_rcu(cur, rcu);
> > + mptcp_pm_free_addr_entry(cur);
> > }
> > }
> >
> > diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
> > index 49384c453950..b15ce0fd996a 100644
> > --- a/net/mptcp/protocol.c
> > +++ b/net/mptcp/protocol.c
> > @@ -49,7 +49,7 @@ static void __mptcp_check_send_data_fin(struct sock *sk);
> > * completed yet or has failed, return the subflow socket.
> > * Otherwise return NULL.
> > */
> > -static struct socket *__mptcp_nmpc_socket(const struct mptcp_sock *msk)
> > +struct socket *__mptcp_nmpc_socket(const struct mptcp_sock *msk)
> > {
> > if (!msk->subflow || READ_ONCE(msk->can_ack))
> > return NULL;
> > diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
> > index f6ed8dc0a073..7b4ba6597416 100644
> > --- a/net/mptcp/protocol.h
> > +++ b/net/mptcp/protocol.h
> > @@ -469,11 +469,15 @@ void mptcp_subflow_shutdown(struct sock *sk, struct sock *ssk, int how);
> > void __mptcp_close_ssk(struct sock *sk, struct sock *ssk,
> > struct mptcp_subflow_context *subflow);
> > void mptcp_subflow_reset(struct sock *ssk);
> > +struct socket *__mptcp_nmpc_socket(const struct mptcp_sock *msk);
> >
> > /* called with sk socket lock held */
> > int __mptcp_subflow_connect(struct sock *sk, const struct mptcp_addr_info *loc,
> > const struct mptcp_addr_info *remote);
> > int mptcp_subflow_create_socket(struct sock *sk, struct socket **new_sock);
> > +void mptcp_info2sockaddr(const struct mptcp_addr_info *info,
> > + struct sockaddr_storage *addr,
> > + unsigned short family);
> >
> > static inline void mptcp_subflow_tcp_fallback(struct sock *sk,
> > struct mptcp_subflow_context *ctx)
> > diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c
> > index 8dc4d9f86773..21d569054e01 100644
> > --- a/net/mptcp/subflow.c
> > +++ b/net/mptcp/subflow.c
> > @@ -1073,9 +1073,9 @@ void mptcpv6_handle_mapped(struct sock *sk, bool mapped)
> > }
> > #endif
> >
> > -static void mptcp_info2sockaddr(const struct mptcp_addr_info *info,
> > - struct sockaddr_storage *addr,
> > - unsigned short family)
> > +void mptcp_info2sockaddr(const struct mptcp_addr_info *info,
> > + struct sockaddr_storage *addr,
> > + unsigned short family)
> > {
> > memset(addr, 0, sizeof(*addr));
> > addr->ss_family = family;
> > --
> > 2.29.2
> > _______________________________________________
> > mptcp mailing list -- mptcp(a)lists.01.org
> > To unsubscribe send an email to mptcp-leave(a)lists.01.org
> >
>
> --
> Mat Martineau
> Intel
^ permalink raw reply [flat|nested] 3+ messages in thread
* [MPTCP] Re: [MPTCP][PATCH v9 mptcp-next 1/9] mptcp: create the listening socket for new port
@ 2021-01-11 23:47 Mat Martineau
0 siblings, 0 replies; 3+ messages in thread
From: Mat Martineau @ 2021-01-11 23:47 UTC (permalink / raw)
To: mptcp
[-- Attachment #1: Type: text/plain, Size: 2337 bytes --]
On Sat, 9 Jan 2021, Geliang Tang wrote:
> Hi Mat,
>
> Mat Martineau <mathew.j.martineau(a)linux.intel.com> 于2021年1月9日周六 上午6:56写道：
>>
>> On Tue, 5 Jan 2021, Geliang Tang wrote:
>>
>>> This patch created a listening socket when an address with a port-number
>>> is added by PM netlink. Then binded the new port to the socket, and
>>> listened for the connection.
>>>
>>> When the address is removed or the addresses are flushed by PM netlink,
>>> release the listening socket.
>>>
>>> Signed-off-by: Geliang Tang <geliangtang(a)gmail.com>
>>> ---
>>> net/mptcp/pm_netlink.c | 96 +++++++++++++++++++++++++++++++++++++++++-
>>> net/mptcp/protocol.c | 2 +-
>>> net/mptcp/protocol.h | 4 ++
>>> net/mptcp/subflow.c | 6 +--
>>> 4 files changed, 102 insertions(+), 6 deletions(-)
...
>>>
>>> @@ -972,6 +1032,38 @@ static int mptcp_nl_remove_subflow_and_signal_addr(struct net *net,
>>> return 0;
>>> }
>>>
>>> +struct addr_entry_release_work {
>>> + struct rcu_work rwork;
>>> + struct mptcp_pm_addr_entry *entry;
>>> +};
>>> +
>>> +static void mptcp_pm_release_addr_entry(struct work_struct *work)
>>> +{
>>> + struct addr_entry_release_work *w;
>>> + struct mptcp_pm_addr_entry *entry;
>>> +
>>> + w = container_of(to_rcu_work(work), struct addr_entry_release_work, rwork);
>>> + entry = w->entry;
>>> + if (entry) {
>>> + if (entry->lsk)
>>> + sock_release(entry->lsk);
>>> + kfree(entry);
>>> + }
>>> + kfree(w);
>>> +}
>>> +
>>> +static void mptcp_pm_free_addr_entry(struct mptcp_pm_addr_entry *entry)
>>> +{
>>> + struct addr_entry_release_work *w;
>>> +
>>> + w = kmalloc(sizeof(*w), GFP_ATOMIC);
>>> + if (w) {
>>> + INIT_RCU_WORK((struct rcu_work *)w, mptcp_pm_release_addr_entry);
>>> + w->entry = entry;
>>> + queue_rcu_work(system_wq, (struct rcu_work *)w);
>>
>> Rather than casting the second arg, please use &w->rwork
>>
>
> May I send a squash-to patch to fix this?
>
Hi Geliang -
Since I'm asking for a rebased version of this series anyway (to get rid
of all the 'git am' conflicts in the pending patch sets), please include
this change in v10.
Thanks,
--
Mat Martineau
Intel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-01-11 23:47 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-08 22:56 [MPTCP] Re: [MPTCP][PATCH v9 mptcp-next 1/9] mptcp: create the listening socket for new port Mat Martineau
-- strict thread matches above, loose matches on Subject: below --
2021-01-09 2:09 Geliang Tang
2021-01-11 23:47 Mat Martineau
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox