From nobody Sat Dec 28 03:46:24 2024 Received: from mail.codeweavers.com (mail.codeweavers.com [4.36.192.163]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CA32019AA5D; Mon, 9 Dec 2024 18:59:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=4.36.192.163 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733770779; cv=none; b=cx7GjvJm01COQQhFKqRjFrNkc8J7kBW5AhFvDeimsf5kjb3OfautOps0za1Cm6lMtTh1ug7rXG2L74j86C4zd5FDLZKGrtfLZ0lpMOZls0wT5Jg30reTYAvYIV6aS0B/zQ5vW0bNmx11a0fT/lvxNIc7qwdZq04qwmdQZkzbc9o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733770779; c=relaxed/simple; bh=DjnEbJDoB9Dul+eXHq8clKxcbVu75NwycVVhQWnf0ig=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EPElPRj0F8L+jA6PAnHFFp9vjIqodVkxtiMj5yM+3SnahnBr6c/75R6XvSnKuHGCOBIX7W+8Q2jskN8zkh+K+0Ub5RIdDb9hJdzjsYd1UQMOYrEBBsqFyEFV6gJ+WURQjnftq95zwtELh2dyUSMR62GNRjsaln++6V4yCeofeD0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=codeweavers.com; spf=pass smtp.mailfrom=codeweavers.com; dkim=pass (2048-bit key) header.d=codeweavers.com header.i=@codeweavers.com header.b=RHJxmLBb; arc=none smtp.client-ip=4.36.192.163 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=codeweavers.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=codeweavers.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=codeweavers.com header.i=@codeweavers.com header.b="RHJxmLBb" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=codeweavers.com; s=s1; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=X2FClKwDD6Y5NBJzrFcfOYwIT9ygvxJfJzIcvxri0Xc=; b=RHJxmLBbEv0UfgKHPNnS0TDckw BNjKqD83SPLehXu69xkLvUQJlpCujZ0rT2yqLkKSg4qNSZjtYUCugS6zo0uOWWrUYcSiA63iesJej ki8+qaqiYsH6mFSiJCBZjsRKHUv8vU1IQmzQw1WzrIpV5OF9udEetP5e6Bg/I5bplu3+pdQqYt+Eb myNQq9i2hTxn1ASU/NzJwFHpiup+auL4VBufMJy3WgB8KIe+5QXanjdYa8xgcYq9JsFQcEmmLZfqY vpytIHJVsiSl7rKX7nDbhxpjJSmBKj0b/x/Q3zRxf/isJa/2BnaPstFmGQB8JDK7YzFlYwzwqVcnV 8HVhY+6g==; Received: from cw137ip160.mn.codeweavers.com ([10.69.137.160] helo=camazotz.mn.codeweavers.com) by mail.codeweavers.com with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1tKiyl-001Gd5-2u; Mon, 09 Dec 2024 12:59:36 -0600 From: Elizabeth Figura To: Arnd Bergmann , Greg Kroah-Hartman , Jonathan Corbet , Shuah Khan Cc: linux-kernel@vger.kernel.org, linux-api@vger.kernel.org, wine-devel@winehq.org, =?UTF-8?q?Andr=C3=A9=20Almeida?= , Wolfram Sang , Arkadiusz Hiler , Peter Zijlstra , Andy Lutomirski , linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, Randy Dunlap , Ingo Molnar , Will Deacon , Waiman Long , Boqun Feng , Elizabeth Figura Subject: [PATCH v6 22/28] selftests: ntsync: Add some tests for wakeup signaling with events. Date: Mon, 9 Dec 2024 12:58:58 -0600 Message-ID: <20241209185904.507350-23-zfigura@codeweavers.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241209185904.507350-1-zfigura@codeweavers.com> References: <20241209185904.507350-1-zfigura@codeweavers.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Expand the contended wait tests, which previously only covered events and semaphores, to cover events as well. Signed-off-by: Elizabeth Figura --- .../testing/selftests/drivers/ntsync/ntsync.c | 151 +++++++++++++++++- 1 file changed, 147 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/drivers/ntsync/ntsync.c b/tools/testin= g/selftests/drivers/ntsync/ntsync.c index 12ccb4ec28e4..5d17eff6a370 100644 --- a/tools/testing/selftests/drivers/ntsync/ntsync.c +++ b/tools/testing/selftests/drivers/ntsync/ntsync.c @@ -622,6 +622,7 @@ TEST(test_wait_any) =20 TEST(test_wait_all) { + struct ntsync_event_args event_args =3D {0}; struct ntsync_mutex_args mutex_args =3D {0}; struct ntsync_sem_args sem_args =3D {0}; __u32 owner, index, count; @@ -644,6 +645,11 @@ TEST(test_wait_all) EXPECT_EQ(0, ret); EXPECT_NE(0xdeadbeef, mutex_args.mutex); =20 + event_args.manual =3D true; + event_args.signaled =3D true; + ret =3D ioctl(fd, NTSYNC_IOC_CREATE_EVENT, &event_args); + EXPECT_EQ(0, ret); + objs[0] =3D sem_args.sem; objs[1] =3D mutex_args.mutex; =20 @@ -692,6 +698,14 @@ TEST(test_wait_all) check_sem_state(sem_args.sem, 1, 3); check_mutex_state(mutex_args.mutex, 1, 123); =20 + objs[0] =3D sem_args.sem; + objs[1] =3D event_args.event; + ret =3D wait_all(fd, 2, objs, 123, &index); + EXPECT_EQ(0, ret); + EXPECT_EQ(0, index); + check_sem_state(sem_args.sem, 0, 3); + check_event_state(event_args.event, 1, 1); + /* test waiting on the same object twice */ objs[0] =3D objs[1] =3D sem_args.sem; ret =3D wait_all(fd, 2, objs, 123, &index); @@ -700,6 +714,7 @@ TEST(test_wait_all) =20 close(sem_args.sem); close(mutex_args.mutex); + close(event_args.event); =20 close(fd); } @@ -746,12 +761,13 @@ static int wait_for_thread(pthread_t thread, unsigned= int ms) =20 TEST(wake_any) { + struct ntsync_event_args event_args =3D {0}; struct ntsync_mutex_args mutex_args =3D {0}; struct ntsync_wait_args wait_args =3D {0}; struct ntsync_sem_args sem_args =3D {0}; struct wait_args thread_args; + __u32 count, index, signaled; int objs[2], fd, ret; - __u32 count, index; pthread_t thread; =20 fd =3D open("/dev/ntsync", O_CLOEXEC | O_RDONLY); @@ -833,10 +849,101 @@ TEST(wake_any) EXPECT_EQ(0, thread_args.ret); EXPECT_EQ(1, wait_args.index); =20 + /* test waking events */ + + event_args.manual =3D false; + event_args.signaled =3D false; + ret =3D ioctl(fd, NTSYNC_IOC_CREATE_EVENT, &event_args); + EXPECT_EQ(0, ret); + + objs[1] =3D event_args.event; + wait_args.timeout =3D get_abs_timeout(1000); + ret =3D pthread_create(&thread, NULL, wait_thread, &thread_args); + EXPECT_EQ(0, ret); + + ret =3D wait_for_thread(thread, 100); + EXPECT_EQ(ETIMEDOUT, ret); + + ret =3D ioctl(event_args.event, NTSYNC_IOC_EVENT_SET, &signaled); + EXPECT_EQ(0, ret); + EXPECT_EQ(0, signaled); + check_event_state(event_args.event, 0, 0); + + ret =3D wait_for_thread(thread, 100); + EXPECT_EQ(0, ret); + EXPECT_EQ(0, thread_args.ret); + EXPECT_EQ(1, wait_args.index); + + wait_args.timeout =3D get_abs_timeout(1000); + ret =3D pthread_create(&thread, NULL, wait_thread, &thread_args); + EXPECT_EQ(0, ret); + + ret =3D wait_for_thread(thread, 100); + EXPECT_EQ(ETIMEDOUT, ret); + + ret =3D ioctl(event_args.event, NTSYNC_IOC_EVENT_PULSE, &signaled); + EXPECT_EQ(0, ret); + EXPECT_EQ(0, signaled); + check_event_state(event_args.event, 0, 0); + + ret =3D wait_for_thread(thread, 100); + EXPECT_EQ(0, ret); + EXPECT_EQ(0, thread_args.ret); + EXPECT_EQ(1, wait_args.index); + + close(event_args.event); + + event_args.manual =3D true; + event_args.signaled =3D false; + ret =3D ioctl(fd, NTSYNC_IOC_CREATE_EVENT, &event_args); + EXPECT_EQ(0, ret); + + objs[1] =3D event_args.event; + wait_args.timeout =3D get_abs_timeout(1000); + ret =3D pthread_create(&thread, NULL, wait_thread, &thread_args); + EXPECT_EQ(0, ret); + + ret =3D wait_for_thread(thread, 100); + EXPECT_EQ(ETIMEDOUT, ret); + + ret =3D ioctl(event_args.event, NTSYNC_IOC_EVENT_SET, &signaled); + EXPECT_EQ(0, ret); + EXPECT_EQ(0, signaled); + check_event_state(event_args.event, 1, 1); + + ret =3D wait_for_thread(thread, 100); + EXPECT_EQ(0, ret); + EXPECT_EQ(0, thread_args.ret); + EXPECT_EQ(1, wait_args.index); + + ret =3D ioctl(event_args.event, NTSYNC_IOC_EVENT_RESET, &signaled); + EXPECT_EQ(0, ret); + EXPECT_EQ(1, signaled); + + wait_args.timeout =3D get_abs_timeout(1000); + ret =3D pthread_create(&thread, NULL, wait_thread, &thread_args); + EXPECT_EQ(0, ret); + + ret =3D wait_for_thread(thread, 100); + EXPECT_EQ(ETIMEDOUT, ret); + + ret =3D ioctl(event_args.event, NTSYNC_IOC_EVENT_PULSE, &signaled); + EXPECT_EQ(0, ret); + EXPECT_EQ(0, signaled); + check_event_state(event_args.event, 0, 1); + + ret =3D wait_for_thread(thread, 100); + EXPECT_EQ(0, ret); + EXPECT_EQ(0, thread_args.ret); + EXPECT_EQ(1, wait_args.index); + + close(event_args.event); + /* delete an object while it's being waited on */ =20 wait_args.timeout =3D get_abs_timeout(200); wait_args.owner =3D 123; + objs[1] =3D mutex_args.mutex; ret =3D pthread_create(&thread, NULL, wait_thread, &thread_args); EXPECT_EQ(0, ret); =20 @@ -856,12 +963,14 @@ TEST(wake_any) =20 TEST(wake_all) { + struct ntsync_event_args manual_event_args =3D {0}; + struct ntsync_event_args auto_event_args =3D {0}; struct ntsync_mutex_args mutex_args =3D {0}; struct ntsync_wait_args wait_args =3D {0}; struct ntsync_sem_args sem_args =3D {0}; struct wait_args thread_args; - int objs[2], fd, ret; - __u32 count, index; + __u32 count, index, signaled; + int objs[4], fd, ret; pthread_t thread; =20 fd =3D open("/dev/ntsync", O_CLOEXEC | O_RDONLY); @@ -881,12 +990,24 @@ TEST(wake_all) EXPECT_EQ(0, ret); EXPECT_NE(0xdeadbeef, mutex_args.mutex); =20 + manual_event_args.manual =3D true; + manual_event_args.signaled =3D true; + ret =3D ioctl(fd, NTSYNC_IOC_CREATE_EVENT, &manual_event_args); + EXPECT_EQ(0, ret); + + auto_event_args.manual =3D false; + auto_event_args.signaled =3D true; + ret =3D ioctl(fd, NTSYNC_IOC_CREATE_EVENT, &auto_event_args); + EXPECT_EQ(0, ret); + objs[0] =3D sem_args.sem; objs[1] =3D mutex_args.mutex; + objs[2] =3D manual_event_args.event; + objs[3] =3D auto_event_args.event; =20 wait_args.timeout =3D get_abs_timeout(1000); wait_args.objs =3D (uintptr_t)objs; - wait_args.count =3D 2; + wait_args.count =3D 4; wait_args.owner =3D 456; thread_args.fd =3D fd; thread_args.args =3D &wait_args; @@ -920,12 +1041,32 @@ TEST(wake_all) =20 check_mutex_state(mutex_args.mutex, 0, 0); =20 + ret =3D ioctl(manual_event_args.event, NTSYNC_IOC_EVENT_RESET, &signaled); + EXPECT_EQ(0, ret); + EXPECT_EQ(1, signaled); + count =3D 2; ret =3D post_sem(sem_args.sem, &count); EXPECT_EQ(0, ret); EXPECT_EQ(0, count); + check_sem_state(sem_args.sem, 2, 3); + + ret =3D ioctl(auto_event_args.event, NTSYNC_IOC_EVENT_RESET, &signaled); + EXPECT_EQ(0, ret); + EXPECT_EQ(1, signaled); + + ret =3D ioctl(manual_event_args.event, NTSYNC_IOC_EVENT_SET, &signaled); + EXPECT_EQ(0, ret); + EXPECT_EQ(0, signaled); + + ret =3D ioctl(auto_event_args.event, NTSYNC_IOC_EVENT_SET, &signaled); + EXPECT_EQ(0, ret); + EXPECT_EQ(0, signaled); + check_sem_state(sem_args.sem, 1, 3); check_mutex_state(mutex_args.mutex, 1, 456); + check_event_state(manual_event_args.event, 1, 1); + check_event_state(auto_event_args.event, 0, 0); =20 ret =3D wait_for_thread(thread, 100); EXPECT_EQ(0, ret); @@ -943,6 +1084,8 @@ TEST(wake_all) =20 close(sem_args.sem); close(mutex_args.mutex); + close(manual_event_args.event); + close(auto_event_args.event); =20 ret =3D wait_for_thread(thread, 200); EXPECT_EQ(0, ret); --=20 2.45.2