Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7084fd5 authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

x32: Switch to a 64-bit clock_t 



clock_t is used mainly to give the number of jiffies a certain process
has burned.  It is entirely feasible for a long-running process to
consume more than 2^32 jiffies especially in a multiprocess system.
As such, switch to a 64-bit clock_t for x32, just as we already
switched to a 64-bit time_t.

clock_t is only used in a handful of places, and as such it is really
not a very significant change.  The one that has the biggest impact is
in struct siginfo, but since the *size* of struct siginfo doesn't
change (it is padded to the hilt) it is fairly easy to make this a
localized change.

This also gets rid of sys_x32_times, however since this is a pretty
late change don't compactify the system call numbers; we can reuse
system call slot 521 next time we need an x32 system call.

Reported-by: default avatarGregory M. Lueck <gregory.m.lueck@intel.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
Cc: H. J. Lu <hjl.tools@gmail.com>
Link: http://lkml.kernel.org/r/1329696488-16970-1-git-send-email-hpa@zytor.com
parent a628b684

arch/x86/ia32/ia32_signal.c

+8 −2
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
int copy_siginfo_to_user32(compat_siginfo_t __user *to, siginfo_t *from)

{

	int err = 0;

	bool ia32 = !is_ia32_task();



	if (!access_ok(VERIFY_WRITE, to, sizeof(compat_siginfo_t)))

		return -EFAULT;
@@ -66,8 +67,13 @@ int copy_siginfo_to_user32(compat_siginfo_t __user *to, siginfo_t *from) 
			case __SI_FAULT >> 16:

				break;

			case __SI_CHLD >> 16:

				if (ia32) {

					put_user_ex(from->si_utime, &to->si_utime);

					put_user_ex(from->si_stime, &to->si_stime);

				} else {

					put_user_ex(from->si_utime, &to->_sifields._sigchld_x32._utime);

					put_user_ex(from->si_stime, &to->_sifields._sigchld_x32._stime);

				}

				put_user_ex(from->si_status, &to->si_status);

				/* FALL THROUGH */

			default:

arch/x86/include/asm/ia32.h

+9 −0
Original line number Diff line number Diff line
@@ -125,6 +125,15 @@ typedef struct compat_siginfo { 
			compat_clock_t _stime;

		} _sigchld;



		/* SIGCHLD (x32 version) */

		struct {

			unsigned int _pid;	/* which child */

			unsigned int _uid;	/* sender's uid */

			int _status;		/* exit code */

			s64 _utime;

			s64 _stime;

		} _sigchld_x32;



		/* SIGILL, SIGFPE, SIGSEGV, SIGBUS */

		struct {

			unsigned int _addr;	/* faulting insn/memory ref. */

arch/x86/syscalls/syscall_64.tbl

+2 −2
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ 
97	common	getrlimit		sys_getrlimit

98	common	getrusage		sys_getrusage

99	common	sysinfo			sys_sysinfo

100	64	times			sys_times

100	common	times			sys_times

101	common	ptrace			sys_ptrace

102	common	getuid			sys_getuid

103	common	syslog			sys_syslog
@@ -331,7 +331,7 @@ 
518	x32	sendmsg			compat_sys_sendmsg

519	x32	recvmsg			compat_sys_recvmsg

520	x32	execve			stub_x32_execve

521	x32	times			compat_sys_times

# 521 available

522	x32	rt_sigpending		sys32_rt_sigpending

523	x32	rt_sigtimedwait		compat_sys_rt_sigtimedwait

524	x32	rt_sigqueueinfo		sys32_rt_sigqueueinfo