Y2038 February 2019

y2038@lists.linaro.org

13 participants
10 discussions

[PATCH 0/2] Unify the system call scripts

by Firoz Khan

System call table generation support is provided for alpha, ia64, m68k, microblaze, mips, parisc, powerpc, sh, sparc and xtensa architectures. The implementat- ions are almost similar across all the above archte- ctures. In order to reduce the source code across all the above architectures, create common ".sh" files and keep it in the common directory, script/. This will be a generic scripts which can use for all the above architectures. This patch depends on; https://lore.kernel.org/lkml/1546439331-18646-1-git-send-email-firoz.khan@l… Firoz Khan (2): mips: remove nargs from __SYSCALL mips: generate uapi header and system call table files arch/mips/kernel/scall32-o32.S | 2 +- arch/mips/kernel/scall64-n32.S | 2 +- arch/mips/kernel/scall64-n64.S | 2 +- arch/mips/kernel/scall64-o32.S | 2 +- arch/mips/kernel/syscalls/Makefile | 6 +++--- arch/mips/kernel/syscalls/syscallhdr.sh | 37 --------------------------------- arch/mips/kernel/syscalls/syscallnr.sh | 28 ------------------------- arch/mips/kernel/syscalls/syscalltbl.sh | 36 -------------------------------- 8 files changed, 7 insertions(+), 108 deletions(-) delete mode 100644 arch/mips/kernel/syscalls/syscallhdr.sh delete mode 100644 arch/mips/kernel/syscalls/syscallnr.sh delete mode 100644 arch/mips/kernel/syscalls/syscalltbl.sh -- 1.9.1

5 years, 3 months

[PATCH v3] generic/390: Add tests for inode timestamp policy

by Deepa Dinamani

The test helps to validate clamping and mount behaviors according to supported file system timestamp ranges. Note that the test can fail on 32-bit systems for a few file systems. This will be corrected when vfs is transitioned to use 64-bit timestamps. Signed-off-by: Deepa Dinamani <deepa.kernel(a)gmail.com> --- The branch of the kernel tree can be located at https://github.com/deepa-hub/vfs refs/heads/vfs_timestamp_policy The xfs_io patch to add utimes is at https://www.spinics.net/lists/linux-xfs/msg02952.html Changes since v2: * Refactored notrun handling * Updated comments Changes since v1: * Use xfs_io utimes command * Updated error handling * Reorganized code according to review comments common/rc | 48 +++++++++++++ tests/generic/390 | 192 ++++++++++++++++++++++++++++++++++++++++++++++++++ tests/generic/390.out | 2 + tests/generic/group | 1 + 4 files changed, 243 insertions(+) create mode 100755 tests/generic/390 create mode 100644 tests/generic/390.out diff --git a/common/rc b/common/rc index e3b54ec..17f025e 100644 --- a/common/rc +++ b/common/rc @@ -1960,6 +1960,51 @@ _run_aiodio() return $status } +# this test requires y2038 sysfs switch and filesystem +# timestamp ranges support. +_require_y2038() +{ + local device=${1:-$TEST_DEV} + local sysfsdir=/proc/sys/fs/fs-timestamp-check-on + + if [ ! -e $sysfsdir ]; then + _notrun "no kernel support for y2038 sysfs switch" + fi + + local tsmin tsmax + read tsmin tsmax <<<$(_filesystem_timestamp_range $device) + if [ $tsmin -eq -1 -a $tsmax -eq -1 ]; then + _notrun "filesystem $FSTYP timestamp bounds are unknown" + fi +} + +_filesystem_timestamp_range() +{ + device=${1:-$TEST_DEV} + case $FSTYP in + ext4) + if [ $(dumpe2fs -h $device 2>/dev/null | grep "Inode size:" | cut -d: -f2) -gt 128 ]; then + echo "-2147483648 15032385535" + else + echo "-2147483648 2147483647" + fi + ;; + + xfs) + echo "-2147483648 2147483647" + ;; + jfs) + echo "0 4294967295" + ;; + f2fs) + echo "-2147483648 2147483647" + ;; + *) + echo "-1 -1" + ;; + esac +} + # indicate whether YP/NIS is active or not # _yp_active() @@ -2070,6 +2115,9 @@ _require_xfs_io_command() echo $testio | egrep -q "Inappropriate ioctl" && \ _notrun "xfs_io $command support is missing" ;; + "utimes" ) + testio=`$XFS_IO_PROG -f -c "utimes" 0 0 0 0 $testfile 2>&1` + ;; *) testio=`$XFS_IO_PROG -c "$command help" 2>&1` esac diff --git a/tests/generic/390 b/tests/generic/390 new file mode 100755 index 0000000..f68b931 --- /dev/null +++ b/tests/generic/390 @@ -0,0 +1,192 @@ +#! /bin/bash +# FS QA Test 390 +# +# Tests to verify policy for filesystem timestamps for +# supported ranges: +# 1. Verify filesystem rw mount according to sysctl +# timestamp_supported. +# 2. Verify timestamp clamping for timestamps beyond max +# timestamp supported. +# +# Exit status 1: either or both tests above fail. +# Exit status 0: both the above tests pass. +# +#----------------------------------------------------------------------- +# Copyright (c) 2016 Deepa Dinamani. All Rights Reserved. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it would be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +#----------------------------------------------------------------------- +# + +seq=`basename $0` +seqres=$RESULT_DIR/$seq +echo "QA output created by $seq" + +here=`pwd` +tmp=/tmp/$$ +status=1 # failure is the default! +trap "exit \$status" 0 1 2 3 15 + +# Get standard environment, filters and checks. +. ./common/rc +. ./common/filter +. ./common/attr + +# remove previous $seqres.full before test +rm -f $seqres.full + +# Prerequisites for the test run. +_supported_fs generic +_supported_os Linux +_require_scratch +_require_xfs_io_command utimes + +# Compare file timestamps obtained from stat +# with a given timestamp. +check_stat() +{ + file=$1 + timestamp=$2 + + stat_timestamp=`stat -c"%X;%Y" $file` + + prev_timestamp="$timestamp;$timestamp" + if [ $prev_timestamp != $stat_timestamp ]; then + echo "$prev_timestamp != $stat_timestamp" | tee -a $seqres.full + fi +} + +run_test_individual() +{ + file=$1 + timestamp=$2 + update_time=$3 + + #check if the time needs update + if [ $update_time -eq 1 ]; then + echo "Updating file: $file to timestamp `date -d @$timestamp`" >> $seqres.full + $XFS_IO_PROG -f -c "utimes $timestamp 0 $timestamp 0" $file + if [ $? -ne 0 ]; then + echo "Failed to update times on $file" | tee -a $seqres.full + fi + fi + + tsclamp=$(($timestamp>$tsmax?$tsmax:$timestamp)) + echo "Checking file: $file Updated timestamp is `date -d @$tsclamp`" >> $seqres.full + check_stat $file $tsclamp +} + +run_test() +{ + update_time=$1 + + n=1 + + for TIME in "${TIMESTAMPS[@]}" + do + #Run the test + run_test_individual ${SCRATCH_MNT}/test_$n $TIME $update_time + + #update iterator + ((n++)) + done +} + +_scratch_mkfs &>> $seqres.full 2>&1 || _fail "mkfs failed" +_require_y2038 $SCRATCH_DEV + +read tsmin tsmax <<<$(_filesystem_timestamp_range $SCRATCH_DEV) +echo min supported timestamp $tsmin $(date --date=@$tsmin) >> $seqres.full +echo max supported timestamp $tsmax $(date --date=@$tsmax) >> $seqres.full + +# Test timestamps array + +declare -a TIMESTAMPS=( + $tsmin + 0 + $tsmax + $((tsmax+1)) + 4294967295 + 8589934591 + 34359738367 +) + +# Max timestamp is hardcoded to Mon Jan 18 19:14:07 PST 2038 +sys_tsmax=2147483647 +echo "max timestamp that needs to be supported by fs for rw mount is" \ + "$((sys_tsmax+1)) $(date --date=@$((sys_tsmax+1)))" >> $seqres.full + +read ts_check <<<$(cat /proc/sys/fs/fs-timestamp-check-on) + +_scratch_mount +result=$? + +if [ $ts_check -ne 0 ]; then + echo "sysctl filesystem timestamp check is on" >> $seqres.full + # check for mount failure if the minimum requirement for max timestamp + # supported is not met. + if [ $sys_tsmax -ge $tsmax ]; then + if [ $result -eq 0 ]; then + echo "mount test failed" | tee -a $seqres.full + exit + fi + else + if [ $result -ne 0 ]; then + echo "failed to mount $SCRATCH_DEV" | tee -a $seqres.full + exit + fi + fi +else + # if sysctl switch is off then mount should succeed always. + echo "sysctl filesystem timestamp check is off" >> $seqres.full + if [ $result -ne 0 ]; then + echo "failed to mount $SCRATCH_DEV and timestamp check is off" >> $seqres.full + exit + fi +fi + +# Begin test case 1 +echo "In memory timestamps update test start" >> $seqres.full + +# update time on the file +update_time=1 + +run_test $update_time + +echo "In memory timestamps update complete" >> $seqres.full + +echo "Unmounting and mounting scratch $SCRATCH_MNT" >> $seqres.full + +# unmount and remount $SCRATCH_DEV +_scratch_cycle_mount + +# Begin test case 2 + +n=1 + +# Do not update time on the file this time, just read from disk +update_time=0 + +echo "On disk timestamps update test start" >> $seqres.full + +# Re-run test +run_test $update_time + +echo "On disk timestamps update test complete" >> $seqres.full + +echo "y2038 inode timestamp tests completed successfully" + +# success, all done +status=0 +exit diff --git a/tests/generic/390.out b/tests/generic/390.out new file mode 100644 index 0000000..82bd4eb --- /dev/null +++ b/tests/generic/390.out @@ -0,0 +1,2 @@ +QA output created by 390 +y2038 inode timestamp tests completed successfully diff --git a/tests/generic/group b/tests/generic/group index 08007d7..d137d01 100644 --- a/tests/generic/group +++ b/tests/generic/group @@ -392,3 +392,4 @@ 387 auto clone 388 auto log metadata 389 auto quick acl +390 auto quick rw -- 2.7.4

5 years, 7 months

[PATCH 0/2] powerpc: Unify the system call scripts

by Firoz Khan

System call table generation support is provided for alpha, ia64, m68k, microblaze, mips, parisc, powerpc, sh, sparc and xtensa architectures. The implementat- ions are almost similar across all the above archte- ctures. In order to reduce the source code across all the above architectures, create common ".sh" files and keep it in the common directory, script/. This will be a generic scripts which can use for all the above architectures. This patch depends on; https://lore.kernel.org/lkml/1546439331-18646-1-git-send-email-firoz.khan@l… Firoz Khan (2): powerpc: remove nargs from __SYSCALL powerpc: generate uapi header and system call table files arch/powerpc/kernel/syscalls/Makefile | 11 +++++++-- arch/powerpc/kernel/syscalls/syscallhdr.sh | 37 ----------------------------- arch/powerpc/kernel/syscalls/syscalltbl.sh | 36 ---------------------------- arch/powerpc/kernel/systbl.S | 6 ++--- arch/powerpc/platforms/cell/spu_callbacks.c | 2 +- 5 files changed, 13 insertions(+), 79 deletions(-) delete mode 100644 arch/powerpc/kernel/syscalls/syscallhdr.sh delete mode 100644 arch/powerpc/kernel/syscalls/syscalltbl.sh -- 1.9.1

5 years, 8 months

[PATCH 0/3] sparc: Unify the system call scripts

by Firoz Khan

System call table generation support is provided for alpha, ia64, m68k, microblaze, mips, parisc, powerpc, sh, sparc and xtensa architectures. The implementat- ions are almost similar across all the above archte- ctures. In order to reduce the source code across all the above architectures, create common ".sh" files and keep it in the common directory, script/. This will be a generic scripts which can use for all the above architectures. This patch depends on; https://lore.kernel.org/lkml/1546439331-18646-1-git-send-email-firoz.khan@l… Firoz Khan (3): sparc: remove nargs from __SYSCALL sparc: rename not implemented system call sparc: generate uapi header and system call table files arch/sparc/kernel/syscalls/Makefile | 11 ++++++++-- arch/sparc/kernel/syscalls/syscall.tbl | 26 +++++++++++------------ arch/sparc/kernel/syscalls/syscallhdr.sh | 36 -------------------------------- arch/sparc/kernel/syscalls/syscalltbl.sh | 36 -------------------------------- arch/sparc/kernel/systbls_32.S | 3 ++- arch/sparc/kernel/systbls_64.S | 4 +++- 6 files changed, 27 insertions(+), 89 deletions(-) delete mode 100644 arch/sparc/kernel/syscalls/syscallhdr.sh delete mode 100644 arch/sparc/kernel/syscalls/syscalltbl.sh -- 1.9.1

5 years, 9 months

[GIT PULL] y2038: additional syscall ABI cleanup

by Arnd Bergmann

The following changes since commit 48166e6ea47d23984f0b481ca199250e1ce0730a: y2038: add 64-bit time_t syscalls to all 32-bit architectures (2019-02-07 00:13:28 +0100) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git tags/y2038-syscall-abi for you to fetch changes up to d4c08b9776b392e20efc6198ebe1bc8ec1911d9b: riscv: Use latest system call ABI (2019-02-25 20:53:52 +0100) ---------------------------------------------------------------- y2038: additional syscall ABI cleanup This is a follow-up to the y2038 syscall patches already merged in the tip tree. As the final 32-bit RISC-V syscall ABI is still being decided on, this is the last chance to make a few corrections to leave out interfaces based on 32-bit time_t along with the old off_t and rlimit types. The series achieves this in a few steps: - A couple of bug fixes for minor regressions I introduced in the original series - A couple of older patches from Yury Norov that I had never merged in the past, these fix up the openat/open_by_handle_at and getrlimit/setrlimit syscalls to disallow the old versions of off_t and rlimit. - Hiding the deprecated system calls behind an #ifdef in include/uapi/asm-generic/unistd.h - Change arch/riscv to drop all these ABIs. Originally, the plan was to also leave these out on C-Sky, but that now has a glibc port that uses the older interfaces, so we need to leave them in place. ---------------------------------------------------------------- Arnd Bergmann (4): asm-generic: Make time32 syscall numbers optional unicore32: Fix __ARCH_WANT_STAT64 definition checksyscalls: fix up mq_timedreceive and stat exceptions riscv: Use latest system call ABI Yury Norov (3): compat ABI: use non-compat openat and open_by_handle_at variants 32-bit userspace ABI: introduce ARCH_32BIT_OFF_T config option asm-generic: Drop getrlimit and setrlimit syscalls from default list arch/Kconfig | 10 ++++++++++ arch/arc/Kconfig | 1 + arch/arc/include/uapi/asm/unistd.h | 2 ++ arch/arm/Kconfig | 1 + arch/arm64/include/uapi/asm/unistd.h | 2 ++ arch/c6x/Kconfig | 1 + arch/c6x/include/uapi/asm/unistd.h | 2 ++ arch/csky/Kconfig | 1 + arch/csky/include/uapi/asm/unistd.h | 2 ++ arch/h8300/Kconfig | 1 + arch/h8300/include/uapi/asm/unistd.h | 2 ++ arch/hexagon/Kconfig | 1 + arch/hexagon/include/uapi/asm/unistd.h | 2 ++ arch/m68k/Kconfig | 1 + arch/microblaze/Kconfig | 1 + arch/mips/Kconfig | 1 + arch/nds32/Kconfig | 1 + arch/nds32/include/uapi/asm/unistd.h | 2 ++ arch/nios2/Kconfig | 1 + arch/nios2/include/uapi/asm/unistd.h | 2 ++ arch/openrisc/Kconfig | 1 + arch/openrisc/include/uapi/asm/unistd.h | 2 ++ arch/parisc/Kconfig | 1 + arch/powerpc/Kconfig | 1 + arch/riscv/include/uapi/asm/unistd.h | 1 + arch/riscv/kernel/vdso/Makefile | 2 ++ arch/sh/Kconfig | 1 + arch/sparc/Kconfig | 1 + arch/unicore32/Kconfig | 1 + arch/unicore32/include/uapi/asm/unistd.h | 4 +++- arch/x86/Kconfig | 1 + arch/x86/um/Kconfig | 1 + arch/xtensa/Kconfig | 1 + include/linux/fcntl.h | 2 +- include/uapi/asm-generic/unistd.h | 46 +++++++++++++++++++++++++++++++++++++++++++--- scripts/checksyscalls.sh | 15 ++++++++++++--- 36 files changed, 110 insertions(+), 8 deletions(-)

5 years, 9 months

[PATCH 0/8] y2038: remove time32 ABI on rv32 and csky

by Arnd Bergmann

This is a follow-up to the y2038 syscall patches that Thomas already merged. Both the csky and riscv maintainers have requested that the time_t syscall ABI should be completely converted before an official glibc port is merged. The series achieves this in a few steps: - A couple of bug fixes for minor regressions I introduced in the original series - A couple of older patches from Yury Norov that I had never merged in the past, these fix up the openat/open_by_handle_at and getrlimit/setrlimit syscalls to disallow the old versions of off_t and rlimit. - Hiding the deprecated system calls behind an #ifdef in include/uapi/asm-generic/unistd.h - Changing the two architectures to use the new style syscall ABI for all three types: loff_t, rusage, and time_t. Arnd Bergmann (5): asm-generic: Make time32 syscall numbers optional unicore32: Fix __ARCH_WANT_STAT64 definition checksyscalls: fix up mq_timedreceive and stat exceptions csky: Use latest system call ABI riscv: Use latest system call ABI Yury Norov (3): compat ABI: use non-compat openat and open_by_handle_at variants 32-bit userspace ABI: introduce ARCH_32BIT_OFF_T config option asm-generic: Drop getrlimit and setrlimit syscalls from default list arch/Kconfig | 15 ++++++++ arch/arc/Kconfig | 1 + arch/arc/include/uapi/asm/unistd.h | 2 ++ arch/arm/Kconfig | 1 + arch/arm64/include/uapi/asm/unistd.h | 2 ++ arch/c6x/Kconfig | 1 + arch/c6x/include/uapi/asm/unistd.h | 2 ++ arch/h8300/Kconfig | 1 + arch/h8300/include/uapi/asm/unistd.h | 2 ++ arch/hexagon/Kconfig | 1 + arch/hexagon/include/uapi/asm/unistd.h | 2 ++ arch/m68k/Kconfig | 1 + arch/microblaze/Kconfig | 1 + arch/mips/Kconfig | 1 + arch/nds32/Kconfig | 1 + arch/nds32/include/uapi/asm/unistd.h | 2 ++ arch/nios2/Kconfig | 1 + arch/nios2/include/uapi/asm/unistd.h | 2 ++ arch/openrisc/Kconfig | 1 + arch/openrisc/include/uapi/asm/unistd.h | 2 ++ arch/parisc/Kconfig | 1 + arch/powerpc/Kconfig | 1 + arch/riscv/include/uapi/asm/unistd.h | 1 + arch/riscv/kernel/vdso/Makefile | 2 ++ arch/sh/Kconfig | 1 + arch/sparc/Kconfig | 1 + arch/unicore32/Kconfig | 1 + arch/unicore32/include/uapi/asm/unistd.h | 4 ++- arch/x86/Kconfig | 1 + arch/x86/um/Kconfig | 1 + arch/xtensa/Kconfig | 1 + include/linux/fcntl.h | 2 +- include/uapi/asm-generic/unistd.h | 46 ++++++++++++++++++++++-- scripts/checksyscalls.sh | 15 ++++++-- 34 files changed, 112 insertions(+), 8 deletions(-) -- 2.20.0

5 years, 9 months

[PATCH net-next 0/2] uapi: Add a new header for time types

by Deepa Dinamani

The series aims at adding a new time header: time_types.h. This header is what will eventually hold all the uapi time types that we plan to leave across the interfaces after the y2038 cleanup. The series was discussed with Arnd Bergmann. The second patch fixes the errqueue.h header, which has a dependency on these types. Note that there may be a trivial merge conflict with linux-next c70a772fda11 ("y2038: remove struct definition redirects"). Deepa Dinamani (2): time: Add time_types.h errqueue.h: Include time_types.h include/uapi/linux/errqueue.h | 1 + include/uapi/linux/time.h | 36 +---------------------------- include/uapi/linux/time_types.h | 40 +++++++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 35 deletions(-) create mode 100644 include/uapi/linux/time_types.h -- 2.17.1

5 years, 9 months

[PATCH net-next v5 00/12] net: y2038-safe socket timestamps

by Deepa Dinamani

The series introduces new socket timestamps that are y2038 safe. The time data types used for the existing socket timestamp options: SO_TIMESTAMP, SO_TIMESTAMPNS and SO_TIMESTAMPING are not y2038 safe. The series introduces SO_TIMESTAMP_NEW, SO_TIMESTAMPNS_NEW and SO_TIMESTAMPING_NEW to replace these. These new timestamps can be used on all architectures. The alternative considered was to extend the sys_setsockopt() by using the flags. We did not receive any strong opinions about either of the approaches. Hence, this was chosen, as glibc folks preferred this. The series does not deal with updating the internal kernel socket calls like rxrpc to make them y2038 safe. This will be dealt with separately. Note that the timestamps behavior already does not match the man page specific behavior: SIOCGSTAMP This ioctl should only be used if the socket option SO_TIMESTAMP is not set on the socket. Otherwise, it returns the timestamp of the last packet that was received while SO_TIMESTAMP was not set, or it fails if no such packet has been received, (i.e., ioctl(2) returns -1 with errno set to ENOENT). The recommendation is to update the man page to remove the above statement. The overview of the socket timestamp series is as below: 1. Delete asm specific socket.h when possible. 2. Support SO/SCM_TIMESTAMP* options only in userspace. 3. Rename current SO/SCM_TIMESTAMP* to SO/SCM_TIMESTAMP*_OLD. 3. Alter socket options so that SOCK_RCVTSTAMPNS does not rely on SOCK_RCVTSTAMP. 4. Introduce y2038 safe types for socket timestamp. 5. Introduce new y2038 safe socket options SO/SCM_TIMESTAMP*_NEW. 6. Intorduce new y2038 safe socket timeout options. Changes since v4: * Fixed the typo in calling sock_get_timeout() Changes since v3: * Rebased onto net-next and fixups as per review comments * Merged the socket timeout series * Integrated Arnd's patch to simplify compat handling of timeout syscalls Changes since v2: * Removed extra functions to reduce diff churn as per code review Changes since v1: * Dropped the change to disentangle sock flags * Renamed sock_timeval to __kernel_sock_timeval * Updated a few comments * Added documentation changes Arnd Bergmann (1): socket: move compat timeout handling into sock.c Deepa Dinamani (11): selftests: add missing include unistd arch: Use asm-generic/socket.h when possible sockopt: Rename SO_TIMESTAMP* to SO_TIMESTAMP*_OLD arch: sparc: Override struct __kernel_old_timeval socket: Use old_timeval types for socket timestamps socket: Add struct __kernel_sock_timeval socket: Add SO_TIMESTAMP[NS]_NEW socket: Add SO_TIMESTAMPING_NEW socket: Update timestamping Documentation socket: Rename SO_RCVTIMEO/ SO_SNDTIMEO with _OLD suffixes sock: Add SO_RCVTIMEO_NEW and SO_SNDTIMEO_NEW Documentation/networking/timestamping.txt | 43 ++++- arch/alpha/include/uapi/asm/socket.h | 47 ++++-- arch/ia64/include/uapi/asm/Kbuild | 1 + arch/ia64/include/uapi/asm/socket.h | 122 -------------- arch/mips/include/uapi/asm/socket.h | 47 ++++-- arch/parisc/include/uapi/asm/socket.h | 46 ++++-- arch/powerpc/include/uapi/asm/socket.h | 4 +- arch/s390/include/uapi/asm/Kbuild | 1 + arch/s390/include/uapi/asm/socket.h | 119 -------------- arch/sparc/include/uapi/asm/posix_types.h | 10 ++ arch/sparc/include/uapi/asm/socket.h | 49 ++++-- arch/x86/include/uapi/asm/Kbuild | 1 + arch/x86/include/uapi/asm/socket.h | 1 - arch/xtensa/include/asm/Kbuild | 1 + arch/xtensa/include/uapi/asm/Kbuild | 1 + arch/xtensa/include/uapi/asm/socket.h | 124 -------------- drivers/isdn/mISDN/socket.c | 2 +- fs/dlm/lowcomms.c | 4 +- include/linux/skbuff.h | 24 ++- include/linux/socket.h | 8 + include/net/sock.h | 1 + include/uapi/asm-generic/socket.h | 48 ++++-- include/uapi/linux/errqueue.h | 4 + include/uapi/linux/time.h | 7 + net/bluetooth/hci_sock.c | 4 +- net/compat.c | 78 +-------- net/core/scm.c | 27 ++++ net/core/sock.c | 151 +++++++++++++----- net/ipv4/tcp.c | 61 ++++--- net/rds/af_rds.c | 10 +- net/rds/recv.c | 18 ++- net/rxrpc/local_object.c | 2 +- net/smc/af_smc.c | 3 +- net/socket.c | 50 ++++-- net/vmw_vsock/af_vsock.c | 4 +- .../networking/timestamping/rxtimestamp.c | 1 + 36 files changed, 541 insertions(+), 583 deletions(-) delete mode 100644 arch/ia64/include/uapi/asm/socket.h delete mode 100644 arch/s390/include/uapi/asm/socket.h delete mode 100644 arch/x86/include/uapi/asm/socket.h delete mode 100644 arch/xtensa/include/uapi/asm/socket.h -- 2.17.1 Cc: ccaulfie(a)redhat.com Cc: chris(a)zankel.net Cc: cluster-devel(a)redhat.com Cc: davem(a)davemloft.net Cc: deller(a)gmx.de Cc: dhowells(a)redhat.com Cc: fenghua.yu(a)intel.com Cc: isdn(a)linux-pingi.de Cc: jejb(a)parisc-linux.org Cc: linux-afs(a)lists.infradead.org Cc: linux-alpha(a)vger.kernel.org Cc: linux-arch(a)vger.kernel.org Cc: linux-ia64(a)vger.kernel.org Cc: linux-mips(a)linux-mips.org Cc: linux-mips(a)vger.kernel.org Cc: linux-parisc(a)vger.kernel.org Cc: linuxppc-dev(a)lists.ozlabs.org Cc: linux-rdma(a)vger.kernel.org Cc: linux-s390(a)vger.kernel.org Cc: linux-xtensa(a)linux-xtensa.org Cc: netdev(a)vger.kernel.org Cc: paulus(a)samba.org Cc: ralf(a)linux-mips.org Cc: rth(a)twiddle.net Cc: schwidefsky(a)de.ibm.com Cc: sparclinux(a)vger.kernel.org Cc: tglx(a)linutronix.de Cc: ubraun(a)linux.ibm.com

5 years, 9 months

[GIT PULL 1/2] arch: System call unification and cleanup

by Arnd Bergmann

The following changes since commit 1c7fc5cbc33980acd13d668f1c8f0313d6ae9fd8: Linux 5.0-rc2 (2019-01-14 10:41:12 +1200) are available in the Git repository at: git://git.kernel.org:/pub/scm/linux/kernel/git/arnd/playground.git tags/y2038-syscall-cleanup for you to fetch changes up to 805089c2f77047d81f47ddc227435d606ceb180e: syscalls: remove obsolete __IGNORE_ macros (2019-02-07 00:13:27 +0100) ---------------------------------------------------------------- arch: System call unification and cleanup The system call tables have diverged a bit over the years, and a number of the recent additions never made it into all architectures, for one reason or another. This is an attempt to clean it up as far as we can without breaking compatibility, doing a number of steps: - Add system calls that have not yet been integrated into all architectures but that we definitely want there. This includes {,f}statfs64() and get{eg,eu,g,p,u,pp}id() on alpha, which have been missing traditionally. - The s390 compat syscall handling is cleaned up to be more like what we do on other architectures, while keeping the 31-bit pointer extension. This was merged as a shared branch by the s390 maintainers and is included here in order to base the other patches on top. - Add the separate ipc syscalls on all architectures that traditionally only had sys_ipc(). This version is done without support for IPC_OLD that is we have in sys_ipc. The new semtimedop_time64 syscall will only be added here, not in sys_ipc - Add syscall numbers for a couple of syscalls that we probably don't need everywhere, in particular pkey_* and rseq, for the purpose of symmetry: if it's in asm-generic/unistd.h, it makes sense to have it everywhere. I expect that any future system calls will get assigned on all platforms together, even when they appear to be specific to a single architecture. - Prepare for having the same system call numbers for any future calls. In combination with the generated tables, this hopefully makes it easier to add new calls across all architectures together. All of the above are technically separate from the y2038 work, but are done as preparation before we add the new 64-bit time_t system calls everywhere, providing a common baseline set of system calls. I expect that glibc and other libraries that want to use 64-bit time_t will require linux-5.1 kernel headers for building in the future, and at a much later point may also require linux-5.1 or a later version as the minimum kernel at runtime. Having a common baseline then allows the removal of many architecture or kernel version specific workarounds. Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> ---------------------------------------------------------------- Arnd Bergmann (22): s390: open-code s390_personality syscall ipc: introduce ksys_ipc()/compat_ksys_ipc() for s390 s390: use generic UID16 implementation s390: autogenerate compat syscall wrappers s390: remove compat_wrapper.c ia64: add __NR_umount2 definition ia64: add statx and io_pgetevents syscalls ia64: assign syscall numbers for perf and seccomp alpha: wire up io_pgetevents system call alpha: update syscall macro definitions ARM: add migrate_pages() system call ARM: add kexec_file_load system call number m68k: assign syscall number for seccomp sh: remove duplicate unistd_32.h file sh: add statx system call sparc64: fix sparc_ipc type conversion ipc: rename old-style shmctl/semctl/msgctl syscalls arch: add split IPC system calls where needed arch: add pkey and rseq syscall numbers everywhere alpha: add standard statfs64/fstatfs64 syscalls alpha: add generic get{eg,eu,g,p,u,pp}id() syscalls syscalls: remove obsolete __IGNORE_ macros arch/alpha/include/asm/unistd.h | 21 -- arch/alpha/include/uapi/asm/unistd.h | 10 + arch/alpha/kernel/syscalls/syscall.tbl | 20 +- arch/arm/include/asm/unistd.h | 1 - arch/arm/tools/syscall.tbl | 8 +- arch/arm64/include/asm/unistd.h | 2 +- arch/arm64/include/asm/unistd32.h | 10 +- arch/ia64/include/asm/unistd.h | 14 - arch/ia64/include/uapi/asm/unistd.h | 2 + arch/ia64/kernel/syscalls/syscall.tbl | 10 +- arch/m68k/kernel/syscalls/syscall.tbl | 16 ++ arch/microblaze/kernel/syscalls/syscall.tbl | 6 +- arch/mips/include/asm/unistd.h | 13 - arch/mips/kernel/syscalls/syscall_n32.tbl | 6 +- arch/mips/kernel/syscalls/syscall_n64.tbl | 6 +- arch/mips/kernel/syscalls/syscall_o32.tbl | 11 + arch/parisc/include/asm/unistd.h | 4 - arch/parisc/kernel/syscalls/syscall.tbl | 4 + arch/powerpc/kernel/syscalls/syscall.tbl | 13 + arch/s390/Kconfig | 2 + arch/s390/include/asm/syscall_wrapper.h | 135 ++++++++++ arch/s390/include/asm/unistd.h | 5 - arch/s390/include/uapi/asm/posix_types.h | 6 + arch/s390/kernel/Makefile | 2 +- arch/s390/kernel/compat_linux.c | 235 +--------------- arch/s390/kernel/compat_wrapper.c | 186 ------------- arch/s390/kernel/entry.S | 4 +- arch/s390/kernel/sys_s390.c | 16 +- arch/s390/kernel/syscalls/syscall.tbl | 301 +++++++++++---------- arch/sh/include/uapi/asm/unistd_32.h | 403 ---------------------------- arch/sh/kernel/syscalls/syscall.tbl | 16 ++ arch/sparc/include/asm/unistd.h | 5 - arch/sparc/kernel/sys_sparc_64.c | 2 +- arch/sparc/kernel/syscalls/syscall.tbl | 16 ++ arch/x86/entry/syscalls/syscall_32.tbl | 11 + arch/x86/entry/syscalls/syscall_64.tbl | 2 + arch/xtensa/include/asm/unistd.h | 12 - arch/xtensa/kernel/syscalls/syscall.tbl | 7 +- include/linux/syscalls.h | 7 + include/uapi/asm-generic/unistd.h | 1 + ipc/msg.c | 39 ++- ipc/sem.c | 39 ++- ipc/shm.c | 40 ++- ipc/syscall.c | 32 ++- ipc/util.h | 21 +- kernel/sys_ni.c | 4 + 46 files changed, 608 insertions(+), 1118 deletions(-) create mode 100644 arch/s390/include/asm/syscall_wrapper.h delete mode 100644 arch/s390/kernel/compat_wrapper.c delete mode 100644 arch/sh/include/uapi/asm/unistd_32.h

5 years, 9 months

[PATCH net-next v4 00/12] net: y2038-safe socket timestamps

by Deepa Dinamani

The series introduces new socket timestamps that are y2038 safe. The time data types used for the existing socket timestamp options: SO_TIMESTAMP, SO_TIMESTAMPNS and SO_TIMESTAMPING are not y2038 safe. The series introduces SO_TIMESTAMP_NEW, SO_TIMESTAMPNS_NEW and SO_TIMESTAMPING_NEW to replace these. These new timestamps can be used on all architectures. The alternative considered was to extend the sys_setsockopt() by using the flags. We did not receive any strong opinions about either of the approaches. Hence, this was chosen, as glibc folks preferred this. The series does not deal with updating the internal kernel socket calls like rxrpc to make them y2038 safe. This will be dealt with separately. Note that the timestamps behavior already does not match the man page specific behavior: SIOCGSTAMP This ioctl should only be used if the socket option SO_TIMESTAMP is not set on the socket. Otherwise, it returns the timestamp of the last packet that was received while SO_TIMESTAMP was not set, or it fails if no such packet has been received, (i.e., ioctl(2) returns -1 with errno set to ENOENT). The recommendation is to update the man page to remove the above statement. The overview of the socket timestamp series is as below: 1. Delete asm specific socket.h when possible. 2. Support SO/SCM_TIMESTAMP* options only in userspace. 3. Rename current SO/SCM_TIMESTAMP* to SO/SCM_TIMESTAMP*_OLD. 3. Alter socket options so that SOCK_RCVTSTAMPNS does not rely on SOCK_RCVTSTAMP. 4. Introduce y2038 safe types for socket timestamp. 5. Introduce new y2038 safe socket options SO/SCM_TIMESTAMP*_NEW. 6. Intorduce new y2038 safe socket timeout options. Changes since v3: * Rebased onto net-next and fixups as per review comments * Merged the socket timeout series * Integrated Arnd's patch to simplify compat handling of timeout syscalls Changes since v2: * Removed extra functions to reduce diff churn as per code review Changes since v1: * Dropped the change to disentangle sock flags * Renamed sock_timeval to __kernel_sock_timeval * Updated a few comments * Added documentation changes Arnd Bergmann (1): socket: move compat timeout handling into sock.c Deepa Dinamani (11): selftests: add missing include unistd arch: Use asm-generic/socket.h when possible sockopt: Rename SO_TIMESTAMP* to SO_TIMESTAMP*_OLD arch: sparc: Override struct __kernel_old_timeval socket: Use old_timeval types for socket timestamps socket: Add struct __kernel_sock_timeval socket: Add SO_TIMESTAMP[NS]_NEW socket: Add SO_TIMESTAMPING_NEW socket: Update timestamping Documentation socket: Rename SO_RCVTIMEO/ SO_SNDTIMEO with _OLD suffixes sock: Add SO_RCVTIMEO_NEW and SO_SNDTIMEO_NEW Documentation/networking/timestamping.txt | 43 ++++- arch/alpha/include/uapi/asm/socket.h | 47 ++++-- arch/ia64/include/uapi/asm/Kbuild | 1 + arch/ia64/include/uapi/asm/socket.h | 122 -------------- arch/mips/include/uapi/asm/socket.h | 47 ++++-- arch/parisc/include/uapi/asm/socket.h | 46 ++++-- arch/powerpc/include/uapi/asm/socket.h | 4 +- arch/s390/include/uapi/asm/Kbuild | 1 + arch/s390/include/uapi/asm/socket.h | 119 -------------- arch/sparc/include/uapi/asm/posix_types.h | 10 ++ arch/sparc/include/uapi/asm/socket.h | 49 ++++-- arch/x86/include/uapi/asm/Kbuild | 1 + arch/x86/include/uapi/asm/socket.h | 1 - arch/xtensa/include/asm/Kbuild | 1 + arch/xtensa/include/uapi/asm/Kbuild | 1 + arch/xtensa/include/uapi/asm/socket.h | 124 -------------- drivers/isdn/mISDN/socket.c | 2 +- fs/dlm/lowcomms.c | 4 +- include/linux/skbuff.h | 24 ++- include/linux/socket.h | 8 + include/net/sock.h | 1 + include/uapi/asm-generic/socket.h | 48 ++++-- include/uapi/linux/errqueue.h | 4 + include/uapi/linux/time.h | 7 + net/bluetooth/hci_sock.c | 4 +- net/compat.c | 78 +-------- net/core/scm.c | 27 ++++ net/core/sock.c | 151 +++++++++++++----- net/ipv4/tcp.c | 61 ++++--- net/rds/af_rds.c | 10 +- net/rds/recv.c | 18 ++- net/rxrpc/local_object.c | 2 +- net/smc/af_smc.c | 3 +- net/socket.c | 50 ++++-- net/vmw_vsock/af_vsock.c | 4 +- .../networking/timestamping/rxtimestamp.c | 1 + 36 files changed, 541 insertions(+), 583 deletions(-) delete mode 100644 arch/ia64/include/uapi/asm/socket.h delete mode 100644 arch/s390/include/uapi/asm/socket.h delete mode 100644 arch/x86/include/uapi/asm/socket.h delete mode 100644 arch/xtensa/include/uapi/asm/socket.h -- 2.17.1

5 years, 9 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

Y2038 February 2019