From patchwork Thu Jan 6 17:49:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Goffredo Baroncelli X-Patchwork-Id: 12705608 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D8D9BC433F5 for ; Thu, 6 Jan 2022 17:49:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242372AbiAFRtV (ORCPT ); Thu, 6 Jan 2022 12:49:21 -0500 Received: from santino.mail.tiscali.it ([213.205.33.245]:56256 "EHLO smtp.tiscali.it" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S242374AbiAFRtQ (ORCPT ); Thu, 6 Jan 2022 12:49:16 -0500 Received: from venice.bhome ([84.220.25.125]) by santino.mail.tiscali.it with id fVpB260072hwt0401VpDJJ; Thu, 06 Jan 2022 17:49:13 +0000 x-auth-user: kreijack@tiscali.it From: Goffredo Baroncelli To: linux-btrfs@vger.kernel.org Cc: Zygo Blaxell , Josef Bacik , David Sterba , Sinnamohideen Shafeeq , Paul Jones , Boris Burkov , Goffredo Baroncelli Subject: [PATCH 1/2] btrfs-progs: new "allocation_hint" property. Date: Thu, 6 Jan 2022 18:49:02 +0100 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Reply-To: Goffredo Baroncelli MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tiscali.it; s=smtp; t=1641491353; bh=JBglZums9YQ5aaQbByVh3QfN4idnVx7qtVndwFrKlIw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=j+OB7l+tjYMIOAMTp1vNnHhDkW9E8PsuGCgIrys2YsOIhv8jrAEkNhvU1luwbW1cJ 2/pIxtV/zA60vOLyIjMMLJHK/kYqhqLkfEujHQFfo9qqbhpt5fTSg1xf4kv75JrFvu +veRv/Gjh0ukhmA5fNO1YF0X4o8d22W7DZhdh7BM= Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org From: Goffredo Baroncelli Handle the property allocation_hint of a btrfs device. Below an example of use: $ # set a new value $ sudo btrfs property set /dev/vde allocation_hint DATA_ONLY $ # get the current value $ sudo btrfs property get /dev/vde allocation_hint devid=4, path=/dev/vde: allocation_hint=DATA_ONLY The following values are availables: - DATA_ONLY - DATA_PREFERRED (default) - METADATA_PREFERRED - METADATA_ONLY Root privileges are required. Signed-off-by: Goffredo Baroncelli --- cmds/property.c | 202 ++++++++++++++++++++++++++++++++++++++++++ kernel-shared/ctree.h | 13 +++ 2 files changed, 215 insertions(+) diff --git a/cmds/property.c b/cmds/property.c index 59ef997c..1ac4266a 100644 --- a/cmds/property.c +++ b/cmds/property.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include "cmds/commands.h" @@ -30,6 +31,7 @@ #include "common/open-utils.h" #include "common/utils.h" #include "common/help.h" +#include "common/path-utils.h" #define XATTR_BTRFS_PREFIX "btrfs." #define XATTR_BTRFS_PREFIX_LEN (sizeof(XATTR_BTRFS_PREFIX) - 1) @@ -232,6 +234,200 @@ out: return ret; } +static int btrfs_find_devid_and_mnt(const char *devpath, int *devid, + char *path, int maxpath) +{ + int ret, i, fd; + DIR *dir; + struct stat stdevpath; + struct btrfs_ioctl_fs_info_args fi_args; + struct btrfs_ioctl_dev_info_args dev_info; + + ret = get_btrfs_mount(devpath, path, maxpath); + if (ret) + return ret; + + fd = btrfs_open_dir(path, &dir, 1); + if (fd < 0) + return fd; + + ret = stat(devpath, &stdevpath); + if (ret) { + error("cannot stat '%s'", devpath); + goto out; + } + + ret = ioctl(fd, BTRFS_IOC_FS_INFO, &fi_args); + if (ret < 0) { + if (errno == EPERM) + return -errno; + error("cannot get filesystem info: %m"); + ret = -10; + goto out; + } + + for (i = 0 ; i <= fi_args.max_id ; i++) { + struct stat st; + + memset(&dev_info, 0, sizeof(dev_info)); + ret = get_device_info(fd, i, &dev_info); + if (ret == -ENODEV) + continue; + if (ret) { + error("cannot get info about device devid=%d", i); + goto out; + } + + if (!dev_info.path) + /* missing devices */ + continue; + + ret = stat((char *)dev_info.path, &st); + if (ret) { + error("cannot stat '%s'", devpath); + goto out; + } + + if (major(st.st_rdev) == major(stdevpath.st_rdev) && + minor(st.st_rdev) == minor(stdevpath.st_rdev)) { + *devid = dev_info.devid; + ret = 0; + goto out; + } + } + + ret = -12; + +out: + close_file_or_dir(fd, dir); + return ret; +} + +static struct ull_charp_pair_t { + u64 value; + const char *descr; +} allocation_hint_description[] = { + {BTRFS_DEV_ALLOCATION_HINT_METADATA_PREFERRED, "METADATA_PREFERRED"}, + {BTRFS_DEV_ALLOCATION_HINT_METADATA_ONLY, "METADATA_ONLY"}, + {BTRFS_DEV_ALLOCATION_HINT_DATA_PREFERRED, "DATA_PREFERRED"}, + {BTRFS_DEV_ALLOCATION_HINT_DATA_ONLY, "DATA_ONLY"}, + {0, NULL} +}; + +static int prop_allocation_hint(enum prop_object_type type, + const char *object, + const char *name, + const char *val, + bool force) +{ + int ret, devid, fd, fd2 = -1; + char path[PATH_MAX]; + DIR *dir; + u8 fsid[BTRFS_UUID_SIZE]; + char fsid_str[BTRFS_UUID_UNPARSED_SIZE]; + char sysfs_file[PATH_MAX]; + char filename[PATH_MAX]; + int i; + u64 v; + char buf[1024]; + + ret = btrfs_find_devid_and_mnt(object, &devid, path, sizeof(path)); + if (ret) + return -5; + + fd = btrfs_open_dir(path, &dir, 1); + if (fd < 0) + return fd; + + ret = get_fsid_fd(fd, fsid); + if (ret < 0) + goto out; + + uuid_unparse(fsid, fsid_str); + sprintf(filename, "devinfo/%d/allocation_hint", devid); + + /* build /sys/fs/btrfs//devinfo//type */ + ret = path_cat3_out(sysfs_file, "/sys/fs/btrfs", fsid_str, filename); + if (ret < 0) + goto out; + + if (!val) { + /* READ */ + fd2 = open(sysfs_file, O_RDONLY); + if (fd2 < 0) { + error("'allocation_hint' property not available or accessible."); + ret = -errno; + goto out; + } + + ret = read(fd2, buf, sizeof(buf) - 1); + if (ret < 0) { + error("Unable to read the 'allocation_hint' property."); + ret = -errno; + goto out; + } + + buf[sizeof(buf) - 1] = 0; + v = strtoull(buf, NULL, 0); + + for (i = 0 ; allocation_hint_description[i].descr ; i++) + if (v == allocation_hint_description[i].value) + break; + + if (allocation_hint_description[i].descr) + printf("devid=%d, path=%s: allocation_hint=%s\n", + devid, object, + allocation_hint_description[i].descr); + else + printf("devid=%d, path=%s: allocation_hint=unknown:%llu\n", + devid, object, v); + ret = 0; + } else { + /* WRITE */ + for (i = 0 ; allocation_hint_description[i].descr ; i++) + if (!strcmp(val, allocation_hint_description[i].descr)) + break; + + if (allocation_hint_description[i].descr) { + v = allocation_hint_description[i].value; + } else if (sscanf(val, "%llu", &v) != 1) { + error("Invalid value '%s'\n", val); + ret = -3; + goto out; + } + if (v & ~BTRFS_DEV_ALLOCATION_HINT_MASK) { + error("Invalid value '%s'\n", val); + ret = -3; + goto out; + } + + fd2 = open(sysfs_file, O_RDWR); + if (fd2 < 0) { + error("'allocation_hint' property not available or accessible for updating."); + ret = -errno; + goto out; + } + + sprintf(buf, "%llu", v); + + ret = write(fd2, buf, strlen(buf)); + + if (ret != strlen(buf)) { + error("Unable to update 'allocation_hint' property."); + ret = -errno; + goto out; + } + + } + + ret = 0; +out: + if (fd2 >= 0) + close(fd2); + close_file_or_dir(fd, dir); + return ret; +} + const struct prop_handler prop_handlers[] = { { .name ="ro", @@ -254,6 +450,12 @@ const struct prop_handler prop_handlers[] = { .types = prop_object_inode, .handler = prop_compression }, + { + .name = "allocation_hint", + .desc = "hint to store the data/metadata chunks", + .types = prop_object_dev, + .handler = prop_allocation_hint + }, {NULL, NULL, 0, 0, NULL} }; diff --git a/kernel-shared/ctree.h b/kernel-shared/ctree.h index 6ca49c09..597ad1af 100644 --- a/kernel-shared/ctree.h +++ b/kernel-shared/ctree.h @@ -216,6 +216,19 @@ struct btrfs_mapping_tree { struct cache_tree cache_tree; }; +/* btrfs chunk allocation hints */ +#define BTRFS_DEV_ALLOCATION_HINT_BIT_COUNT 2 +#define BTRFS_DEV_ALLOCATION_HINT_MASK ((1ULL << \ + BTRFS_DEV_ALLOCATION_HINT_BIT_COUNT) - 1) +/* preferred metadata chunk, but data chunk allowed */ +#define BTRFS_DEV_ALLOCATION_HINT_METADATA_PREFERRED (1ULL) +/* only metadata chunk are allowed */ +#define BTRFS_DEV_ALLOCATION_HINT_METADATA_ONLY (2ULL) +/* only data chunk allowed */ +#define BTRFS_DEV_ALLOCATION_HINT_DATA_ONLY (3ULL) +/* preferred data chunk, but metadata chunk allowed */ +#define BTRFS_DEV_ALLOCATION_HINT_DATA_PREFERRED (0ULL) + #define BTRFS_UUID_SIZE 16 struct btrfs_dev_item { /* the internal btrfs device id */ From patchwork Thu Jan 6 17:49:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Goffredo Baroncelli X-Patchwork-Id: 12705610 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 738E1C433FE for ; Thu, 6 Jan 2022 17:49:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242407AbiAFRtX (ORCPT ); Thu, 6 Jan 2022 12:49:23 -0500 Received: from santino.mail.tiscali.it ([213.205.33.245]:56282 "EHLO smtp.tiscali.it" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S242392AbiAFRtR (ORCPT ); Thu, 6 Jan 2022 12:49:17 -0500 Received: from venice.bhome ([84.220.25.125]) by santino.mail.tiscali.it with id fVpB260072hwt0401VpDJf; Thu, 06 Jan 2022 17:49:14 +0000 x-auth-user: kreijack@tiscali.it From: Goffredo Baroncelli To: linux-btrfs@vger.kernel.org Cc: Zygo Blaxell , Josef Bacik , David Sterba , Sinnamohideen Shafeeq , Paul Jones , Boris Burkov , Goffredo Baroncelli Subject: [PATCH 2/2] Update man page for allocator_hint property. Date: Thu, 6 Jan 2022 18:49:03 +0100 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Reply-To: Goffredo Baroncelli MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tiscali.it; s=smtp; t=1641491354; bh=asotvVmm9NKLTEMVpHnR79w3ucYdvVxl6spURN3HzNg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=kz3w09NXGVzF/VViAYegYwNONURF/lE9OTATFgTo/nAi+1YrRjGUHjq/beatMNbdO 1edIbUoCSx3B83Z9aW33sWbiMsFJlZXND3cnT//856N+W6cAPDlCqCkQicEWstMRNI eCT7WJoxltlxtD+LtJEbx1yjyIuIl+t9pZFrRJkg= Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org From: Goffredo Baroncelli Update the man page of the btrfs property subcommand to show the use of the device property "allocation_hint". Signed-off-by: Goffredo Baroncelli --- Documentation/btrfs-property.asciidoc | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/Documentation/btrfs-property.asciidoc b/Documentation/btrfs-property.asciidoc index b32d000e..70b01f68 100644 --- a/Documentation/btrfs-property.asciidoc +++ b/Documentation/btrfs-property.asciidoc @@ -49,6 +49,23 @@ device as object. For a mounted filesystem, specify a mount point. compression:::: compression algorithm set for an inode, possible values: 'lzo', 'zlib', 'zstd'. To disable compression use "" (empty string), 'no' or 'none'. +allocation_hint:::: +a device property that instructs how and when the allocator should use a +block device. +Possible values are: +- 'METADATA_PREFERRED': the device has an higher priority when a new metadata +chunk is allocated. Data chunk is allowed only if there is no other possibility. +- 'METADATA_ONLY': the device is used only for metadata chunk. +Data chunk is never allowed. +- 'DATA_PREFERRED' (default): the device has an higher priority when a new data +chunk is allocated. Metadata chunk is allowed only if there is no other +possibility. +- 'DATA_ONLY': the device is used only for data chunk. +Metadata chunk is never allowed. + :::: +The default is 'DATA_PREFERRED'; if all the disks have this setting the +allocator uses all of them with the same priority. + *list* [-t ] :: Lists available properties with their descriptions for the given object.