From patchwork Thu Sep 19 23:53:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 13808039 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 34A0A17C8B for ; Thu, 19 Sep 2024 23:53:05 +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=1726789986; cv=none; b=H9FLDKSMh4heUlHxsvC8xe94m0Y+iFSxqTo3yCG1TUTz+qAO+73/vw/vlWQ0D0tLZRvZa/RQwQPy2zbjKPF1BhEVwxvrsm/NzkWOzJmeUTp/H8YZGLwoy2BYcV2BWgIxI7jjyk9Vv+AdmujevSevwWchKNm9hg03OU3oqfOmpl4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726789986; c=relaxed/simple; bh=kIaY+NssqJHtwTsoP73k8rZq9dsiM7PfLT/CJFVUMag=; h=Date:Subject:From:To:Cc:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=ZQMri4W4Hhc3ZtVdljKeKLSGUN/stUeLprgx8NZ3dkchDDNRtMlSFBHNiCYTxuymkt5Xjmc4tGjlelUbae+UrbO0u+wXhAjsLGfpgpB9znwT6pBRg6Ug5ja8jTgP24yRNunelRz7C5Lg0KnykbYq2r2gLslNV0Ls+p9+94gFHp4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=quOM1VE7; 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="quOM1VE7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AA8E9C4CEC4; Thu, 19 Sep 2024 23:53:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1726789985; bh=kIaY+NssqJHtwTsoP73k8rZq9dsiM7PfLT/CJFVUMag=; h=Date:Subject:From:To:Cc:In-Reply-To:References:From; b=quOM1VE7wxIpVLZp6boyCfFTPB1TlM3NOeaeOhU8vLDcKo7lTMxWcCLfLJ4yLoLsi pr5dPrssY8jcZwxK86YIWtWTj+TvLYPwt8Gh4SZZKMcIWcnSLDmcqjMcADfNUIP11J LMJd5k8KsXdjtV7N6T62m6F1SqKe1AA25b7rBdn8VXhJRlns/a9GJ8u+/jqgOl9CPG +DA3HeVcf9bmujBo1yhbozGw+RoEwvPEwUhwi7OA61tK/YXG5+H4e+7GVHaAH0sOCi L3rfuBAO8/UrNwoMxiwD8QwxyHoChUPRNMcOTtZWDoCQBSRV6Hh8RT0+ihoHxP8FhA G9ly8xeMVW0Tw== Date: Thu, 19 Sep 2024 16:53:05 -0700 Subject: [PATCH 1/2] misc: clean up code around attr_list_by_handle calls From: "Darrick J. Wong" To: djwong@kernel.org, cem@kernel.org Cc: linux-xfs@vger.kernel.org, hch@lst.de Message-ID: <172678988217.4013721.10321131196439907338.stgit@frogsfrogsfrogs> In-Reply-To: <172678988199.4013721.16925840378603009022.stgit@frogsfrogsfrogs> References: <172678988199.4013721.16925840378603009022.stgit@frogsfrogsfrogs> User-Agent: StGit/0.19 Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Darrick J. Wong Reduce stack usage of the attr_list_by_handle calls by allocating the buffers dynamically. Remove some redundant bits while we're at it. Signed-off-by: Darrick J. Wong Reviewed-by: Christoph Hellwig --- libfrog/fsprops.c | 10 ++++++---- scrub/phase5.c | 46 +++++++++++++++++++++++++++++----------------- 2 files changed, 35 insertions(+), 21 deletions(-) diff --git a/libfrog/fsprops.c b/libfrog/fsprops.c index 88046b7a0738..a25c2726cd58 100644 --- a/libfrog/fsprops.c +++ b/libfrog/fsprops.c @@ -69,13 +69,14 @@ fsprops_walk_names( void *priv) { struct attrlist_cursor cur = { }; - char attrbuf[XFS_XATTR_LIST_MAX]; - struct attrlist *attrlist = (struct attrlist *)attrbuf; + struct attrlist *attrlist; int ret; - memset(attrbuf, 0, XFS_XATTR_LIST_MAX); + attrlist = calloc(XFS_XATTR_LIST_MAX, 1); + if (!attrlist) + return -1; - while ((ret = attr_list_by_handle(fph->hanp, fph->hlen, attrbuf, + while ((ret = attr_list_by_handle(fph->hanp, fph->hlen, attrlist, XFS_XATTR_LIST_MAX, XFS_IOC_ATTR_ROOT, &cur)) == 0) { unsigned int i; @@ -96,6 +97,7 @@ fsprops_walk_names( break; } + free(attrlist); return ret; } diff --git a/scrub/phase5.c b/scrub/phase5.c index f6c295c64ada..d298d628a998 100644 --- a/scrub/phase5.c +++ b/scrub/phase5.c @@ -190,30 +190,40 @@ check_xattr_ns_names( struct xfs_bulkstat *bstat, const struct attrns_decode *attr_ns) { - struct attrlist_cursor cur; - char attrbuf[XFS_XATTR_LIST_MAX]; - char keybuf[XATTR_NAME_MAX + 1]; - struct attrlist *attrlist = (struct attrlist *)attrbuf; - struct attrlist_ent *ent; + struct attrlist_cursor cur = { }; + char *keybuf; + struct attrlist *attrlist; struct unicrash *uc = NULL; int i; int error; + attrlist = calloc(XFS_XATTR_LIST_MAX, 1); + if (!attrlist) { + error = errno; + str_errno(ctx, descr_render(dsc)); + return error; + } + + keybuf = calloc(XATTR_NAME_MAX + 1, 1); + if (!keybuf) { + error = errno; + str_errno(ctx, descr_render(dsc)); + goto out_attrlist; + } + error = unicrash_xattr_init(&uc, ctx, bstat); if (error) { str_liberror(ctx, error, descr_render(dsc)); - return error; + goto out_keybuf; } - memset(attrbuf, 0, XFS_XATTR_LIST_MAX); - memset(&cur, 0, sizeof(cur)); - memset(keybuf, 0, XATTR_NAME_MAX + 1); - error = attr_list_by_handle(handle, sizeof(*handle), attrbuf, - XFS_XATTR_LIST_MAX, attr_ns->flags, &cur); - while (!error) { + while ((error = attr_list_by_handle(handle, sizeof(*handle), attrlist, + XFS_XATTR_LIST_MAX, attr_ns->flags, + &cur)) == 0) { /* Examine the xattrs. */ for (i = 0; i < attrlist->al_count; i++) { - ent = ATTR_ENTRY(attrlist, i); + struct attrlist_ent *ent = ATTR_ENTRY(attrlist, i); + snprintf(keybuf, XATTR_NAME_MAX, "%s.%s", attr_ns->name, ent->a_name); if (uc) @@ -225,14 +235,12 @@ check_xattr_ns_names( keybuf); if (error) { str_liberror(ctx, error, descr_render(dsc)); - goto out; + goto out_uc; } } if (!attrlist->al_more) break; - error = attr_list_by_handle(handle, sizeof(*handle), attrbuf, - XFS_XATTR_LIST_MAX, attr_ns->flags, &cur); } if (error) { if (errno == ESTALE) @@ -241,8 +249,12 @@ check_xattr_ns_names( if (errno) str_errno(ctx, descr_render(dsc)); } -out: +out_uc: unicrash_free(uc); +out_keybuf: + free(keybuf); +out_attrlist: + free(attrlist); return error; } From patchwork Thu Sep 19 23:53:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 13808040 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 C8E0C17C8B for ; Thu, 19 Sep 2024 23:53:21 +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=1726790001; cv=none; b=e8zWK3q+vEKgtmGszSYSFz3+Nd8oEMG/meMzFG6+i3+pQn5YRrduZ2BlSdtMCQDbDltqussZ2PI4F7M3nFVJ+ac2z4oShI890NLpgQ4GHA0cfYYs3l4zT33Z3P9CD8pX/yGllrMnNT62F26ebTbPXkYssVZH0qbResGm9spRGiE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726790001; c=relaxed/simple; bh=AP7cVxmSUPO9QI89BnZ5hTglySMnDK+rVI5TcdNL3xA=; h=Date:Subject:From:To:Cc:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=JCKTsgymtAfJ65SjNEylgOnZ9Ae8DDxZX61JVI2XawjZI1dcge5vKpGMeh5R5J+OGra1/NGo3fkizW2D5lt7wqRGJjImXJKLLPeVA2VrvmXGdSR1d0ji9n9mbXCCpQ5xgY+z4qIIXRnCM8iEG6eZyDz81f22qZ1r2hiavZFIOq4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=GNosROY9; 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="GNosROY9" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 64628C4CEC4; Thu, 19 Sep 2024 23:53:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1726790001; bh=AP7cVxmSUPO9QI89BnZ5hTglySMnDK+rVI5TcdNL3xA=; h=Date:Subject:From:To:Cc:In-Reply-To:References:From; b=GNosROY9WS96JKxoEFkbPZo/Oi8yKsYHTtla1r8dPuqyCqFPBoJYQ45thyOTX4kWs HcS/j2TU1ZsANHt9U8y5I9HzR/8RJItAX5yo/O2f+cyzHPXPywbvD9/5lmgBjUTgj6 c1MDZC0pMBsmXyKP753byy3SWLMb9vLQIMFMVixPywrMYoVRn0QkofOSyGho4Dg+AQ QZvWOpv7zdwxoobu8ieKMj1J+ubBezrYzhO72J1vQg1jLPfec9at06MljzafDWIdCR BvZjbRq17i/8x/18j1hUjv+j+9xv1WRF2WibF9CSJtgYlBocmwoPiYjgbjln3OBmUM 1xLy5yJ18HN9g== Date: Thu, 19 Sep 2024 16:53:20 -0700 Subject: [PATCH 2/2] libfrog: emulate deprecated attrlist functionality in libattr From: "Darrick J. Wong" To: djwong@kernel.org, cem@kernel.org Cc: linux-xfs@vger.kernel.org, hch@lst.de Message-ID: <172678988232.4013721.6771483228393251863.stgit@frogsfrogsfrogs> In-Reply-To: <172678988199.4013721.16925840378603009022.stgit@frogsfrogsfrogs> References: <172678988199.4013721.16925840378603009022.stgit@frogsfrogsfrogs> User-Agent: StGit/0.19 Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Darrick J. Wong Break our dependence on the (deprecated) libattr by emulating the necessary pieces in libfrog. It's a little sketchy to open-code these symbols, but they're originally from XFS so we trust ourselves. Signed-off-by: Darrick J. Wong Reviewed-by: Christoph Hellwig --- configure.ac | 2 -- debian/control | 2 +- include/builddefs.in | 1 - libfrog/Makefile | 8 +++----- libfrog/fakelibattr.h | 36 ++++++++++++++++++++++++++++++++++++ libfrog/fsprops.c | 16 ++++++++-------- m4/package_attr.m4 | 25 ------------------------- scrub/Makefile | 4 ---- scrub/phase5.c | 23 +++++++++-------------- 9 files changed, 57 insertions(+), 60 deletions(-) create mode 100644 libfrog/fakelibattr.h delete mode 100644 m4/package_attr.m4 diff --git a/configure.ac b/configure.ac index 33b01399ae3b..d021c519d538 100644 --- a/configure.ac +++ b/configure.ac @@ -152,8 +152,6 @@ AC_HAVE_DEVMAPPER AC_HAVE_MALLINFO AC_HAVE_MALLINFO2 AC_HAVE_MEMFD_CREATE -AC_PACKAGE_WANT_ATTRIBUTES_H -AC_HAVE_LIBATTR if test "$enable_scrub" = "yes"; then if test "$enable_libicu" = "yes" || test "$enable_libicu" = "probe"; then AC_HAVE_LIBICU diff --git a/debian/control b/debian/control index 3f05d4e3797c..66b0a47a36ee 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: admin Priority: optional Maintainer: XFS Development Team Uploaders: Nathan Scott , Anibal Monsalve Salazar , Bastian Germann -Build-Depends: libinih-dev (>= 53), uuid-dev, debhelper (>= 12), gettext, libtool, libedit-dev, libblkid-dev (>= 2.17), linux-libc-dev, libdevmapper-dev, libattr1-dev, libicu-dev, pkg-config, liburcu-dev, systemd-dev | systemd (<< 253-2~) +Build-Depends: libinih-dev (>= 53), uuid-dev, debhelper (>= 12), gettext, libtool, libedit-dev, libblkid-dev (>= 2.17), linux-libc-dev, libdevmapper-dev, libicu-dev, pkg-config, liburcu-dev, systemd-dev | systemd (<< 253-2~) Standards-Version: 4.0.0 Homepage: https://xfs.wiki.kernel.org/ diff --git a/include/builddefs.in b/include/builddefs.in index 1647d2cd1690..07c4a43f78a0 100644 --- a/include/builddefs.in +++ b/include/builddefs.in @@ -102,7 +102,6 @@ HAVE_DEVMAPPER = @have_devmapper@ HAVE_MALLINFO = @have_mallinfo@ HAVE_MALLINFO2 = @have_mallinfo2@ HAVE_MEMFD_CREATE = @have_memfd_create@ -HAVE_LIBATTR = @have_libattr@ HAVE_LIBICU = @have_libicu@ HAVE_SYSTEMD = @have_systemd@ SYSTEMD_SYSTEM_UNIT_DIR = @systemd_system_unit_dir@ diff --git a/libfrog/Makefile b/libfrog/Makefile index acddc894ee93..4da427789411 100644 --- a/libfrog/Makefile +++ b/libfrog/Makefile @@ -21,6 +21,7 @@ crc32.c \ file_exchange.c \ fsgeom.c \ fsproperties.c \ +fsprops.c \ getparents.c \ histogram.c \ list_sort.c \ @@ -46,9 +47,11 @@ crc32defs.h \ crc32table.h \ dahashselftest.h \ div64.h \ +fakelibattr.h \ file_exchange.h \ fsgeom.h \ fsproperties.h \ +fsprops.h \ getparents.h \ histogram.h \ logging.h \ @@ -62,11 +65,6 @@ workqueue.h LSRCFILES += gen_crc32table.c -ifeq ($(HAVE_LIBATTR),yes) -CFILES+=fsprops.c -HFILES+=fsprops.h -endif - LDIRT = gen_crc32table crc32table.h default: ltdepend $(LTLIBRARY) diff --git a/libfrog/fakelibattr.h b/libfrog/fakelibattr.h new file mode 100644 index 000000000000..30e0e51466d8 --- /dev/null +++ b/libfrog/fakelibattr.h @@ -0,0 +1,36 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Copyright (c) 2024 Oracle. All Rights Reserved. + * Author: Darrick J. Wong + */ +#ifndef __LIBFROG_FAKELIBATTR_H__ +#define __LIBFROG_FAKELIBATTR_H__ + +/* This file emulates APIs from the deprecated libattr. */ + +struct attrlist_cursor; + +static inline struct xfs_attrlist_ent * +libfrog_attr_entry( + struct xfs_attrlist *list, + unsigned int index) +{ + char *buffer = (char *)list; + + return (struct xfs_attrlist_ent *)&buffer[list->al_offset[index]]; +} + +static inline int +libfrog_attr_list_by_handle( + void *hanp, + size_t hlen, + void *buf, + size_t bufsize, + int flags, + struct xfs_attrlist_cursor *cursor) +{ + return attr_list_by_handle(hanp, hlen, buf, bufsize, flags, + (struct attrlist_cursor *)cursor); +} + +#endif /* __LIBFROG_FAKELIBATTR_H__ */ diff --git a/libfrog/fsprops.c b/libfrog/fsprops.c index a25c2726cd58..f59fbd9c2165 100644 --- a/libfrog/fsprops.c +++ b/libfrog/fsprops.c @@ -10,8 +10,7 @@ #include "libfrog/bulkstat.h" #include "libfrog/fsprops.h" #include "libfrog/fsproperties.h" - -#include +#include "libfrog/fakelibattr.h" /* * Given an xfd and a mount table path, get us the handle for the root dir so @@ -68,21 +67,22 @@ fsprops_walk_names( fsprops_name_walk_fn walk_fn, void *priv) { - struct attrlist_cursor cur = { }; - struct attrlist *attrlist; + struct xfs_attrlist_cursor cur = { }; + struct xfs_attrlist *attrlist; int ret; attrlist = calloc(XFS_XATTR_LIST_MAX, 1); if (!attrlist) return -1; - while ((ret = attr_list_by_handle(fph->hanp, fph->hlen, attrlist, - XFS_XATTR_LIST_MAX, XFS_IOC_ATTR_ROOT, - &cur)) == 0) { + while ((ret = libfrog_attr_list_by_handle(fph->hanp, fph->hlen, + attrlist, XFS_XATTR_LIST_MAX, + XFS_IOC_ATTR_ROOT, &cur)) == 0) { unsigned int i; for (i = 0; i < attrlist->al_count; i++) { - struct attrlist_ent *ent = ATTR_ENTRY(attrlist, i); + struct xfs_attrlist_ent *ent = + libfrog_attr_entry(attrlist, i); const char *p = attr_name_to_fsprop_name(ent->a_name); diff --git a/m4/package_attr.m4 b/m4/package_attr.m4 deleted file mode 100644 index 05e02b38fb5a..000000000000 --- a/m4/package_attr.m4 +++ /dev/null @@ -1,25 +0,0 @@ -AC_DEFUN([AC_PACKAGE_WANT_ATTRIBUTES_H], - [ - AC_CHECK_HEADERS(attr/attributes.h) - ]) - -# -# Check if we have a ATTR_ROOT flag and libattr structures -# -AC_DEFUN([AC_HAVE_LIBATTR], - [ AC_MSG_CHECKING([for struct attrlist_cursor]) - AC_COMPILE_IFELSE( - [ AC_LANG_PROGRAM([[ -#include -#include - ]], [[ -struct attrlist_cursor *cur; -struct attrlist *list; -struct attrlist_ent *ent; -int flags = ATTR_ROOT; - ]]) - ], have_libattr=yes - AC_MSG_RESULT(yes), - AC_MSG_RESULT(no)) - AC_SUBST(have_libattr) - ]) diff --git a/scrub/Makefile b/scrub/Makefile index 53e8cb02a926..1e1109048c2a 100644 --- a/scrub/Makefile +++ b/scrub/Makefile @@ -100,10 +100,6 @@ ifeq ($(HAVE_MALLINFO2),yes) LCFLAGS += -DHAVE_MALLINFO2 endif -ifeq ($(HAVE_LIBATTR),yes) -LCFLAGS += -DHAVE_LIBATTR -endif - ifeq ($(HAVE_LIBICU),yes) CFILES += unicrash.c LCFLAGS += -DHAVE_LIBICU $(LIBICU_CFLAGS) diff --git a/scrub/phase5.c b/scrub/phase5.c index d298d628a998..e1d94f9a3568 100644 --- a/scrub/phase5.c +++ b/scrub/phase5.c @@ -8,9 +8,6 @@ #include #include #include -#ifdef HAVE_LIBATTR -# include -#endif #include #include "handle.h" #include "list.h" @@ -20,6 +17,7 @@ #include "libfrog/scrub.h" #include "libfrog/bitmap.h" #include "libfrog/bulkstat.h" +#include "libfrog/fakelibattr.h" #include "xfs_scrub.h" #include "common.h" #include "inodes.h" @@ -164,7 +162,6 @@ check_dirent_names( return ret; } -#ifdef HAVE_LIBATTR /* Routines to scan all of an inode's xattrs for name problems. */ struct attrns_decode { int flags; @@ -173,8 +170,8 @@ struct attrns_decode { static const struct attrns_decode attr_ns[] = { {0, "user"}, - {ATTR_ROOT, "system"}, - {ATTR_SECURE, "secure"}, + {XFS_IOC_ATTR_ROOT, "system"}, + {XFS_IOC_ATTR_SECURE, "secure"}, {0, NULL}, }; @@ -190,9 +187,9 @@ check_xattr_ns_names( struct xfs_bulkstat *bstat, const struct attrns_decode *attr_ns) { - struct attrlist_cursor cur = { }; + struct xfs_attrlist_cursor cur = { }; char *keybuf; - struct attrlist *attrlist; + struct xfs_attrlist *attrlist; struct unicrash *uc = NULL; int i; int error; @@ -217,12 +214,13 @@ check_xattr_ns_names( goto out_keybuf; } - while ((error = attr_list_by_handle(handle, sizeof(*handle), attrlist, - XFS_XATTR_LIST_MAX, attr_ns->flags, + while ((error = libfrog_attr_list_by_handle(handle, sizeof(*handle), + attrlist, XFS_XATTR_LIST_MAX, attr_ns->flags, &cur)) == 0) { /* Examine the xattrs. */ for (i = 0; i < attrlist->al_count; i++) { - struct attrlist_ent *ent = ATTR_ENTRY(attrlist, i); + struct xfs_attrlist_ent *ent = + libfrog_attr_entry(attrlist, i); snprintf(keybuf, XATTR_NAME_MAX, "%s.%s", attr_ns->name, ent->a_name); @@ -279,9 +277,6 @@ check_xattr_names( } return ret; } -#else -# define check_xattr_names(c, d, h, b) (0) -#endif /* HAVE_LIBATTR */ static int render_ino_from_handle(