diff --git a/0001-Use-mountinfo-to-be-able-to-use-the-mount-identity.patch b/0001-Use-mountinfo-to-be-able-to-use-the-mount-identity.patch index 286d28e..bcd23c5 100644 --- a/0001-Use-mountinfo-to-be-able-to-use-the-mount-identity.patch +++ b/0001-Use-mountinfo-to-be-able-to-use-the-mount-identity.patch @@ -1,4 +1,4 @@ -From fbfa621f68e8edd522e0111fca72693943295df5 Mon Sep 17 00:00:00 2001 +From d220bd127a595287be2893e5808c4d53505e65af Mon Sep 17 00:00:00 2001 From: Werner Fink Date: Mon, 22 Oct 2018 12:02:50 +0200 Subject: [PATCH] Use mountinfo to be able to use the mount identity @@ -16,11 +16,11 @@ Support also btrfs with its subvolumes Signed-off-by: Werner Fink --- configure.ac | 18 +- - src/fuser.c | 537 +++++++++++++++++++++++++++---------- + src/fuser.c | 541 +++++++++++++++++++++++++++---------- src/fuser.h | 19 +- testsuite/Makefile.am | 3 +- testsuite/killall.test/killall.exp | 4 + - 5 files changed, 437 insertions(+), 144 deletions(-) + 5 files changed, 440 insertions(+), 145 deletions(-) diff --git configure.ac configure.ac index 176a2fc..d8d3366 100644 @@ -66,7 +66,7 @@ index 176a2fc..d8d3366 100644 dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST diff --git src/fuser.c src/fuser.c -index c44cee8..6176ac3 100644 +index c44cee8..2681f74 100644 --- src/fuser.c +++ src/fuser.c @@ -32,6 +32,10 @@ @@ -229,7 +229,7 @@ index c44cee8..6176ac3 100644 (unsigned long)this_name->st.st_dev, - (unsigned long)this_name->st.st_ino); + (unsigned long)this_name->st.st_ino, -+ mountinfo->id, mountinfo->isnfs ? "yes" : "no"); ++ mountinfo->id, mountinfo->isremote ? "yes" : "no"); #endif /* DEBUG */ add_inode(ino_list, this_name, this_name->st.st_dev, this_name->st.st_ino); @@ -543,7 +543,7 @@ index c44cee8..6176ac3 100644 } static void -@@ -1998,16 +2074,47 @@ scan_swaps(struct names *names_head, struct inode_list *ino_head, +@@ -1998,16 +2074,49 @@ scan_swaps(struct names *names_head, struct inode_list *ino_head, fclose(fp); } @@ -551,7 +551,8 @@ index c44cee8..6176ac3 100644 /* * Use /proc/self/mountinfo of modern linux system to determine * the device numbers of the mount points. Use this to avoid the - * stat(2) system call wherever possible. +- * stat(2) system call wherever possible. ++ * stat(2) system call for remote file system. */ -static list_t mntinfo = { &mntinfo, &mntinfo }; @@ -575,15 +576,17 @@ index c44cee8..6176ac3 100644 + mnt->nlen = nlen; + mnt->parid = parid; + mnt->dev = dev; -+ if (strncmp("btrfs", type, 5) == 0) { ++ mnt->id = mid; ++ if (strncmp("nfs", type, 3) == 0 || strncmp("afs", type, 3) == 0 || strncmp("autofs", type, 6)) ++ mnt->isremote = 1; ++ else mnt->isremote = 0; ++ if (!mnt->isremote) { ++ /* E.g. sub volumes of BtrFS do not show correct device ++ * numbers in /proc/self/mountinfo */ + struct stat st; + if (stat(mpoint, &st) >= 0) + mnt->dev = st.st_dev; + } -+ mnt->id = mid; -+ if (strncmp("nfs", type, 3) == 0) -+ mnt->isnfs = 1; -+ else mnt->isnfs = 0; + + return mnt; +} @@ -594,7 +597,7 @@ index c44cee8..6176ac3 100644 { list_t *ptr, *tmp; -@@ -2018,72 +2125,232 @@ static void clear_mntinfo(void) +@@ -2018,72 +2127,232 @@ static void clear_mntinfo(void) } } @@ -871,7 +874,7 @@ index c44cee8..6176ac3 100644 /* * Determine device of links below /proc/ */ -@@ -2091,8 +2358,7 @@ static int mntstat(const char *path, struct stat *buf) +@@ -2091,8 +2360,7 @@ static int mntstat(const char *path, struct stat *buf) { char name[PATH_MAX + 1]; const char *use; @@ -881,7 +884,7 @@ index c44cee8..6176ac3 100644 if ((use = realpath(path, name)) == NULL || *use != '/') { -@@ -2104,27 +2370,26 @@ static int mntstat(const char *path, struct stat *buf) +@@ -2104,27 +2372,26 @@ static int mntstat(const char *path, struct stat *buf) errno = 0; return stat(path, buf); } @@ -917,7 +920,7 @@ index c44cee8..6176ac3 100644 - errno = ENOENT; - return -1; + -+ if (mnt->isnfs) { ++ if (mnt->isremote) { + buf->st_dev = mnt->dev; + buf->st_ino = mnt->id; /* inode substitute */ + return 0; /* found on NFS */ @@ -928,7 +931,7 @@ index c44cee8..6176ac3 100644 #endif /* WITH_MOUNTINFO_LIST */ diff --git src/fuser.h src/fuser.h -index 93020d5..7886aa3 100644 +index 93020d5..51c6770 100644 --- src/fuser.h +++ src/fuser.h @@ -37,10 +37,16 @@ struct procs { @@ -982,7 +985,7 @@ index 93020d5..7886aa3 100644 typedef struct mntinfo_s { list_t this; int id, parid; -+ char isnfs; ++ char isremote; dev_t dev; size_t nlen; char *mpoint; diff --git a/0002-Use-new-statx-2-system-call-to-avoid-hangs-on-NFS.patch b/0002-Use-new-statx-2-system-call-to-avoid-hangs-on-NFS.patch new file mode 100644 index 0000000..ba9b5f2 --- /dev/null +++ b/0002-Use-new-statx-2-system-call-to-avoid-hangs-on-NFS.patch @@ -0,0 +1,947 @@ +From dcc25d4e18d2a61f8a72670282210a0abdce7f30 Mon Sep 17 00:00:00 2001 +From: Werner Fink +Date: Fri, 2 Nov 2018 14:27:00 +0100 +Subject: [PATCH] Use new statx(2) system call to avoid hangs on NFS + +Signed-off-by: Werner Fink +--- + Makefile.am | 4 +- + configure.ac | 38 +++--- + src/fuser.c | 86 +++----------- + src/statx.c | 147 +++++++++++++++++++++++ + src/statx.h | 61 ++++++++++ + src/timeout.c | 372 ---------------------------------------------------------- + src/timeout.h | 45 ------- + 7 files changed, 242 insertions(+), 511 deletions(-) + create mode 100644 src/statx.c + create mode 100644 src/statx.h + delete mode 100644 src/timeout.c + delete mode 100644 src/timeout.h + +diff --git Makefile.am Makefile.am +index d8c4619..a76799c 100644 +--- Makefile.am ++++ Makefile.am +@@ -58,8 +58,8 @@ src_fuser_SOURCES = \ + src/fuser.h \ + src/lists.h + +-if WANT_TIMEOUT_STAT +-src_fuser_SOURCES += src/timeout.c src/timeout.h ++if HAVE_SYSCALL_STATX ++src_fuser_SOURCES += src/statx.c src/statx.h + endif + src_fuser_LDADD = @LIBINTL@ + src_killall_SOURCES = src/killall.c src/comm.h src/signals.c src/signals.h src/i18n.h +diff --git configure.ac configure.ac +index d8d3366..81d3674 100644 +--- configure.ac ++++ configure.ac +@@ -33,20 +33,6 @@ else + fi + AC_SUBST([SELINUX_LIB]) + +-# Call fork before all stat calls to stop hanging on NFS mounts +-AC_SUBST([WITH_TIMEOUT_STAT]) +-AC_ARG_ENABLE([timeout_stat], +- [AS_HELP_STRING([--enable-timeout-stat], [Use a timeout on stat calls (optional with argument "static" for a static background process)])], +- [enable_timeout_stat=$enableval], +- [enable_timeout_stat="no"]) +-if test "$enable_timeout_stat" = "yes"; then +- AC_DEFINE([WITH_TIMEOUT_STAT], [1], [Use timeout on stat calls]) +-fi +-if test "$enable_timeout_stat" = "static"; then +- AC_DEFINE([WITH_TIMEOUT_STAT], [2], [Use timeout on stat calls]) +-fi +-AM_CONDITIONAL([WANT_TIMEOUT_STAT], [test "$enable_timeout_stat" = "static"]) +- + # Use /proc/self/mountinfo if available + if test -e /proc/self/mountinfo ; then + AC_DEFINE([HAS_MOUNTINFO], [1], [System has /proc/self/mountinfo which can used instead /proc(/self)/mounts]) +@@ -60,16 +46,20 @@ fi + AC_CHECK_FUNC([name_to_handle_at],[ + AC_DEFINE([HAS_NAME_TO_HANDLE_AT], [1], [System has name_to_handle_at(2) system call])]) + +-# Use string search for network based file systems but only if the system +-# has /proc/self/mountinfo +-AC_SUBST([WITH_MOUNTINFO_LIST]) +-AC_ARG_ENABLE([mountinfo_list], +- [AS_HELP_STRING([--enable-mountinfo-list], [Use the list in /proc/self/mountinfo to replace stat(2) syscall on network file systems shares])], +- [enable_mountinfo_list="yes"], +- [enable_mountinfo_list="no"]) +-if test "$enable_mountinfo_list" = "yes" -a -e /proc/self/mountinfo ; then +- AC_DEFINE([WITH_MOUNTINFO_LIST], [1], [Use list in /proc/self/mountinfo to replace stat calls]) +-fi ++AC_CHECK_HEADERS([sys/syscall.h]) ++AC_CHECK_DECLS([SYS_statx], ++ [has_syscall_statx="yes"], ++ [has_syscall_statx="no"], ++ [[#include ]] ++) ++AC_CHECK_FUNCS([statx]) ++# Check for linux specific statx(2) system call ++AC_SUBST([HAS_SYSCALL_STATX]) ++AC_ARG_ENABLE([disable_statx], ++ [AS_HELP_STRING([--disable-statx], [Do not use linux specific statx(2) system call as replacement for stat(2), lstat(2), and fstat(2)])], ++ [enable_syscall_statx="no"], ++ [enable_syscall_statx=$has_syscall_statx]) ++AM_CONDITIONAL([HAVE_SYSCALL_STATX], [test "$enable_syscall_statx" = "yes"]) + + # Enable hardened compile and link flags + AC_ARG_ENABLE([harden_flags], +diff --git src/fuser.c src/fuser.c +index 2681f74..c717e19 100644 +--- src/fuser.c ++++ src/fuser.c +@@ -63,7 +63,7 @@ + #include "fuser.h" + #include "signals.h" + #include "i18n.h" +-#include "timeout.h" ++#include "statx.h" + #include "comm.h" + + //#define DEBUG 1 +@@ -118,10 +118,6 @@ static void clear_mntinfo(void) __attribute__ ((__destructor__)); + static void init_mntinfo(void) __attribute__ ((__constructor__)); + static int get_fdinfo(const pid_t pid, const char *fd, struct fdinfo *info); + static int find_mountpoint(const char *path, mntinfo_t **mountinfo); +-#if defined(WITH_MOUNTINFO_LIST) +-static int mntstat(const char *path, struct stat *buf); +-#endif +-static stat_t thestat = stat; + static char *expandpath(const char *path); + static struct unixsocket_list *unixsockets = NULL; + static struct names *names_head = NULL, *names_tail = NULL; +@@ -468,7 +464,7 @@ int parse_file(struct names *this_name, struct inode_list **ino_list, + free(this_name->filename); + this_name->filename = strdup(new); + } +- if (timeout(thestat, this_name->filename, &(this_name->st), 5) != 0 || ++ if (statn(this_name->filename, STATX_INO, &(this_name->st)) != 0 || + find_mountpoint(this_name->filename, &mountinfo) != 0) { + if (errno == ENOENT) + fprintf(stderr, +@@ -1193,9 +1189,7 @@ int main(int argc, char *argv[]) + opts |= OPT_INTERACTIVE; + break; + case 'I': +-#if defined(WITH_MOUNTINFO_LIST) + opts |= OPT_ALWAYSSTAT; +-#endif + break; + case 'k': + opts |= OPT_KILL; +@@ -1261,10 +1255,9 @@ int main(int argc, char *argv[]) + continue; + } + +-#if defined(WITH_MOUNTINFO_LIST) +- if ((opts & (OPT_MOUNTS|OPT_ALWAYSSTAT)) == OPT_MOUNTS) +- thestat = mntstat; +-#endif ++ if ((opts & OPT_ALWAYSSTAT)) ++ stat_flags = 0; /* Triggers sync with e.g. remote NFS server even on autofs */ ++ + /* an option */ + /* Not an option, must be a file specification */ + if ((this_name = malloc(sizeof(struct names))) == NULL) +@@ -1584,7 +1577,7 @@ static struct stat *get_pidstat(const pid_t pid, const char *filename, int *id) + if ((st = (struct stat *)malloc(sizeof(struct stat))) == NULL) + return NULL; + snprintf(pathname, 256, "/proc/%d/%s", pid, filename); +- if (timeout(thestat, pathname, st, 5) != 0) { ++ if (statn(pathname, STATX_UID|STATX_INO|STATX_TYPE, st) != 0) { + free(st); + return NULL; + } +@@ -1631,7 +1624,7 @@ check_dir(const pid_t pid, const char *dirname, struct device_list *dev_head, + snprintf(filepath, sizeof filepath - 1, "/proc/%d/%s/%s", + pid, dirname, direntry->d_name); + +- if (timeout(thestat, filepath, &st, 5) != 0) { ++ if (statn(filepath, STATX_INO, &st) != 0) { + if (errno != ENOENT && errno != ENOTDIR) { + fprintf(stderr, _("Cannot stat file %s: %s\n"), + filepath, strerror(errno)); +@@ -1673,7 +1666,7 @@ check_dir(const pid_t pid, const char *dirname, struct device_list *dev_head, + if (thedev != ino_tmp->device) + continue; + if (!st.st_ino +- && timeout(thestat, filepath, &st, 5) != 0) { ++ && statn(filepath, STATX_INO, &st) != 0) { + fprintf(stderr, + _("Cannot stat file %s: %s\n"), + filepath, strerror(errno)); +@@ -1761,11 +1754,11 @@ static uid_t getpiduid(const pid_t pid) + + if (asprintf(&pathname, "/proc/%d", pid) < 0) + return 0; +- if (timeout(thestat, pathname, &st, 5) != 0) { +- free(pathname); ++ if (statn(pathname, STATX_UID, &st) != 0) { ++ free(pathname); + return 0; +- } +- free(pathname); ++ } ++ free(pathname); + return st.st_uid; + } + +@@ -1803,7 +1796,7 @@ void fill_unix_cache(struct unixsocket_list **unixsocket_head) + path = scanned_path; + if (*scanned_path == '@') + scanned_path++; +- if (timeout(thestat, scanned_path, &st, 5) < 0) { ++ if (statn(scanned_path, STATX_INO, &st) < 0) { + free(path); + continue; + } +@@ -1938,7 +1931,7 @@ static dev_t find_net_dev(void) + fprintf(stderr, _("Cannot open a network socket.\n")); + return -1; + } +- if (fstat(skt, &st) != 0) { ++ if (fstatn(skt, STATX_INO, &st) != 0) { + fprintf(stderr, _("Cannot find socket's device number.\n")); + close(skt); + return -1; +@@ -1971,7 +1964,7 @@ scan_knfsd(struct names *names_head, struct inode_list *ino_head, + if ((find_space = strpbrk(line, " \t")) == NULL) + continue; + *find_space = '\0'; +- if (timeout(thestat, line, &st, 5) != 0) { ++ if (statn(line, STATX_INO, &st) != 0) { + continue; + } + /* Scan the devices */ +@@ -2006,7 +1999,7 @@ scan_mounts(struct names *names_head, struct inode_list *ino_head, + mntinfo_t *mnt = list_entry(ptr, mntinfo_t); + const char *find_mountp = mnt->mpoint; + +- if (timeout(thestat, find_mountp, &st, 5) != 0) ++ if (statn(find_mountp, STATX_INO, &st) != 0) + continue; + + /* Scan the devices */ +@@ -2053,7 +2046,7 @@ scan_swaps(struct names *names_head, struct inode_list *ino_head, + if (*find_space == '\0') + continue; + } +- if (timeout(thestat, line, &st, 5) != 0) { ++ if (statn(line, STATX_INO, &st) != 0) { + continue; + } + /* Scan the devices */ +@@ -2209,7 +2202,7 @@ out: + struct stat lst; + + snprintf(pathname, 256, "/proc/%d/fd/%s", pid, fd); +- if (!flags && lstat(pathname, &lst) == 0) { ++ if (!flags && lstatn(pathname, STATX_MODE, &lst) == 0) { + if (lst.st_mode & S_IWUSR) + info->flags |= O_WRONLY; + ret++; +@@ -2352,49 +2345,6 @@ out: + return ret; + } + +-#if defined(WITH_MOUNTINFO_LIST) +-/* +- * Determine device of links below /proc/ +- */ +-static int mntstat(const char *path, struct stat *buf) +-{ +- char name[PATH_MAX + 1]; +- const char *use; +- mntinfo_t *mnt; +- +- if ((use = realpath(path, name)) == NULL || *use != '/') +- { +- if (errno == ENOENT) +- return -1; +- /* +- * Could be a special file (socket, pipe, inotify) +- */ +- errno = 0; +- return stat(path, buf); +- } +- if (strncmp("/dev/", use, 5) == 0) { +- /* +- * Could be a special file (socket, pipe, inotify) +- */ +- errno = 0; +- return stat(path, buf); +- } +- +- if (find_mountpoint(use, &mnt) < 0) { +- errno = ENOENT; +- return -1; +- } +- +- if (mnt->isremote) { +- buf->st_dev = mnt->dev; +- buf->st_ino = mnt->id; /* inode substitute */ +- return 0; /* found on NFS */ +- } +- +- return stat(path, buf); +-} +-#endif /* WITH_MOUNTINFO_LIST */ +- + /* + * Somehow the realpath(3) glibc function call, nevertheless + * it avoids lstat(2) system calls. +diff --git src/statx.c src/statx.c +new file mode 100644 +index 0000000..2554da7 +--- /dev/null ++++ src/statx.c +@@ -0,0 +1,147 @@ ++/* ++ * statx.c - Map modern statx(2) system call to older stat(2), lstat(2), ++ * and fstat(2) replacements named {,l,f}statn() ++ * ++ * Copyright (C) 2018 Werner Fink ++ * ++ * 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; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will 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 to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++#ifndef _GNU_SOURCE ++#define _GNU_SOURCE ++#endif ++ ++#ifdef HAVE_CONFIG_H ++#include ++#endif ++ ++#ifndef HAVE_STATX ++# define _ASM_GENERIC_FCNTL_H /* Avoid collisions between asm/fcntl.h and bits/fcntl.h ! */ ++# include /* Definition of AT_* and AT_STATX_* constants ! */ ++#endif ++#include /* Definition of AT_* constants */ ++#ifndef HAVE_STATX ++# include /* Provides 'struct statx' and STATX_* ! */ ++#endif ++#include ++#include ++#include ++#include ++#include ++ ++int stat_flags = AT_NO_AUTOMOUNT|AT_STATX_DONT_SYNC; ++ ++int statn(const char *pathname, unsigned int mask, struct stat *st) ++{ ++ int flags = stat_flags; ++ int dirfd = pathname && *pathname == '/' ? 0 : AT_FDCWD; ++ int ret; ++ struct statx stx; ++ ++#ifndef HAVE_STATX ++ ret = syscall(SYS_statx, dirfd, pathname, flags, mask, &stx); ++#else ++ ret = statx(dirfd, pathname, flags, mask, &stx); ++#endif ++ if (ret >= 0) { ++ st->st_dev = makedev(stx.stx_dev_major, stx.stx_dev_minor); ++ st->st_rdev = makedev(stx.stx_rdev_major, stx.stx_rdev_minor); ++ ++ st->st_ino = stx.stx_ino; ++ st->st_mode = stx.stx_mode; ++ st->st_nlink = stx.stx_nlink; ++ st->st_uid = stx.stx_uid; ++ st->st_gid = stx.stx_gid; ++ st->st_size = stx.stx_size; ++ st->st_blksize = stx.stx_blksize; ++ st->st_blocks = stx.stx_blocks; ++ ++ st->st_atim.tv_sec = stx.stx_atime.tv_sec; ++ st->st_atim.tv_nsec = stx.stx_atime.tv_nsec; ++ st->st_mtim.tv_sec = stx.stx_mtime.tv_sec; ++ st->st_mtim.tv_nsec = stx.stx_mtime.tv_nsec; ++ st->st_ctim.tv_sec = stx.stx_ctime.tv_sec; ++ st->st_ctim.tv_nsec = stx.stx_ctime.tv_nsec; ++ } ++ return ret; ++} ++ ++int fstatn(int fd, unsigned int mask, struct stat *st) ++{ ++ int flags = AT_EMPTY_PATH|stat_flags; ++ int ret; ++ struct statx stx; ++ ++#ifndef HAVE_STATX ++ ret = syscall(SYS_statx, fd, "", flags, mask, &stx); ++#else ++ ret = statx(fd, "", flags, mask, &stx); ++#endif ++ if (ret >= 0) { ++ st->st_dev = makedev(stx.stx_dev_major, stx.stx_dev_minor); ++ st->st_rdev = makedev(stx.stx_rdev_major, stx.stx_rdev_minor); ++ ++ st->st_ino = stx.stx_ino; ++ st->st_mode = stx.stx_mode; ++ st->st_nlink = stx.stx_nlink; ++ st->st_uid = stx.stx_uid; ++ st->st_gid = stx.stx_gid; ++ st->st_size = stx.stx_size; ++ st->st_blksize = stx.stx_blksize; ++ st->st_blocks = stx.stx_blocks; ++ ++ st->st_atim.tv_sec = stx.stx_atime.tv_sec; ++ st->st_atim.tv_nsec = stx.stx_atime.tv_nsec; ++ st->st_mtim.tv_sec = stx.stx_mtime.tv_sec; ++ st->st_mtim.tv_nsec = stx.stx_mtime.tv_nsec; ++ st->st_ctim.tv_sec = stx.stx_ctime.tv_sec; ++ st->st_ctim.tv_nsec = stx.stx_ctime.tv_nsec; ++ } ++ return ret; ++} ++ ++int lstatn(const char *pathname, unsigned int mask, struct stat *st) ++{ ++ int flags = AT_SYMLINK_NOFOLLOW|stat_flags; ++ int dirfd = pathname && *pathname == '/' ? 0 : AT_FDCWD; ++ int ret; ++ struct statx stx; ++ ++#ifndef HAVE_STATX ++ ret = syscall(SYS_statx, dirfd, pathname, flags, mask, &stx); ++#else ++ ret = statx(dirfd, pathname, flags, mask, &stx); ++#endif ++ if (ret >= 0) { ++ st->st_dev = makedev(stx.stx_dev_major, stx.stx_dev_minor); ++ st->st_rdev = makedev(stx.stx_rdev_major, stx.stx_rdev_minor); ++ ++ st->st_ino = stx.stx_ino; ++ st->st_mode = stx.stx_mode; ++ st->st_nlink = stx.stx_nlink; ++ st->st_uid = stx.stx_uid; ++ st->st_gid = stx.stx_gid; ++ st->st_size = stx.stx_size; ++ st->st_blksize = stx.stx_blksize; ++ st->st_blocks = stx.stx_blocks; ++ ++ st->st_atim.tv_sec = stx.stx_atime.tv_sec; ++ st->st_atim.tv_nsec = stx.stx_atime.tv_nsec; ++ st->st_mtim.tv_sec = stx.stx_mtime.tv_sec; ++ st->st_mtim.tv_nsec = stx.stx_mtime.tv_nsec; ++ st->st_ctim.tv_sec = stx.stx_ctime.tv_sec; ++ st->st_ctim.tv_nsec = stx.stx_ctime.tv_nsec; ++ } ++ return ret; ++} +diff --git src/statx.h src/statx.h +new file mode 100644 +index 0000000..846e67d +--- /dev/null ++++ src/statx.h +@@ -0,0 +1,61 @@ ++/* ++ * statx.h - Map modern statx(2) system call to older stat(2), lstat(2), ++ * and fstat(2) replacements named {,l,f}statn() ++ * ++ * Copyright (C) 2018 Werner Fink ++ * ++ * 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; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will 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 to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++ ++#ifndef _STATX_H ++#define _STATX_H ++ ++extern int stat_flags; ++#if defined(HAVE_DECL_SYS_STATX) && HAVE_DECL_SYS_STATX == 1 ++extern int statn(const char*, unsigned int, struct stat*); ++extern int fstatn(int, unsigned int, struct stat*); ++extern int lstatn(const char*, unsigned int, struct stat*); ++#else ++extern inline int ++statn(const char *path, unsigned int mask __atribute__((unused)), struct stat *st) ++{ ++ return stat(path, st); ++} ++extern inline int ++fstatn(int fd, unsigned int mask __atribute__((unused)), struct stat *st) ++{ ++ return fstat(fd, st); ++} ++extern inline int ++lstatn(const char *path, unsigned int mask __atribute__((unused)), struct stat *st) ++{ ++ lstat(path, st); ++} ++#define STATX_TYPE 0 ++#define STATX_MODE 0 ++#define STATX_NLINK 0 ++#define STATX_UID 0 ++#define STATX_GID 0 ++#define STATX_ATIME 0 ++#define STATX_MTIME 0 ++#define STATX_CTIME 0 ++#define STATX_INO 0 ++#define STATX_SIZE 0 ++#define STATX_BLOCKS 0 ++#define STATX_BASIC_STATS 0 ++#define STATX_BTIME 0 ++#define STATX_ALL 0 ++#endif ++#endif +diff --git src/timeout.c src/timeout.c +deleted file mode 100644 +index ca4a7cd..0000000 +--- src/timeout.c ++++ /dev/null +@@ -1,372 +0,0 @@ +-/* +- * timout.c Advanced timeout handling for file system calls +- * to avoid deadlocks on remote file shares. +- * +- * Version: 0.2 11-Dec-2012 Fink +- * +- * Copyright 2011,2012 Werner Fink, 2011,2012 SUSE LINUX Products GmbH, Germany. +- * +- * 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; either version 2 of the License, or +- * (at your option) any later version. +- * +- * Author: Werner Fink , 2011 +- */ +- +-#ifndef _GNU_SOURCE +-# define _GNU_SOURCE +-#endif +- +-#ifdef _FEATURES_H +-# error Include local config.h before any system header file +-#endif +-#include "config.h" +- +-#ifndef WITH_TIMEOUT_STAT +-# define WITH_TIMEOUT_STAT 0 +-#endif +- +-#ifndef USE_SOCKETPAIR +-# define USE_SOCKETPAIR 1 +-#endif +- +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#if USE_SOCKETPAIR +-# include +-# include +-# include +-# ifndef SHUT_RD +-# define SHUT_RD 0 +-# endif +-# ifndef SHUT_WR +-# define SHUT_WR 1 +-# endif +-# undef pipe +-# define pipe(v) (((socketpair(AF_UNIX,SOCK_STREAM,0,v) < 0) || \ +- (shutdown((v)[1],SHUT_RD) < 0) || (shutdown((v)[0],SHUT_WR) < 0)) ? -1 : 0) +-#endif +-#include +- +-#include "timeout.h" +- +-#if !defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L) +-# ifndef destructor +-# define destructor __destructor__ +-# endif +-# ifndef constructor +-# define constructor __constructor__ +-# endif +-# ifndef packed +-# define packed __packed__ +-# endif +-# ifndef inline +-# define inline __inline__ +-# endif +-# ifndef unused +-# define unused __unused__ +-# endif +-# ifndef volatile +-# define volatile __volatile__ +-# endif +-#endif +-#ifndef attribute +-# define attribute(attr) __attribute__(attr) +-#endif +- +-#if defined __GNUC__ +-# undef strcpy +-# define strcpy(d,s) __builtin_strcpy((d),(s)) /* Without boundary check please */ +-#endif +- +-#if WITH_TIMEOUT_STAT +-static sigjmp_buf jenv; +-static void sigjump(int sig attribute((unused))) +-{ +- siglongjmp(jenv, 1); +-} +-#endif +- +-#if WITH_TIMEOUT_STAT == 2 +-/* +- * The structure used for communication between the processes +- */ +-typedef struct _handle { +- int errcode; +- struct stat argument; +- stat_t function; +- size_t len; +- char path[0]; +-} attribute((packed)) handle_t; +- +-/* +- * Using a forked process for doing e.g. stat(2) system call as this +- * allows us to send e.g. SIGKILL to this process if it hangs in `D' +- * state on a file share due a stalled NFS server. This does not work +- * with (p)threads as SIGKILL would kill all threads including main. +- */ +- +-static volatile pid_t active; +-static int pipes[4] = {-1, -1, -1, -1}; +-static handle_t *restrict handle; +-static const size_t buflen = PATH_MAX+sizeof(handle_t)+1; +- +-static void sigchild(int sig attribute((unused))) +-{ +- pid_t pid = waitpid(active, NULL, WNOHANG|WUNTRACED); +- if (pid <= 0) +- return; +- if (errno == ECHILD) +- return; +- active = 0; +-} +- +-static void attribute((constructor)) start(void) +-{ +- sigset_t sigset, oldset; +- struct sigaction act; +- char sync[1]; +- ssize_t in; +- +- if (pipes[1] >= 0) close(pipes[1]); +- if (pipes[2] >= 0) close(pipes[2]); +- +- if (pipe(&pipes[0])) +- goto error; +- if (pipe(&pipes[2])) +- goto error; +- +- memset(&act, 0, sizeof(act)); +- sigemptyset(&act.sa_mask); +- act.sa_flags = SA_RESTART; +- act.sa_handler = sigchild; +- sigaction(SIGCHLD, &act, 0); +- +- if (!handle) +- handle = mmap(NULL, buflen, PROT_READ|PROT_WRITE, +- MAP_ANONYMOUS|MAP_SHARED, -1, 0); +- if (handle == MAP_FAILED) +- goto error; +- +- if ((active = fork()) < 0) +- goto error; +- +- if (active) { +- close(pipes[0]); +- close(pipes[3]); +- pipes[0] = pipes[3] = -1; +- return; +- } +- +- sigemptyset(&sigset); +- sigaddset(&sigset, SIGALRM); +- sigprocmask(SIG_BLOCK, &sigset, &oldset); +- +- act.sa_handler = SIG_DFL; +- sigaction(SIGCHLD, &act, 0); +- +- close(pipes[1]); +- close(pipes[2]); +- dup2(pipes[0], STDIN_FILENO); +- dup2(pipes[3], STDOUT_FILENO); +- close(pipes[0]); +- close(pipes[3]); +- pipes[1] = pipes[2] = -1; +- pipes[0] = pipes[3] = -1; +- +- while ((in = read(STDIN_FILENO, &sync, sizeof(sync))) != 0) { +- ssize_t out; +- if (in < 0) { +- if (errno == EINTR) +- continue; +- break; +- } +- if (!handle) +- break; +- if (handle->function(handle->path, &handle->argument) < 0) +- handle->errcode = errno; +- do +- out = write(STDOUT_FILENO, &sync, sizeof(sync)); +- while (out < 0 && errno == EINTR); +- } +- +- sigprocmask(SIG_SETMASK, &oldset, NULL); +- exit(0); +-error: +- if (pipes[0] >= 0) close(pipes[0]); +- if (pipes[1] >= 0) close(pipes[1]); +- if (pipes[2] >= 0) close(pipes[2]); +- if (pipes[3] >= 0) close(pipes[3]); +- if (handle && handle != MAP_FAILED) +- munmap(handle, buflen); +- handle = NULL; +-} +- +-static void /* attribute((destructor)) */ stop(void) +-{ +- if (active && waitpid(active, NULL, WNOHANG|WUNTRACED) == 0) +- kill(active, SIGKILL); +-} +- +-/* +- * External routine +- * +- * Execute stat(2) system call with timeout to avoid deadlock +- * on network based file systems. +- * +- */ +-int +-timeout(stat_t function, const char *path, struct stat *restrict argument, time_t seconds) +-{ +- struct sigaction alrm_act, pipe_act, new_act; +- sigset_t sigset, oldset; +- char sync[1] = "x"; +- +- if (active <= 0) /* Oops, last one failed therefore clear status and restart */ +- start(); +- if (!handle) /* No shared memory area */ +- return function(path, argument); +- memset(handle, 0, sizeof(handle_t)); +- handle->len = strlen(path) + 1; +- if (handle->len >= PATH_MAX) { +- errno = ENAMETOOLONG; +- goto error; +- } +- handle->errcode = 0; +- handle->argument = *argument; +- handle->function = function; +- strcpy(handle->path, path); +- +- sigemptyset(&sigset); +- sigaddset(&sigset, SIGALRM); +- sigaddset(&sigset, SIGPIPE); +- sigprocmask(SIG_UNBLOCK, &sigset, &oldset); +- +- memset(&new_act, 0, sizeof(new_act)); +- sigemptyset(&new_act.sa_mask); +- new_act.sa_flags = SA_RESETHAND; +- +- if (sigsetjmp(jenv, 1)) +- goto timed; +- +- new_act.sa_handler = sigjump; +- sigaction(SIGALRM, &new_act, &alrm_act); +- sigaction(SIGPIPE, &new_act, &pipe_act); +- alarm(seconds); +- +- write(pipes[1], &sync, sizeof(sync)); +- read(pipes[2], &sync, sizeof(sync)); +- +- alarm(0); +- sigaction(SIGPIPE, &pipe_act, NULL); +- sigaction(SIGALRM, &alrm_act, NULL); +- +- if (handle->errcode) { +- errno = handle->errcode; +- goto error; +- } +- +- *argument = handle->argument; +- sigprocmask(SIG_SETMASK, &oldset, NULL); +- +- return 0; +-timed: +- (void) alarm(0); +- sigaction(SIGPIPE, &pipe_act, NULL); +- sigaction(SIGALRM, &alrm_act, NULL); +- sigprocmask(SIG_SETMASK, &oldset, NULL); +- stop(); +- errno = ETIMEDOUT; +-error: +- return -1; +-} +-#elif WITH_TIMEOUT_STAT == 1 +-/* +- * External routine +- * +- * Execute stat(2) system call with timeout to avoid deadlock +- * on network based file systems. +- * +- */ +-int +-timeout(stat_t function, const char *path, struct stat *restrict argument, time_t seconds) +-{ +- struct sigaction alrm_act, pipe_act, new_act; +- sigset_t sigset, oldset; +- int ret = 0, pipes[4]; +- pid_t pid = 0; +- ssize_t len; +- +- if (pipe(&pipes[0]) < 0) +- goto error; +- switch ((pid = fork())) { +- case -1: +- close(pipes[0]); +- close(pipes[1]); +- goto error; +- case 0: +- new_act.sa_handler = SIG_DFL; +- sigaction(SIGALRM, &new_act, NULL); +- close(pipes[0]); +- if ((ret = function(path, argument)) == 0) +- do +- len = write(pipes[1], argument, sizeof(struct stat)); +- while (len < 0 && errno == EINTR); +- close(pipes[1]); +- exit(ret); +- default: +- close(pipes[1]); +- +- sigemptyset(&sigset); +- sigaddset(&sigset, SIGALRM); +- sigaddset(&sigset, SIGPIPE); +- sigprocmask(SIG_UNBLOCK, &sigset, &oldset); +- +- memset(&new_act, 0, sizeof(new_act)); +- sigemptyset(&new_act.sa_mask); +- +- if (sigsetjmp(jenv, 1)) +- goto timed; +- +- new_act.sa_handler = sigjump; +- sigaction(SIGALRM, &new_act, &alrm_act); +- sigaction(SIGPIPE, &new_act, &pipe_act); +- alarm(seconds); +- if (read(pipes[0], argument, sizeof(struct stat)) == 0) { +- errno = EFAULT; +- ret = -1; +- } +- (void)alarm(0); +- sigaction(SIGPIPE, &pipe_act, NULL); +- sigaction(SIGALRM, &alrm_act, NULL); +- +- close(pipes[0]); +- waitpid(pid, NULL, 0); +- break; +- } +- return ret; +-timed: +- (void)alarm(0); +- sigaction(SIGPIPE, &pipe_act, NULL); +- sigaction(SIGALRM, &alrm_act, NULL); +- if (waitpid(0, NULL, WNOHANG) == 0) +- kill(pid, SIGKILL); +- errno = ETIMEDOUT; +-error: +- return -1; +-} +-#endif +- +-/* +- * End of timeout.c +- */ +diff --git src/timeout.h src/timeout.h +deleted file mode 100644 +index f372297..0000000 +--- src/timeout.h ++++ /dev/null +@@ -1,45 +0,0 @@ +-/* +- * timout.h Advanced timeout handling for file system calls +- * to avoid deadlocks on remote file shares. +- * +- * Version: 0.1 07-Sep-2011 Fink +- * +- * Copyright 2011 Werner Fink, 2011 SUSE LINUX Products GmbH, Germany. +- * +- * 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; either version 2 of the License, or +- * (at your option) any later version. +- * +- * Author: Werner Fink , 2011 +- */ +- +-#ifndef _TIMEOUT_H +-#define _TIMEOUT_H +- +-#include "config.h" +- +-#ifndef WITH_TIMEOUT_STAT +-# define WITH_TIMEOUT_STAT 0 +-#endif +- +-#include +-#include +-#include +-#include +- +-#if !defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L) +-# ifndef restrict +-# define restrict __restrict__ +-# endif +-#endif +- +-typedef int (*stat_t)(const char *, struct stat *); +- +-#if WITH_TIMEOUT_STAT > 0 +-extern int timeout(stat_t, const char *, struct stat *restrict, time_t); +-#else +-# define timeout(func,path,buf,dummy) (func)((path),(buf)) +-#endif +- +-#endif +-- +2.16.4 + diff --git a/psmisc-v23.2.dif b/psmisc-v23.2.dif index 25a548b..bcaf6e3 100644 --- a/psmisc-v23.2.dif +++ b/psmisc-v23.2.dif @@ -1,20 +1,11 @@ --- - configure.ac | 4 ++-- + configure.ac | 2 +- src/fuser.c | 5 ++++- - 2 files changed, 6 insertions(+), 3 deletions(-) + 2 files changed, 5 insertions(+), 2 deletions(-) --- configure.ac -+++ configure.ac 2018-10-22 10:48:51.847515299 +0000 -@@ -45,7 +45,7 @@ fi - if test "$enable_timeout_stat" = "static"; then - AC_DEFINE([WITH_TIMEOUT_STAT], [2], [Use timeout on stat calls]) - fi --AM_CONDITIONAL([WANT_TIMEOUT_STAT], [test "$enable_timeout_stat" = "static"]) -+AM_CONDITIONAL([WANT_TIMEOUT_STAT], [test "$enable_timeout_stat" != "no"]) - - # Use /proc/self/mountinfo if available - if test -e /proc/self/mountinfo ; then -@@ -142,7 +142,7 @@ AC_CHECK_MEMBERS([struct user_regs_struc ++++ configure.ac 2018-11-02 13:34:07.811373984 +0000 +@@ -132,7 +132,7 @@ AC_CHECK_MEMBERS([struct user_regs_struc struct user_regs_struct.rdi, struct user_regs_struct.rsi, struct user_regs_struct.rdx], [],[], @@ -24,8 +15,8 @@ AC_CHECK_MEMBERS([struct pt_regs.orig_gpr3, struct pt_regs.gpr], [],[], [#include ]) --- src/fuser.c -+++ src/fuser.c 2018-10-22 10:48:51.867514927 +0000 -@@ -1098,6 +1098,7 @@ int main(int argc, char *argv[]) ++++ src/fuser.c 2018-11-02 13:34:07.811373984 +0000 +@@ -1094,6 +1094,7 @@ int main(int argc, char *argv[]) struct option *optr; char *nsptr; int skip_argv; @@ -33,7 +24,7 @@ struct option options[] = { {"all", 0, NULL, 'a'}, -@@ -1141,6 +1142,7 @@ int main(int argc, char *argv[]) +@@ -1137,6 +1138,7 @@ int main(int argc, char *argv[]) #endif atexit(atexit_free_lists); @@ -41,7 +32,7 @@ for (argc_cnt = 1; argc_cnt < argc; argc_cnt++) { current_argv = argv[argc_cnt]; if (current_argv[0] == '-') { /* its an option */ -@@ -1286,6 +1288,7 @@ int main(int argc, char *argv[]) +@@ -1279,6 +1281,7 @@ int main(int argc, char *argv[]) } } this_name->matched_procs = NULL; @@ -49,7 +40,7 @@ if (opts & (OPT_MOUNTS | OPT_ISMOUNTPOINT) && this_name->name_space != NAMESPACE_FILE) { free(this_name); -@@ -1339,7 +1342,7 @@ int main(int argc, char *argv[]) +@@ -1332,7 +1335,7 @@ int main(int argc, char *argv[]) names_tail->next = this_name; names_tail = this_name; } /* for across the argvs */ diff --git a/psmisc.changes b/psmisc.changes index c96aa5c..5d23442 100644 --- a/psmisc.changes +++ b/psmisc.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Nov 2 13:37:49 UTC 2018 - Dr. Werner Fink + +- Modify patch 0001-Use-mountinfo-to-be-able-to-use-the-mount-identity.patch + to respect autofs as well as afs file system +- Add patch 0002-Use-new-statx-2-system-call-to-avoid-hangs-on-NFS.patch + to use statx(2) system call since kernel 4.12. Now it is possible + to avoid sync with remote file servers as well as trigger autofs + mounts due stat(x) calls. + ------------------------------------------------------------------- Tue Oct 23 10:10:12 UTC 2018 - Dr. Werner Fink diff --git a/psmisc.spec b/psmisc.spec index 34920ab..8eeb620 100644 --- a/psmisc.spec +++ b/psmisc.spec @@ -39,6 +39,7 @@ Patch2: %{name}-22.21-pstree.patch # PATCH-ADD-SUSE boo#908068, boo#1046237, boo#1046237 # https://gitlab.com/bitstreamout/psmisc/tree/mountinfo Patch3: 0001-Use-mountinfo-to-be-able-to-use-the-mount-identity.patch +Patch4: 0002-Use-new-statx-2-system-call-to-avoid-hangs-on-NFS.patch %define have_peekfd %ix86 x86_64 ppc ppc64 ppc64le %arm mipsel m68k @@ -53,9 +54,10 @@ processes that are using specified files or filesystems. %lang_package %prep -%setup -q -D -n %{name}-v%{version} +%setup -q -n %{name}-v%{version} %patch2 -p0 -b .pstree %patch3 -p0 -b .mntinf +%patch4 -p0 -b .statx %patch0 -p0 -b .p0 %build