lib/posix-fdio: Add internal futime(n)s syscalls

This change adds internal API variants of futimes and futimens.

Checkpatch-Ignore: MACRO_ARG_REUSE
Signed-off-by: Andrei Tatar <andrei@unikraft.io>
Approved-by: Sergiu Moga <sergiu@unikraft.io>
Reviewed-by: Sergiu Moga <sergiu@unikraft.io>
GitHub-Closes: #1575

diff --git a/lib/posix-fdio/Config.uk b/lib/posix-fdio/Config.uk
index e11a933aca07b8040c07c2b74397ea24f16d01be..47264a8a508365b6f8a2d3c05486feea9364a6ec 100644 (file)
--- a/lib/posix-fdio/Config.uk
+++ b/lib/posix-fdio/Config.uk
@@ -2,5 +2,7 @@ config LIBPOSIX_FDIO
        bool "posix-fdio: File I/O and control"
        select LIBUKATOMIC
        select LIBUKFILE
+       select LIBPOSIX_TIME
+       select LIBUKTIMECONV
        select LIBPOSIX_FDTAB
        select LIBPOSIX_FDTAB_LEGACY_SHIM

diff --git a/lib/posix-fdio/fdstat.c b/lib/posix-fdio/fdstat.c
index 80d65304330a989bf9a660aaa1fb3009fd066ab8..8638c341625282d7d049ee95c9261e46213d744e 100644 (file)
--- a/lib/posix-fdio/fdstat.c
+++ b/lib/posix-fdio/fdstat.c
@@ -9,9 +9,16 @@
 #include <string.h>
 
 #include <uk/posix-fdio.h>
+#include <uk/posix-time.h>
+#include <uk/timeutil.h>
 
 #include "fdio-impl.h"
 
+#define statx_time(ts) ((struct uk_statx_timestamp){ \
+       .tv_sec = (ts).tv_sec, \
+       .tv_nsec = (ts).tv_nsec \
+})
+
 static inline
 dev_t nums2dev(__u32 major, __u32 minor)
 {
@@ -117,3 +124,63 @@ int uk_sys_fchown(struct uk_ofile *of, uid_t owner, gid_t group)
                uk_file_wunlock(of->file);
        return r;
 }
+
+int uk_sys_futimens(struct uk_ofile *of, const struct timespec *times)
+{
+       int r;
+       unsigned int mask;
+       struct uk_statx sx;
+       struct timespec t;
+       const int iolock = _SHOULD_LOCK(of->mode);
+
+       /* TODO: check if uid is root or file owner for custom times */
+
+       if (!times ||
+           times[0].tv_nsec == UTIME_NOW || times[1].tv_nsec == UTIME_NOW) {
+               r = uk_sys_clock_gettime(CLOCK_REALTIME, &t);
+               if (unlikely(r)) {
+                       UK_ASSERT(r < 0);
+                       /* The futime(n)s manpages do not specify an error case
+                        * for failing to get the current time, and failure of
+                        * the above call may indicate a misconfigured kernel.
+                        * Print a warning before erroring out.
+                        */
+                       uk_pr_warn("Failed to get current time: %d\n", r);
+                       return r;
+               }
+       }
+
+       if (!times) {
+               mask = UK_STATX_ATIME | UK_STATX_MTIME;
+               sx.stx_atime = statx_time(t);
+               sx.stx_mtime = statx_time(t);
+       } else {
+               mask = 0;
+               if (times[0].tv_nsec != UTIME_OMIT) {
+                       mask |= UK_STATX_ATIME;
+                       if (times[0].tv_nsec == UTIME_NOW)
+                               sx.stx_atime = statx_time(t);
+                       else
+                               sx.stx_atime = statx_time(times[0]);
+               }
+               if (times[1].tv_nsec != UTIME_OMIT) {
+                       mask |= UK_STATX_MTIME;
+                       if (times[1].tv_nsec == UTIME_NOW)
+                               sx.stx_mtime = statx_time(t);
+                       else
+                               sx.stx_mtime = statx_time(times[1]);
+               }
+       }
+
+       if (iolock)
+               uk_file_wlock(of->file);
+       r = uk_file_setstat(of->file, mask, &sx);
+       if (iolock)
+               uk_file_wunlock(of->file);
+       return r;
+}
+
+int uk_sys_futimes(struct uk_ofile *of, const struct timeval *tv)
+{
+       return uk_sys_futimens(of, tv ? &uk_time_spec_from_val(tv) : NULL);
+}

diff --git a/lib/posix-fdio/include/uk/posix-fdio.h b/lib/posix-fdio/include/uk/posix-fdio.h
index e051824586dfa492d55a22364401b77b5cf7c788..4ee445eceb82fd2f2c1c90d0a44b17a6a59d37bd 100644 (file)
--- a/lib/posix-fdio/include/uk/posix-fdio.h
+++ b/lib/posix-fdio/include/uk/posix-fdio.h
@@ -10,6 +10,7 @@
 #define __UK_POSIX_FDIO_H__
 
 #include <sys/stat.h>
+#include <sys/time.h>
 
 #include <uk/posix-fd.h>
 
@@ -67,6 +68,10 @@ int uk_sys_fchmod(struct uk_ofile *of, mode_t mode);
 
 int uk_sys_fchown(struct uk_ofile *of, uid_t owner, gid_t group);
 
+int uk_sys_futimes(struct uk_ofile *of, const struct timeval *tv);
+
+int uk_sys_futimens(struct uk_ofile *of, const struct timespec *times);
+
 /* Control */
 
 int uk_sys_ioctl(struct uk_ofile *of, int cmd, void *arg);