From patchwork Fri Oct 11 21:45:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Brauner X-Patchwork-Id: 13833195 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ECF651D1721; Fri, 11 Oct 2024 21:46:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728683175; cv=none; b=sHIlq+dFjLKjLi8x+DnjeDemgHuwgCep8z9Ko20IVYGmHSx1l1rQ+DyjiF2YINBDk1TuqztOCH4FP3Yy43mKyxgkWBvM3GE7jv7fxLs10/+UWYOD7NC2qAjXvqCX9PBaVVfjwyH9PX5XEi58uKo+emEDa9Rp4M9Ks53adBkBBMQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728683175; c=relaxed/simple; bh=u1eDTasujqFqnJhY0XPvafSE03WRfY8oAIQszSM6PEc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Y7GK/Uk+GK9HPAAQiskIhOXkfIHXrZxGIlnlqGcWNeoS54pau6PhAzc72vpuug8JMcFiQsICc/P0XupI6+uHMCqKfnos+g5JU23zA+J80WS+kShbDcVQiEYbvA3zGCOFiY/EnOjP+fCEWLsFHJ8XxGc0CEsyRlDSfUH5/wBhXCw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=HR6eXZ7E; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="HR6eXZ7E" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8F1FCC4CECE; Fri, 11 Oct 2024 21:46:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1728683174; bh=u1eDTasujqFqnJhY0XPvafSE03WRfY8oAIQszSM6PEc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=HR6eXZ7E92TqvXFI4evcEgKrQfH5P6QVECTOJBjcdST/MzfCVXw44hv2oiKiLIRUM ID+M+jKZJxyDLeyWzpOBYj8o7Ex605XCoU/AduB2qq/RGiNMLIwzlSApAk1YHzQtwo Hwf9ABPrAgflIpzr1vJ1W+7FGaWDRQm4QmgCbuJJ7fEFXsc83tud/xeuFJATUDyCU1 yzb1G83tv1KiPIhRXQf3Se0dUt6BFG2wIUWTDxqX/yLzuZWBd+8VgKySHVRR2/gxxl ivb/U4O/gA3RmrQTYbhFsVAzWkJIJitEdJj9XKEY0XyvimRqbdB4Vk2YH1PTYxrzKm z5sglrH0CU4mA== From: Christian Brauner Date: Fri, 11 Oct 2024 23:45:50 +0200 Subject: [PATCH RFC v2 1/4] fs: add helper to use mount option as path or fd Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241011-work-overlayfs-v2-1-1b43328c5a31@kernel.org> References: <20241011-work-overlayfs-v2-0-1b43328c5a31@kernel.org> In-Reply-To: <20241011-work-overlayfs-v2-0-1b43328c5a31@kernel.org> To: Miklos Szeredi , Amir Goldstein Cc: Josef Bacik , linux-fsdevel@vger.kernel.org, linux-unionfs@vger.kernel.org, Christian Brauner X-Mailer: b4 0.15-dev-2a633 X-Developer-Signature: v=1; a=openpgp-sha256; l=2579; i=brauner@kernel.org; h=from:subject:message-id; bh=u1eDTasujqFqnJhY0XPvafSE03WRfY8oAIQszSM6PEc=; b=owGbwMvMwCU28Zj0gdSKO4sYT6slMaRzzll8YK7hJNWv80oPK/fsPDJn9vXnvWnZYtXLmjtuX /x+n6utqaOUhUGMi0FWTJHFod0kXG45T8Vmo0wNmDmsTCBDGLg4BWAiv+4xMpx2t3ztLP//0D2D mg2TP5s6uLR43LrgkfVRrNwpzrG5LIbhn/WqeomyGBlb9RuXtUWfz2L8U+lp/THUf3ZY0/Om5c7 P+QA= X-Developer-Key: i=brauner@kernel.org; a=openpgp; fpr=4880B8C9BD0E5106FC070F4F7B3C391EFEA93624 Allow filesystems to use a mount option either as a path or a file descriptor. Signed-off-by: Christian Brauner Reviewed-by: Amir Goldstein --- fs/fs_parser.c | 19 +++++++++++++++++++ include/linux/fs_parser.h | 5 ++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/fs/fs_parser.c b/fs/fs_parser.c index 24727ec34e5aa434364e87879cccf9fe1ec19d37..a017415d8d6bc91608ece5d42fa4bea26e47456b 100644 --- a/fs/fs_parser.c +++ b/fs/fs_parser.c @@ -308,6 +308,25 @@ int fs_param_is_fd(struct p_log *log, const struct fs_parameter_spec *p, } EXPORT_SYMBOL(fs_param_is_fd); +int fs_param_is_fd_or_path(struct p_log *log, const struct fs_parameter_spec *p, + struct fs_parameter *param, + struct fs_parse_result *result) +{ + switch (param->type) { + case fs_value_is_string: + return fs_param_is_string(log, p, param, result); + case fs_value_is_file: + result->uint_32 = param->dirfd; + if (result->uint_32 <= INT_MAX) + return 0; + break; + default: + break; + } + return fs_param_bad_value(log, param); +} +EXPORT_SYMBOL(fs_param_is_fd_or_path); + int fs_param_is_uid(struct p_log *log, const struct fs_parameter_spec *p, struct fs_parameter *param, struct fs_parse_result *result) { diff --git a/include/linux/fs_parser.h b/include/linux/fs_parser.h index 6cf713a7e6c6fc2402a68c87036264eaed921432..73fe4e119ee24b3bed1f0cf2bc23d6b31811cb69 100644 --- a/include/linux/fs_parser.h +++ b/include/linux/fs_parser.h @@ -28,7 +28,8 @@ typedef int fs_param_type(struct p_log *, */ fs_param_type fs_param_is_bool, fs_param_is_u32, fs_param_is_s32, fs_param_is_u64, fs_param_is_enum, fs_param_is_string, fs_param_is_blob, fs_param_is_blockdev, - fs_param_is_path, fs_param_is_fd, fs_param_is_uid, fs_param_is_gid; + fs_param_is_path, fs_param_is_fd, fs_param_is_uid, fs_param_is_gid, + fs_param_is_fd_or_path; /* * Specification of the type of value a parameter wants. @@ -133,6 +134,8 @@ static inline bool fs_validate_description(const char *name, #define fsparam_bdev(NAME, OPT) __fsparam(fs_param_is_blockdev, NAME, OPT, 0, NULL) #define fsparam_path(NAME, OPT) __fsparam(fs_param_is_path, NAME, OPT, 0, NULL) #define fsparam_fd(NAME, OPT) __fsparam(fs_param_is_fd, NAME, OPT, 0, NULL) +#define fsparam_fd_or_path(NAME, OPT) \ + __fsparam(fs_param_is_fd_or_path, NAME, OPT, 0, NULL) #define fsparam_uid(NAME, OPT) __fsparam(fs_param_is_uid, NAME, OPT, 0, NULL) #define fsparam_gid(NAME, OPT) __fsparam(fs_param_is_gid, NAME, OPT, 0, NULL) From patchwork Fri Oct 11 21:45:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Brauner X-Patchwork-Id: 13833196 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 096201D1721; Fri, 11 Oct 2024 21:46:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728683177; cv=none; b=upYqtn+iZGQkIKrloOFp/xM2R0ErtWK0BkZxEqux+MnfOZnBRAKiK4HkCwLjNBySXWh8/joZ9IvG/fX1PqRP3SmUMXMk5ZX3T3DxCOfL6uieWU5u37PiDZvNfbOmvQB1Helum2uYEYzofySWaPZCPYjqruRH7S0/CiChpEH/4Nc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728683177; c=relaxed/simple; bh=No1W/7ZwuqncBOVOAg5NNUk9ZiY7MM4gM5ISkS161hA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=CcRzqA1GZueOQtaaGauIz6wvVZw+rRmbVStLwAtuHChBPok50OLEWRBvbRI3GnpDDzfBKuayzzrMajXdFKXt0A9Ws8VUbuBK2SPYvDqh1j3YGCrRcSiQIvarQsJ+ddJEk5LLX3o5fa3H6QVBfkk5RlX9NwZJ6M0WQGl1dxt/dCc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=sVuRNoe3; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="sVuRNoe3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 46A6CC4CECE; Fri, 11 Oct 2024 21:46:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1728683176; bh=No1W/7ZwuqncBOVOAg5NNUk9ZiY7MM4gM5ISkS161hA=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=sVuRNoe3iBq3s6zFhNWtd8IKfpNNi+TKZXkjkvXfYKdXwMskv/vRAqR2jOpW8meFu OUKLTqaPWifz5D3EAAqxsSRIPaoQ3j+XlZ8Ai+Loz6ryGANKv3EPr5l5qe5JdHgSn0 vtFJ8hBrIdPhGM0wIRwaA5WH1Mis1FDPLxG7JO3QsxjA3Dl1Z/wLBuue2foYUjZbJK i2+6dqujmcqkHCbF0bsVchGkMgbsO9kCizyusreJJM1zuhRkQf/SA/lS1r04J6XTEZ 0KQCble13T+LbM9t2fI7El0PpYkJ0DB4zuLzaaU73QD8TSM294M3woE2HdD+dS31if UF42XGNTpmgDA== From: Christian Brauner Date: Fri, 11 Oct 2024 23:45:51 +0200 Subject: [PATCH RFC v2 2/4] ovl: specify layers via file descriptors Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241011-work-overlayfs-v2-2-1b43328c5a31@kernel.org> References: <20241011-work-overlayfs-v2-0-1b43328c5a31@kernel.org> In-Reply-To: <20241011-work-overlayfs-v2-0-1b43328c5a31@kernel.org> To: Miklos Szeredi , Amir Goldstein Cc: Josef Bacik , linux-fsdevel@vger.kernel.org, linux-unionfs@vger.kernel.org, Christian Brauner X-Mailer: b4 0.15-dev-2a633 X-Developer-Signature: v=1; a=openpgp-sha256; l=5781; i=brauner@kernel.org; h=from:subject:message-id; bh=No1W/7ZwuqncBOVOAg5NNUk9ZiY7MM4gM5ISkS161hA=; b=owGbwMvMwCU28Zj0gdSKO4sYT6slMaRzzlnclsbl2/TwzJf6js1ptdMZp89L6EgJlXlxxvLXu asiSe1vO0pZGMS4GGTFFFkc2k3C5ZbzVGw2ytSAmcPKBDKEgYtTACaSa8DI8MvOqkWtb/1F8fhr FSd+n5+iGn3utCBrzZOAwouior5P/jL8FTmtqGWy0qJjh93Dpqjq73zP4r5sy9jme3etzU3Jqj+ SfAA= X-Developer-Key: i=brauner@kernel.org; a=openpgp; fpr=4880B8C9BD0E5106FC070F4F7B3C391EFEA93624 Currently overlayfs only allows specifying layers through path names. This is inconvenient for users such as systemd that want to assemble an overlayfs mount purely based on file descriptors. This enables user to specify both: fsconfig(fd_overlay, FSCONFIG_SET_FD, "upperdir+", NULL, fd_upper); fsconfig(fd_overlay, FSCONFIG_SET_FD, "workdir+", NULL, fd_work); fsconfig(fd_overlay, FSCONFIG_SET_FD, "lowerdir+", NULL, fd_lower1); fsconfig(fd_overlay, FSCONFIG_SET_FD, "lowerdir+", NULL, fd_lower2); in addition to: fsconfig(fd_overlay, FSCONFIG_SET_STRING, "upperdir+", "/upper", 0); fsconfig(fd_overlay, FSCONFIG_SET_STRING, "workdir+", "/work", 0); fsconfig(fd_overlay, FSCONFIG_SET_STRING, "lowerdir+", "/lower1", 0); fsconfig(fd_overlay, FSCONFIG_SET_STRING, "lowerdir+", "/lower2", 0); Signed-off-by: Christian Brauner --- fs/overlayfs/params.c | 106 +++++++++++++++++++++++++++++++++++++------------- 1 file changed, 79 insertions(+), 27 deletions(-) diff --git a/fs/overlayfs/params.c b/fs/overlayfs/params.c index e42546c6c5dfbea930414856d791e3e4424a999e..2d5a072b8683ce94b6cec4b75ce5ddd6d6db8dc6 100644 --- a/fs/overlayfs/params.c +++ b/fs/overlayfs/params.c @@ -141,10 +141,10 @@ static int ovl_verity_mode_def(void) const struct fs_parameter_spec ovl_parameter_spec[] = { fsparam_string_empty("lowerdir", Opt_lowerdir), - fsparam_string("lowerdir+", Opt_lowerdir_add), - fsparam_string("datadir+", Opt_datadir_add), - fsparam_string("upperdir", Opt_upperdir), - fsparam_string("workdir", Opt_workdir), + fsparam_fd_or_path("lowerdir+", Opt_lowerdir_add), + fsparam_fd_or_path("datadir+", Opt_datadir_add), + fsparam_fd_or_path("upperdir", Opt_upperdir), + fsparam_fd_or_path("workdir", Opt_workdir), fsparam_flag("default_permissions", Opt_default_permissions), fsparam_enum("redirect_dir", Opt_redirect_dir, ovl_parameter_redirect_dir), fsparam_enum("index", Opt_index, ovl_parameter_bool), @@ -367,43 +367,89 @@ static void ovl_add_layer(struct fs_context *fc, enum ovl_opt layer, } } -static int ovl_parse_layer(struct fs_context *fc, const char *layer_name, enum ovl_opt layer) +static inline bool is_upper_layer(enum ovl_opt layer) { - char *name = kstrdup(layer_name, GFP_KERNEL); - bool upper = (layer == Opt_upperdir || layer == Opt_workdir); - struct path path; - int err; + return layer == Opt_upperdir || layer == Opt_workdir; +} + +/* Handle non-file descriptor-based layer options that require path lookup. */ +static inline int ovl_kern_path(const char *layer_name, struct path *layer_path, + enum ovl_opt layer) +{ + switch (layer) { + case Opt_upperdir: + fallthrough; + case Opt_workdir: + fallthrough; + case Opt_lowerdir: + return ovl_mount_dir(layer_name, layer_path); + case Opt_lowerdir_add: + fallthrough; + case Opt_datadir_add: + return ovl_mount_dir_noesc(layer_name, layer_path); + default: + WARN_ON_ONCE(true); + return -EINVAL; + } + + return 0; +} + +static int ovl_do_parse_layer(struct fs_context *fc, const char *layer_name, + struct path *layer_path, enum ovl_opt layer) +{ + char *name __free(kfree) = kstrdup(layer_name, GFP_KERNEL); + bool upper; + int err = 0; if (!name) return -ENOMEM; - if (upper || layer == Opt_lowerdir) - err = ovl_mount_dir(name, &path); - else - err = ovl_mount_dir_noesc(name, &path); + upper = is_upper_layer(layer); + err = ovl_mount_dir_check(fc, layer_path, layer, name, upper); if (err) - goto out_free; - - err = ovl_mount_dir_check(fc, &path, layer, name, upper); - if (err) - goto out_put; + return err; if (!upper) { err = ovl_ctx_realloc_lower(fc); if (err) - goto out_put; + return err; } /* Store the user provided path string in ctx to show in mountinfo */ - ovl_add_layer(fc, layer, &path, &name); - -out_put: - path_put(&path); -out_free: - kfree(name); + ovl_add_layer(fc, layer, layer_path, &name); return err; } +static int ovl_parse_layer(struct fs_context *fc, struct fs_parameter *param, + enum ovl_opt layer) +{ + struct path path __free(path_put) = {}; + char *buf __free(kfree) = NULL; + char *layer_name; + int err = 0; + + if (param->type == fs_value_is_file) { + buf = kmalloc(PATH_MAX, GFP_KERNEL_ACCOUNT); + if (!buf) + return -ENOMEM; + + path = param->file->f_path; + path_get(&path); + + layer_name = d_path(&path, buf, PATH_MAX); + if (IS_ERR(layer_name)) + return PTR_ERR(layer_name); + } else { + layer_name = param->string; + err = ovl_kern_path(layer_name, &path, layer); + } + if (err) + return err; + + return ovl_do_parse_layer(fc, layer_name, &path, layer); +} + static void ovl_reset_lowerdirs(struct ovl_fs_context *ctx) { struct ovl_fs_context_layer *l = ctx->lower; @@ -474,7 +520,13 @@ static int ovl_parse_param_lowerdir(const char *name, struct fs_context *fc) iter = dup; for (nr = 0; nr < nr_lower; nr++) { - err = ovl_parse_layer(fc, iter, Opt_lowerdir); + struct path path __free(path_put) = {}; + + err = ovl_kern_path(iter, &path, Opt_lowerdir); + if (err) + goto out_err; + + err = ovl_do_parse_layer(fc, iter, &path, Opt_lowerdir); if (err) goto out_err; @@ -555,7 +607,7 @@ static int ovl_parse_param(struct fs_context *fc, struct fs_parameter *param) case Opt_datadir_add: case Opt_upperdir: case Opt_workdir: - err = ovl_parse_layer(fc, param->string, opt); + err = ovl_parse_layer(fc, param, opt); break; case Opt_default_permissions: config->default_permissions = true; From patchwork Fri Oct 11 21:45:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Brauner X-Patchwork-Id: 13833197 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ACAF91D173A; Fri, 11 Oct 2024 21:46:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728683178; cv=none; b=b+2/VOJkbtnRBJbTGGZmWJbYG3Ogx/1nziGwrFCc3K9wEDKDODzx+vGjH6eBALYbFQ271KtJZ3Fssmsx/CKjN77t3D9tSwhiEQNpvp11IDQRdetiUP+7iI9vcX03Kg/5nSMbebxQqf/VE/JzjVhdbRYp8aN9Hl0XCIEC7CdzQJU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728683178; c=relaxed/simple; bh=KRWLagaS4YguCRS2vcI21OA10tbn8Q0Kj2MV+AwTbjI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=b0tBfBamW5iDeNGh5W5BlmvyDqT/vdxu4N3alOo18KlEzWnx8Ciy5vpCrOaUPjZdpKZZs1hNvhqdn7i6glSV5Wg390scGk6RrjwTL/B84VoaTr5WIDATlbkO3uiqYN8wTqmWTQ62pniUVYEY3GGIRFLzg9qJ0GuVkAJY+Euz/Iw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=MxFK2R8e; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="MxFK2R8e" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F294AC4CECF; Fri, 11 Oct 2024 21:46:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1728683178; bh=KRWLagaS4YguCRS2vcI21OA10tbn8Q0Kj2MV+AwTbjI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=MxFK2R8eKAYp5oZ1EUesIU8MHXSrfaZsSxUZrCjp2+Xxqu6sF39a6e38D3ykIEGFZ Gg51aYECxDrOs4CSA+kOc0AShBzba/+xfyODhiClf9i9cizBGh5QvPG9C/oeni/L7l GNW+wl52HPWUQwK2vAwiNu0Lq9asxJYbJrBBQjqViGvHq94B82jN40T3tOSPuX0jAJ XHfKFGpi/5VCC+jfDTQk3D+ke9zYFelhj2sBrdqtrJSZ5Um56QMZZ8E97pZZ9X4JrO Wlw+5CugpsIV2N5zbAcJlkXH3TorNaGIpATmnVVw/T5azHaenxWGplYDdDbXVK7yWy cqnXIQeuYtuyA== From: Christian Brauner Date: Fri, 11 Oct 2024 23:45:52 +0200 Subject: [PATCH RFC v2 3/4] selftests: use shared header Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241011-work-overlayfs-v2-3-1b43328c5a31@kernel.org> References: <20241011-work-overlayfs-v2-0-1b43328c5a31@kernel.org> In-Reply-To: <20241011-work-overlayfs-v2-0-1b43328c5a31@kernel.org> To: Miklos Szeredi , Amir Goldstein Cc: Josef Bacik , linux-fsdevel@vger.kernel.org, linux-unionfs@vger.kernel.org, Christian Brauner X-Mailer: b4 0.15-dev-2a633 X-Developer-Signature: v=1; a=openpgp-sha256; l=3280; i=brauner@kernel.org; h=from:subject:message-id; bh=KRWLagaS4YguCRS2vcI21OA10tbn8Q0Kj2MV+AwTbjI=; b=owGbwMvMwCU28Zj0gdSKO4sYT6slMaRzzlmst2jTqhkTnPob9yS0Cc9n8J0a8KJj/3rx9AdZy Yacy/7VdpSyMIhxMciKKbI4tJuEyy3nqdhslKkBM4eVCWQIAxenAExkuwwjw40WsWmLgvuT0/44 lljJMxctOmgc8794c4Lyx4KzEQvkKhkZpnLtM6kPPfLp/qUwE73M5esbuQXuhfKvmfPK9yz/soW f2AE= X-Developer-Key: i=brauner@kernel.org; a=openpgp; fpr=4880B8C9BD0E5106FC070F4F7B3C391EFEA93624 So that we don't have to redefine the same system calls over and over. Signed-off-by: Christian Brauner Reviewed-by: Amir Goldstein --- .../selftests/filesystems/overlayfs/dev_in_maps.c | 27 +------------- .../selftests/filesystems/overlayfs/wrappers.h | 43 ++++++++++++++++++++++ 2 files changed, 44 insertions(+), 26 deletions(-) diff --git a/tools/testing/selftests/filesystems/overlayfs/dev_in_maps.c b/tools/testing/selftests/filesystems/overlayfs/dev_in_maps.c index 2862aae58b79acbe175ab6b36b42798bb99a2225..3b796264223f81fc753d0adaeccc04077023520b 100644 --- a/tools/testing/selftests/filesystems/overlayfs/dev_in_maps.c +++ b/tools/testing/selftests/filesystems/overlayfs/dev_in_maps.c @@ -17,32 +17,7 @@ #include "../../kselftest.h" #include "log.h" - -static int sys_fsopen(const char *fsname, unsigned int flags) -{ - return syscall(__NR_fsopen, fsname, flags); -} - -static int sys_fsconfig(int fd, unsigned int cmd, const char *key, const char *value, int aux) -{ - return syscall(__NR_fsconfig, fd, cmd, key, value, aux); -} - -static int sys_fsmount(int fd, unsigned int flags, unsigned int attr_flags) -{ - return syscall(__NR_fsmount, fd, flags, attr_flags); -} -static int sys_mount(const char *src, const char *tgt, const char *fst, - unsigned long flags, const void *data) -{ - return syscall(__NR_mount, src, tgt, fst, flags, data); -} -static int sys_move_mount(int from_dfd, const char *from_pathname, - int to_dfd, const char *to_pathname, - unsigned int flags) -{ - return syscall(__NR_move_mount, from_dfd, from_pathname, to_dfd, to_pathname, flags); -} +#include "wrappers.h" static long get_file_dev_and_inode(void *addr, struct statx *stx) { diff --git a/tools/testing/selftests/filesystems/overlayfs/wrappers.h b/tools/testing/selftests/filesystems/overlayfs/wrappers.h new file mode 100644 index 0000000000000000000000000000000000000000..4f99e10f7f018fd9a7be5263f68d34807da4c53c --- /dev/null +++ b/tools/testing/selftests/filesystems/overlayfs/wrappers.h @@ -0,0 +1,43 @@ +// SPDX-License-Identifier: GPL-2.0 +// +#ifndef __SELFTEST_OVERLAYFS_WRAPPERS_H__ +#define __SELFTEST_OVERLAYFS_WRAPPERS_H__ + +#define _GNU_SOURCE + +#include +#include +#include + +static inline int sys_fsopen(const char *fsname, unsigned int flags) +{ + return syscall(__NR_fsopen, fsname, flags); +} + +static inline int sys_fsconfig(int fd, unsigned int cmd, const char *key, + const char *value, int aux) +{ + return syscall(__NR_fsconfig, fd, cmd, key, value, aux); +} + +static inline int sys_fsmount(int fd, unsigned int flags, + unsigned int attr_flags) +{ + return syscall(__NR_fsmount, fd, flags, attr_flags); +} + +static inline int sys_mount(const char *src, const char *tgt, const char *fst, + unsigned long flags, const void *data) +{ + return syscall(__NR_mount, src, tgt, fst, flags, data); +} + +static inline int sys_move_mount(int from_dfd, const char *from_pathname, + int to_dfd, const char *to_pathname, + unsigned int flags) +{ + return syscall(__NR_move_mount, from_dfd, from_pathname, to_dfd, + to_pathname, flags); +} + +#endif From patchwork Fri Oct 11 21:45:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Brauner X-Patchwork-Id: 13833198 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6F9071D1741; Fri, 11 Oct 2024 21:46:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728683180; cv=none; b=R+dUiK208qUVchfDA4m1naSQCWCAJXk/zGpgmW7QbjyETlC3Mw91D2en9KxO3+lDN2kGMzIq/kitrk7BzGQdc4BmKXZk1Z/qTHRfO8y+n67IpQZvIgM6/1uPB/BEH0MhsXmsoPdNfNX+CiaLAnuT+tF2nl1/TIO87xnm/OkAH04= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728683180; c=relaxed/simple; bh=4zdhHcyUigfcaZd/+sZsZAsCVbg3OR83S3y+KsQlK0g=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=NaAFzl8t3k7q2k8FR7VVfbMDGhn7queLsyg78S9FUza1mMhtc4yS3aZezGRT/BV1cuv4IfZ4p5zt3ZIbAY6NrUoM51J6atVC+gYVTJDxi+aNorwUmLOne4t2X8ksClE3qRPYwxSJCKuLBJqpMGKq5R5+sU9F95TUq/eEhMLSg/A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=l2O6kdjl; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="l2O6kdjl" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A93BDC4CEC3; Fri, 11 Oct 2024 21:46:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1728683179; bh=4zdhHcyUigfcaZd/+sZsZAsCVbg3OR83S3y+KsQlK0g=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=l2O6kdjl9QJ9+/Su6JtnxOYnfJ/dSHD/Y1pN87j9DlIpJayvPMSqquZxxf8oMxJSq /Jwh74t9G6xH+vuPG3vovQo7YA7H5ELkxxmhU/1Tg0qSGRDZH4xloN3kyj7rbpxdkn fu+ysZ3ERYn2O4QdmmyO86+IoOW4KDDDPJiCarZyvtye7tSpR3seD0EDKTKcxxzMPI PTt9MUrz/BiO3X4QjI8D3u7VK5ocm5YAE5OsyNRLp0K3J9WVtgk2TjCtDgvwImiyl8 cPl0jDY/OhH2IcikWCaZMQjAejMZ9O7G02ypMuK+wiOzPhzC8th9layOqoTeO6jBCh 1oaPvlvtSAHOA== From: Christian Brauner Date: Fri, 11 Oct 2024 23:45:53 +0200 Subject: [PATCH RFC v2 4/4] selftests: add overlayfs fd mounting selftests Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241011-work-overlayfs-v2-4-1b43328c5a31@kernel.org> References: <20241011-work-overlayfs-v2-0-1b43328c5a31@kernel.org> In-Reply-To: <20241011-work-overlayfs-v2-0-1b43328c5a31@kernel.org> To: Miklos Szeredi , Amir Goldstein Cc: Josef Bacik , linux-fsdevel@vger.kernel.org, linux-unionfs@vger.kernel.org, Christian Brauner X-Mailer: b4 0.15-dev-2a633 X-Developer-Signature: v=1; a=openpgp-sha256; l=6353; i=brauner@kernel.org; h=from:subject:message-id; bh=4zdhHcyUigfcaZd/+sZsZAsCVbg3OR83S3y+KsQlK0g=; b=owGbwMvMwCU28Zj0gdSKO4sYT6slMaRzzlksdDq4fXp6hJbc5ZNVvP8DxX5d4J3//bOE2IVTM g9nGiVt7ChlYRDjYpAVU2RxaDcJl1vOU7HZKFMDZg4rE8gQBi5OAZhIbSMjw/m5Z+dszZL1U9ZX DNM/EPNT3sfoKneBANv1vYt/mDak1TAyPNiiPnXiZHmubvXD8bzcGabCU64+/akcWvBHWqkp5Xo dDwA= X-Developer-Key: i=brauner@kernel.org; a=openpgp; fpr=4880B8C9BD0E5106FC070F4F7B3C391EFEA93624 Signed-off-by: Christian Brauner Reviewed-by: Amir Goldstein --- .../selftests/filesystems/overlayfs/.gitignore | 1 + .../selftests/filesystems/overlayfs/Makefile | 2 +- .../filesystems/overlayfs/set_layers_via_fds.c | 122 +++++++++++++++++++++ .../selftests/filesystems/overlayfs/wrappers.h | 4 + 4 files changed, 128 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/filesystems/overlayfs/.gitignore b/tools/testing/selftests/filesystems/overlayfs/.gitignore index 52ae618fdd980ee22424d35d79f077077b132401..e23a18c8b37f2cdbb121496b1df1faffd729ad79 100644 --- a/tools/testing/selftests/filesystems/overlayfs/.gitignore +++ b/tools/testing/selftests/filesystems/overlayfs/.gitignore @@ -1,2 +1,3 @@ # SPDX-License-Identifier: GPL-2.0-only dev_in_maps +set_layers_via_fds diff --git a/tools/testing/selftests/filesystems/overlayfs/Makefile b/tools/testing/selftests/filesystems/overlayfs/Makefile index 56b2b48a765b1d6706faee14616597ed0315f267..e8d1adb021af44588dd7af1049de66833bb584ce 100644 --- a/tools/testing/selftests/filesystems/overlayfs/Makefile +++ b/tools/testing/selftests/filesystems/overlayfs/Makefile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 -TEST_GEN_PROGS := dev_in_maps +TEST_GEN_PROGS := dev_in_maps set_layers_via_fds CFLAGS := -Wall -Werror diff --git a/tools/testing/selftests/filesystems/overlayfs/set_layers_via_fds.c b/tools/testing/selftests/filesystems/overlayfs/set_layers_via_fds.c new file mode 100644 index 0000000000000000000000000000000000000000..d3b497eea5e5c9f718caa4957f7fec7c40970502 --- /dev/null +++ b/tools/testing/selftests/filesystems/overlayfs/set_layers_via_fds.c @@ -0,0 +1,122 @@ +// SPDX-License-Identifier: GPL-2.0 +#define _GNU_SOURCE +#define __SANE_USERSPACE_TYPES__ // Use ll64 + +#include +#include +#include +#include +#include +#include +#include + +#include "../../kselftest_harness.h" +#include "log.h" +#include "wrappers.h" + +FIXTURE(set_layers_via_fds) { +}; + +FIXTURE_SETUP(set_layers_via_fds) +{ + ASSERT_EQ(mkdir("/set_layers_via_fds", 0755), 0); +} + +FIXTURE_TEARDOWN(set_layers_via_fds) +{ + umount2("/set_layers_via_fds", 0); + ASSERT_EQ(rmdir("/set_layers_via_fds"), 0); +} + +TEST_F(set_layers_via_fds, set_layers_via_fds) +{ + int fd_context, fd_tmpfs, fd_overlay; + int layer_fds[5] = { -EBADF, -EBADF, -EBADF, -EBADF, -EBADF }; + bool layers_found[5] = { false, false, false, false, false }; + size_t len = 0; + char *line = NULL; + FILE *f_mountinfo; + + ASSERT_EQ(unshare(CLONE_NEWNS), 0); + ASSERT_EQ(sys_mount(NULL, "/", NULL, MS_SLAVE | MS_REC, NULL), 0); + + fd_context = sys_fsopen("tmpfs", 0); + ASSERT_GE(fd_context, 0); + + ASSERT_EQ(sys_fsconfig(fd_context, FSCONFIG_CMD_CREATE, NULL, NULL, 0), 0); + fd_tmpfs = sys_fsmount(fd_context, 0, 0); + ASSERT_GE(fd_tmpfs, 0); + ASSERT_EQ(close(fd_context), 0); + + ASSERT_EQ(mkdirat(fd_tmpfs, "w", 0755), 0); + ASSERT_EQ(mkdirat(fd_tmpfs, "u", 0755), 0); + ASSERT_EQ(mkdirat(fd_tmpfs, "l1", 0755), 0); + ASSERT_EQ(mkdirat(fd_tmpfs, "l2", 0755), 0); + ASSERT_EQ(mkdirat(fd_tmpfs, "l3", 0755), 0); + + layer_fds[0] = openat(fd_tmpfs, "w", O_DIRECTORY); + ASSERT_GE(layer_fds[0], 0); + + layer_fds[1] = openat(fd_tmpfs, "u", O_DIRECTORY); + ASSERT_GE(layer_fds[1], 0); + + layer_fds[2] = openat(fd_tmpfs, "l1", O_DIRECTORY); + ASSERT_GE(layer_fds[2], 0); + + layer_fds[3] = openat(fd_tmpfs, "l2", O_DIRECTORY); + ASSERT_GE(layer_fds[3], 0); + + layer_fds[4] = openat(fd_tmpfs, "l3", O_DIRECTORY); + ASSERT_GE(layer_fds[4], 0); + + ASSERT_EQ(sys_move_mount(fd_tmpfs, "", -EBADF, "/tmp", MOVE_MOUNT_F_EMPTY_PATH), 0); + ASSERT_EQ(close(fd_tmpfs), 0); + + fd_context = sys_fsopen("overlay", 0); + ASSERT_GE(fd_context, 0); + + ASSERT_NE(sys_fsconfig(fd_context, FSCONFIG_SET_FD, "lowerdir", NULL, layer_fds[2]), 0); + + ASSERT_EQ(sys_fsconfig(fd_context, FSCONFIG_SET_FD, "workdir", NULL, layer_fds[0]), 0); + ASSERT_EQ(sys_fsconfig(fd_context, FSCONFIG_SET_FD, "upperdir", NULL, layer_fds[1]), 0); + ASSERT_EQ(sys_fsconfig(fd_context, FSCONFIG_SET_FD, "lowerdir+", NULL, layer_fds[2]), 0); + ASSERT_EQ(sys_fsconfig(fd_context, FSCONFIG_SET_FD, "lowerdir+", NULL, layer_fds[3]), 0); + ASSERT_EQ(sys_fsconfig(fd_context, FSCONFIG_SET_FD, "lowerdir+", NULL, layer_fds[4]), 0); + + ASSERT_EQ(sys_fsconfig(fd_context, FSCONFIG_CMD_CREATE, NULL, NULL, 0), 0); + + fd_overlay = sys_fsmount(fd_context, 0, 0); + ASSERT_GE(fd_overlay, 0); + + ASSERT_EQ(sys_move_mount(fd_overlay, "", -EBADF, "/set_layers_via_fds", MOVE_MOUNT_F_EMPTY_PATH), 0); + + f_mountinfo = fopen("/proc/self/mountinfo", "r"); + ASSERT_NE(f_mountinfo, NULL); + + while (getline(&line, &len, f_mountinfo) != -1) { + char *haystack = line; + + if (strstr(haystack, "workdir=/tmp/w")) + layers_found[0] = true; + if (strstr(haystack, "upperdir=/tmp/u")) + layers_found[1] = true; + if (strstr(haystack, "lowerdir+=/tmp/l1")) + layers_found[2] = true; + if (strstr(haystack, "lowerdir+=/tmp/l2")) + layers_found[3] = true; + if (strstr(haystack, "lowerdir+=/tmp/l3")) + layers_found[4] = true; + } + free(line); + + for (int i = 0; i < 5; i++) { + ASSERT_EQ(layers_found[i], true); + ASSERT_EQ(close(layer_fds[i]), 0); + } + + ASSERT_EQ(close(fd_context), 0); + ASSERT_EQ(close(fd_overlay), 0); + ASSERT_EQ(fclose(f_mountinfo), 0); +} + +TEST_HARNESS_MAIN diff --git a/tools/testing/selftests/filesystems/overlayfs/wrappers.h b/tools/testing/selftests/filesystems/overlayfs/wrappers.h index 4f99e10f7f018fd9a7be5263f68d34807da4c53c..071b95fd2ac0ad7b02d90e8e89df73fd27be69c3 100644 --- a/tools/testing/selftests/filesystems/overlayfs/wrappers.h +++ b/tools/testing/selftests/filesystems/overlayfs/wrappers.h @@ -32,6 +32,10 @@ static inline int sys_mount(const char *src, const char *tgt, const char *fst, return syscall(__NR_mount, src, tgt, fst, flags, data); } +#ifndef MOVE_MOUNT_F_EMPTY_PATH +#define MOVE_MOUNT_F_EMPTY_PATH 0x00000004 /* Empty from path permitted */ +#endif + static inline int sys_move_mount(int from_dfd, const char *from_pathname, int to_dfd, const char *to_pathname, unsigned int flags)