Commit 60ee64fa32a79bd6438cef27836332d58d49d1bf

Authored by Mike Frysinger
Committed by Greg Kroah-Hartman
1 parent 0d8ab48e3c

x86, x32: Use compat shims for io_{setup,submit}

commit 7fd44dacdd803c0bbf38bf478d51d280902bb0f1 upstream.

The io_setup takes a pointer to a context id of type aio_context_t.
This in turn is typed to a __kernel_ulong_t.  We could tweak the
exported headers to define this as a 64bit quantity for specific
ABIs, but since we already have a 32bit compat shim for the x86 ABI,
let's just re-use that logic.  The libaio package is also written to
expect this as a pointer type, so a compat shim would simplify that.

The io_submit func operates on an array of pointers to iocb structs.
Padding out the array to be 64bit aligned is a huge pain, so convert
it over to the existing compat shim too.

We don't convert io_getevents to the compat func as its only purpose
is to handle the timespec struct, and the x32 ABI uses 64bit times.

With this change, the libaio package can now pass its testsuite when
built for the x32 ABI.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Link: http://lkml.kernel.org/r/1399250595-5005-1-git-send-email-vapier@gentoo.org
Cc: H.J. Lu <hjl.tools@gmail.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 1 changed file with 4 additions and 2 deletions Side-by-side Diff

arch/x86/syscalls/syscall_64.tbl
... ... @@ -212,10 +212,10 @@
212 212 203 common sched_setaffinity sys_sched_setaffinity
213 213 204 common sched_getaffinity sys_sched_getaffinity
214 214 205 64 set_thread_area
215   -206 common io_setup sys_io_setup
  215 +206 64 io_setup sys_io_setup
216 216 207 common io_destroy sys_io_destroy
217 217 208 common io_getevents sys_io_getevents
218   -209 common io_submit sys_io_submit
  218 +209 64 io_submit sys_io_submit
219 219 210 common io_cancel sys_io_cancel
220 220 211 64 get_thread_area
221 221 212 common lookup_dcookie sys_lookup_dcookie
... ... @@ -359,4 +359,6 @@
359 359 540 x32 process_vm_writev compat_sys_process_vm_writev
360 360 541 x32 setsockopt compat_sys_setsockopt
361 361 542 x32 getsockopt compat_sys_getsockopt
  362 +543 x32 io_setup compat_sys_io_setup
  363 +544 x32 io_submit compat_sys_io_submit