From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from picard.linux.it (picard.linux.it [213.254.12.146]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7C00EC28CF5 for ; Wed, 26 Jan 2022 11:56:53 +0000 (UTC) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 99DE03C54C9 for ; Wed, 26 Jan 2022 12:56:50 +0100 (CET) Received: from in-3.smtp.seeweb.it (in-3.smtp.seeweb.it [IPv6:2001:4b78:1:20::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id 92A3D3C54C9 for ; Wed, 26 Jan 2022 12:56:40 +0100 (CET) Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by in-3.smtp.seeweb.it (Postfix) with ESMTPS id 3CFBA1A01526 for ; Wed, 26 Jan 2022 12:56:38 +0100 (CET) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 5A938218E4; Wed, 26 Jan 2022 11:56:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1643198198; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=e10eMJiPWF0pp/fKHSvoT5tWkEJrq3k1sDyzuFS26HA=; b=wqLxOPwWq+nGspKxGLf43mljxWPZRLqrVx51sr01ZD8z9Hek0NLp0kkC4SjeiGWCFnrlv6 5rVXcrH+zxA1MXzFhxFulHWPESc1+6IIYdh3Nk2ExJtTg7FYGQienpbwSqp1vfqnY1eCnI grrjSwS/hx0ztMo2/ZcRoQSzFVUHA6o= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1643198198; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=e10eMJiPWF0pp/fKHSvoT5tWkEJrq3k1sDyzuFS26HA=; b=pTQVYiytfEJnKzmH1MNIhgj+qTZl3MyCuk1MYoENAaIQmvmWtocaavzN8vqkXx4tmk5h0m zxS6x6JwD0oR2SBA== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 4376913BA2; Wed, 26 Jan 2022 11:56:38 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id ZYetDfY28WHSIgAAMHmgww (envelope-from ); Wed, 26 Jan 2022 11:56:38 +0000 Date: Wed, 26 Jan 2022 12:58:27 +0100 From: Cyril Hrubis To: Andrea Cervesato Message-ID: References: <20220107212058.19768-1-andrea.cervesato@suse.de> <20220107212058.19768-4-andrea.cervesato@suse.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20220107212058.19768-4-andrea.cervesato@suse.de> X-Virus-Scanned: clamav-milter 0.102.4 at in-3.smtp.seeweb.it X-Virus-Status: Clean Subject: Re: [LTP] [PATCH v4 03/11] Add wqueue01 test X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ltp@lists.linux.it Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ltp-bounces+ltp=archiver.kernel.org@lists.linux.it Sender: "ltp" Hi! > Signed-off-by: Andrea Cervesato > --- > runtest/watchqueue | 9 ++ > scenario_groups/default | 1 + > testcases/kernel/Makefile | 1 + > testcases/kernel/watchqueue/.gitignore | 9 ++ > testcases/kernel/watchqueue/Makefile | 8 ++ > testcases/kernel/watchqueue/common.h | 149 +++++++++++++++++++++++++ > testcases/kernel/watchqueue/wqueue01.c | 40 +++++++ > 7 files changed, 217 insertions(+) > create mode 100644 runtest/watchqueue > create mode 100644 testcases/kernel/watchqueue/.gitignore > create mode 100644 testcases/kernel/watchqueue/Makefile > create mode 100644 testcases/kernel/watchqueue/common.h > create mode 100644 testcases/kernel/watchqueue/wqueue01.c > > diff --git a/runtest/watchqueue b/runtest/watchqueue > new file mode 100644 > index 000000000..bd6b0a423 > --- /dev/null > +++ b/runtest/watchqueue > @@ -0,0 +1,9 @@ > +wqueue01 wqueue01 > +wqueue02 wqueue02 > +wqueue03 wqueue03 > +wqueue04 wqueue04 > +wqueue05 wqueue05 > +wqueue06 wqueue06 > +wqueue07 wqueue07 > +wqueue08 wqueue08 > +wqueue09 wqueue09 While this is minor, such entries should be added with each respective test. > diff --git a/scenario_groups/default b/scenario_groups/default > index 1dc2987d5..68bd5300d 100644 > --- a/scenario_groups/default > +++ b/scenario_groups/default > @@ -30,3 +30,4 @@ cve > crypto > kernel_misc > uevent > +watchqueue > diff --git a/testcases/kernel/Makefile b/testcases/kernel/Makefile > index 4604f1f38..d44856c57 100644 > --- a/testcases/kernel/Makefile > +++ b/testcases/kernel/Makefile > @@ -38,6 +38,7 @@ SUBDIRS += connectors \ > sound \ > tracing \ > uevents \ > + watchqueue \ > > ifeq ($(WITH_POWER_MANAGEMENT_TESTSUITE),yes) > SUBDIRS += power_management > diff --git a/testcases/kernel/watchqueue/.gitignore b/testcases/kernel/watchqueue/.gitignore > new file mode 100644 > index 000000000..dcfcd8272 > --- /dev/null > +++ b/testcases/kernel/watchqueue/.gitignore > @@ -0,0 +1,9 @@ > +wqueue01 > +wqueue02 > +wqueue03 > +wqueue04 > +wqueue05 > +wqueue06 > +wqueue07 > +wqueue08 > +wqueue09 Same here. > diff --git a/testcases/kernel/watchqueue/Makefile b/testcases/kernel/watchqueue/Makefile > new file mode 100644 > index 000000000..896d66d42 > --- /dev/null > +++ b/testcases/kernel/watchqueue/Makefile > @@ -0,0 +1,8 @@ > +# SPDX-License-Identifier: GPL-2.0-or-later > + > +top_srcdir ?= ../../.. > + > +include $(top_srcdir)/include/mk/testcases.mk > +include $(top_srcdir)/include/mk/generic_leaf_target.mk > + > +LDLIBS += $(KEYUTILS_LIBS) > diff --git a/testcases/kernel/watchqueue/common.h b/testcases/kernel/watchqueue/common.h > new file mode 100644 > index 000000000..00d19b5bc > --- /dev/null > +++ b/testcases/kernel/watchqueue/common.h > @@ -0,0 +1,149 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > +/* > + * Copyright (C) 2021 SUSE LLC Andrea Cervesato > + */ > + > +#ifndef WQUEUE_COMMON_H__ > +#define WQUEUE_COMMON_H__ > + > +#include "tst_test.h" > +#include "lapi/watch_queue.h" > +#include "lapi/keyctl.h" > + > +static struct watch_notification_filter wqueue_filter = { > + .nr_filters = 2, > + .filters = { > + [0] = { > + .type = WATCH_TYPE_META, > + .subtype_filter[0] = UINT_MAX, > + }, > + [1] = { > + .type = WATCH_TYPE_KEY_NOTIFY, > + .subtype_filter[0] = UINT_MAX, > + }, > + }, > +}; > + > +static inline int wqueue_key_event(struct watch_notification *n, size_t len, unsigned int wtype, int type) > +{ > + struct key_notification *k; > + const char* msg; > + > + if (wtype != WATCH_TYPE_KEY_NOTIFY) > + return 0; > + > + if (len != sizeof(struct key_notification)) > + tst_brk(TBROK, "Incorrect key message length"); > + > + switch (n->subtype) { > + case NOTIFY_KEY_INSTANTIATED: > + msg = "instantiated"; > + break; > + case NOTIFY_KEY_UPDATED: > + msg = "updated"; > + break; > + case NOTIFY_KEY_LINKED: > + msg = "linked"; > + break; > + case NOTIFY_KEY_UNLINKED: > + msg = "unlinked"; > + break; > + case NOTIFY_KEY_CLEARED: > + msg = "cleared"; > + break; > + case NOTIFY_KEY_REVOKED: > + msg = "revoked"; > + break; > + case NOTIFY_KEY_INVALIDATED: > + msg = "invalidated"; > + break; > + case NOTIFY_KEY_SETATTR: > + msg = "setattr"; > + break; > + default: > + msg = "Invalid notification"; > + break; > + }; > + > + k = (struct key_notification *)n; > + tst_res(TINFO, "KEY %08x change=%u[%s] aux=%u", > + k->key_id, n->subtype, msg, k->aux); > + > + if (n->subtype == type) > + return 1; > + > + return 0; > +} > + > +static inline key_serial_t wqueue_add_key(int fd) > +{ > + key_serial_t key; > + > + key = add_key("user", "ltptestkey", "a", 1, KEY_SPEC_SESSION_KEYRING); > + if (key == -1) > + tst_brk(TBROK, "add_key error: %s", tst_strerrno(errno)); > + > + keyctl(KEYCTL_WATCH_KEY, key, fd, 0x01); > + keyctl(KEYCTL_WATCH_KEY, KEY_SPEC_SESSION_KEYRING, fd, 0x02); > + > + return key; > +} > + > +static inline int wqueue_watch(int buf_size, struct watch_notification_filter *filter) > +{ > + int pipefd[2]; > + int fd; > + > + SAFE_PIPE2(pipefd, O_NOTIFICATION_PIPE); We can get two different errors here that should be translated to TCONF. If you look at watch_queue.h in the linux kernel sources it looks like: #ifdef CONFIG_WATCH_QUEUE ... #else static inline int watch_queue_init(struct pipe_inode_info *pipe) { return -ENOPKG; } #endif So in the case that CONFIG_WATCH_QUEUE is not set pipe2() with O_NOTIFICATION_PIPE will fail with errno set to ENOPKG. And on kernels that are older than the watch queue implementation we will trip over: if (flags & ~(O_CLOEXEC | O_NONBLOCK | O_DIRECT)) return -EINVAL; In the __do_pipe_flags() function and the call will fail with EINVAL instead. So this code should look like: TEST(pipe2(pipefd, O_NOTIFICATION_PIPE)); if (TST_RET) { switch (TST_ERR) { case ENOPKG: tst_brk(TCONF | TTERRNO, "CONFIG_WATCH_QUEUE is not set"); break; case EINVAL: tst_brk(TCONF | TTERRNO, "O_NOTIFICATION_PIPE is not supported"); break; default: tst_brk(TBROK | TTERRNO, "pipe2() returned %ld", TST_RET); } } > + fd = pipefd[0]; > + > + SAFE_IOCTL(fd, IOC_WATCH_QUEUE_SET_SIZE, buf_size); > + SAFE_IOCTL(fd, IOC_WATCH_QUEUE_SET_FILTER, filter); > + > + return fd; > +} > + > +typedef void (*wqueue_callback) (struct watch_notification *n, size_t len, unsigned int wtype); > + > +static void wqueue_consumer(int fd, wqueue_callback cb) > +{ > + unsigned char buffer[433], *p, *end; > + union { > + struct watch_notification n; > + unsigned char buf1[128]; > + } n; > + ssize_t buf_len; > + > + tst_res(TINFO, "Reading watch queue events"); > + > + buf_len = SAFE_READ(0, fd, buffer, sizeof(buffer)); > + > + p = buffer; > + end = buffer + buf_len; > + while (p < end) { > + size_t largest, len; > + > + largest = end - p; > + if (largest > 128) > + largest = 128; > + > + if (largest < sizeof(struct watch_notification)) > + tst_brk(TBROK, "Short message header: %zu", largest); > + > + memcpy(&n, p, largest); > + > + tst_res(TINFO, "NOTIFY[%03zx]: ty=%06x sy=%02x i=%08x", > + p - buffer, n.n.type, n.n.subtype, n.n.info); > + > + len = n.n.info & WATCH_INFO_LENGTH; > + if (len < sizeof(n.n) || len > largest) > + tst_brk(TBROK, "Bad message length: %zu/%zu", len, largest); > + > + cb(&n.n, len, n.n.type); > + > + p += len; > + } > +} > + > +#endif > diff --git a/testcases/kernel/watchqueue/wqueue01.c b/testcases/kernel/watchqueue/wqueue01.c > new file mode 100644 > index 000000000..24c3908ce > --- /dev/null > +++ b/testcases/kernel/watchqueue/wqueue01.c > @@ -0,0 +1,40 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > +/* > + * Copyright (C) 2021 SUSE LLC Andrea Cervesato > + */ > + > +/*\ > + * [Description] > + * > + * Test if keyctl update is correctly recognized by watch queue. > + */ > + > +#include "tst_test.h" > +#include "lapi/keyctl.h" > +#include "common.h" > + > +static void saw_key_updated(struct watch_notification *n, size_t len, unsigned int wtype) > +{ > + if (wqueue_key_event(n, len, wtype, NOTIFY_KEY_UPDATED)) > + tst_res(TPASS, "keyctl update has been recognized"); > + else > + tst_res(TFAIL, "keyctl update has not been recognized"); > +} > + > +static void run(void) > +{ > + int fd; > + key_serial_t key; > + > + fd = wqueue_watch(256, &wqueue_filter); > + key = wqueue_add_key(fd); > + > + keyctl(KEYCTL_UPDATE, key, "b", 1); > + wqueue_consumer(fd, saw_key_updated); > + > + SAFE_CLOSE(fd); > +} > + > +static struct tst_test test = { > + .test_all = run, > +}; > -- > 2.34.1 > > > -- > Mailing list info: https://lists.linux.it/listinfo/ltp -- Cyril Hrubis chrubis@suse.cz -- Mailing list info: https://lists.linux.it/listinfo/ltp