Y2038 December 2016

y2038@lists.linaro.org

5 participants
8 discussions

[PATCH 0/7] [media] y2038 conversion for subsystem

by Arnd Bergmann

Hi everyone, This is a conversion of all subsystem-wide v4l2 code to avoid the use of types based on time_t. The first five patches should all be harmless and obvious, so they can get applied for 4.3 after normal review. The last two patches are marked RFC for now because their possible impact on the user space ABI and to decide if this is the best approach or whether we should instead introduce extra code in the kernel to handle modified user space. There are a few device drivers beyond this series that rely on time_t/timeval/timespec internally, but they are all easy to fix and can be taken care of later. Arnd Arnd Bergmann (7): [media] dvb: use ktime_t for internal timeout [media] dvb: remove unused systime() function [media] dvb: don't use 'time_t' in event ioctl [media] exynos4-is: use monotonic timestamps as advertized [media] use v4l2_get_timestamp where possible [RFC] [media]: v4l2: introduce v4l2_timeval [RFC] [media] introduce v4l2_timespec type for timestamps drivers/media/dvb-core/demux.h | 2 +- drivers/media/dvb-core/dmxdev.c | 2 +- drivers/media/dvb-core/dvb_demux.c | 17 ++++++----------- drivers/media/dvb-core/dvb_demux.h | 4 ++-- drivers/media/dvb-core/dvb_net.c | 2 +- drivers/media/dvb-frontends/dibx000_common.c | 10 ---------- drivers/media/dvb-frontends/dibx000_common.h | 2 -- drivers/media/pci/bt8xx/bttv-driver.c | 7 ++----- drivers/media/pci/cx18/cx18-mailbox.c | 2 +- drivers/media/pci/meye/meye.h | 2 +- drivers/media/pci/zoran/zoran.h | 2 +- drivers/media/platform/coda/coda.h | 2 +- drivers/media/platform/exynos4-is/fimc-capture.c | 8 +------- drivers/media/platform/exynos4-is/fimc-lite.c | 7 +------ drivers/media/platform/omap/omap_vout.c | 4 ++-- drivers/media/platform/omap3isp/ispstat.c | 5 ++--- drivers/media/platform/omap3isp/ispstat.h | 2 +- drivers/media/platform/s3c-camif/camif-capture.c | 8 +------- drivers/media/platform/vim2m.c | 2 +- drivers/media/platform/vivid/vivid-ctrls.c | 2 +- drivers/media/usb/cpia2/cpia2.h | 2 +- drivers/media/usb/cpia2/cpia2_v4l.c | 2 +- drivers/media/usb/gspca/gspca.c | 6 +++--- drivers/media/usb/usbvision/usbvision.h | 2 +- drivers/media/v4l2-core/v4l2-common.c | 6 +++--- drivers/media/v4l2-core/v4l2-event.c | 20 +++++++++++++------- drivers/staging/media/omap4iss/iss_video.c | 5 +---- include/media/v4l2-common.h | 2 +- include/media/videobuf-core.h | 2 +- include/trace/events/v4l2.h | 12 ++++++++++-- include/uapi/linux/dvb/video.h | 3 ++- include/uapi/linux/omap3isp.h | 2 +- include/uapi/linux/videodev2.h | 16 ++++++++++++++-- 33 files changed, 79 insertions(+), 93 deletions(-) -- 2.1.0.rc2

7 years, 2 months

[PATCH v2] 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 v1: * Use xfs_io utimes command * Updated error handling * Reorganized code according to review comments common/rc | 42 +++++++++++ tests/generic/390 | 197 ++++++++++++++++++++++++++++++++++++++++++++++++++ tests/generic/390.out | 2 + tests/generic/group | 1 + 4 files changed, 242 insertions(+) create mode 100755 tests/generic/390 create mode 100644 tests/generic/390.out diff --git a/common/rc b/common/rc index e3b54ec..93c6e65 100644 --- a/common/rc +++ b/common/rc @@ -1960,6 +1960,45 @@ _run_aiodio() return $status } +# this test requires y2038 sysfs switch support +# +_require_y2038_sysfs() +{ + sysfsdir=/proc/sys/fs/fs-timestamp-check-on + + if [ ! -e $sysfsdir ]; then + _notrun "no kernel support for y2038 sysfs switch" + 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" + _notrun "filesystem $FSTYP timestamp bounds are unknown" + ;; + esac +} + # indicate whether YP/NIS is active or not # _yp_active() @@ -2070,6 +2109,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..8ccadad --- /dev/null +++ b/tests/generic/390 @@ -0,0 +1,197 @@ +#! /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 +_require_y2038_sysfs + +# 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 + exit + 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 + exit + 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 + + #initialization iterator + 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" +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 "min timestamp that needs to be supported by fs for rw mount is $sys_tsmax $(date --date=@$sys_tsmax)" >> $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 + if [ $sys_tsmax -gt $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 + 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 +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 +if [ $? -ne 0 ];then + echo "Failed to remount $SCRATCH_DEV" | tee -a $seqres.full + exit +fi + +# Begin test case 2 + +#re-initialize iterator +n=1 + +#Do not update time on the file, 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

7 years, 10 months

[PATCH v2] xfs_io: implement 'utimes' command

by Deepa Dinamani

Add the utimes command to provide a way to utilize the futimens C library call. This is the interface to the utimensat system call, which updates the mtime and atime of a file. Signed-off-by: Deepa Dinamani <deepa.kernel(a)gmail.com> --- Changes since v1: * changed error return values * removed redundant roff formatting directive * removed unneeded argument count check include/input.h | 1 + io/Makefile | 2 +- io/init.c | 1 + io/io.h | 1 + io/utimes.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ libxcmd/input.c | 22 +++++++++++++++ man/man8/xfs_io.8 | 11 ++++++++ 7 files changed, 118 insertions(+), 1 deletion(-) create mode 100755 io/utimes.c mode change 100644 => 100755 libxcmd/input.c diff --git a/include/input.h b/include/input.h index d02170f..221678e 100644 --- a/include/input.h +++ b/include/input.h @@ -48,6 +48,7 @@ extern uid_t uid_from_string(char *user); extern gid_t gid_from_string(char *group); extern prid_t prid_from_string(char *project); extern bool isdigits_only(const char *str); +extern int timespec_from_string(const char *sec, const char *nsec, struct timespec *ts); #define HAVE_FTW_H 1 /* TODO: configure me */ diff --git a/io/Makefile b/io/Makefile index 62bc03b..392e02a 100644 --- a/io/Makefile +++ b/io/Makefile @@ -11,7 +11,7 @@ HFILES = init.h io.h CFILES = init.c \ attr.c bmap.c file.c freeze.c fsync.c getrusage.c imap.c link.c \ mmap.c open.c parent.c pread.c prealloc.c pwrite.c seek.c shutdown.c \ - sync.c truncate.c reflink.c + sync.c truncate.c reflink.c utimes.c LLDLIBS = $(LIBXCMD) $(LIBHANDLE) LTDEPENDENCIES = $(LIBXCMD) $(LIBHANDLE) diff --git a/io/init.c b/io/init.c index efe7390..6319aeb 100644 --- a/io/init.c +++ b/io/init.c @@ -85,6 +85,7 @@ init_commands(void) sync_range_init(); truncate_init(); reflink_init(); + utimes_init(); } static int diff --git a/io/io.h b/io/io.h index 2bc7ac4..fddd7a3 100644 --- a/io/io.h +++ b/io/io.h @@ -113,6 +113,7 @@ extern void seek_init(void); extern void shutdown_init(void); extern void sync_init(void); extern void truncate_init(void); +extern void utimes_init(void); #ifdef HAVE_FADVISE extern void fadvise_init(void); diff --git a/io/utimes.c b/io/utimes.c new file mode 100755 index 0000000..faf9b8d --- /dev/null +++ b/io/utimes.c @@ -0,0 +1,81 @@ +/* + * 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 + */ + +#include "command.h" +#include "input.h" +#include "init.h" +#include "io.h" + +static cmdinfo_t utimes_cmd; + +static void +utimes_help(void) +{ + printf(_( +"\n" +" Update file atime and mtime of the current file with nansecond precision.\n" +"\n" +" Usage: utimes atime_sec atime_nsec mtime_sec mtime_nsec.\n" +" *_sec: Seconds elapsed since 1970-01-01 00:00:00 UTC.\n" +" *_nsec: Nanoseconds since the corresponding *_sec.\n" +"\n")); +} + +static int +utimes_f( + int argc, + char **argv) +{ + struct timespec t[2]; + int result; + + /* Get the timestamps */ + result = timespec_from_string(argv[1], argv[2], &t[0]); + if (result) { + fprintf(stderr, "Bad value for atime\n"); + return 0; + } + result = timespec_from_string(argv[3], argv[4], &t[1]); + if (result) { + fprintf(stderr, "Bad value for mtime\n"); + return 0; + } + + /* Call futimens to update time. */ + if (futimens(file->fd, t)) { + perror("futimens"); + return 0; + } + + return 0; +} + +void +utimes_init(void) +{ + utimes_cmd.name = "utimes"; + utimes_cmd.cfunc = utimes_f; + utimes_cmd.argmin = 4; + utimes_cmd.argmax = 4; + utimes_cmd.flags = CMD_NOMAP_OK | CMD_FOREIGN_OK; + utimes_cmd.args = _("atime_sec atime_nsec mtime_sec mtime_nsec"); + utimes_cmd.oneline = _("Update file times of the current file"); + utimes_cmd.help = utimes_help; + + add_command(&utimes_cmd); +} diff --git a/libxcmd/input.c b/libxcmd/input.c old mode 100644 new mode 100755 index 5a7dce3..8aeb3b0 --- a/libxcmd/input.c +++ b/libxcmd/input.c @@ -327,6 +327,28 @@ timestr( } /* + * Convert from a pair of arbitrary user strings into a timespec. + */ + +int +timespec_from_string( + const char * secs, + const char * nsecs, + struct timespec * ts) +{ + char* p; + if (!secs || !nsecs || !ts) + return 1; + ts->tv_sec = strtoull(secs, &p, 0); + if (*p) + return 1; + ts->tv_nsec = strtoull(nsecs, &p, 0); + if (*p) + return 1; + return 0; +} + +/* * Convert from arbitrary user strings into a numeric ID. * If it's all numeric, we convert that inplace, else we do * the name lookup, and return the found identifier. diff --git a/man/man8/xfs_io.8 b/man/man8/xfs_io.8 index 2c56f09..9efb7b2 100644 --- a/man/man8/xfs_io.8 +++ b/man/man8/xfs_io.8 @@ -589,6 +589,16 @@ Copy data into the open file beginning at Copy up to .I length bytes of data. +.RE +.PD +.TP +.BI utimes " atime_sec atime_nsec mtime_sec mtime_nsec" +The utimes command changes the atime and mtime of the current file. +sec uses UNIX timestamp notation and is the seconds elapsed since +1970-01-01 00:00:00 UTC. +nsec is the nanoseconds since the sec. This value needs to be in +the range 0-999999999 with UTIME_NOW and UTIME_OMIT being exceptions. +Each (sec, nsec) pair constitutes a single timestamp value. .SH MEMORY MAPPED I/O COMMANDS .TP @@ -875,6 +885,7 @@ verbose output will be printed. .BR fstatfs (2), .BR fsync (2), .BR ftruncate (2), +.BR futimens (3), .BR mmap (2), .BR msync (2), .BR open (2), -- 2.7.4

7 years, 11 months

Parcel #000501985 shipment problem, please review

by FedEx SameDay

Dear Customer, Your item has arrived at December 26, but our courier was not able to deliver the parcel. Please check the attachment for details! Sincerely yours, Ian Hale, Mail Delivery Clerk.

7 years, 11 months

[PATCH] xfs_io: implement 'utimes' command

by Deepa Dinamani

Add the utimes command to provide a way to utilize the futimens C library call. This is the interface to the utimensat system call, which updates the mtime and atime of a file. Signed-off-by: Deepa Dinamani <deepa.kernel(a)gmail.com> --- include/input.h | 1 + io/Makefile | 2 +- io/init.c | 1 + io/io.h | 1 + io/utimes.c | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ libxcmd/input.c | 22 +++++++++++++++ man/man8/xfs_io.8 | 12 ++++++++ 7 files changed, 122 insertions(+), 1 deletion(-) create mode 100644 io/utimes.c diff --git a/include/input.h b/include/input.h index d02170f..221678e 100644 --- a/include/input.h +++ b/include/input.h @@ -48,6 +48,7 @@ extern uid_t uid_from_string(char *user); extern gid_t gid_from_string(char *group); extern prid_t prid_from_string(char *project); extern bool isdigits_only(const char *str); +extern int timespec_from_string(const char *sec, const char *nsec, struct timespec *ts); #define HAVE_FTW_H 1 /* TODO: configure me */ diff --git a/io/Makefile b/io/Makefile index 62bc03b..392e02a 100644 --- a/io/Makefile +++ b/io/Makefile @@ -11,7 +11,7 @@ HFILES = init.h io.h CFILES = init.c \ attr.c bmap.c file.c freeze.c fsync.c getrusage.c imap.c link.c \ mmap.c open.c parent.c pread.c prealloc.c pwrite.c seek.c shutdown.c \ - sync.c truncate.c reflink.c + sync.c truncate.c reflink.c utimes.c LLDLIBS = $(LIBXCMD) $(LIBHANDLE) LTDEPENDENCIES = $(LIBXCMD) $(LIBHANDLE) diff --git a/io/init.c b/io/init.c index efe7390..6319aeb 100644 --- a/io/init.c +++ b/io/init.c @@ -85,6 +85,7 @@ init_commands(void) sync_range_init(); truncate_init(); reflink_init(); + utimes_init(); } static int diff --git a/io/io.h b/io/io.h index 2bc7ac4..fddd7a3 100644 --- a/io/io.h +++ b/io/io.h @@ -113,6 +113,7 @@ extern void seek_init(void); extern void shutdown_init(void); extern void sync_init(void); extern void truncate_init(void); +extern void utimes_init(void); #ifdef HAVE_FADVISE extern void fadvise_init(void); diff --git a/io/utimes.c b/io/utimes.c new file mode 100644 index 0000000..1465762 --- /dev/null +++ b/io/utimes.c @@ -0,0 +1,84 @@ +/* + * 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 + */ + +#include "command.h" +#include "input.h" +#include "init.h" +#include "io.h" + +static cmdinfo_t utimes_cmd; + +static void +utimes_help(void) +{ + printf(_( +"\n" +" Update file atime and mtime of the current file with nansecond precision.\n" +"\n" +" Usage: utimes atime_sec atime_nsec mtime_sec mtime_nsec.\n" +" *_sec: Seconds elapsed since 1970-01-01 00:00:00 UTC.\n" +" *_nsec: Nanoseconds since the corresponding *_sec.\n" +"\n")); +} + +static int +utimes_f( + int argc, + char **argv) +{ + struct timespec t[2]; + int result; + + if (argc != 5) + return command_usage(&utimes_cmd); + + /* Get the timestamps */ + result = timespec_from_string(argv[1], argv[2], &t[0]); + if (result) { + fprintf(stderr, "Bad value for atime\n"); + return 1; + } + result = timespec_from_string(argv[3], argv[4], &t[1]); + if (result) { + fprintf(stderr, "Bad value for mtime\n"); + return 1; + } + + /* Call futimens to update time. */ + if (futimens(file->fd, t)) { + perror("futimens"); + return 1; + } + + return 0; +} + +void +utimes_init(void) +{ + utimes_cmd.name = "utimes"; + utimes_cmd.cfunc = utimes_f; + utimes_cmd.argmin = 4; + utimes_cmd.argmax = 4; + utimes_cmd.flags = CMD_NOMAP_OK | CMD_FOREIGN_OK; + utimes_cmd.args = _("atime_sec atime_nsec mtime_sec mtime_nsec"); + utimes_cmd.oneline = _("Update file times of the current file"); + utimes_cmd.help = utimes_help; + + add_command(&utimes_cmd); +} diff --git a/libxcmd/input.c b/libxcmd/input.c index 5a7dce3..2fdb3e8 100644 --- a/libxcmd/input.c +++ b/libxcmd/input.c @@ -327,6 +327,28 @@ timestr( } /* + * Convert from a pair of arbitrary user strings into a timespec. + */ + +int +timespec_from_string( + const char * secs, + const char * nsecs, + struct timespec * ts) +{ + char* p; + if (!secs || !nsecs || !ts) + return -1; + ts->tv_sec = strtoull(secs, &p, 0); + if (*p) + return -1; + ts->tv_nsec = strtoull(nsecs, &p, 0); + if (*p) + return -1; + return 0; +} + +/* * Convert from arbitrary user strings into a numeric ID. * If it's all numeric, we convert that inplace, else we do * the name lookup, and return the found identifier. diff --git a/man/man8/xfs_io.8 b/man/man8/xfs_io.8 index 2c56f09..3ffe439 100644 --- a/man/man8/xfs_io.8 +++ b/man/man8/xfs_io.8 @@ -589,6 +589,17 @@ Copy data into the open file beginning at Copy up to .I length bytes of data. +.RE +.PD +.TP +.TP +.BI utimes " atime_sec atime_nsec mtime_sec mtime_nsec" +The utimes command changes the atime and mtime of the current file. +sec uses UNIX timestamp notation and is the seconds elapsed since +1970-01-01 00:00:00 UTC. +nsec is the nanoseconds since the sec. This value needs to be in +the range 0-999999999 with UTIME_NOW and UTIME_OMIT being exceptions. +Each (sec, nsec) pair constitutes a single timestamp value. .SH MEMORY MAPPED I/O COMMANDS .TP @@ -875,6 +886,7 @@ verbose output will be printed. .BR fstatfs (2), .BR fsync (2), .BR ftruncate (2), +.BR futimens (3), .BR mmap (2), .BR msync (2), .BR open (2), -- 2.7.4

7 years, 11 months

[PATCH] xfs_io: implement 'utimes' command

by Deepa Dinamani

Add the utimes command to provide a way to utilize the futimens C library call. On linux, this is the interface to the utimensat system call, which updates the mtime and atime of a file. Signed-off-by: Deepa Dinamani <deepa.kernel(a)gmail.com> --- include/input.h | 1 + io/Makefile | 2 +- io/init.c | 1 + io/io.h | 1 + io/utimes.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ libxcmd/input.c | 22 +++++++++++++++ 6 files changed, 109 insertions(+), 1 deletion(-) create mode 100644 io/utimes.c diff --git a/include/input.h b/include/input.h index d02170f..221678e 100644 --- a/include/input.h +++ b/include/input.h @@ -48,6 +48,7 @@ extern uid_t uid_from_string(char *user); extern gid_t gid_from_string(char *group); extern prid_t prid_from_string(char *project); extern bool isdigits_only(const char *str); +extern int timespec_from_string(const char *sec, const char *nsec, struct timespec *ts); #define HAVE_FTW_H 1 /* TODO: configure me */ diff --git a/io/Makefile b/io/Makefile index 62bc03b..392e02a 100644 --- a/io/Makefile +++ b/io/Makefile @@ -11,7 +11,7 @@ HFILES = init.h io.h CFILES = init.c \ attr.c bmap.c file.c freeze.c fsync.c getrusage.c imap.c link.c \ mmap.c open.c parent.c pread.c prealloc.c pwrite.c seek.c shutdown.c \ - sync.c truncate.c reflink.c + sync.c truncate.c reflink.c utimes.c LLDLIBS = $(LIBXCMD) $(LIBHANDLE) LTDEPENDENCIES = $(LIBXCMD) $(LIBHANDLE) diff --git a/io/init.c b/io/init.c index efe7390..6319aeb 100644 --- a/io/init.c +++ b/io/init.c @@ -85,6 +85,7 @@ init_commands(void) sync_range_init(); truncate_init(); reflink_init(); + utimes_init(); } static int diff --git a/io/io.h b/io/io.h index 2bc7ac4..fddd7a3 100644 --- a/io/io.h +++ b/io/io.h @@ -113,6 +113,7 @@ extern void seek_init(void); extern void shutdown_init(void); extern void sync_init(void); extern void truncate_init(void); +extern void utimes_init(void); #ifdef HAVE_FADVISE extern void fadvise_init(void); diff --git a/io/utimes.c b/io/utimes.c new file mode 100644 index 0000000..419d221 --- /dev/null +++ b/io/utimes.c @@ -0,0 +1,83 @@ +/* + * 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 + */ + +#include "command.h" +#include "input.h" +#include "init.h" +#include "io.h" + +static cmdinfo_t utimes_cmd; + +static void +utimes_help(void) +{ + printf(_( +"\n" +" Update file atime and mtime of the current file with nansecond precision.\n" +"\n" +" Usage: utimes atime.tv_sec atime.tv_nsec mtime.tv_sec mtime.tv_nsec\n" +" Timestamp is seconds and nanoseconds since 1970-01-01 00:00:00 UTC\n" +"\n")); +} + +static int +utimes_f( + int argc, + char **argv) +{ + struct timespec t[2]; + int result; + + if (argc != 5) + return command_usage(&utimes_cmd); + + /* Get the timestamps */ + result = timespec_from_string(argv[1], argv[2], &t[0]); + if (result) { + fprintf(stderr, "Bad value for atime\n"); + return 1; + } + result = timespec_from_string(argv[3], argv[4], &t[1]); + if (result) { + fprintf(stderr, "Bad value for mtime\n"); + return 1; + } + + /* Call futimens to update time. */ + if (futimens(file->fd, t)) { + perror("futimens"); + return 1; + } + + return 0; +} + +void +utimes_init(void) +{ + utimes_cmd.name = "utimes"; + utimes_cmd.cfunc = utimes_f; + utimes_cmd.argmin = 4; + utimes_cmd.argmax = 4; + utimes_cmd.flags = CMD_NOMAP_OK | CMD_FOREIGN_OK; + utimes_cmd.args = _("atime.tv_sec atime.tv_nsec mtime.tv_sec mtime.tv_nsec"); + utimes_cmd.oneline = _("Update file times for a file"); + utimes_cmd.help = utimes_help; + + add_command(&utimes_cmd); +} diff --git a/libxcmd/input.c b/libxcmd/input.c index 5a7dce3..2fdb3e8 100644 --- a/libxcmd/input.c +++ b/libxcmd/input.c @@ -327,6 +327,28 @@ timestr( } /* + * Convert from a pair of arbitrary user strings into a timespec. + */ + +int +timespec_from_string( + const char * secs, + const char * nsecs, + struct timespec * ts) +{ + char* p; + if (!secs || !nsecs || !ts) + return -1; + ts->tv_sec = strtoull(secs, &p, 0); + if (*p) + return -1; + ts->tv_nsec = strtoull(nsecs, &p, 0); + if (*p) + return -1; + return 0; +} + +/* * Convert from arbitrary user strings into a numeric ID. * If it's all numeric, we convert that inplace, else we do * the name lookup, and return the found identifier. -- 2.7.4

7 years, 11 months

[PATCH] 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> --- common/attr | 27 ++++++ src/Makefile | 2 +- src/y2038_futimens.c | 61 +++++++++++++ tests/generic/390 | 238 ++++++++++++++++++++++++++++++++++++++++++++++++++ tests/generic/390.out | 2 + tests/generic/group | 1 + 6 files changed, 330 insertions(+), 1 deletion(-) create mode 100644 src/y2038_futimens.c create mode 100755 tests/generic/390 create mode 100644 tests/generic/390.out diff --git a/common/attr b/common/attr index ce2d76a..579dc9b 100644 --- a/common/attr +++ b/common/attr @@ -56,6 +56,33 @@ _acl_get_max() esac } +_filesystem_timestamp_range() +{ + device=${1:-$TEST_DEV} + case $FSTYP in + ext4) #dumpe2fs + 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 +} + _require_acl_get_max() { if [ $(_acl_get_max) -eq 0 ]; then diff --git a/src/Makefile b/src/Makefile index dd51216..0b99ae4 100644 --- a/src/Makefile +++ b/src/Makefile @@ -21,7 +21,7 @@ LINUX_TARGETS = xfsctl bstat t_mtab getdevicesize preallo_rw_pattern_reader \ stale_handle pwrite_mmap_blocked t_dir_offset2 seek_sanity_test \ seek_copy_test t_readdir_1 t_readdir_2 fsync-tester nsexec cloner \ renameat2 t_getcwd e4compact test-nextquota punch-alternating \ - attr-list-by-handle-cursor-test listxattr + attr-list-by-handle-cursor-test listxattr y2038_futimens SUBDIRS = diff --git a/src/y2038_futimens.c b/src/y2038_futimens.c new file mode 100644 index 0000000..291e4fa --- /dev/null +++ b/src/y2038_futimens.c @@ -0,0 +1,61 @@ +#include <fcntl.h> +#include <stdio.h> +#include <sys/stat.h> +#include <errno.h> +#include <stdlib.h> + +int +do_utime(int fd, long long time) +{ + struct timespec t[2]; + + /* + * Convert long long to timespec format. + * Seconds precision is assumed here. + */ + t[0].tv_sec = time; + t[0].tv_nsec = 0; + t[1].tv_sec = time; + t[1].tv_nsec = 0; + + /* Call utimens to update time. */ + if (futimens(fd, t)) { + perror("futimens"); + return 1; + } + + return 0; +} + +int +main(int argc, char **argv) +{ + int fd; + long long time; + + if(argc < 3) { + fprintf(stderr, "Usage: %s filename timestamp\n" + "Filename: file to be created or opened in current directory\n" + "Timestamp: is seconds since 1970-01-01 00:00:00 UTC\n", argv[0]); + exit(1); + } + + /* Create the file */ + fd = creat(argv[1], 0666); + if(fd < 0) { + perror("creat"); + exit(1); + } + + /* Get the timestamp */ + time = strtoull(argv[2], NULL, 0); + if (errno) { + perror("strtoull"); + exit(1); + } + + if (do_utime(fd, time)) + return 1; + + return 0; +} diff --git a/tests/generic/390 b/tests/generic/390 new file mode 100755 index 0000000..f069988 --- /dev/null +++ b/tests/generic/390 @@ -0,0 +1,238 @@ +#! /bin/bash +# FS QA Test No. generic/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. + +seq=`basename $0` +seqres=$RESULT_DIR/$seq +echo "QA output created by $seq" +#echo "output in $seqres.full" +here=`pwd` + +# Get standard environment, filters and checks. +. ./common/rc +. ./common/filter +. ./common/attr + +SRC_GROUPS=`find tests -not -path tests -type d -printf "%f "` + +# Prerequisites for the test run. +_supported_fs generic +_supported_os Linux +_require_scratch + +Y2038_PROG=$here/src/y2038_futimens + +#initialize exit status +status=0 + +# Generic test cleanup function. +_cleanup() +{ + # Remove any leftover files from last run. + rm -f ${SCRATCH_MNT}/test_? +} + +#unmount and mount $SCRATCH_DEV. +_umount_mount_scratch_dev() +{ + #change directory so that you are not using SCRATCH_MNT anymore. + cd $here + + # Unmount the ${SCRATCH_DEV} + _scratch_unmount + if [ $? != 0 ]; then + return $? + fi + + # Mount the ${SCRATCH_DEV} + _scratch_mount + if [ $? != 0 ]; then + return $? + fi + + cd ${SCRATCH_MNT} +} + +# Compare file timestamps obtained from stat +# with a given timestamp. +_check_stat() #check_stat(file, timestamp) +{ + stat_timestamp=`stat -c"%X;%Y" $1` + + prev_timestamp="$2;$2" + if [ $prev_timestamp != $stat_timestamp ]; then + echo "$prev_timestamp != $stat_timestamp" >> $seqres.full + return 1 + else + return 0 + fi +} + +_run_test_individual() #_run_individual_test(file, timestamp, update_time) +{ + 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 + $Y2038_PROG $file $timestamp &>> $seqres.full + if [ $? != 0 ]; then + echo "Failed to run the y2038 program" >> $seqres.full + return 1 + fi + fi + + tsclamp=$(($timestamp>$tsmax?$tsmax:$timestamp)) + _check_stat $file $tsclamp + echo "Checking file: $file Updated timestamp is `date -d @$tsclamp`" >> $seqres.full + + if [ $? != 0 ]; then + echo "Failed to set time to $timestamp" >> $seqres.full + return 1 + fi + + return 0 +} + +_run_test() #_run_test(update_time) +{ + #initialization iterator + n=1 + + for TIME in "${TIMESTAMPS[@]}" + do + #Run the test + _run_test_individual ${SCRATCH_MNT}/test_$n $TIME $1 + + if [ $? != 0 ]; then + echo "file timestamp update failed `date -d @$TIME`" >> $seqres.full + if [ $n -lt 4 ]; then + echo "Test failed" + return 1 + fi + fi + + #update iterator + ((n++)) + done + + return 0 +} + +#Remove log from last run +rm -f $seqres.full + +#install cleaner +trap "_cleanup; exit \$status" 0 1 2 3 15 + +_scratch_mkfs &>> $seqres.full 2>&1 || _fail "mkfs failed" +read tsmin tsmax <<<$(_filesystem_timestamp_range $SCRATCH_DEV) + +if [ $tsmin -eq -1 -a $tsmax -eq -1 ]; then + _notrun "filesystem $FSTYP timestamp bounds are unknown" +fi + +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 "min timestamp that needs to be supported by fs for rw mount is $sys_tsmax $(date --date=@$sys_tsmax)" >> $seqres.full + +read ts_check <<<$(cat /proc/sys/fs/fs-timestamp-check-on) + +_scratch_mount +result=$? + +if [ $ts_check != 0 ]; then + echo "sysctl filesystem timestamp check is on" >> $seqres.full + if [ $sys_tsmax > $tsmax ]; then + if [ $result != -1 ]; then + echo "mount test failed" >> $seqres.full + fi + else + if [ $result != 0 ]; then + echo "mount test failed" >> $seqres.full + fi + fi +else + echo "sysctl filesystem timestamp check is off" >> $seqres.full + if [ $result != 0 ]; then + echo "mount test failed" >> $seqres.full + fi +fi + +#cd to the SCRATCH_MNT to run the tests +cd $SCRATCH_MNT + +# Begin test case 1 +echo "In memory timestamps update test start" >> $seqres.full + +#update time on the file +update_time=1 + +#Run test +_run_test $update_time + +if [ $? != 0 ]; then + echo "In memory timestamps update failed" >> $seqres.full + status=1 + exit +fi + +echo "In memory timestamps update complete" >> $seqres.full + +echo "Unmounting and mounting scratch $SCRATCH_MNT" >> $seqres.full + +#unmount and remount $SCRATCH_DEV +_umount_mount_scratch_dev + +if [ $? != 0 ];then + status=1 + exit +fi + +# Begin test case 2 + +#re-initialize iterator +n=1 + +#Do not update time on the file, just read from disk +update_time=0 + +echo "On disk timestamps update test start" >> $seqres.full + +#Re-run test +_run_test $update_time + +if [ $? != 0 ];then + status=1 + exit +fi + +echo "On disk timestamps update test complete" >> $seqres.full + +echo "y2038 inode filestamp update successful" diff --git a/tests/generic/390.out b/tests/generic/390.out new file mode 100644 index 0000000..355f28e --- /dev/null +++ b/tests/generic/390.out @@ -0,0 +1,2 @@ +QA output created by 390 +y2038 inode filestamp update successful 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

7 years, 11 months

Unable to deliver your item, #0000531397

by FedEx International MailService

Dear Customer, This is to confirm that one or more of your parcels has been shipped. Please, download Delivery Label attached to this email. Thank you for choosing FedEx, Randall Schneider, Station Manager.

7 years, 11 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

Y2038 December 2016