All of lore.kernel.org
 help / color / mirror / Atom feed
* epoll_wait.2: epoll_pwait2(2) prototype
@ 2021-03-13 16:48 Alejandro Colomar (man-pages)
  2021-03-13 17:02 ` Dmitry V. Levin
  0 siblings, 1 reply; 3+ messages in thread
From: Alejandro Colomar (man-pages) @ 2021-03-13 16:48 UTC (permalink / raw)
  To: Willem de Bruijn
  Cc: linux-man, Florian Weimer, Michael Kerrisk, linux-fsdevel, linux-api

Hi Willem,

I checked that the prototype of the kernel epoll_pwait2() syscall is 
different from the one we recently merged; it has one more parameter 
'size_t sigsetsize':

$ grep_syscall epoll_pwait2
fs/eventpoll.c:2272:
SYSCALL_DEFINE6(epoll_pwait2, int, epfd, struct epoll_event __user *, 
events,
		int, maxevents, const struct __kernel_timespec __user *, timeout,
		const sigset_t __user *, sigmask, size_t, sigsetsize)
fs/eventpoll.c:2326:
COMPAT_SYSCALL_DEFINE6(epoll_pwait2, int, epfd,
		       struct epoll_event __user *, events,
		       int, maxevents,
		       const struct __kernel_timespec __user *, timeout,
		       const compat_sigset_t __user *, sigmask,
		       compat_size_t, sigsetsize)
include/linux/compat.h:540:
asmlinkage long compat_sys_epoll_pwait2(int epfd,
			struct epoll_event __user *events,
			int maxevents,
			const struct __kernel_timespec __user *timeout,
			const compat_sigset_t __user *sigmask,
			compat_size_t sigsetsize);
include/linux/syscalls.h:389:
asmlinkage long sys_epoll_pwait2(int epfd, struct epoll_event __user 
*events,
				 int maxevents,
				 const struct __kernel_timespec __user *timeout,
				 const sigset_t __user *sigmask,
				 size_t sigsetsize);

I'm could fix the prototype, but maybe there are more changes needed for 
the manual page.

Would you mind fixing it?

Thanks,

Alex

-- 
Alejandro Colomar
Linux man-pages comaintainer; https://www.kernel.org/doc/man-pages/
http://www.alejandro-colomar.es/

^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: epoll_wait.2: epoll_pwait2(2) prototype
  2021-03-13 16:48 epoll_wait.2: epoll_pwait2(2) prototype Alejandro Colomar (man-pages)
@ 2021-03-13 17:02 ` Dmitry V. Levin
  2021-03-13 17:10   ` Alejandro Colomar (man-pages)
  0 siblings, 1 reply; 3+ messages in thread
From: Dmitry V. Levin @ 2021-03-13 17:02 UTC (permalink / raw)
  To: Alejandro Colomar (man-pages)
  Cc: Willem de Bruijn, linux-man, Florian Weimer, Michael Kerrisk,
	linux-fsdevel, linux-api

Hi Alex,

On Sat, Mar 13, 2021 at 05:48:08PM +0100, Alejandro Colomar (man-pages) wrote:
> Hi Willem,
> 
> I checked that the prototype of the kernel epoll_pwait2() syscall is 
> different from the one we recently merged; it has one more parameter 
> 'size_t sigsetsize':
> 
> $ grep_syscall epoll_pwait2
> fs/eventpoll.c:2272:
> SYSCALL_DEFINE6(epoll_pwait2, int, epfd, struct epoll_event __user *, 
> events,
> 		int, maxevents, const struct __kernel_timespec __user *, timeout,
> 		const sigset_t __user *, sigmask, size_t, sigsetsize)
> fs/eventpoll.c:2326:
> COMPAT_SYSCALL_DEFINE6(epoll_pwait2, int, epfd,
> 		       struct epoll_event __user *, events,
> 		       int, maxevents,
> 		       const struct __kernel_timespec __user *, timeout,
> 		       const compat_sigset_t __user *, sigmask,
> 		       compat_size_t, sigsetsize)
> include/linux/compat.h:540:
> asmlinkage long compat_sys_epoll_pwait2(int epfd,
> 			struct epoll_event __user *events,
> 			int maxevents,
> 			const struct __kernel_timespec __user *timeout,
> 			const compat_sigset_t __user *sigmask,
> 			compat_size_t sigsetsize);
> include/linux/syscalls.h:389:
> asmlinkage long sys_epoll_pwait2(int epfd, struct epoll_event __user 
> *events,
> 				 int maxevents,
> 				 const struct __kernel_timespec __user *timeout,
> 				 const sigset_t __user *sigmask,
> 				 size_t sigsetsize);
> 
> I'm could fix the prototype, but maybe there are more changes needed for 
> the manual page.
> 
> Would you mind fixing it?

Looks like the 6th argument of epoll_pwait and epoll_pwait2 syscalls
is already described in "C library/kernel differences" subsection of
epoll_pwait2(2).


-- 
ldv

^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: epoll_wait.2: epoll_pwait2(2) prototype
  2021-03-13 17:02 ` Dmitry V. Levin
@ 2021-03-13 17:10   ` Alejandro Colomar (man-pages)
  0 siblings, 0 replies; 3+ messages in thread
From: Alejandro Colomar (man-pages) @ 2021-03-13 17:10 UTC (permalink / raw)
  To: Dmitry V. Levin
  Cc: Willem de Bruijn, linux-man, Florian Weimer, Michael Kerrisk,
	linux-fsdevel, linux-api

Hi Dmitry,

On 3/13/21 6:02 PM, Dmitry V. Levin wrote:
> Hi Alex,
> 
> On Sat, Mar 13, 2021 at 05:48:08PM +0100, Alejandro Colomar (man-pages) wrote:
>> Hi Willem,
>>
>> I checked that the prototype of the kernel epoll_pwait2() syscall is
>> different from the one we recently merged; it has one more parameter
>> 'size_t sigsetsize':
[...]
>>
>> I'm could fix the prototype, but maybe there are more changes needed for
>> the manual page.
>>
>> Would you mind fixing it?
> 
> Looks like the 6th argument of epoll_pwait and epoll_pwait2 syscalls
> is already described in "C library/kernel differences" subsection of
> epoll_pwait2(2).

Ahhh, I didn't see it, ok.  That's in BUGS by mistake.  I'll move it to 
NOTES, where it should be.

Thanks,

Alex

-- 
Alejandro Colomar
Linux man-pages comaintainer; https://www.kernel.org/doc/man-pages/
http://www.alejandro-colomar.es/

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-03-13 17:10 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-13 16:48 epoll_wait.2: epoll_pwait2(2) prototype Alejandro Colomar (man-pages)
2021-03-13 17:02 ` Dmitry V. Levin
2021-03-13 17:10   ` Alejandro Colomar (man-pages)

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.