mptcp: add msk interations helper

mptcp_token_iter_next() allow traversing all the MPTCP
sockets inside the token container belonging to the given
network namespace with a quite standard iterator semantic.

That will be used by the next patch, but keep the API generic,
as we plan to use this later for PM's sake.

Additionally export mptcp_token_get_sock(), as it also
will be used by the diag module.

Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index 39bfec3f1586d7cef9c6e1e1f5806516a43c135e..e5baaef5ec89597abe0ce7e594e4991af7aba768 100644 (file)
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -391,6 +391,8 @@ int mptcp_token_new_connect(struct sock *sk);
 void mptcp_token_accept(struct mptcp_subflow_request_sock *r,
                        struct mptcp_sock *msk);
 struct mptcp_sock *mptcp_token_get_sock(u32 token);
+struct mptcp_sock *mptcp_token_iter_next(const struct net *net, long *s_slot,
+                                        long *s_num);
 void mptcp_token_destroy(struct mptcp_sock *msk);
 
 void mptcp_crypto_key_sha(u64 key, u32 *token, u64 *idsn);

diff --git a/net/mptcp/token.c b/net/mptcp/token.c
index 66a4990bd8975818c144b60bbf958679f86ce308..7d810602608174e8322b85c980309eef398bfcf6 100644 (file)
--- a/net/mptcp/token.c
+++ b/net/mptcp/token.c
@@ -238,6 +238,66 @@ found:
        rcu_read_unlock();
        return msk;
 }
+EXPORT_SYMBOL_GPL(mptcp_token_get_sock);
+
+/**
+ * mptcp_token_iter_next - iterate over the token container from given pos
+ * @net: namespace to be iterated
+ * @s_slot: start slot number
+ * @s_num: start number inside the given lock
+ *
+ * This function returns the first mptcp connection structure found inside the
+ * token container starting from the specified position, or NULL.
+ *
+ * On successful iteration, the iterator is move to the next position and the
+ * the acquires a reference to the returned socket.
+ */
+struct mptcp_sock *mptcp_token_iter_next(const struct net *net, long *s_slot,
+                                        long *s_num)
+{
+       struct mptcp_sock *ret = NULL;
+       struct hlist_nulls_node *pos;
+       int slot, num;
+
+       for (slot = *s_slot; slot <= token_mask; *s_num = 0, slot++) {
+               struct token_bucket *bucket = &token_hash[slot];
+               struct sock *sk;
+
+               num = 0;
+
+               if (hlist_nulls_empty(&bucket->msk_chain))
+                       continue;
+
+               rcu_read_lock();
+               sk_nulls_for_each_rcu(sk, pos, &bucket->msk_chain) {
+                       ++num;
+                       if (!net_eq(sock_net(sk), net))
+                               continue;
+
+                       if (num <= *s_num)
+                               continue;
+
+                       if (!refcount_inc_not_zero(&sk->sk_refcnt))
+                               continue;
+
+                       if (!net_eq(sock_net(sk), net)) {
+                               sock_put(sk);
+                               continue;
+                       }
+
+                       ret = mptcp_sk(sk);
+                       rcu_read_unlock();
+                       goto out;
+               }
+               rcu_read_unlock();
+       }
+
+out:
+       *s_slot = slot;
+       *s_num = num;
+       return ret;
+}
+EXPORT_SYMBOL_GPL(mptcp_token_iter_next);
 
 /**
  * mptcp_token_destroy_request - remove mptcp connection/token
@@ -312,7 +372,6 @@ void __init mptcp_token_init(void)
 EXPORT_SYMBOL_GPL(mptcp_token_new_request);
 EXPORT_SYMBOL_GPL(mptcp_token_new_connect);
 EXPORT_SYMBOL_GPL(mptcp_token_accept);
-EXPORT_SYMBOL_GPL(mptcp_token_get_sock);
 EXPORT_SYMBOL_GPL(mptcp_token_destroy_request);
 EXPORT_SYMBOL_GPL(mptcp_token_destroy);
 #endif