mptcp: introduce and use mptcp_pm_send_ack()

The in-kernel PM has a bit of duplicate code related to ack
generation. Create a new helper factoring out the PM-specific
needs and use it in a couple of places.

As a bonus, mptcp_subflow_send_ack() is not used anymore
outside its own compilation unit and can become static.

Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
index 5bdb559..8e1d3ae 100644 (file)
--- a/net/mptcp/pm_netlink.c
+++ b/net/mptcp/pm_netlink.c
@@ -463,6 +463,37 @@ static unsigned int fill_remote_addresses_vec(struct mptcp_sock *msk, bool fullm
        return i;
 }
 
+static void __mptcp_pm_send_ack(struct mptcp_sock *msk, struct mptcp_subflow_context *subflow,
+                               bool prio, bool backup)
+{
+       struct sock *ssk = mptcp_subflow_tcp_sock(subflow);
+       bool slow;
+
+       pr_debug("send ack for %s",
+                prio ? "mp_prio" : (mptcp_pm_should_add_signal(msk) ? "add_addr" : "rm_addr"));
+
+       slow = lock_sock_fast(ssk);
+       if (prio) {
+               if (subflow->backup != backup)
+                       msk->last_snd = NULL;
+
+               subflow->send_mp_prio = 1;
+               subflow->backup = backup;
+               subflow->request_bkup = backup;
+       }
+
+       __mptcp_subflow_send_ack(ssk);
+       unlock_sock_fast(ssk, slow);
+}
+
+static void mptcp_pm_send_ack(struct mptcp_sock *msk, struct mptcp_subflow_context *subflow,
+                             bool prio, bool backup)
+{
+       spin_unlock_bh(&msk->pm.lock);
+       __mptcp_pm_send_ack(msk, subflow, prio, backup);
+       spin_lock_bh(&msk->pm.lock);
+}
+
 static struct mptcp_pm_addr_entry *
 __lookup_addr_by_id(struct pm_nl_pernet *pernet, unsigned int id)
 {
@@ -705,16 +736,8 @@ void mptcp_pm_nl_addr_send_ack(struct mptcp_sock *msk)
                return;
 
        subflow = list_first_entry_or_null(&msk->conn_list, typeof(*subflow), node);
-       if (subflow) {
-               struct sock *ssk = mptcp_subflow_tcp_sock(subflow);
-
-               spin_unlock_bh(&msk->pm.lock);
-               pr_debug("send ack for %s",
-                        mptcp_pm_should_add_signal(msk) ? "add_addr" : "rm_addr");
-
-               mptcp_subflow_send_ack(ssk);
-               spin_lock_bh(&msk->pm.lock);
-       }
+       if (subflow)
+               mptcp_pm_send_ack(msk, subflow, false, false);
 }
 
 int mptcp_pm_nl_mp_prio_send_ack(struct mptcp_sock *msk,
@@ -729,7 +752,6 @@ int mptcp_pm_nl_mp_prio_send_ack(struct mptcp_sock *msk,
        mptcp_for_each_subflow(msk, subflow) {
                struct sock *ssk = mptcp_subflow_tcp_sock(subflow);
                struct mptcp_addr_info local, remote;
-               bool slow;
 
                local_address((struct sock_common *)ssk, &local);
                if (!mptcp_addresses_equal(&local, addr, addr->port))
@@ -741,17 +763,7 @@ int mptcp_pm_nl_mp_prio_send_ack(struct mptcp_sock *msk,
                                continue;
                }
 
-               slow = lock_sock_fast(ssk);
-               if (subflow->backup != bkup)
-                       msk->last_snd = NULL;
-               subflow->backup = bkup;
-               subflow->send_mp_prio = 1;
-               subflow->request_bkup = bkup;
-
-               pr_debug("send ack for mp_prio");
-               __mptcp_subflow_send_ack(ssk);
-               unlock_sock_fast(ssk, slow);
-
+               __mptcp_pm_send_ack(msk, subflow, true, bkup);
                return 0;
        }
 

diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index 2caad4a..6cf5fa1 100644 (file)
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -508,7 +508,7 @@ void __mptcp_subflow_send_ack(struct sock *ssk)
                tcp_send_ack(ssk);
 }
 
-void mptcp_subflow_send_ack(struct sock *ssk)
+static void mptcp_subflow_send_ack(struct sock *ssk)
 {
        bool slow;
 

diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index 07871e1..e38b861 100644 (file)
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -607,7 +607,6 @@ 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_send_ack(struct sock *ssk);
-void mptcp_subflow_send_ack(struct sock *ssk);
 void mptcp_subflow_reset(struct sock *ssk);
 void mptcp_subflow_queue_clean(struct sock *ssk);
 void mptcp_sock_graft(struct sock *sk, struct socket *parent);