You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Ulrich Drepper aaca0bdca5 flag parameters: paccept ... This patch is by far the most complex in the series. It adds a new syscall paccept. This syscall differs from accept in that it adds (at the userlevel) two additional parameters: - a signal mask - a flags value The flags parameter can be used to set flag like SOCK_CLOEXEC. This is imlpemented here as well. Some people argued that this is a property which should be inherited from the file desriptor for the server but this is against POSIX. Additionally, we really want the signal mask parameter as well (similar to pselect, ppoll, etc). So an interface change in inevitable. The flag value is the same as for socket and socketpair. I think diverging here will only create confusion. Similar to the filesystem interfaces where the use of the O_* constants differs, it is acceptable here. The signal mask is handled as for pselect etc. The mask is temporarily installed for the thread and removed before the call returns. I modeled the code after pselect. If there is a problem it's likely also in pselect. For architectures which use socketcall I maintained this interface instead of adding a system call. The symmetry shouldn't be broken. The following test must be adjusted for architectures other than x86 and x86-64 and in case the syscall numbers changed. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ #include <errno.h> #include <fcntl.h> #include <pthread.h> #include <signal.h> #include <stdio.h> #include <unistd.h> #include <netinet/in.h> #include <sys/socket.h> #include <sys/syscall.h> #ifndef __NR_paccept # ifdef __x86_64__ # define __NR_paccept 288 # elif defined __i386__ # define SYS_PACCEPT 18 # define USE_SOCKETCALL 1 # else # error "need __NR_paccept" # endif #endif #ifdef USE_SOCKETCALL # define paccept(fd, addr, addrlen, mask, flags) \ ({ long args[6] = { \ (long) fd, (long) addr, (long) addrlen, (long) mask, 8, (long) flags }; \ syscall (__NR_socketcall, SYS_PACCEPT, args); }) #else # define paccept(fd, addr, addrlen, mask, flags) \ syscall (__NR_paccept, fd, addr, addrlen, mask, 8, flags) #endif #define PORT 57392 #define SOCK_CLOEXEC O_CLOEXEC static pthread_barrier_t b; static void * tf (void *arg) { pthread_barrier_wait (&b); int s = socket (AF_INET, SOCK_STREAM, 0); struct sockaddr_in sin; sin.sin_family = AF_INET; sin.sin_addr.s_addr = htonl (INADDR_LOOPBACK); sin.sin_port = htons (PORT); connect (s, (const struct sockaddr *) &sin, sizeof (sin)); close (s); pthread_barrier_wait (&b); s = socket (AF_INET, SOCK_STREAM, 0); sin.sin_port = htons (PORT); connect (s, (const struct sockaddr *) &sin, sizeof (sin)); close (s); pthread_barrier_wait (&b); pthread_barrier_wait (&b); sleep (2); pthread_kill ((pthread_t) arg, SIGUSR1); return NULL; } static void handler (int s) { } int main (void) { pthread_barrier_init (&b, NULL, 2); struct sockaddr_in sin; pthread_t th; if (pthread_create (&th, NULL, tf, (void *) pthread_self ()) != 0) { puts ("pthread_create failed"); return 1; } int s = socket (AF_INET, SOCK_STREAM, 0); int reuse = 1; setsockopt (s, SOL_SOCKET, SO_REUSEADDR, &reuse, sizeof (reuse)); sin.sin_family = AF_INET; sin.sin_addr.s_addr = htonl (INADDR_LOOPBACK); sin.sin_port = htons (PORT); bind (s, (struct sockaddr *) &sin, sizeof (sin)); listen (s, SOMAXCONN); pthread_barrier_wait (&b); int s2 = paccept (s, NULL, 0, NULL, 0); if (s2 < 0) { puts ("paccept(0) failed"); return 1; } int coe = fcntl (s2, F_GETFD); if (coe & FD_CLOEXEC) { puts ("paccept(0) set close-on-exec-flag"); return 1; } close (s2); pthread_barrier_wait (&b); s2 = paccept (s, NULL, 0, NULL, SOCK_CLOEXEC); if (s2 < 0) { puts ("paccept(SOCK_CLOEXEC) failed"); return 1; } coe = fcntl (s2, F_GETFD); if ((coe & FD_CLOEXEC) == 0) { puts ("paccept(SOCK_CLOEXEC) does not set close-on-exec flag"); return 1; } close (s2); pthread_barrier_wait (&b); struct sigaction sa; sa.sa_handler = handler; sa.sa_flags = 0; sigemptyset (&sa.sa_mask); sigaction (SIGUSR1, &sa, NULL); sigset_t ss; pthread_sigmask (SIG_SETMASK, NULL, &ss); sigaddset (&ss, SIGUSR1); pthread_sigmask (SIG_SETMASK, &ss, NULL); sigdelset (&ss, SIGUSR1); alarm (4); pthread_barrier_wait (&b); errno = 0 ; s2 = paccept (s, NULL, 0, &ss, 0); if (s2 != -1 || errno != EINTR) { puts ("paccept did not fail with EINTR"); return 1; } close (s); puts ("OK"); return 0; } ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [akpm@linux-foundation.org: make it compile] [akpm@linux-foundation.org: add sys_ni stub] Signed-off-by: Ulrich Drepper <drepper@redhat.com> Acked-by: Davide Libenzi <davidel@xmailserver.org> Cc: Michael Kerrisk <mtk.manpages@googlemail.com> Cc: <linux-arch@vger.kernel.org> Cc: "David S. Miller" <davem@davemloft.net> Cc: Roland McGrath <roland@redhat.com> Cc: Kyle McMartin <kyle@mcmartin.ca> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>		17 years ago
..
Kbuild	[PARISC] Export pdc.h for palo	18 years ago
a.out.h	aout: move STACK_TOP[_MAX] to asm/processor.h	17 years ago
agp.h	x86: remove flush_agp_mappings()	17 years ago
asmregs.h	…
assembly.h	parisc: use conditional macro for 64-bit wide ops	17 years ago
atomic.h	Add cmpxchg_local to parisc	17 years ago
auxvec.h	…
bitops.h	generic: implement __fls on all 64-bit archs	17 years ago
bug.h	Fix WARN_ON() on bitfield ops for all other archs	18 years ago
bugs.h	…
byteorder.h	…
cache.h	[PARISC] Clean up the cache and tlb headers	18 years ago
cacheflush.h	[PARISC] Add prototypes for flush_user_dcache_range and flush_user_icache_range	18 years ago
checksum.h	parisc: fix miscompilation of ip_fast_csum with gcc >= 4.3	17 years ago
compat.h	asm-*/compat.h: fix typo in comment	17 years ago
compat_rt_sigframe.h	…
compat_signal.h	…
compat_ucontext.h	[PARISC] Arch-specific compat signals	19 years ago
cputime.h	…
current.h	…
delay.h	…
device.h	Driver core: add dev_archdata to struct device	18 years ago
div64.h	…
dma-mapping.h	[PARISC] Fix ccio_request_resource when CONFIG_IOMMU_CCIO is not defined	18 years ago
dma.h	Fix misc .c/.h comment typos	18 years ago
eisa_bus.h	…
eisa_eeprom.h	…
elf.h	[PARISC] clean up include/asm-parisc/elf.h	17 years ago
emergency-restart.h	…
errno.h	…
fb.h	fbdev: detect primary display device	18 years ago
fcntl.h	Introduce O_CLOEXEC	18 years ago
fixmap.h	[PARISC] move VMALLOC_* definitions to fixmap.h	17 years ago
floppy.h	cleanup floppy.h	18 years ago
futex.h	asm-*/futex.h should include linux/uaccess.h	17 years ago
grfioctl.h	[PARISC] Use kzalloc and other janitor-style cleanups	19 years ago
hardirq.h	…
hardware.h	[PARISC] fix section mismatches in arch/parisc/kernel	18 years ago
hw_irq.h	[PATCH] genirq: add ->retrigger() irq op to consolidate hw_irq_resend()	19 years ago
ide.h	ide: remove ide_default_io_ctl() macro	17 years ago
io.h	[PARISC] parisc: "extern inline" -> "static inline"	18 years ago
ioctl.h	parisc: Remove ioctl.h content picked up from <asm-generic/ioctl.h>.	17 years ago
ioctls.h	parisc: new termios definitions	17 years ago
ipcbuf.h	…
irq.h	[PARISC] Allow nested interrupts	19 years ago
irq_regs.h	Build fixes for struct pt_regs removal	19 years ago
kdebug.h	move die notifier handling to common code	18 years ago
kmap_types.h	Don't include linux/config.h from anywhere else in include/	19 years ago
kvm.h	kvm: provide kvm.h for all architecture: fixes headers_install	17 years ago
led.h	[PARISC] Convert soft power switch driver to kthread	18 years ago
linkage.h	include/asm-parisc/: Spelling fixes	17 years ago
local.h	local_t: parisc cleanup	18 years ago
machdep.h	…
mc146818rtc.h	…
mckinley.h	[PARISC] Add asm-parisc/mckinley.h bus header	19 years ago
mman.h	[PATCH] Remove final references to deprecated "MAP_ANON" page protection flag	18 years ago
mmu.h	…
mmu_context.h	Detach sched.h from mm.h	18 years ago
mmzone.h	[PARISC] convert to use CONFIG_64BIT instead of __LP64__	18 years ago
module.h	[PARISC] convert to use CONFIG_64BIT instead of __LP64__	18 years ago
msgbuf.h	[PARISC] convert to use CONFIG_64BIT instead of __LP64__	18 years ago
mutex.h	[PATCH] mutex subsystem, add default include/asm-*/mutex.h files	19 years ago
namei.h	…
page.h	PAGE_ALIGN(): correctly handle 64-bit values on 32-bit architectures	17 years ago
param.h	[PARISC] Use CONFIG_HZ to determine interval timer rate (aka clock ticks)	19 years ago
parisc-device.h	[PARISC] convert to use CONFIG_64BIT instead of __LP64__	18 years ago
parport.h	…
pci.h	[PARISC] parisc: "extern inline" -> "static inline"	18 years ago
pdc.h	[PARISC] pdc_console: fix bizarre panic on boot	17 years ago
pdc_chassis.h	[PARISC] Clarify pdc_stable license terms	19 years ago
pdcpat.h	[PARISC] Remove duplicate PDC_PAT_CELL defines	18 years ago
percpu.h	…
perf.h	…
pgalloc.h	[PARISC] unbreak pgalloc.h	17 years ago
pgtable.h	mm: introduce pte_special pte bit	17 years ago
poll.h	Consolidate asm/poll.h	18 years ago
posix_types.h	asm-*/posix_types.h: scrub __GLIBC__	17 years ago
prefetch.h	[PARISC] parisc: "extern inline" -> "static inline"	18 years ago
processor.h	aout: move STACK_TOP[_MAX] to asm/processor.h	17 years ago
psw.h	Don't include linux/config.h from anywhere else in include/	19 years ago
ptrace.h	…
real.h	…
resource.h	…
ropes.h	Fix misc .c/.h comment typos	18 years ago
rt_sigframe.h	[PARISC] Arch-specific compat signals	19 years ago
rtc.h	[PARISC] fix uninitialized variable warning in asm/rtc.h	18 years ago
runway.h	…
scatterlist.h	parisc: fix sg_page() fallout	18 years ago
sections.h	…
segment.h	…
semaphore.h	Generic semaphore implementation	17 years ago
sembuf.h	[PARISC] convert to use CONFIG_64BIT instead of __LP64__	18 years ago
serial.h	[PARISC] Clean up asm-parisc/serial.h	19 years ago
setup.h	…
shmbuf.h	[PARISC] convert to use CONFIG_64BIT instead of __LP64__	18 years ago
shmparam.h	…
sigcontext.h	…
siginfo.h	…
signal.h	[PARISC] convert to use CONFIG_64BIT instead of __LP64__	18 years ago
smp.h	parisc: convert to generic helpers for IPI function calls	17 years ago
socket.h	flag parameters: paccept	17 years ago
sockios.h	[NET]: Introduce SIOCGSTAMPNS ioctl to get timestamps with nanosec resolution	18 years ago
spinlock.h	[PARISC] Enable interrupts while spinning	19 years ago
spinlock_types.h	[PARISC] "Fix" circular includes	18 years ago
stat.h	…
statfs.h	[PATCH] use __u64 rather than u64 in parisc statfs structs	18 years ago
string.h	…
superio.h	…
system.h	[PATCH] sched: sched_cacheflush is now unused	18 years ago
termbits.h	parisc: new termios definitions	17 years ago
termios.h	parisc: new termios definitions	17 years ago
thread_info.h	remove unused TIF_NOTIFY_RESUME flag	18 years ago
timex.h	…
tlb.h	add mm argument to pte/pmd/pud/pgd_free	17 years ago
tlbflush.h	remove unused flush_tlb_pgtables	18 years ago
topology.h	…
traps.h	…
types.h	parisc: types: use <asm-generic/int-*.h> for the parisc architecture	17 years ago
uaccess.h	[PARISC] add ASM_EXCEPTIONTABLE_ENTRY() macro	18 years ago
ucontext.h	…
unaligned.h	kernel: Move arches to use common unaligned access	17 years ago
unistd.h	[PARISC] bump __NR_syscalls	17 years ago
unwind.h	…
user.h	…
vga.h	vga.h: Fix prepocessor warning	17 years ago
xor.h	…