From patchwork Fri Nov 27 19:30:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcos Paulo de Souza X-Patchwork-Id: 11937207 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8F6EDC63777 for ; Fri, 27 Nov 2020 19:58:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4D466208D5 for ; Fri, 27 Nov 2020 19:58:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=mpdesouza.com header.i=@mpdesouza.com header.b="uAHYqKP6" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729872AbgK0T6L (ORCPT ); Fri, 27 Nov 2020 14:58:11 -0500 Received: from gateway24.websitewelcome.com ([192.185.51.251]:16047 "EHLO gateway24.websitewelcome.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730832AbgK0Typ (ORCPT ); Fri, 27 Nov 2020 14:54:45 -0500 X-Greylist: delayed 723 seconds by postgrey-1.27 at vger.kernel.org; Fri, 27 Nov 2020 14:54:33 EST Received: from cm10.websitewelcome.com (cm10.websitewelcome.com [100.42.49.4]) by gateway24.websitewelcome.com (Postfix) with ESMTP id 472194BB98 for ; Fri, 27 Nov 2020 13:31:28 -0600 (CST) Received: from br540.hostgator.com.br ([108.179.252.180]) by cmsmtp with SMTP id ijSqkEXceuDoAijSqkpWgn; Fri, 27 Nov 2020 13:31:28 -0600 X-Authority-Reason: nr=8 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mpdesouza.com; s=default; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=cxPF9r7TJ1ZNPalvmCjEm1iNV3uku0zoey/QWFeQ+Sg=; b=uAHYqKP671wjPXfOnFslbJgUhG FS7cxBdpAF+s44bo2cQTD410ZVs64zDXF4nuYqW1AT7JPf8VdD5obt4EX9WUsmTutQNlcSCe1HxIX 7Dv0ld6HeGctyqqq96Qaevj5gQfrJHQxSRaOCNwYtwUeDqTgDxY19omWZeBRydIjDbZ4/9bqpYPcA tAoWcAKSE3Ov8NyYdhxpiWjZNP9dh/sUh4nvqh1YeVSnFczyjjDvH8MLuOedMQRsfmDUE8pX9+SNS VJZ2c5bdwLt/Sj0mF3VeyX+ndAeEjC3JibLrWjyGHcAC9/QatfjH3i68XWfCE6MC1ThY7TQOuiNu8 DzbNqHXQ==; Received: from 200.146.52.186.dynamic.dialup.gvt.net.br ([200.146.52.186]:60574 helo=localhost.suse.de) by br540.hostgator.com.br with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1kijSp-003Dm3-Lx; Fri, 27 Nov 2020 16:31:28 -0300 From: Marcos Paulo de Souza To: linux-btrfs@vger.kernel.org Cc: Marcos Paulo de Souza , wqu@suse.com, dsterba@suse.com Subject: [PATCH v4 1/3] btrfs-progs: Adapt find_mount_root to verify other fields of mntent struct Date: Fri, 27 Nov 2020 16:30:33 -0300 Message-Id: <20201127193035.19171-2-marcos@mpdesouza.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201127193035.19171-1-marcos@mpdesouza.com> References: <20201127193035.19171-1-marcos@mpdesouza.com> MIME-Version: 1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - br540.hostgator.com.br X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - mpdesouza.com X-BWhitelist: no X-Source-IP: 200.146.52.186 X-Source-L: No X-Exim-ID: 1kijSp-003Dm3-Lx X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 200.146.52.186.dynamic.dialup.gvt.net.br (localhost.suse.de) [200.146.52.186]:60574 X-Source-Auth: marcos@mpdesouza.com X-Email-Count: 8 X-Source-Cap: bXBkZXNvNTM7bXBkZXNvNTM7YnI1NDAuaG9zdGdhdG9yLmNvbS5icg== X-Local-Domain: yes Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org From: Marcos Paulo de Souza Currently find_mount_root searches for all btrfs filesystems mounted and comparing with mnt_dir of each mountpoint. But there are cases when we need to find the mountpoint for a determined subvolid or subvol path, and these informations are present in mnt_opts of mntent struct. This patch adds two arguments to find_mount_root (data and flag). The data argument hold the information that we want to compare, and the flag argument specifies which field of mntent struct that we want to compare. Currently there is only one flag, BTRFS_FIND_ROOT_PATH, implementing the current behavior. The next patch will add a new flag to expand the functionality. Users of find_mount_root were changed, having the data argument the same as path, since they are only trying to find the mountpoint based on path alone. Signed-off-by: Marcos Paulo de Souza --- cmds/receive.c | 3 ++- cmds/send.c | 6 ++++-- common/utils.c | 15 ++++++++++++--- common/utils.h | 8 +++++++- 4 files changed, 25 insertions(+), 7 deletions(-) diff --git a/cmds/receive.c b/cmds/receive.c index 2aaba3ff..dc64480e 100644 --- a/cmds/receive.c +++ b/cmds/receive.c @@ -1079,7 +1079,8 @@ static int do_receive(struct btrfs_receive *rctx, const char *tomnt, if (realmnt[0]) { rctx->root_path = realmnt; } else { - ret = find_mount_root(dest_dir_full_path, &rctx->root_path); + ret = find_mount_root(dest_dir_full_path, dest_dir_full_path, + BTRFS_FIND_ROOT_PATH, &rctx->root_path); if (ret < 0) { errno = -ret; error("failed to determine mount point for %s: %m", diff --git a/cmds/send.c b/cmds/send.c index b8e3ba12..7757f0da 100644 --- a/cmds/send.c +++ b/cmds/send.c @@ -329,7 +329,8 @@ static int init_root_path(struct btrfs_send *sctx, const char *subvol) if (sctx->root_path) goto out; - ret = find_mount_root(subvol, &sctx->root_path); + ret = find_mount_root(subvol, subvol, BTRFS_FIND_ROOT_PATH, + &sctx->root_path); if (ret < 0) { errno = -ret; error("failed to determine mount point for %s: %m", subvol); @@ -659,7 +660,8 @@ static int cmd_send(const struct cmd_struct *cmd, int argc, char **argv) goto out; } - ret = find_mount_root(subvol, &mount_root); + ret = find_mount_root(subvol, subvol, BTRFS_FIND_ROOT_PATH, + &mount_root); if (ret < 0) { errno = -ret; error("find_mount_root failed on %s: %m", subvol); diff --git a/common/utils.c b/common/utils.c index 1253e87d..1c264455 100644 --- a/common/utils.c +++ b/common/utils.c @@ -1248,7 +1248,7 @@ int ask_user(const char *question) * return 1 if a mount point is found but not btrfs * return <0 if something goes wrong */ -int find_mount_root(const char *path, char **mount_root) +int find_mount_root(const char *path, const char *data, u8 flag, char **mount_root) { FILE *mnttab; int fd; @@ -1258,6 +1258,10 @@ int find_mount_root(const char *path, char **mount_root) int not_btrfs = 1; int longest_matchlen = 0; char *longest_match = NULL; + char *cmp_field = NULL; + bool found; + + BUG_ON(flag != BTRFS_FIND_ROOT_PATH); fd = open(path, O_RDONLY | O_NOATIME); if (fd < 0) @@ -1269,8 +1273,13 @@ int find_mount_root(const char *path, char **mount_root) return -errno; while ((ent = getmntent(mnttab))) { - len = strlen(ent->mnt_dir); - if (strncmp(ent->mnt_dir, path, len) == 0) { + cmp_field = ent->mnt_dir; + + len = strlen(cmp_field); + + found = strncmp(cmp_field, data, len) == 0; + + if (found) { /* match found and use the latest match */ if (longest_matchlen <= len) { free(longest_match); diff --git a/common/utils.h b/common/utils.h index 119c3881..449e1d3e 100644 --- a/common/utils.h +++ b/common/utils.h @@ -52,6 +52,11 @@ #define UNITS_HUMAN (UNITS_HUMAN_BINARY) #define UNITS_DEFAULT (UNITS_HUMAN) +enum btrfs_find_root_flags { + /* check mnt_dir of mntent */ + BTRFS_FIND_ROOT_PATH = 0 +}; + void units_set_mode(unsigned *units, unsigned mode); void units_set_base(unsigned *units, unsigned base); @@ -93,7 +98,8 @@ int csum_tree_block(struct btrfs_fs_info *root, struct extent_buffer *buf, int ask_user(const char *question); int lookup_path_rootid(int fd, u64 *rootid); int get_btrfs_mount(const char *dev, char *mp, size_t mp_size); -int find_mount_root(const char *path, char **mount_root); +int find_mount_root(const char *path, const char *data, u8 flag, + char **mount_root); int get_device_info(int fd, u64 devid, struct btrfs_ioctl_dev_info_args *di_args); int get_df(int fd, struct btrfs_ioctl_space_args **sargs_ret); From patchwork Fri Nov 27 19:30:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcos Paulo de Souza X-Patchwork-Id: 11937205 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B63E0C3E8C5 for ; Fri, 27 Nov 2020 19:58:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5B217208D5 for ; Fri, 27 Nov 2020 19:58:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=mpdesouza.com header.i=@mpdesouza.com header.b="S54d+zig" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730991AbgK0T5W (ORCPT ); Fri, 27 Nov 2020 14:57:22 -0500 Received: from gateway32.websitewelcome.com ([192.185.145.12]:14333 "EHLO gateway32.websitewelcome.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730876AbgK0Ty7 (ORCPT ); Fri, 27 Nov 2020 14:54:59 -0500 Received: from cm11.websitewelcome.com (cm11.websitewelcome.com [100.42.49.5]) by gateway32.websitewelcome.com (Postfix) with ESMTP id 63E3A2077A for ; Fri, 27 Nov 2020 13:31:29 -0600 (CST) Received: from br540.hostgator.com.br ([108.179.252.180]) by cmsmtp with SMTP id ijSrkXXAdnPrxijSrkybJX; Fri, 27 Nov 2020 13:31:29 -0600 X-Authority-Reason: nr=8 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mpdesouza.com; s=default; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=QQlnK8904Y5tSxI5gqzCuvKl4btdWYmKVGn1g/t6fVU=; b=S54d+zigOihNXE+nngfcrTaRBV pyYSY5jzX3LYpQCEZsOsNCw5b5KgXg3kSWrkEL0E7+1jlPC2BDgoI5rSfg4C4x/BjfHnHwEyyiFKS +Tyz5plisfAI8+TVP/Q0MgFfAl35dcCtC2tEErjWXGVJ35H4fNu+iYaMymM8Z4x8rTTqNJkRWACIh 7KiTVlUeedcacummskLP3LSZZ/GdqFBFRh7khpAnGuRhmPn2r6HcrZCiQ3UdTPGamHDd5Hytly+nU WDoheYj0ebKIw32Hwt1M5JJUTW9juiJ8grtQWd6XJVvr8OSNBBYPmAzXFycplIwpLnu9LZXqSraeY G0rVRbwQ==; Received: from 200.146.52.186.dynamic.dialup.gvt.net.br ([200.146.52.186]:60574 helo=localhost.suse.de) by br540.hostgator.com.br with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1kijSr-003Dm3-3Z; Fri, 27 Nov 2020 16:31:29 -0300 From: Marcos Paulo de Souza To: linux-btrfs@vger.kernel.org Cc: Marcos Paulo de Souza , wqu@suse.com, dsterba@suse.com Subject: [PATCH v4 2/3] btrfs-progs: inspect: Fix logical-resolve file path lookup Date: Fri, 27 Nov 2020 16:30:34 -0300 Message-Id: <20201127193035.19171-3-marcos@mpdesouza.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201127193035.19171-1-marcos@mpdesouza.com> References: <20201127193035.19171-1-marcos@mpdesouza.com> MIME-Version: 1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - br540.hostgator.com.br X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - mpdesouza.com X-BWhitelist: no X-Source-IP: 200.146.52.186 X-Source-L: No X-Exim-ID: 1kijSr-003Dm3-3Z X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 200.146.52.186.dynamic.dialup.gvt.net.br (localhost.suse.de) [200.146.52.186]:60574 X-Source-Auth: marcos@mpdesouza.com X-Email-Count: 12 X-Source-Cap: bXBkZXNvNTM7bXBkZXNvNTM7YnI1NDAuaG9zdGdhdG9yLmNvbS5icg== X-Local-Domain: yes Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org From: Marcos Paulo de Souza [BUG] logical-resolve is currently broken on systems that have a child subvolume being mounted without access to the parent subvolume. This is the default for SLE/openSUSE installations. openSUSE has the subvolume '@' as the parent of all other subvolumes like /boot, /home. The subvolume '@' is never mounted and accessed, but only it's childs: mount | grep btrfs /dev/sda2 on / type btrfs (rw,relatime,ssd,space_cache,subvolid=267,subvol=/@/.snapshots/1/snapshot) /dev/sda2 on /opt type btrfs (rw,relatime,ssd,space_cache,subvolid=262,subvol=/@/opt) /dev/sda2 on /boot/grub2/i386-pc type btrfs (rw,relatime,ssd,space_cache,subvolid=265,subvol=/@/boot/grub2/i386-pc) logical-resolve command calls btrfs_list_path_for_root, that returns the subvolume full-path that corresponds to the tree id of the logical address. As the name implies, the 'full-path' returns the subvolume full path, starting from '@'. Later on, btrfs_open_dir is called using the path returned, but it fails to resolve it since it contains the '@' and this subvolume cannot be accessed. The same problem can be triggered to any user that calls for logical-resolve on a child subvolume that has the parent subvolume not accessible. Another problem in the current approach is that it believes that a subvolume will be mounted in a directory with the same name e.g /@/boot being mounted in /boot. When this is not true, the code also fails, since it uses the subvolume name as the path. [FIX] Extent the find_mount_root function by allowing it to check for mnt_opts member of mntent struct. Using this new approach we can change logical-resolve command to search for subvolid=XXX,subvol=YYY returning the correct path accessible to the user. Using this approach we can solve the problems stated above by not trusting the subvolume name being the mountpoint, and not executing the lookup based only in the subvolume tree. Signed-off-by: Marcos Paulo de Souza Reviewed-by: Qu Wenruo --- cmds/inspect.c | 44 ++++++++++++++++++++++++++++++++++---------- common/utils.c | 29 +++++++++++++++++++++++------ common/utils.h | 5 ++++- 3 files changed, 61 insertions(+), 17 deletions(-) diff --git a/cmds/inspect.c b/cmds/inspect.c index 2530b904..cfa2f708 100644 --- a/cmds/inspect.c +++ b/cmds/inspect.c @@ -236,6 +236,7 @@ static int cmd_inspect_logical_resolve(const struct cmd_struct *cmd, DIR *dirs = NULL; if (getpath) { + char mount_path[PATH_MAX]; name = btrfs_list_path_for_root(fd, root); if (IS_ERR(name)) { ret = PTR_ERR(name); @@ -244,23 +245,46 @@ static int cmd_inspect_logical_resolve(const struct cmd_struct *cmd, if (!name) { path_ptr[-1] = '\0'; path_fd = fd; + + strncpy(mount_path, full_path, PATH_MAX); } else { - path_ptr[-1] = '/'; - ret = snprintf(path_ptr, bytes_left, "%s", - name); - free(name); - if (ret >= bytes_left) { - error("path buffer too small: %d bytes", - bytes_left - ret); - goto out; + char *mounted = NULL; + char volid_str[PATH_MAX]; + + /* + * btrfs_list_path_for_root returns the full + * path to the subvolume pointed by root, but the + * subvolume can be mounted in a directory name + * different from the subvolume name. In this + * case we need to find the correct mountpoint + * using same subvol path and subvol id found + * before. + */ + snprintf(volid_str, PATH_MAX, "subvolid=%llu,subvol=/%s", + root, name); + + ret = find_mount_root(full_path, volid_str, + BTRFS_FIND_ROOT_OPTS, &mounted); + + if (ret == -ENOENT) { + printf("inode %llu subvol %s could not be accessed: not mounted\n", + inum, name); + continue; } - path_fd = btrfs_open_dir(full_path, &dirs, 1); + + if (ret < 0) + goto out; + + strncpy(mount_path, mounted, PATH_MAX); + free(mounted); + + path_fd = btrfs_open_dir(mount_path, &dirs, 1); if (path_fd < 0) { ret = -ENOENT; goto out; } } - ret = __ino_to_path_fd(inum, path_fd, full_path); + ret = __ino_to_path_fd(inum, path_fd, mount_path); if (path_fd != fd) close_file_or_dir(path_fd, dirs); } else { diff --git a/common/utils.c b/common/utils.c index 1c264455..1562ac52 100644 --- a/common/utils.c +++ b/common/utils.c @@ -1259,9 +1259,6 @@ int find_mount_root(const char *path, const char *data, u8 flag, char **mount_ro int longest_matchlen = 0; char *longest_match = NULL; char *cmp_field = NULL; - bool found; - - BUG_ON(flag != BTRFS_FIND_ROOT_PATH); fd = open(path, O_RDONLY | O_NOATIME); if (fd < 0) @@ -1273,12 +1270,32 @@ int find_mount_root(const char *path, const char *data, u8 flag, char **mount_ro return -errno; while ((ent = getmntent(mnttab))) { - cmp_field = ent->mnt_dir; + bool found = false; - len = strlen(cmp_field); + /* BTRFS_FIND_ROOT_PATH is the default behavior */ + if (flag == BTRFS_FIND_ROOT_OPTS) + cmp_field = ent->mnt_opts; + else + cmp_field = ent->mnt_dir; - found = strncmp(cmp_field, data, len) == 0; + len = strlen(cmp_field); + if (flag == BTRFS_FIND_ROOT_OPTS) { + size_t dlen = strlen(data); + char *tmp_str = strstr(cmp_field, data); + /* + * Make sure that we are dealing with the wanted string, + * since strstr returns the start of the string found. + * Compare the end string position from data with the + * mount point found, and make sure that we have an + * option separator or string end. + */ + if (tmp_str) + found = tmp_str[dlen] == ',' || + tmp_str[dlen] == 0; + } else { + found = strncmp(cmp_field, data, len) == 0; + } if (found) { /* match found and use the latest match */ if (longest_matchlen <= len) { diff --git a/common/utils.h b/common/utils.h index 449e1d3e..b5d256c6 100644 --- a/common/utils.h +++ b/common/utils.h @@ -54,7 +54,10 @@ enum btrfs_find_root_flags { /* check mnt_dir of mntent */ - BTRFS_FIND_ROOT_PATH = 0 + BTRFS_FIND_ROOT_PATH = 0, + + /* check mnt_opts of mntent */ + BTRFS_FIND_ROOT_OPTS }; void units_set_mode(unsigned *units, unsigned mode); From patchwork Fri Nov 27 19:30:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcos Paulo de Souza X-Patchwork-Id: 11937141 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 67987C3E8C5 for ; Fri, 27 Nov 2020 19:54:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F3D1A208B3 for ; Fri, 27 Nov 2020 19:54:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=mpdesouza.com header.i=@mpdesouza.com header.b="p66ygSla" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730852AbgK0TyJ (ORCPT ); Fri, 27 Nov 2020 14:54:09 -0500 Received: from gateway30.websitewelcome.com ([192.185.192.34]:17635 "EHLO gateway30.websitewelcome.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730718AbgK0TxE (ORCPT ); Fri, 27 Nov 2020 14:53:04 -0500 X-Greylist: delayed 701 seconds by postgrey-1.27 at vger.kernel.org; Fri, 27 Nov 2020 14:53:03 EST Received: from cm16.websitewelcome.com (cm16.websitewelcome.com [100.42.49.19]) by gateway30.websitewelcome.com (Postfix) with ESMTP id 21BD1A123 for ; Fri, 27 Nov 2020 13:31:32 -0600 (CST) Received: from br540.hostgator.com.br ([108.179.252.180]) by cmsmtp with SMTP id ijSukdLXHfAtaijSukTQit; Fri, 27 Nov 2020 13:31:32 -0600 X-Authority-Reason: nr=8 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mpdesouza.com; s=default; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=XzUl/OA+elutv3PgG4jfRtkmxPAF/uzTf0X4MmLH7XA=; b=p66ygSla/jDJwV5OaPNsJZ66G2 4rQfmejGMsDubi45GAEAHkIJmz+SLs8VOKM6VB6FTvwmcIjD9cXK8xLjrxCHwz/klBhn4RwsrVKI8 PDEk+FOvxIe7Fm6ExwUiEUN1zRVYBlLzOt9C7TYSEQgGIP0OBrJOZAfnMqMKmIsS3yJ2M2M+Rdi/5 cpEPBdld4b1ZA93Xa2M2uc483Iex06Sm1uPFlrUG5TG+FZ27pJm/g/j+LUPvrddPu7yzG0FIRFFtT M4hz0miRbY7k5uGcp0SalWYBZjoK4zG6Z/TBnwR/htpKu3HcjP/SCadO3m+mkxbgjhklKWhYlaoZb +wZ2hiuQ==; Received: from 200.146.52.186.dynamic.dialup.gvt.net.br ([200.146.52.186]:60574 helo=localhost.suse.de) by br540.hostgator.com.br with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1kijSt-003Dm3-I1; Fri, 27 Nov 2020 16:31:31 -0300 From: Marcos Paulo de Souza To: linux-btrfs@vger.kernel.org Cc: Marcos Paulo de Souza , wqu@suse.com, dsterba@suse.com Subject: [PATCH v4 3/3] btrfs-progs: tests: Add new logical-resolve test Date: Fri, 27 Nov 2020 16:30:35 -0300 Message-Id: <20201127193035.19171-4-marcos@mpdesouza.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201127193035.19171-1-marcos@mpdesouza.com> References: <20201127193035.19171-1-marcos@mpdesouza.com> MIME-Version: 1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - br540.hostgator.com.br X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - mpdesouza.com X-BWhitelist: no X-Source-IP: 200.146.52.186 X-Source-L: No X-Exim-ID: 1kijSt-003Dm3-I1 X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 200.146.52.186.dynamic.dialup.gvt.net.br (localhost.suse.de) [200.146.52.186]:60574 X-Source-Auth: marcos@mpdesouza.com X-Email-Count: 16 X-Source-Cap: bXBkZXNvNTM7bXBkZXNvNTM7YnI1NDAuaG9zdGdhdG9yLmNvbS5icg== X-Local-Domain: yes Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org From: Marcos Paulo de Souza Signed-off-by: Marcos Paulo de Souza --- .../test.sh | 81 +++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100755 tests/misc-tests/042-inspect-internal-logical-resolve/test.sh diff --git a/tests/misc-tests/042-inspect-internal-logical-resolve/test.sh b/tests/misc-tests/042-inspect-internal-logical-resolve/test.sh new file mode 100755 index 00000000..fcf1147f --- /dev/null +++ b/tests/misc-tests/042-inspect-internal-logical-resolve/test.sh @@ -0,0 +1,81 @@ +#!/bin/bash +# Check if logical-resolve is resolving the paths correctly for different +# subvolume tree configurations. This used to fail when a child subvolume was +# mounted without the parent subvolume being accessible. + +source "$TEST_TOP/common" + +setup_root_helper +prepare_test_dev + +check_prereq btrfs +check_prereq mkfs.btrfs + +check_logical_offset_filename() +{ + local filename + local offset + offset="$1" + filename="$2" + + while read file; do + if [[ "$file" = *"inode "* ]]; then + _log "$file" + elif [ ! -f $file ]; then + _fail "Path not $file file cannot be accessed" + elif [ ! $filename = $file ]; then + _fail "logical-resolve failed. Expected $filename but returned $file" + else + _log "$file" + fi + done < <($TOP/btrfs inspect-internal logical-resolve "$offset" "$TEST_MNT") +} + +run_check_mkfs_test_dev +run_check_mount_test_dev + +# create top subvolume called '@' +run_check $SUDO_HELPER "$TOP/btrfs" subvolume create "$TEST_MNT/@" + +# create a file in eacch subvolume of @, and each file will have 2 EXTENT_DATA +# items, and also create a snapshot to have a extent being referenced by two +# different fs trees +run_check $SUDO_HELPER "$TOP/btrfs" subvolume create "$TEST_MNT/@/vol1" +vol1id=$($SUDO_HELPER "$TOP/btrfs" inspect-internal rootid "$TEST_MNT/@/vol1") +run_check $SUDO_HELPER dd if=/dev/zero bs=1M count=150 of="$TEST_MNT/@/vol1/file1" +run_check $SUDO_HELPER "$TOP/btrfs" subvolume snapshot "$TEST_MNT/@/vol1" "$TEST_MNT/@/snap1" + +run_check $SUDO_HELPER "$TOP/btrfs" subvolume create "$TEST_MNT/@/vol1/subvol1" +subvol1id=$($SUDO_HELPER "$TOP/btrfs" inspect-internal rootid "$TEST_MNT/@/vol1/subvol1") +run_check $SUDO_HELPER dd if=/dev/zero bs=1M count=150 of="$TEST_MNT/@/vol1/subvol1/file2" +run_check $SUDO_HELPER "$TOP/btrfs" subvolume snapshot "$TEST_MNT/@/vol1/subvol1" \ + "$TEST_MNT/@/vol1/snapshot1" + +"$TOP/btrfs" filesystem sync "$TEST_MNT" + +run_check_umount_test_dev + +# to be used later +mkdir -p mnt2 + +$SUDO_HELPER mount -o subvol=/@/vol1 $TEST_DEV "$TEST_MNT" +# create a bind mount to the vol1. logical-resolve should avoid bind mounts, +# otherwise the test will fail +mkdir -p "$TEST_MNT/dir" +$SUDO_HELPER mount --bind "$TEST_MNT/dir" mnt2 + +for offset in $("$TOP/btrfs" inspect-internal dump-tree -t "$vol1id" \ + "$TEST_DEV" | awk '/disk byte/ { print $5 }'); do + check_logical_offset_filename "$offset" "$TEST_MNT/file1" +done + +run_check_umount_test_dev mnt2 +run_check_umount_test_dev + +$SUDO_HELPER mount -o subvol=/@/vol1/subvol1 $TEST_DEV "$TEST_MNT" +for offset in $("$TOP/btrfs" inspect-internal dump-tree -t "$subvol1id" \ + "$TEST_DEV" | awk '/disk byte/ { print $5 }'); do + check_logical_offset_filename "$offset" "$TEST_MNT/file2" +done + +run_check_umount_test_dev