update bloom filter handling (ABI break)

11 files changed, 55 insertions, 44 deletions

diff --git a/test/kdbus-enum.c b/test/kdbus-enum.c
index b87effbaf41..3dffc83e44a 100644
--- a/test/kdbus-enum.c
+++ b/test/kdbus-enum.c
@@ -57,7 +57,8 @@ TABLE(MSG) = {
 	ENUM(KDBUS_ITEM_PAYLOAD_OFF),
 	ENUM(KDBUS_ITEM_PAYLOAD_MEMFD),
 	ENUM(KDBUS_ITEM_FDS),
-	ENUM(KDBUS_ITEM_BLOOM),
+	ENUM(KDBUS_ITEM_BLOOM_PARAMETER),
+	ENUM(KDBUS_ITEM_BLOOM_FILTER),
 	ENUM(KDBUS_ITEM_DST_NAME),
 	ENUM(KDBUS_ITEM_CREDS),
 	ENUM(KDBUS_ITEM_PID_COMM),
diff --git a/test/kdbus-util.c b/test/kdbus-util.c
index 2f375857798..ed59af52b8a 100644
--- a/test/kdbus-util.c
+++ b/test/kdbus-util.c
@@ -120,7 +120,7 @@ int msg_send(const struct conn *conn,
 	size += KDBUS_ITEM_SIZE(sizeof(struct kdbus_vec));
 
 	if (dst_id == KDBUS_DST_ID_BROADCAST)
-		size += KDBUS_ITEM_HEADER_SIZE + 64;
+		size += KDBUS_ITEM_SIZE(sizeof(struct kdbus_bloom_filter)) + 64;
 	else {
 		struct {
 			struct kdbus_cmd_memfd_make cmd;
@@ -203,8 +203,9 @@ int msg_send(const struct conn *conn,
 	item = KDBUS_ITEM_NEXT(item);
 
 	if (dst_id == KDBUS_DST_ID_BROADCAST) {
-		item->type = KDBUS_ITEM_BLOOM;
-		item->size = KDBUS_ITEM_HEADER_SIZE + 64;
+		item->type = KDBUS_ITEM_BLOOM_FILTER;
+		item->size = KDBUS_ITEM_SIZE(sizeof(struct kdbus_bloom_filter)) + 64;
+		item->bloom_filter.generation = 0;
 	} else {
 		item->type = KDBUS_ITEM_PAYLOAD_MEMFD;
 		item->size = KDBUS_ITEM_HEADER_SIZE + sizeof(struct kdbus_memfd);
diff --git a/test/test-kdbus-activator.c b/test/test-kdbus-activator.c
index 4754a925cdf..957afee6d90 100644
--- a/test/test-kdbus-activator.c
+++ b/test/test-kdbus-activator.c
@@ -75,7 +75,7 @@ int main(int argc, char *argv[])
 		struct {
 			uint64_t size;
 			uint64_t type;
-			uint64_t bloom_size;
+			struct kdbus_bloom_parameter bloom;
 		} bs;
 
 		/* name item */
@@ -98,8 +98,9 @@ int main(int argc, char *argv[])
 
 	memset(&bus_make, 0, sizeof(bus_make));
 	bus_make.bs.size = sizeof(bus_make.bs);
-	bus_make.bs.type = KDBUS_ITEM_BLOOM_SIZE;
-	bus_make.bs.bloom_size = 64;
+	bus_make.bs.type = KDBUS_ITEM_BLOOM_PARAMETER;
+	bus_make.bs.bloom.size = 64;
+	bus_make.bs.bloom.n_hash = 1;
 
 	snprintf(bus_make.name, sizeof(bus_make.name), "%u-testbus", getuid());
 	bus_make.n_type = KDBUS_ITEM_MAKE_NAME;
diff --git a/test/test-kdbus-benchmark.c b/test/test-kdbus-benchmark.c
index 1d19fa7fc07..694c432c00e 100644
--- a/test/test-kdbus-benchmark.c
+++ b/test/test-kdbus-benchmark.c
@@ -214,7 +214,7 @@ int main(int argc, char *argv[])
 		struct {
 			uint64_t size;
 			uint64_t type;
-			uint64_t bloom_size;
+			struct kdbus_bloom_parameter bloom;
 		} bs;
 
 		/* name item */
@@ -242,8 +242,9 @@ int main(int argc, char *argv[])
 
 	memset(&bus_make, 0, sizeof(bus_make));
 	bus_make.bs.size = sizeof(bus_make.bs);
-	bus_make.bs.type = KDBUS_ITEM_BLOOM_SIZE;
-	bus_make.bs.bloom_size = 64;
+	bus_make.bs.type = KDBUS_ITEM_BLOOM_PARAMETER;
+	bus_make.bs.bloom.size = 64;
+	bus_make.bs.bloom.n_hash = 1;
 
 	snprintf(bus_make.name, sizeof(bus_make.name), "%u-testbus", getuid());
 	bus_make.n_type = KDBUS_ITEM_MAKE_NAME;
diff --git a/test/test-kdbus-chat.c b/test/test-kdbus-chat.c
index df62e2be72e..5881b3f795a 100644
--- a/test/test-kdbus-chat.c
+++ b/test/test-kdbus-chat.c
@@ -23,7 +23,7 @@ int main(int argc, char *argv[])
 		struct {
 			uint64_t size;
 			uint64_t type;
-			uint64_t bloom_size;
+			struct kdbus_bloom_parameter bloom;
 		} bs;
 
 		/* name item */
@@ -47,8 +47,9 @@ int main(int argc, char *argv[])
 
 	memset(&bus_make, 0, sizeof(bus_make));
 	bus_make.bs.size = sizeof(bus_make.bs);
-	bus_make.bs.type = KDBUS_ITEM_BLOOM_SIZE;
-	bus_make.bs.bloom_size = 64;
+	bus_make.bs.type = KDBUS_ITEM_BLOOM_PARAMETER;
+	bus_make.bs.bloom.size = 64;
+	bus_make.bs.bloom.n_hash = 1;
 
 	snprintf(bus_make.name, sizeof(bus_make.name), "%u-testbus", getuid());
 	bus_make.n_type = KDBUS_ITEM_MAKE_NAME;
diff --git a/test/test-kdbus-daemon.c b/test/test-kdbus-daemon.c
index fa29dde184a..4ab054f6379 100644
--- a/test/test-kdbus-daemon.c
+++ b/test/test-kdbus-daemon.c
@@ -24,7 +24,7 @@ int main(int argc, char *argv[])
 		struct {
 			uint64_t size;
 			uint64_t type;
-			uint64_t bloom_size;
+			struct kdbus_bloom_parameter bloom;
 		} bs;
 
 		uint64_t n_size;
@@ -48,8 +48,9 @@ int main(int argc, char *argv[])
 
 	memset(&bus_make, 0, sizeof(bus_make));
 	bus_make.bs.size = sizeof(bus_make.bs);
-	bus_make.bs.type = KDBUS_ITEM_BLOOM_SIZE;
-	bus_make.bs.bloom_size = 64;
+	bus_make.bs.type = KDBUS_ITEM_BLOOM_PARAMETER;
+	bus_make.bs.bloom.size = 64;
+	bus_make.bs.bloom.n_hash = 1;
 
 	snprintf(bus_make.name, sizeof(bus_make.name), "%u-testbus", getuid());
 	bus_make.n_type = KDBUS_ITEM_MAKE_NAME;
diff --git a/test/test-kdbus-fuzz.c b/test/test-kdbus-fuzz.c
index 811ab55e423..3eba7d6957e 100644
--- a/test/test-kdbus-fuzz.c
+++ b/test/test-kdbus-fuzz.c
@@ -86,7 +86,7 @@ static int make_bus(void)
 		struct {
 			uint64_t size;
 			uint64_t type;
-			uint64_t bloom_size;
+			struct kdbus_bloom_parameter bloom;
 		} bs;
 
 		/* name item */
@@ -119,8 +119,9 @@ static int make_bus(void)
 	bus_make.head.size = sizeof(struct kdbus_cmd_make) + strlen(bus_make.name) + 1;
 
 	bus_make.bs.size = sizeof(bus_make.bs);
-	bus_make.bs.type = KDBUS_ITEM_BLOOM_SIZE;
-	bus_make.bs.bloom_size = 64;
+	bus_make.bs.type = KDBUS_ITEM_BLOOM_PARAMETER;
+	bus_make.bs.bloom.size = 64;
+	bus_make.bs.bloom.n_hash = 1;
 
 	printf("-- creating bus '%s'\n", bus_make.name);
 	ret = ioctl(fdc, KDBUS_CMD_BUS_MAKE, &bus_make);
diff --git a/test/test-kdbus-prio.c b/test/test-kdbus-prio.c
index ef3b6dc6d72..980ca6d615c 100644
--- a/test/test-kdbus-prio.c
+++ b/test/test-kdbus-prio.c
@@ -52,7 +52,7 @@ static int run_test(void)
 		struct {
 			uint64_t size;
 			uint64_t type;
-			uint64_t bloom_size;
+			struct kdbus_bloom_parameter bloom;
 		} bs;
 
 		/* name item */
@@ -76,8 +76,9 @@ static int run_test(void)
 	memset(&bus_make, 0, sizeof(bus_make));
 	bus_make.head.flags = KDBUS_MAKE_POLICY_OPEN;
 	bus_make.bs.size = sizeof(bus_make.bs);
-	bus_make.bs.type = KDBUS_ITEM_BLOOM_SIZE;
-	bus_make.bs.bloom_size = 64;
+	bus_make.bs.type = KDBUS_ITEM_BLOOM_PARAMETER;
+	bus_make.bs.bloom.size = 64;
+	bus_make.bs.bloom.n_hash = 1;
 
 	snprintf(bus_make.name, sizeof(bus_make.name), "%u-testbus", getuid());
 	bus_make.n_type = KDBUS_ITEM_MAKE_NAME;
diff --git a/test/test-kdbus-sync.c b/test/test-kdbus-sync.c
index 18071e0a02c..43d1c07663a 100644
--- a/test/test-kdbus-sync.c
+++ b/test/test-kdbus-sync.c
@@ -49,7 +49,7 @@ int main(int argc, char *argv[])
 		struct {
 			uint64_t size;
 			uint64_t type;
-			uint64_t bloom_size;
+			struct kdbus_bloom_parameter bloom;
 		} bs;
 
 		/* name item */
@@ -71,8 +71,9 @@ int main(int argc, char *argv[])
 	memset(&bus_make, 0, sizeof(bus_make));
 	bus_make.head.flags = KDBUS_MAKE_POLICY_OPEN;
 	bus_make.bs.size = sizeof(bus_make.bs);
-	bus_make.bs.type = KDBUS_ITEM_BLOOM_SIZE;
-	bus_make.bs.bloom_size = 64;
+	bus_make.bs.type = KDBUS_ITEM_BLOOM_PARAMETER;
+	bus_make.bs.bloom.size = 64;
+	bus_make.bs.bloom.n_hash = 1;
 
 	snprintf(bus_make.name, sizeof(bus_make.name), "%u-testbus", getuid());
 	bus_make.n_type = KDBUS_ITEM_MAKE_NAME;
diff --git a/test/test-kdbus-timeout.c b/test/test-kdbus-timeout.c
index 527b5a9cbf2..2acc882478b 100644
--- a/test/test-kdbus-timeout.c
+++ b/test/test-kdbus-timeout.c
@@ -50,7 +50,7 @@ static int run_test(void)
 		struct {
 			uint64_t size;
 			uint64_t type;
-			uint64_t bloom_size;
+			struct kdbus_bloom_parameter bloom;
 		} bs;
 
 		/* name item */
@@ -73,8 +73,9 @@ static int run_test(void)
 	memset(&bus_make, 0, sizeof(bus_make));
 	bus_make.head.flags = KDBUS_MAKE_POLICY_OPEN;
 	bus_make.bs.size = sizeof(bus_make.bs);
-	bus_make.bs.type = KDBUS_ITEM_BLOOM_SIZE;
-	bus_make.bs.bloom_size = 64;
+	bus_make.bs.type = KDBUS_ITEM_BLOOM_PARAMETER;
+	bus_make.bs.bloom.size = 64;
+	bus_make.bs.bloom.n_hash = 1;
 
 	snprintf(bus_make.name, sizeof(bus_make.name), "%u-testbus", getuid());
 	bus_make.n_type = KDBUS_ITEM_MAKE_NAME;
diff --git a/test/test-kdbus.c b/test/test-kdbus.c
index 344ea80c8c7..7e5472c07ac 100644
--- a/test/test-kdbus.c
+++ b/test/test-kdbus.c
@@ -178,7 +178,7 @@ static int send_message(const struct kdbus_conn *conn,
 	size += KDBUS_ITEM_SIZE(sizeof(struct kdbus_vec));
 
 	if (dst_id == KDBUS_DST_ID_BROADCAST)
-		size += KDBUS_ITEM_HEADER_SIZE + 64;
+		size += KDBUS_ITEM_SIZE(sizeof(struct kdbus_bloom_filter)) + 64;
 	else {
 		struct kdbus_cmd_memfd_make mfd;
 
@@ -237,8 +237,9 @@ static int send_message(const struct kdbus_conn *conn,
 	item = KDBUS_ITEM_NEXT(item);
 
 	if (dst_id == KDBUS_DST_ID_BROADCAST) {
-		item->type = KDBUS_ITEM_BLOOM;
-		item->size = KDBUS_ITEM_HEADER_SIZE + 64;
+		item->type = KDBUS_ITEM_BLOOM_FILTER;
+		item->size = KDBUS_ITEM_SIZE(sizeof(struct kdbus_bloom_filter)) + 64;
+		item->bloom_filter.generation = 0;
 	} else {
 		item->type = KDBUS_ITEM_PAYLOAD_MEMFD;
 		item->size = KDBUS_ITEM_HEADER_SIZE + sizeof(struct kdbus_memfd);
@@ -316,7 +317,7 @@ static int check_busmake(struct kdbus_check_env *env)
 		struct {
 			uint64_t size;
 			uint64_t type;
-			uint64_t bloom_size;
+			struct kdbus_bloom_parameter bloom;
 		} bs;
 
 		/* name item */
@@ -333,23 +334,24 @@ static int check_busmake(struct kdbus_check_env *env)
 	memset(&bus_make, 0, sizeof(bus_make));
 
 	bus_make.bs.size = sizeof(bus_make.bs);
-	bus_make.bs.type = KDBUS_ITEM_BLOOM_SIZE;
-	bus_make.bs.bloom_size = 64;
+	bus_make.bs.type = KDBUS_ITEM_BLOOM_PARAMETER;
+	bus_make.bs.bloom.size = 64;
+	bus_make.bs.bloom.n_hash = 1;
 
 	bus_make.n_type = KDBUS_ITEM_MAKE_NAME;
 
 	/* missing uid prefix */
 	snprintf(bus_make.name, sizeof(bus_make.name), "foo");
 	bus_make.n_size = KDBUS_ITEM_HEADER_SIZE + strlen(bus_make.name) + 1;
-	bus_make.head.size = sizeof(struct kdbus_cmd_make) + bus_make.n_size;
+	bus_make.head.size = sizeof(struct kdbus_cmd_make) + sizeof(bus_make.bs) +
+			     bus_make.n_size;
 	ret = ioctl(env->control_fd, KDBUS_CMD_BUS_MAKE, &bus_make);
 	ASSERT_RETURN(ret == -1 && errno == EINVAL);
 
 	/* non alphanumeric character */
 	snprintf(bus_make.name, sizeof(bus_make.name), "%u-blah@123", getuid());
 	bus_make.n_size = KDBUS_ITEM_HEADER_SIZE + strlen(bus_make.name) + 1;
-	bus_make.head.size = sizeof(struct kdbus_cmd_make) +
-			     sizeof(uint64_t) * 3 +
+	bus_make.head.size = sizeof(struct kdbus_cmd_make) + sizeof(bus_make.bs) +
 			     bus_make.n_size;
 	ret = ioctl(env->control_fd, KDBUS_CMD_BUS_MAKE, &bus_make);
 	ASSERT_RETURN(ret == -1 && errno == EINVAL);
@@ -357,8 +359,7 @@ static int check_busmake(struct kdbus_check_env *env)
 	/* '-' at the end */
 	snprintf(bus_make.name, sizeof(bus_make.name), "%u-blah-", getuid());
 	bus_make.n_size = KDBUS_ITEM_HEADER_SIZE + strlen(bus_make.name) + 1;
-	bus_make.head.size = sizeof(struct kdbus_cmd_make) +
-			     sizeof(uint64_t) * 3 +
+	bus_make.head.size = sizeof(struct kdbus_cmd_make) + sizeof(bus_make.bs) +
 			     bus_make.n_size;
 	ret = ioctl(env->control_fd, KDBUS_CMD_BUS_MAKE, &bus_make);
 	ASSERT_RETURN(ret == -1 && errno == EINVAL);
@@ -366,8 +367,7 @@ static int check_busmake(struct kdbus_check_env *env)
 	/* create a new bus */
 	snprintf(bus_make.name, sizeof(bus_make.name), "%u-blah-1", getuid());
 	bus_make.n_size = KDBUS_ITEM_HEADER_SIZE + strlen(bus_make.name) + 1;
-	bus_make.head.size = sizeof(struct kdbus_cmd_make) +
-			     sizeof(uint64_t) * 3 +
+	bus_make.head.size = sizeof(struct kdbus_cmd_make) + sizeof(bus_make.bs) +
 			     bus_make.n_size;
 	ret = ioctl(env->control_fd, KDBUS_CMD_BUS_MAKE, &bus_make);
 	ASSERT_RETURN(ret == 0);
@@ -1061,7 +1061,7 @@ static int check_prepare_env(const struct kdbus_check *c, struct kdbus_check_env
 			struct {
 				uint64_t size;
 				uint64_t type;
-				uint64_t bloom_size;
+				struct kdbus_bloom_parameter bloom;
 			} bs;
 
 			/* name item */
@@ -1078,8 +1078,9 @@ static int check_prepare_env(const struct kdbus_check *c, struct kdbus_check_env
 
 		memset(&bus_make, 0, sizeof(bus_make));
 		bus_make.bs.size = sizeof(bus_make.bs);
-		bus_make.bs.type = KDBUS_ITEM_BLOOM_SIZE;
-		bus_make.bs.bloom_size = 64;
+		bus_make.bs.type = KDBUS_ITEM_BLOOM_PARAMETER;
+		bus_make.bs.bloom.size = 64;
+		bus_make.bs.bloom.n_hash = 1;
 
 		for (i = 0; i < sizeof(n); i++)
 			n[i] = 'a' + (random() % ('z' - 'a'));