mptcp: introduce token KUNIT self-tests

Unit tests for the internal MPTCP token APIs, using KUNIT

v1 -> v2:
 - use the correct RCU annotation when initializing icsk ulp
 - fix a few checkpatch issues

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

diff --git a/net/mptcp/Kconfig b/net/mptcp/Kconfig
index d7d5f93493662b3dfb10ff9350f52bf435d8ee72..af84fce70bb084646b967800bc2f8edca1dd0f7e 100644 (file)
--- a/net/mptcp/Kconfig
+++ b/net/mptcp/Kconfig
@@ -26,7 +26,7 @@ config MPTCP_KUNIT_TESTS
        depends on KUNIT
        default KUNIT_ALL_TESTS
        help
-         Currently covers the MPTCP crypto helpers.
+         Currently covers the MPTCP crypto and token helpers.
          Only useful for kernel devs running KUnit test harness and are not
          for inclusion into a production build.
 

diff --git a/net/mptcp/Makefile b/net/mptcp/Makefile
index f9039804207b56ec815a7dce6227fe919719b9e4..c53f9b845523adf6fa1a58cd62ac01a4f86e99d7 100644 (file)
--- a/net/mptcp/Makefile
+++ b/net/mptcp/Makefile
@@ -5,4 +5,5 @@ mptcp-y := protocol.o subflow.o options.o token.o crypto.o ctrl.o pm.o diag.o \
           mib.o pm_netlink.o
 
 mptcp_crypto_test-objs := crypto_test.o
-obj-$(CONFIG_MPTCP_KUNIT_TESTS) += mptcp_crypto_test.o
\ No newline at end of file
+mptcp_token_test-objs := token_test.o
+obj-$(CONFIG_MPTCP_KUNIT_TESTS) += mptcp_crypto_test.o mptcp_token_test.o

diff --git a/net/mptcp/token.c b/net/mptcp/token.c
index 9c07717748153a4a0dfebedebb4b567bbcf1103d..66a4990bd8975818c144b60bbf958679f86ce308 100644 (file)
--- a/net/mptcp/token.c
+++ b/net/mptcp/token.c
@@ -307,3 +307,12 @@ void __init mptcp_token_init(void)
                spin_lock_init(&token_hash[i].lock);
        }
 }
+
+#if IS_MODULE(CONFIG_MPTCP_KUNIT_TESTS)
+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

diff --git a/net/mptcp/token_test.c b/net/mptcp/token_test.c
new file mode 100644 (file)
index 0000000..e1bd6f0
--- /dev/null
+++ b/net/mptcp/token_test.c
@@ -0,0 +1,140 @@
+// SPDX-License-Identifier: GPL-2.0
+#include <kunit/test.h>
+
+#include "protocol.h"
+
+static struct mptcp_subflow_request_sock *build_req_sock(struct kunit *test)
+{
+       struct mptcp_subflow_request_sock *req;
+
+       req = kunit_kzalloc(test, sizeof(struct mptcp_subflow_request_sock),
+                           GFP_USER);
+       KUNIT_EXPECT_NOT_ERR_OR_NULL(test, req);
+       mptcp_token_init_request((struct request_sock *)req);
+       return req;
+}
+
+static void mptcp_token_test_req_basic(struct kunit *test)
+{
+       struct mptcp_subflow_request_sock *req = build_req_sock(test);
+       struct mptcp_sock *null_msk = NULL;
+
+       KUNIT_ASSERT_EQ(test, 0,
+                       mptcp_token_new_request((struct request_sock *)req));
+       KUNIT_EXPECT_NE(test, 0, (int)req->token);
+       KUNIT_EXPECT_PTR_EQ(test, null_msk, mptcp_token_get_sock(req->token));
+
+       /* cleanup */
+       mptcp_token_destroy_request((struct request_sock *)req);
+}
+
+static struct inet_connection_sock *build_icsk(struct kunit *test)
+{
+       struct inet_connection_sock *icsk;
+
+       icsk = kunit_kzalloc(test, sizeof(struct inet_connection_sock),
+                            GFP_USER);
+       KUNIT_EXPECT_NOT_ERR_OR_NULL(test, icsk);
+       return icsk;
+}
+
+static struct mptcp_subflow_context *build_ctx(struct kunit *test)
+{
+       struct mptcp_subflow_context *ctx;
+
+       ctx = kunit_kzalloc(test, sizeof(struct mptcp_subflow_context),
+                           GFP_USER);
+       KUNIT_EXPECT_NOT_ERR_OR_NULL(test, ctx);
+       return ctx;
+}
+
+static struct mptcp_sock *build_msk(struct kunit *test)
+{
+       struct mptcp_sock *msk;
+
+       msk = kunit_kzalloc(test, sizeof(struct mptcp_sock), GFP_USER);
+       KUNIT_EXPECT_NOT_ERR_OR_NULL(test, msk);
+       refcount_set(&((struct sock *)msk)->sk_refcnt, 1);
+       return msk;
+}
+
+static void mptcp_token_test_msk_basic(struct kunit *test)
+{
+       struct inet_connection_sock *icsk = build_icsk(test);
+       struct mptcp_subflow_context *ctx = build_ctx(test);
+       struct mptcp_sock *msk = build_msk(test);
+       struct mptcp_sock *null_msk = NULL;
+       struct sock *sk;
+
+       rcu_assign_pointer(icsk->icsk_ulp_data, ctx);
+       ctx->conn = (struct sock *)msk;
+       sk = (struct sock *)msk;
+
+       KUNIT_ASSERT_EQ(test, 0,
+                       mptcp_token_new_connect((struct sock *)icsk));
+       KUNIT_EXPECT_NE(test, 0, (int)ctx->token);
+       KUNIT_EXPECT_EQ(test, ctx->token, msk->token);
+       KUNIT_EXPECT_PTR_EQ(test, msk, mptcp_token_get_sock(ctx->token));
+       KUNIT_EXPECT_EQ(test, 2, (int)refcount_read(&sk->sk_refcnt));
+
+       mptcp_token_destroy(msk);
+       KUNIT_EXPECT_PTR_EQ(test, null_msk, mptcp_token_get_sock(ctx->token));
+}
+
+static void mptcp_token_test_accept(struct kunit *test)
+{
+       struct mptcp_subflow_request_sock *req = build_req_sock(test);
+       struct mptcp_sock *msk = build_msk(test);
+
+       KUNIT_ASSERT_EQ(test, 0,
+                       mptcp_token_new_request((struct request_sock *)req));
+       msk->token = req->token;
+       mptcp_token_accept(req, msk);
+       KUNIT_EXPECT_PTR_EQ(test, msk, mptcp_token_get_sock(msk->token));
+
+       /* this is now a no-op */
+       mptcp_token_destroy_request((struct request_sock *)req);
+       KUNIT_EXPECT_PTR_EQ(test, msk, mptcp_token_get_sock(msk->token));
+
+       /* cleanup */
+       mptcp_token_destroy(msk);
+}
+
+static void mptcp_token_test_destroyed(struct kunit *test)
+{
+       struct mptcp_subflow_request_sock *req = build_req_sock(test);
+       struct mptcp_sock *msk = build_msk(test);
+       struct mptcp_sock *null_msk = NULL;
+       struct sock *sk;
+
+       sk = (struct sock *)msk;
+
+       KUNIT_ASSERT_EQ(test, 0,
+                       mptcp_token_new_request((struct request_sock *)req));
+       msk->token = req->token;
+       mptcp_token_accept(req, msk);
+
+       /* simulate race on removal */
+       refcount_set(&sk->sk_refcnt, 0);
+       KUNIT_EXPECT_PTR_EQ(test, null_msk, mptcp_token_get_sock(msk->token));
+
+       /* cleanup */
+       mptcp_token_destroy(msk);
+}
+
+static struct kunit_case mptcp_token_test_cases[] = {
+       KUNIT_CASE(mptcp_token_test_req_basic),
+       KUNIT_CASE(mptcp_token_test_msk_basic),
+       KUNIT_CASE(mptcp_token_test_accept),
+       KUNIT_CASE(mptcp_token_test_destroyed),
+       {}
+};
+
+static struct kunit_suite mptcp_token_suite = {
+       .name = "mptcp-token",
+       .test_cases = mptcp_token_test_cases,
+};
+
+kunit_test_suite(mptcp_token_suite);
+
+MODULE_LICENSE("GPL");