: tst_find_backing_dev(): add support for overlayfs
PATCH v4 1/1 : tst_find_backing_dev(): add support for overlayfs
Add checks for overlayfs in tst_find_backing_dev. As with btrfs, only a single device is checked (the upper one) and returned from tst_find_backing_dev().
The implementation uses both /proc/self/mountinfo and /proc/self/mounts. The former is used to map a device to a mountpoint, and the latter is used to get the file system options for the mountpoint. All of the information is present in mountinfo, but the file format is more complex, and there are no glibc helpers for parsing it.
The '#define _GNU_SOURCE' was added for the use of the strchrnul(3) function.
---
v4: Address review comments from Petr:
- s/unsigned/unsigned int/
- string formatting
- code simplification: remove else block
- use SAFE_STAT
Address review comments from Cyril:
- s/PATH_MAX/4096
- string formatting fixes
- use strcmp() instead of strncmp() to prevent false matching
- don't re-implement strndup
v3: Address review comments from Petr:
- Don't split long strings across lines
- use TST_OVERLAYFS_MAGIC instead of the kernel's definition Note that I did not use SAFE_SSCANF, as tst_device.c uses the old style safe macros, and that function is not covered.
v2: Don't use libmount. Instead, map from device number to mount-point
using /proc/self/mountinfo, and then use the mntent.h helpers to get the mount options for the mountpoint from /proc/self/mounts.
lib/tst_device.c +128 -0
@@ -3,6 +3,7 @@* Copyright (C) 2014 Cyril Hrubis [email protected] */ +#define _GNU_SOURCE#include <sys/types.h> #include <sys/stat.h> #include <sys/ioctl.h>
@@ -570,6 +571,131 @@ static void btrfs_get_uevent_path(char *tmp_path, char *uevent_path)SAFE_CLOSEDIR (NULL , dir); } +static char *overlay_mount_from_dev (dev_t dev) +{ +unsigned int dev_major, dev_minor, mnt_major, mnt_minor; +FILE *fp; +char line[4096 ]; +char *mountpoint; +int ret; + + dev_major =major (dev); + dev_minor =minor (dev); + + fp =SAFE_FOPEN (NULL ,"/proc/self/mountinfo" ,"r" ); +while (fgets (line,sizeof (line), fp) !=NULL ) { + ret =sscanf (line,"%*d %*d %u:%u %*s %ms" , + &mnt_major, &mnt_minor, &mountpoint); +if (ret !=3 ) +tst_brkm (TBROK ,NULL , +"failed to parse mountinfo line: '%s'" , + line); +if (mnt_major == dev_major && mnt_minor == dev_minor) +break ; +free (mountpoint); + mountpoint =NULL ; + } +SAFE_FCLOSE (NULL , fp); +if (!mountpoint) +tst_brkm (TBROK ,NULL , +"Unable to find mount entry for device %u:%u" , + dev_major, dev_minor); + +return mountpoint; +} + +static char *overlay_get_upperdir (char *mountpoint) +{ +FILE *mntf; +struct mntent *mnt; +char *optstr, *optstart, *optend; +char *upperdir =NULL ; + + mntf =setmntent ("/proc/self/mounts" ,"r" ); +if (!mntf) +tst_brkm (TBROK |TERRNO ,NULL ,"Can't open /proc/self/mounts" ); + +while ((mnt =getmntent (mntf)) !=NULL ) { +if (strcmp (mnt->mnt_dir, mountpoint)) +continue ; + +if (strcmp (mnt->mnt_type,"overlay" )) +tst_brkm (TBROK ,NULL , +"expected overlayfs on mount point \"%s\", but it is of type %s." , + mountpoint, mnt->mnt_type); + + optstr =hasmntopt (mnt,"upperdir" ); + +if (optstr) { + optstart =strchr (optstr,'=' ); + optstart++; + optend =strchrnul (optstr,',' ); + upperdir =strndup (optstart, optend - optstart); +break ; + } + +tst_brkm (TBROK ,NULL , +"mount point %s does not contain an upperdir" , + mountpoint); + } +endmntent (mntf); + +if (!upperdir) +tst_brkm (TBROK ,NULL , +"Unable to find mount point \"%s\" in mount table" , + mountpoint); + +return upperdir; +} + +/* +* To get from a file or directory on an overlayfs to a device +* for an underlying mountpoint requires the following steps: +* +* 1. stat() the pathname and pick out st_dev. +* 2. use the st_dev to look up the mount point of the file +* system in /proc/self/mountinfo +* +* Because 'mountinfo' is a much more complicated file format than +* 'mounts', we switch to looking up the mount point in /proc/mounts, +* and use the mntent.h helpers to parse the entries. +* +* 3. Using getmntent(), find the entry for the mount point identified +* in step 2. +* 4. Call hasmntopt() to find the upperdir option, and parse that +* option to get to the path name for the upper directory. +* 5. Call stat on the upper directory. This should now contain +* the major and minor number for the underlying device (assuming +* that there aren't nested overlay file systems). +* 6. Populate the uevent path. +* +* Example /proc/self/mountinfo line for overlayfs: +* 471 69 0:48 / /tmp rw,relatime shared:242 - overlay overlay rw,seclabel,lowerdir=/tmp,upperdir=/mnt/upper/upper,workdir=/mnt/upper/work,uuid=null +* +* See section 3.5 of the kernel's Documentation/filesystems/proc.rst file +* for a detailed explanation of the mountinfo format. +*/ +static void overlay_get_uevent_path (char *tmp_path,char *uevent_path) +{ +struct stat st; +char *mountpoint, *upperdir; + +tst_resm (TINFO ,"Use OVERLAYFS specific strategy" ); + +SAFE_STAT (NULL , tmp_path, &st); + + mountpoint =overlay_mount_from_dev (st.st_dev); + upperdir =overlay_get_upperdir (mountpoint); +free (mountpoint); + +SAFE_STAT (NULL , upperdir, &st); +free (upperdir); + +tst_resm (TINFO ,"WARNING: used first of multiple backing devices" ); +sprintf (uevent_path,"/sys/dev/block/%d:%d/uevent" , +major (st.st_dev),minor (st.st_dev)); +} + __attribute__((nonnull))void tst_find_backing_dev (const char *path,char *dev,size_t dev_size) {
@@ -597,6 +723,8 @@ void tst_find_backing_dev(const char *path, char *dev, size_t dev_size)if (fsbuf.f_type ==TST_BTRFS_MAGIC ) {btrfs_get_uevent_path (tmp_path, uevent_path); + }else if (fsbuf.f_type ==TST_OVERLAYFS_MAGIC ) { +overlay_get_uevent_path (tmp_path, uevent_path); }else if (dev_major ==0 ) {tst_brkm (TBROK ,NULL ,"%s resides on an unsupported pseudo-file system" , path); }else {
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Hi Jeff, Cyril,
Quoted 14 lines
Add checks for overlayfs in
tst_find_backing_dev. As with btrfs, only a single device is checked (the upper one) and returned fromtst_find_backing_dev().The implementation uses both
/proc/self/mountinfoand/proc/self/mounts. The former is used to map a device to a mountpoint, and the latter is used to get the file system options for the mountpoint. All of the information is present in mountinfo, but the file format is more complex, and there are no glibc helpers for parsing it.The '#define
_GNU_SOURCE' was added for the use of the strchrnul(3) function.Signed-off-by Jeff Moyer <[email protected]>
Quoted 11 lines
---
v4: Address review comments from Petr:
- s/unsigned/unsigned int/
- string formatting
- code simplification: remove else block
- useSAFE_STAT
Address review comments from Cyril:
- s/PATH_MAX/4096
- string formatting fixes
- usestrcmp()instead ofstrncmp()to prevent false matching
- don't re-implement strndup
LGTM. I leave where overlay_mount_from_dev() should be called up to Cyril.
Kind regards,
Petr
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Hi!
Looks good to me as well.
Signature · 5 lines
Cyril Hrubis [email protected] -- Mailing list info: https://lists.linux.it/listinfo/ltp
Hi Jeff, Cyril,
Quoted 2 lines
Hi!
Looks good to me as well.
Great, merged.
Thanks to both.
Kind regards,
Petr
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp