From patchwork Sun Mar 17 16:34: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: 13594685 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 532C31B949; Sun, 17 Mar 2024 16:34: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=1710693246; cv=none; b=q4UfzPvjLbDdcDnxbd+r38uBITsMjoulUza6DwOpONWLydOqqJuzjexryxOUbolp4jD/PSnQiWf15XBOseZ+eCkvLxClyDjTgcnc2BCd1IslO1aki297TK6xAZZb1A3jRZ1mCpT/oRKBlW51s+T1fmdIkmVsisOfClMTrGa09LY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710693246; c=relaxed/simple; bh=kwab96/jJDrcOROQdEleYxy9DZSIXvgQliZADQW+gqg=; h=Date:Subject:From:To:Cc:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=XCNmtZDyPqdnf0Gz0j/VPKVkYqLtXPU8ky6TsPo7FD2pUz1gBsRAoJtf/vlQagEyocq8P0DzyozuTTxGuGwt7gD1y95iWZHcVIMyQh8qxTXd9wRBeI/xk58xlRFNCH/ubOJ3mLaBpjPyvvWzOzbXCwiizyQAgT8rw4BmYDM8xCc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=kN5W3VXZ; 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="kN5W3VXZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C250CC433F1; Sun, 17 Mar 2024 16:34:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1710693245; bh=kwab96/jJDrcOROQdEleYxy9DZSIXvgQliZADQW+gqg=; h=Date:Subject:From:To:Cc:In-Reply-To:References:From; b=kN5W3VXZggoD5j3lccDK/SUp2UiuaOtioLPLZDOuRbQp2x8usblI2T8sca4nfkjNL LnWwVaiCm3abUnFkxufgPTlusc5PY2hF8hhwg4Ax0VmUzxdTnUrcpYPsrgMpHqgmQe J6TPxaJpbtaWzaUUJz+dMOZhPS1HKVK72NeHnrrT34pMrEccM+IeFYXAAPmLHXQ7jE Q/36bMGReu91p2Q70UarbuKfIaaN3IDKlvvF3GdVwgkEWENtu0lftcoR2naZPInP/T WZIrxPasCOqBV/mN474uqdleke8Ex6nz8G1E1IUVAW96GTWYRqo8Mu+5xOptxQLg9Z dmOGqt9yc8xAQ== Date: Sun, 17 Mar 2024 09:34:05 -0700 Subject: [PATCH 01/20] xfsprogs: add parent pointer support to attribute code From: "Darrick J. Wong" To: aalbersh@redhat.com, djwong@kernel.org, cem@kernel.org, ebiggers@kernel.org Cc: Mark Tinguely , Dave Chinner , Allison Henderson , fsverity@lists.linux.dev, linux-fsdevel@vger.kernel.org, linux-xfs@vger.kernel.org Message-ID: <171069247688.2685643.4696633268276009013.stgit@frogsfrogsfrogs> In-Reply-To: <171069247657.2685643.11583844772215446491.stgit@frogsfrogsfrogs> References: <171069247657.2685643.11583844772215446491.stgit@frogsfrogsfrogs> User-Agent: StGit/0.19 Precedence: bulk X-Mailing-List: fsverity@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Allison Henderson Source kernel commit: 403a9dc2804baec57eb03a9c4ae14ba811f091e5 Add the new parent attribute type. XFS_ATTR_PARENT is used only for parent pointer entries; it uses reserved blocks like XFS_ATTR_ROOT. Signed-off-by: Mark Tinguely Signed-off-by: Dave Chinner Signed-off-by: Allison Henderson Reviewed-by: Darrick J. Wong --- libxfs/xfs_attr.c | 4 +++- libxfs/xfs_da_format.h | 5 ++++- libxfs/xfs_log_format.h | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libxfs/xfs_attr.c b/libxfs/xfs_attr.c index 630065f1..4818eabb 100644 --- a/libxfs/xfs_attr.c +++ b/libxfs/xfs_attr.c @@ -922,11 +922,13 @@ xfs_attr_set( struct xfs_inode *dp = args->dp; struct xfs_mount *mp = dp->i_mount; struct xfs_trans_res tres; - bool rsvd = (args->attr_filter & XFS_ATTR_ROOT); + bool rsvd; int error, local; int rmt_blks = 0; unsigned int total; + rsvd = (args->attr_filter & (XFS_ATTR_ROOT | XFS_ATTR_PARENT)) != 0; + if (xfs_is_shutdown(dp->i_mount)) return -EIO; diff --git a/libxfs/xfs_da_format.h b/libxfs/xfs_da_format.h index 060e5c96..5434d4d5 100644 --- a/libxfs/xfs_da_format.h +++ b/libxfs/xfs_da_format.h @@ -714,12 +714,15 @@ struct xfs_attr3_leafblock { #define XFS_ATTR_LOCAL_BIT 0 /* attr is stored locally */ #define XFS_ATTR_ROOT_BIT 1 /* limit access to trusted attrs */ #define XFS_ATTR_SECURE_BIT 2 /* limit access to secure attrs */ +#define XFS_ATTR_PARENT_BIT 3 /* parent pointer attrs */ #define XFS_ATTR_INCOMPLETE_BIT 7 /* attr in middle of create/delete */ #define XFS_ATTR_LOCAL (1u << XFS_ATTR_LOCAL_BIT) #define XFS_ATTR_ROOT (1u << XFS_ATTR_ROOT_BIT) #define XFS_ATTR_SECURE (1u << XFS_ATTR_SECURE_BIT) +#define XFS_ATTR_PARENT (1u << XFS_ATTR_PARENT_BIT) #define XFS_ATTR_INCOMPLETE (1u << XFS_ATTR_INCOMPLETE_BIT) -#define XFS_ATTR_NSP_ONDISK_MASK (XFS_ATTR_ROOT | XFS_ATTR_SECURE) +#define XFS_ATTR_NSP_ONDISK_MASK \ + (XFS_ATTR_ROOT | XFS_ATTR_SECURE | XFS_ATTR_PARENT) /* * Alignment for namelist and valuelist entries (since they are mixed diff --git a/libxfs/xfs_log_format.h b/libxfs/xfs_log_format.h index 16872972..9cbcba4b 100644 --- a/libxfs/xfs_log_format.h +++ b/libxfs/xfs_log_format.h @@ -974,6 +974,7 @@ struct xfs_icreate_log { */ #define XFS_ATTRI_FILTER_MASK (XFS_ATTR_ROOT | \ XFS_ATTR_SECURE | \ + XFS_ATTR_PARENT | \ XFS_ATTR_INCOMPLETE) /*