bpftool: Mount bpffs on provided dir instead of parent dir
PATCH v4 1/1 bpftool: Mount bpffs on provided dir instead of parent dir
When pinning programs/objects under PATH (eg: during "bpftool prog loadall") the bpffs is mounted on the parent dir of PATH in the following situations:
- the given dir exists but it is not bpffs.
- the given dir doesn't exist and the parent dir is not bpffs.
Mounting on the parent dir can also have the unintentional side- effect of hiding other files located under the parent dir.
If the given dir exists but is not bpffs, then the bpffs should be mounted on the given dir and not its parent dir.
Similarly, if the given dir doesn't exist and its parent dir is not bpffs, then the given dir should be created and the bpffs should be mounted on this new dir.
Changes since v1:
- Split "mount_bpffs_for_pin" into two functions. This is done to improve maintainability and readability.
Changes since v2:
- mount_bpffs_for_pin: rename to "create_and_mount_bpffs_dir".
- mount_bpffs_given_file: rename to "mount_bpffs_given_file".
- create_and_mount_bpffs_dir:
- introduce "dir_exists" boolean.
- remove new dir if "mnt_fs" fails.
- improve error handling and error messages.
Changes since v3:
- Rectify function name.
- Improve error messages and formatting.
- mount_bpffs_for_file:
- Check if dir exists before block_mount check.
--- tools/bpf/bpftool/common.c | 98 +++++++++++++++++++++++++++++----- tools/bpf/bpftool/iter.c | 2 +- tools/bpf/bpftool/main.h | 3 +- tools/bpf/bpftool/prog.c | 5 +- tools/bpf/bpftool/struct_ops.c | 2 +- 5 files changed, 94 insertions(+), 16 deletions(-)
tools/bpf/bpftool/common.c +86 -12
@@ -244,29 +244,103 @@ int open_obj_pinned_any(const char *path, enum bpf_obj_type exp_type)return fd; } -int mount_bpffs_for_pin (const char *name,bool is_dir) +int create_and_mount_bpffs_dir (const char *dir_name) {char err_str[ERR_MAX_LEN ]; -char *file; -char *dir; +bool dir_exists;int err =0 ; -if (is_dir &&is_bpffs (name)) +if (is_bpffs (dir_name))return err; - file =malloc (strlen (name) +1 ); -if (!file) { + dir_exists = (access (dir_name,F_OK ) ==0 ); + +if (!dir_exists) { +char *temp_name; +char *parent_name; + + temp_name =malloc (strlen (dir_name) +1 ); +if (!temp_name) { +p_err ("mem alloc failed" ); +return -1 ; + } + +strcpy (temp_name, dir_name); + parent_name =dirname (temp_name); + +if (is_bpffs (parent_name)) { +/* nothing to do if already mounted */ +free (temp_name); +return err; + } + +if (access (parent_name,F_OK ) ==-1 ) { +p_err ("can't create dir '%s' to pin BPF object: parent dir '%s' doesn't exist" , + dir_name, parent_name); +free (temp_name); +return -1 ; + } + +free (temp_name); + } + +if (block_mount) { +p_err ("no BPF file system found, not mounting it due to --nomount option" ); +return -1 ; + } + +if (!dir_exists) { + err =mkdir (dir_name,0700 ); +if (err) { +p_err ("failed to create dir '%s': %s" , dir_name,strerror (errno)); +return err; + } + } + + err =mnt_fs (dir_name,"bpf" , err_str,ERR_MAX_LEN ); +if (err) { + err_str[ERR_MAX_LEN -1 ] ='\0' ; +p_err ("can't mount BPF file system on given dir '%s': %s" , + dir_name, err_str); + +if (!dir_exists) +rmdir (dir_name); + } + +return err; +} + +int mount_bpffs_for_file (const char *file_name) +{ +char err_str[ERR_MAX_LEN ]; +char *temp_name; +char *dir; +int err =0 ; + +if (access (file_name,F_OK ) !=-1 ) { +p_err ("can't pin BPF object: path '%s' already exists" , file_name); +return -1 ; + } + + temp_name =malloc (strlen (file_name) +1 ); +if (!temp_name) {p_err ("mem alloc failed" );return -1 ; } -strcpy (file, name); - dir =dirname (file); +strcpy (temp_name, file_name); + dir =dirname (temp_name);if (is_bpffs (dir))/* nothing to do if already mounted */ goto out_free; +if (access (dir,F_OK ) ==-1 ) { +p_err ("can't pin BPF object: dir '%s' doesn't exist" , dir); +free (temp_name); +return -1 ; + } +if (block_mount) {p_err ("no BPF file system found, not mounting it due to --nomount option" ); err =-1 ;
@@ -276,12 +350,12 @@ int mount_bpffs_for_pin(const char *name, bool is_dir) err =mnt_fs (dir,"bpf" , err_str,ERR_MAX_LEN );if (err) { err_str[ERR_MAX_LEN -1 ] ='\0' ; -p_err ("can't mount BPF file system to pin the object (%s): %s" , - name, err_str); +p_err ("can't mount BPF file system to pin the object '%s': %s" , + file_name, err_str); } out_free: -free (file); +free (temp_name);return err; }
@@ -289,7 +363,7 @@ int do_pin_fd(int fd, const char *name) {int err; - err =mount_bpffs_for_pin (name, false); + err =mount_bpffs_for_file (name);if (err)return err;
tools/bpf/bpftool/iter.c +1 -1
@@ -76,7 +76,7 @@ static int do_pin(int argc, char **argv) goto close_obj; } - err =mount_bpffs_for_pin (path, false); + err =mount_bpffs_for_file (path);if (err) goto close_link;
tools/bpf/bpftool/main.h +2 -1
@@ -142,7 +142,8 @@ const char *get_fd_type_name(enum bpf_obj_type type);char *get_fdinfo (int fd,const char *key);int open_obj_pinned (const char *path,bool quiet);int open_obj_pinned_any (const char *path,enum bpf_obj_type exp_type); -int mount_bpffs_for_pin (const char *name,bool is_dir); +int mount_bpffs_for_file (const char *file_name); +int create_and_mount_bpffs_dir (const char *dir_name);int do_pin_any (int argc,char **argv,int (*get_fd_by_id)(int *,char ***));int do_pin_fd (int fd,const char *name);
tools/bpf/bpftool/prog.c +4 -1
@@ -1778,7 +1778,10 @@ static int load_with_options(int argc, char **argv, bool first_prog_only) goto err_close_obj; } - err =mount_bpffs_for_pin (pinfile, !first_prog_only); +if (first_prog_only) + err =mount_bpffs_for_file (pinfile); +else + err =create_and_mount_bpffs_dir (pinfile);if (err) goto err_close_obj;
tools/bpf/bpftool/struct_ops.c +1 -1
@@ -515,7 +515,7 @@ static int do_register(int argc, char **argv)if (argc ==1 ) linkdir =GET_ARG (); -if (linkdir &&mount_bpffs_for_pin (linkdir, true)) { +if (linkdir &&create_and_mount_bpffs_dir (linkdir)) {p_err ("can't mount bpffs for pinning" );return -1 ; }
Signature · 1 line
2.44.0
Quoted 32 lines · Sahil Siddiq
When pinning programs/objects under PATH (eg: during "bpftool prog loadall") the bpffs is mounted on the parent dir of PATH in the following situations:
- the given dir exists but it is not bpffs.
- the given dir doesn't exist and the parent dir is not bpffs.Mounting on the parent dir can also have the unintentional side- effect of hiding other files located under the parent dir.
If the given dir exists but is not bpffs, then the bpffs should be mounted on the given dir and not its parent dir.
Similarly, if the given dir doesn't exist and its parent dir is not bpffs, then the given dir should be created and the bpffs should be mounted on this new dir.
Fixes 2a36c26fe3b8 ("bpftool: Support bpffs mountpoint as pin path for prog loadall")Changes since v1:
- Split "mount_bpffs_for_pin" into two functions. This is done to improve maintainability and readability.Changes since v2:
-mount_bpffs_for_pin: rename to "create_and_mount_bpffs_dir".
-mount_bpffs_given_file: rename to "mount_bpffs_given_file".
-create_and_mount_bpffs_dir:
- introduce "dir_exists" boolean.
- remove new dir if "mnt_fs" fails.
- improve error handling and error messages.
Quoted 7 lines
Changes since v3:
- Rectify function name.
- Improve error messages and formatting.
-mount_bpffs_for_file:
- Check if dir exists beforeblock_mountcheck.Signed-off-by Sahil Siddiq <[email protected]>
Quoted 109 lines
--- tools/bpf/bpftool/common.c | 98 +++++++++++++++++++++++++++++----- tools/bpf/bpftool/iter.c | 2 +- tools/bpf/bpftool/main.h | 3 +- tools/bpf/bpftool/prog.c | 5 +- tools/bpf/bpftool/struct_ops.c | 2 +- 5 files changed, 94 insertions(+), 16 deletions(-)tools/bpf/bpftool/common.c +75
-8@@ -244,29 +244,103 @@ int open_obj_pinned_any(const char *path, enum bpf_obj_type exp_type)return fd; } -int mount_bpffs_for_pin (const char *name,bool is_dir) +int create_and_mount_bpffs_dir (const char *dir_name) {char err_str[ERR_MAX_LEN ]; -char *file; -char *dir; +bool dir_exists;int err =0 ; -if (is_dir &&is_bpffs (name)) +if (is_bpffs (dir_name))return err; - file =malloc (strlen (name) +1 ); -if (!file) { + dir_exists = (access (dir_name,F_OK ) ==0 ); + +if (!dir_exists) { +char *temp_name; +char *parent_name; + + temp_name =malloc (strlen (dir_name) +1 ); +if (!temp_name) { +p_err ("mem alloc failed" ); +return -1 ; + } + +strcpy (temp_name, dir_name); + parent_name =dirname (temp_name); + +if (is_bpffs (parent_name)) { +/* nothing to do if already mounted */ +free (temp_name); +return err; + } + +if (access (parent_name,F_OK ) ==-1 ) { +p_err ("can't create dir '%s' to pin BPF object: parent dir '%s' doesn't exist" , + dir_name, parent_name); +free (temp_name); +return -1 ; + } + +free (temp_name); + } + +if (block_mount) { +p_err ("no BPF file system found, not mounting it due to --nomount option" ); +return -1 ; + } + +if (!dir_exists) { + err =mkdir (dir_name,0700 ); +if (err) { +p_err ("failed to create dir '%s': %s" , dir_name,strerror (errno)); +return err; + } + } + + err =mnt_fs (dir_name,"bpf" , err_str,ERR_MAX_LEN ); +if (err) { + err_str[ERR_MAX_LEN -1 ] ='\0' ; +p_err ("can't mount BPF file system on given dir '%s': %s" , + dir_name, err_str); + +if (!dir_exists) +rmdir (dir_name); + } + +return err; +} + +int mount_bpffs_for_file (const char *file_name) +{ +char err_str[ERR_MAX_LEN ]; +char *temp_name; +char *dir; +int err =0 ; + +if (access (file_name,F_OK ) !=-1 ) { +p_err ("can't pin BPF object: path '%s' already exists" , file_name); +return -1 ; + } + + temp_name =malloc (strlen (file_name) +1 ); +if (!temp_name) {p_err ("mem alloc failed" );return -1 ; } -strcpy (file, name); - dir =dirname (file); +strcpy (temp_name, file_name);
tools/bpf/bpftool/common.c int open_obj_pinned_any(const char *path, enum bpf_obj_type exp_type) · line 341
Quoted 10 lines
tools/bpf/bpftool/common.c +5
-0+ dir =dirname (temp_name);if (is_bpffs (dir))/* nothing to do if already mounted */ goto out_free; +if (access (dir,F_OK ) ==-1 ) { +p_err ("can't pin BPF object: dir '%s' doesn't exist" , dir); +free (temp_name); +return -1 ;
Or:
p_err(...); err = -1; goto out_free;
to be more consistent with the other error paths. But that's fine, no need to respin for that.
Thanks a lot!
Daniel Borkmann
maintainerQuoted 69 lines · Quentin Monnet
Quoted 32 lines · Sahil Siddiq
When pinning programs/objects under PATH (eg: during "bpftool prog loadall") the bpffs is mounted on the parent dir of PATH in the following situations:
- the given dir exists but it is not bpffs.
- the given dir doesn't exist and the parent dir is not bpffs.Mounting on the parent dir can also have the unintentional side- effect of hiding other files located under the parent dir.
If the given dir exists but is not bpffs, then the bpffs should be mounted on the given dir and not its parent dir.
Similarly, if the given dir doesn't exist and its parent dir is not bpffs, then the given dir should be created and the bpffs should be mounted on this new dir.
Fixes 2a36c26fe3b8 ("bpftool: Support bpffs mountpoint as pin path for prog loadall")Changes since v1:
- Split "mount_bpffs_for_pin" into two functions. This is done to improve maintainability and readability.Changes since v2:
-mount_bpffs_for_pin: rename to "create_and_mount_bpffs_dir".
-mount_bpffs_given_file: rename to "mount_bpffs_given_file".
-create_and_mount_bpffs_dir:
- introduce "dir_exists" boolean.
- remove new dir if "mnt_fs" fails.
- improve error handling and error messages.Quoted 7 lines
Changes since v3:
- Rectify function name.
- Improve error messages and formatting.
-mount_bpffs_for_file:
- Check if dir exists beforeblock_mountcheck.Signed-off-by Sahil Siddiq <[email protected]>Tested-by Quentin Monnet <[email protected]>Reviewed-by Quentin Monnet <[email protected]>Quoted 25 lines
--- tools/bpf/bpftool/common.c | 98 +++++++++++++++++++++++++++++----- tools/bpf/bpftool/iter.c | 2 +- tools/bpf/bpftool/main.h | 3 +- tools/bpf/bpftool/prog.c | 5 +- tools/bpf/bpftool/struct_ops.c | 2 +- 5 files changed, 94 insertions(+), 16 deletions(-)tools/bpf/bpftool/common.c +2
-3@@ -244,29 +244,103 @@ int open_obj_pinned_any(const char *path, enum bpf_obj_type exp_type)return fd; } -int mount_bpffs_for_pin (const char *name,bool is_dir) +int create_and_mount_bpffs_dir (const char *dir_name) {char err_str[ERR_MAX_LEN ]; -char *file; -char *dir; +bool dir_exists;int err =0 ;
Quoted 7 lines
tools/bpf/bpftool/common.c int open_obj_pinned_any(const char *path, enum bpf_obj_type exp_type) · line 256
Quoted 7 lines
tools/bpf/bpftool/common.c +2
-3-if (is_dir &&is_bpffs (name)) +if (is_bpffs (dir_name))return err; - file =malloc (strlen (name) +1 ); -if (!file) { + dir_exists = (access (dir_name,F_OK ) ==0 );
nit: No need for extra ().
Quoted 11 lines
tools/bpf/bpftool/common.c int open_obj_pinned_any(const char *path, enum bpf_obj_type exp_type) · line 268
Quoted 11 lines
tools/bpf/bpftool/common.c +11
-0+if (!dir_exists) { +char *temp_name; +char *parent_name; + + temp_name =malloc (strlen (dir_name) +1 ); +if (!temp_name) { +p_err ("mem alloc failed" ); +return -1 ; + } + +strcpy (temp_name, dir_name);
strdup() ?
Quoted 17 lines
Quoted 17 lines
tools/bpf/bpftool/common.c +17
-0+ parent_name =dirname (temp_name); + +if (is_bpffs (parent_name)) { +/* nothing to do if already mounted */ +free (temp_name); +return err; + } + +if (access (parent_name,F_OK ) ==-1 ) { +p_err ("can't create dir '%s' to pin BPF object: parent dir '%s' doesn't exist" , + dir_name, parent_name); +free (temp_name); +return -1 ; + } + +free (temp_name); + }
Quoted 8 lines
tools/bpf/bpftool/common.c int open_obj_pinned_any(const char *path, enum bpf_obj_type exp_type) · line 293
Quoted 8 lines
tools/bpf/bpftool/common.c +8
-0+ +if (block_mount) { +p_err ("no BPF file system found, not mounting it due to --nomount option" ); +return -1 ; + } + +if (!dir_exists) { + err =mkdir (dir_name,0700 );
nit: S_IRWXU
Quoted 37 lines
Quoted 37 lines
tools/bpf/bpftool/common.c +33
-0+if (err) { +p_err ("failed to create dir '%s': %s" , dir_name,strerror (errno)); +return err; + } + } + + err =mnt_fs (dir_name,"bpf" , err_str,ERR_MAX_LEN ); +if (err) { + err_str[ERR_MAX_LEN -1 ] ='\0' ; +p_err ("can't mount BPF file system on given dir '%s': %s" , + dir_name, err_str); + +if (!dir_exists) +rmdir (dir_name); + } + +return err; +} + +int mount_bpffs_for_file (const char *file_name) +{ +char err_str[ERR_MAX_LEN ]; +char *temp_name; +char *dir; +int err =0 ; + +if (access (file_name,F_OK ) !=-1 ) { +p_err ("can't pin BPF object: path '%s' already exists" , file_name); +return -1 ; + } + + temp_name =malloc (strlen (file_name) +1 ); +if (!temp_name) {p_err ("mem alloc failed" );return -1 ; }
Quoted 3 lines
tools/bpf/bpftool/common.c int open_obj_pinned_any(const char *path, enum bpf_obj_type exp_type) · line 331
Quoted 3 lines
tools/bpf/bpftool/common.c +1
-2-strcpy (file, name); - dir =dirname (file); +strcpy (temp_name, file_name);
strdup()
Quoted 13 lines
tools/bpf/bpftool/common.c int open_obj_pinned_any(const char *path, enum bpf_obj_type exp_type) · line 341
Quoted 10 lines
tools/bpf/bpftool/common.c +5
-0+ dir =dirname (temp_name);if (is_bpffs (dir))/* nothing to do if already mounted */ goto out_free; +if (access (dir,F_OK ) ==-1 ) { +p_err ("can't pin BPF object: dir '%s' doesn't exist" , dir); +free (temp_name); +return -1 ;Or:
Quoted 6 lines
p_err(...); err = -1; goto out_free;to be more consistent with the other error paths. But that's fine, no need to respin for that.
+1, pls fix.
Hi,
Thank you for both your reviews. I have made the
suggested changes and have submitted v5.
Thanks,
Sahil