kevent32: fix the split of data into data1/data2

The current situation results in intermittent breakage if data gets split up
with the sign bit set on the data1 half of it, as PAIR32TO64 will then:
data1 | (data2 << 32) -> resulting in data1 getting sign-extended when it's
implicitly widened and clobbering the result. AFAICT, there's no compelling
reason for these to be signed.

This was most exposed by flakiness in the kqueue timer tests under compat32
after the ABSTIME test got switched over to using a better clock and
microseconds.

Reviewed by:	kib
MFC after:	3 days
Differential Revision:	https://reviews.freebsd.org/D24518

This commit is contained in:

Kyle Evans

2020-04-21 16:13:22 +00:00

parent 33655d9546

commit 83ec37c85d

1 changed files with 1 additions and 1 deletions

									
										sys/sys/event.h
									
		+1
		-1
	
												View File
												
				@@ -111,7 +111,7 @@ struct kevent32 {

				#ifndef __amd64__

					uint32_t	pad0;

				#endif

					int32_t		data1, data2;

					uint32_t	data1, data2;

					uint32_t	udata;		/* opaque user data identifier */

				#ifndef __amd64__

					uint32_t	pad1;