| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20241023162006.1725309-3-anjali.k.kulkarni@oracle.com>
Date: Wed, 23 Oct 2024 09:20:05 -0700
From: Anjali Kulkarni <anjali.k.kulkarni@...cle.com>
To: davem@...emloft.net, Liam.Howlett@...cle.com
Cc: edumazet@...gle.com, kuba@...nel.org, pabeni@...hat.com, mingo@...hat.com,
peterz@...radead.org, juri.lelli@...hat.com,
vincent.guittot@...aro.org, dietmar.eggemann@....com,
rostedt@...dmis.org, bsegall@...gle.com, mgorman@...e.de,
vschneid@...hat.com, jiri@...nulli.us, linux-kernel@...r.kernel.org,
netdev@...r.kernel.org, akpm@...ux-foundation.org,
brendan.higgins@...ux.dev, davidgow@...gle.com, rmoar@...gle.com,
johannes.berg@...el.com, mic@...ikod.net, gnoack@...gle.com,
jk@...econstruct.com.au, kunit-dev@...glegroups.com, shuah@...nel.org,
linux-kselftest@...r.kernel.org, anjali.k.kulkarni@...cle.com,
peili.io@...cle.com
Subject: [PATCH net-next v6 2/3] connector/cn_proc: Kunit tests for threads hash table
Kunit tests to test hash table add, delete, duplicate add and delete.
Add following configs and compile kernel code:
CONFIG_CONNECTOR=y
CONFIG_PROC_EVENTS=y
CONFIG_NET=y
CONFIG_KUNIT=m
CONFIG_CN_HASH_KUNIT_TEST=m
To run kunit tests:
sudo modprobe cn_hash_test
Output of kunit tests and hash table contents are displayed in
/var/log/messages (at KERN_DEBUG level).
Signed-off-by: Anjali Kulkarni <anjali.k.kulkarni@...cle.com>
---
drivers/connector/cn_hash.c | 40 +++++
drivers/connector/connector.c | 12 ++
include/linux/connector.h | 4 +
lib/Kconfig.debug | 19 +++
lib/Makefile | 1 +
lib/cn_hash_test.c | 169 +++++++++++++++++++
lib/cn_hash_test.h | 10 ++
tools/testing/kunit/configs/all_tests.config | 5 +
8 files changed, 260 insertions(+)
create mode 100644 lib/cn_hash_test.c
create mode 100644 lib/cn_hash_test.h
diff --git a/drivers/connector/cn_hash.c b/drivers/connector/cn_hash.c
index b94f6c461496..a8b8760c2e8c 100644
--- a/drivers/connector/cn_hash.c
+++ b/drivers/connector/cn_hash.c
@@ -165,6 +165,46 @@ int cn_hash_get_exval(struct cn_hash_dev *hdev, pid_t pid)
return -EINVAL;
}
+int cn_hash_display_hlist(struct cn_hash_dev *hdev, pid_t pid, int max_len,
+ int *hkey, int *key_display)
+{
+ struct uexit_pid_hnode *hnode;
+ int key, count = 0;
+
+ mutex_lock(&hdev->uexit_hash_lock);
+ key = hash_min(pid, HASH_BITS(hdev->uexit_pid_htable));
+ pr_debug("Bucket: %d\n", key);
+
+ hlist_for_each_entry(hnode,
+ &hdev->uexit_pid_htable[key],
+ uexit_pid_hlist) {
+ if (key_display[key] != 1) {
+ if (!hnode->uexit_pid_hlist.next)
+ pr_debug("pid %d ", hnode->pid);
+ else
+ pr_debug("pid %d --> ", hnode->pid);
+ }
+ count++;
+ }
+
+ mutex_unlock(&hdev->uexit_hash_lock);
+
+ if (key_display[key] != 1 && !count)
+ pr_debug("(empty)\n");
+
+ pr_debug("\n");
+
+ *hkey = key;
+
+ if (count > max_len) {
+ pr_err("%d entries in hlist for key %d, expected %d\n",
+ count, key, max_len);
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
bool cn_hash_table_empty(struct cn_hash_dev *hdev)
{
bool is_empty;
diff --git a/drivers/connector/connector.c b/drivers/connector/connector.c
index 2494a443fbd6..9b0cbe134e87 100644
--- a/drivers/connector/connector.c
+++ b/drivers/connector/connector.c
@@ -304,6 +304,18 @@ int cn_get_exval(pid_t pid)
}
EXPORT_SYMBOL_GPL(cn_get_exval);
+int cn_display_hlist(pid_t pid, int max_len, int *hkey, int *key_display)
+{
+ struct cn_dev *dev = &cdev;
+
+ if (!cn_already_initialized)
+ return 0;
+
+ return cn_hash_display_hlist(dev->hdev, pid, max_len,
+ hkey, key_display);
+}
+EXPORT_SYMBOL_GPL(cn_display_hlist);
+
bool cn_table_empty(void)
{
struct cn_dev *dev = &cdev;
diff --git a/include/linux/connector.h b/include/linux/connector.h
index 3f0648c886bc..393e1a391b70 100644
--- a/include/linux/connector.h
+++ b/include/linux/connector.h
@@ -173,4 +173,8 @@ int cn_get_exval(pid_t pid);
bool cn_table_empty(void);
bool cn_hash_table_empty(struct cn_hash_dev *hdev);
+int cn_display_hlist(pid_t pid, int max_len, int *hkey, int *key_display);
+int cn_hash_display_hlist(struct cn_hash_dev *hdev, pid_t pid, int max_len,
+ int *hkey, int *key_display);
+
#endif /* __CONNECTOR_H */
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 7315f643817a..784bd66221ab 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -2705,6 +2705,25 @@ config HASHTABLE_KUNIT_TEST
If unsure, say N.
+config CN_HASH_KUNIT_TEST
+ tristate "KUnit Test for connector hashtable code" if !KUNIT_ALL_TESTS
+ depends on KUNIT
+ depends on CONNECTOR && PROC_EVENTS
+ depends on NET
+ default KUNIT_ALL_TESTS
+ help
+ This builds the hashtable KUnit test suite.
+ It tests the basic functionality of the API defined in
+ drivers/connector/cn_hash.c.
+ CONFIG_CONNECTOR=y, CONFIG_PROC_EVENTS=y and CONFIG_NET=y needs
+ to be enabled along with CONFIG_CN_HASH_KUNIT_TEST=m and
+ CONFIG_KUNIT=m in .config file to compile and then test as a
+ kernel module with "modprobe cn_hash_test".
+ For more information on KUnit and unit tests in general please
+ refer to the KUnit documentation in Documentation/dev-tools/kunit/.
+
+ If unsure, say N.
+
config LINEAR_RANGES_TEST
tristate "KUnit test for linear_ranges"
depends on KUNIT
diff --git a/lib/Makefile b/lib/Makefile
index 811ba12c8cd0..2c59c82b0b18 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -379,6 +379,7 @@ obj-$(CONFIG_CMDLINE_KUNIT_TEST) += cmdline_kunit.o
obj-$(CONFIG_SLUB_KUNIT_TEST) += slub_kunit.o
obj-$(CONFIG_MEMCPY_KUNIT_TEST) += memcpy_kunit.o
obj-$(CONFIG_IS_SIGNED_TYPE_KUNIT_TEST) += is_signed_type_kunit.o
+obj-$(CONFIG_CN_HASH_KUNIT_TEST) += cn_hash_test.o
CFLAGS_overflow_kunit.o = $(call cc-disable-warning, tautological-constant-out-of-range-compare)
obj-$(CONFIG_OVERFLOW_KUNIT_TEST) += overflow_kunit.o
CFLAGS_stackinit_kunit.o += $(call cc-disable-warning, switch-unreachable)
diff --git a/lib/cn_hash_test.c b/lib/cn_hash_test.c
new file mode 100644
index 000000000000..efaf727d9b2a
--- /dev/null
+++ b/lib/cn_hash_test.c
@@ -0,0 +1,169 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * KUnit test for the connector threads hashtable code.
+ *
+ * Copyright (c) 2024 Oracle and/or its affiliates.
+ * Author: Anjali Kulkarni <anjali.k.kulkarni@...cle.com>
+ */
+#include <kunit/test.h>
+
+#include "cn_hash_test.h"
+
+#define ARR_SIZE 4
+#define HASH_TABLE_LEN 1024
+
+struct add_data {
+ pid_t pid;
+ int exit_val;
+ int key;
+};
+
+static struct add_data adata[ARR_SIZE];
+static int key_display[HASH_TABLE_LEN];
+
+static int cn_hash_init(struct kunit *test)
+{
+ for (int i = 0; i < HASH_TABLE_LEN; i++)
+ key_display[i] = 0;
+
+ return 0;
+}
+
+static void cn_display_htable(struct kunit *test, int len)
+{
+ int i, err;
+
+ cn_hash_init(test);
+
+ pr_debug("\n");
+ pr_debug("Displaying hash table:\n");
+
+ for (i = 0; i < len; i++) {
+ err = cn_display_hlist(adata[i].pid, len, &adata[i].key,
+ key_display);
+ key_display[adata[i].key] = 1;
+ KUNIT_EXPECT_EQ(test, err, 0);
+ }
+}
+
+static void cn_hash_test_add(struct kunit *test)
+{
+ int err, i;
+ int exit_val;
+
+ adata[0].pid = 1;
+ adata[0].exit_val = 45;
+
+ adata[1].pid = 2;
+ adata[1].exit_val = 13;
+
+ adata[2].pid = 1024;
+ adata[2].exit_val = 16;
+
+ adata[3].pid = 1023;
+ adata[3].exit_val = 71;
+
+ for (i = 0; i < ARRAY_SIZE(adata); i++) {
+ err = cn_add_elem(adata[i].exit_val, adata[i].pid);
+ KUNIT_EXPECT_EQ_MSG(test, 0, err,
+ "Adding pid %d returned err %d",
+ adata[i].pid, err);
+
+ exit_val = cn_get_exval(adata[i].pid);
+ KUNIT_EXPECT_EQ(test, adata[i].exit_val, exit_val);
+ }
+
+ cn_display_htable(test, ARRAY_SIZE(adata));
+}
+
+static void cn_hash_test_del(struct kunit *test)
+{
+ int i, err;
+ int exit_val;
+
+ for (i = 0; i < ARRAY_SIZE(adata); i++) {
+ err = cn_del_get_exval(adata[i].pid);
+ KUNIT_EXPECT_GT_MSG(test, err, 0,
+ "Deleting pid %d returned err %d",
+ adata[i].pid, err);
+
+ exit_val = cn_get_exval(adata[i].pid);
+ KUNIT_EXPECT_EQ(test, -EINVAL, exit_val);
+ }
+
+ cn_display_htable(test, ARRAY_SIZE(adata));
+ KUNIT_EXPECT_TRUE(test, cn_table_empty());
+}
+
+static void cn_hash_test_del_get_exval(struct kunit *test)
+{
+ int i, exval;
+
+ for (i = 0; i < ARRAY_SIZE(adata); i++) {
+ exval = cn_del_get_exval(adata[i].pid);
+ KUNIT_EXPECT_EQ(test, adata[i].exit_val, exval);
+
+ cn_display_htable(test, ARRAY_SIZE(adata));
+ }
+
+ KUNIT_EXPECT_TRUE(test, cn_table_empty());
+}
+
+static void cn_hash_test_dup_add(struct kunit *test)
+{
+ int err, exit_val;
+
+ adata[0].pid = 10;
+ adata[0].exit_val = 21;
+
+ err = cn_add_elem(adata[0].exit_val, adata[0].pid);
+ KUNIT_EXPECT_EQ(test, 0, err);
+
+ exit_val = cn_get_exval(adata[0].pid);
+ KUNIT_EXPECT_EQ(test, 21, exit_val);
+
+ adata[1].pid = 10;
+ adata[1].exit_val = 12;
+
+ err = cn_add_elem(adata[1].exit_val, adata[1].pid);
+ KUNIT_EXPECT_EQ(test, -EEXIST, err);
+
+ exit_val = cn_get_exval(adata[1].pid);
+ KUNIT_EXPECT_EQ(test, 21, exit_val);
+
+ cn_display_htable(test, 1);
+}
+
+static void cn_hash_test_dup_del(struct kunit *test)
+{
+ int err;
+
+ err = cn_del_get_exval(adata[0].pid);
+ KUNIT_EXPECT_EQ(test, adata[0].exit_val, err);
+
+ err = cn_del_get_exval(adata[0].pid);
+ KUNIT_EXPECT_EQ(test, -EINVAL, err);
+
+ KUNIT_EXPECT_TRUE(test, cn_table_empty());
+}
+
+static struct kunit_case cn_hashtable_test_cases[] = {
+ KUNIT_CASE(cn_hash_test_add),
+ KUNIT_CASE(cn_hash_test_del),
+ KUNIT_CASE(cn_hash_test_dup_add),
+ KUNIT_CASE(cn_hash_test_dup_del),
+ KUNIT_CASE(cn_hash_test_add),
+ KUNIT_CASE(cn_hash_test_del_get_exval),
+ {},
+};
+
+static struct kunit_suite cn_hashtable_test_module = {
+ .name = "cn_hashtable",
+ .init = cn_hash_init,
+ .test_cases = cn_hashtable_test_cases,
+};
+
+kunit_test_suite(cn_hashtable_test_module);
+
+MODULE_DESCRIPTION("KUnit test for the connector threads hashtable code");
+MODULE_LICENSE("GPL");
diff --git a/lib/cn_hash_test.h b/lib/cn_hash_test.h
new file mode 100644
index 000000000000..b25033feab09
--- /dev/null
+++ b/lib/cn_hash_test.h
@@ -0,0 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright (c) 2024 Oracle and/or its affiliates.
+ * Author: Anjali Kulkarni <anjali.k.kulkarni@...cle.com>
+ */
+int cn_display_hlist(pid_t pid, int max_len, int *hkey, int *key_display);
+int cn_add_elem(__u32 uexit_code, pid_t pid);
+int cn_del_get_exval(pid_t pid);
+int cn_get_exval(pid_t pid);
+bool cn_table_empty(void);
diff --git a/tools/testing/kunit/configs/all_tests.config b/tools/testing/kunit/configs/all_tests.config
index b3b00269a52a..a663280b0f3a 100644
--- a/tools/testing/kunit/configs/all_tests.config
+++ b/tools/testing/kunit/configs/all_tests.config
@@ -52,3 +52,8 @@ CONFIG_SOUND=y
CONFIG_SND=y
CONFIG_SND_SOC=y
CONFIG_SND_SOC_TOPOLOGY_BUILD=y
+
+CONFIG_CONNECTOR=y
+CONFIG_PROC_EVENTS=y
+CONFIG_NET=y
+CONFIG_CN_HASH_KUNIT_TEST=y
--
2.46.0
Powered by blists - more mailing lists