Merge tag 'nfs-for-5.11-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[linux-2.6-microblaze.git] / net / mptcp / pm.c

diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c
index e19e152..da2ed57 100644 (file)
--- a/net/mptcp/pm.c
+++ b/net/mptcp/pm.c
@@ -14,22 +14,43 @@
 
 int mptcp_pm_announce_addr(struct mptcp_sock *msk,
                           const struct mptcp_addr_info *addr,
-                          bool echo)
+                          bool echo, bool port)
 {
+       u8 add_addr = READ_ONCE(msk->pm.addr_signal);
+
        pr_debug("msk=%p, local_id=%d", msk, addr->id);
 
+       if (add_addr) {
+               pr_warn("addr_signal error, add_addr=%d", add_addr);
+               return -EINVAL;
+       }
+
        msk->pm.local = *addr;
-       WRITE_ONCE(msk->pm.add_addr_echo, echo);
-       WRITE_ONCE(msk->pm.add_addr_signal, true);
+       add_addr |= BIT(MPTCP_ADD_ADDR_SIGNAL);
+       if (echo)
+               add_addr |= BIT(MPTCP_ADD_ADDR_ECHO);
+       if (addr->family == AF_INET6)
+               add_addr |= BIT(MPTCP_ADD_ADDR_IPV6);
+       if (port)
+               add_addr |= BIT(MPTCP_ADD_ADDR_PORT);
+       WRITE_ONCE(msk->pm.addr_signal, add_addr);
        return 0;
 }
 
 int mptcp_pm_remove_addr(struct mptcp_sock *msk, u8 local_id)
 {
+       u8 rm_addr = READ_ONCE(msk->pm.addr_signal);
+
        pr_debug("msk=%p, local_id=%d", msk, local_id);
 
+       if (rm_addr) {
+               pr_warn("addr_signal error, rm_addr=%d", rm_addr);
+               return -EINVAL;
+       }
+
        msk->pm.rm_id = local_id;
-       WRITE_ONCE(msk->pm.rm_addr_signal, true);
+       rm_addr |= BIT(MPTCP_RM_ADDR_SIGNAL);
+       WRITE_ONCE(msk->pm.addr_signal, rm_addr);
        return 0;
 }
 
@@ -89,8 +110,7 @@ static bool mptcp_pm_schedule_work(struct mptcp_sock *msk,
                return false;
 
        msk->pm.status |= BIT(new_status);
-       if (schedule_work(&msk->work))
-               sock_hold((struct sock *)msk);
+       mptcp_schedule_work((struct sock *)msk);
        return true;
 }
 
@@ -106,8 +126,14 @@ void mptcp_pm_fully_established(struct mptcp_sock *msk)
 
        spin_lock_bh(&pm->lock);
 
-       if (READ_ONCE(pm->work_pending))
+       /* mptcp_pm_fully_established() can be invoked by multiple
+        * racing paths - accept() and check_fully_established()
+        * be sure to serve this event only once.
+        */
+       if (READ_ONCE(pm->work_pending) &&
+           !(msk->pm.status & BIT(MPTCP_PM_ALREADY_ESTABLISHED)))
                mptcp_pm_schedule_work(msk, MPTCP_PM_ESTABLISHED);
+       msk->pm.status |= BIT(MPTCP_PM_ALREADY_ESTABLISHED);
 
        spin_unlock_bh(&pm->lock);
 }
@@ -150,14 +176,25 @@ void mptcp_pm_add_addr_received(struct mptcp_sock *msk,
 
        spin_lock_bh(&pm->lock);
 
-       if (!READ_ONCE(pm->accept_addr))
-               mptcp_pm_announce_addr(msk, addr, true);
-       else if (mptcp_pm_schedule_work(msk, MPTCP_PM_ADD_ADDR_RECEIVED))
+       if (!READ_ONCE(pm->accept_addr)) {
+               mptcp_pm_announce_addr(msk, addr, true, addr->port);
+               mptcp_pm_add_addr_send_ack(msk);
+       } else if (mptcp_pm_schedule_work(msk, MPTCP_PM_ADD_ADDR_RECEIVED)) {
                pm->remote = *addr;
+       }
 
        spin_unlock_bh(&pm->lock);
 }
 
+void mptcp_pm_add_addr_send_ack(struct mptcp_sock *msk)
+{
+       if (!mptcp_pm_should_add_signal_ipv6(msk) &&
+           !mptcp_pm_should_add_signal_port(msk))
+               return;
+
+       mptcp_pm_schedule_work(msk, MPTCP_PM_ADD_ADDR_SEND_ACK);
+}
+
 void mptcp_pm_rm_addr_received(struct mptcp_sock *msk, u8 rm_id)
 {
        struct mptcp_pm_data *pm = &msk->pm;
@@ -173,7 +210,7 @@ void mptcp_pm_rm_addr_received(struct mptcp_sock *msk, u8 rm_id)
 /* path manager helpers */
 
 bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, unsigned int remaining,
-                             struct mptcp_addr_info *saddr, bool *echo)
+                             struct mptcp_addr_info *saddr, bool *echo, bool *port)
 {
        int ret = false;
 
@@ -183,13 +220,14 @@ bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, unsigned int remaining,
        if (!mptcp_pm_should_add_signal(msk))
                goto out_unlock;
 
-       *echo = READ_ONCE(msk->pm.add_addr_echo);
+       *echo = mptcp_pm_should_add_signal_echo(msk);
+       *port = mptcp_pm_should_add_signal_port(msk);
 
-       if (remaining < mptcp_add_addr_len(msk->pm.local.family, *echo))
+       if (remaining < mptcp_add_addr_len(msk->pm.local.family, *echo, *port))
                goto out_unlock;
 
        *saddr = msk->pm.local;
-       WRITE_ONCE(msk->pm.add_addr_signal, false);
+       WRITE_ONCE(msk->pm.addr_signal, 0);
        ret = true;
 
 out_unlock:
@@ -212,7 +250,7 @@ bool mptcp_pm_rm_addr_signal(struct mptcp_sock *msk, unsigned int remaining,
                goto out_unlock;
 
        *rm_id = msk->pm.rm_id;
-       WRITE_ONCE(msk->pm.rm_addr_signal, false);
+       WRITE_ONCE(msk->pm.addr_signal, 0);
        ret = true;
 
 out_unlock:
@@ -233,11 +271,9 @@ void mptcp_pm_data_init(struct mptcp_sock *msk)
        msk->pm.subflows = 0;
        msk->pm.rm_id = 0;
        WRITE_ONCE(msk->pm.work_pending, false);
-       WRITE_ONCE(msk->pm.add_addr_signal, false);
-       WRITE_ONCE(msk->pm.rm_addr_signal, false);
+       WRITE_ONCE(msk->pm.addr_signal, 0);
        WRITE_ONCE(msk->pm.accept_addr, false);
        WRITE_ONCE(msk->pm.accept_subflow, false);
-       WRITE_ONCE(msk->pm.add_addr_echo, false);
        msk->pm.status = 0;
 
        spin_lock_init(&msk->pm.lock);