From: "Darrick J. Wong" <djwong@kernel.org>
To: Andrey Albershteyn <aalbersh@redhat.com>
Cc: ebiggers@kernel.org, zlang@redhat.com, fsverity@lists.linux.dev,
fstests@vger.kernel.org, linux-fsdevel@vger.kernel.org,
guan@eryu.me, linux-xfs@vger.kernel.org
Subject: Re: [PATCH 2/3] xfs/{021,122}: adapt to fsverity xattrs
Date: Tue, 19 Mar 2024 12:25:08 -0700 [thread overview]
Message-ID: <20240319192508.GK6188@frogsfrogsfrogs> (raw)
In-Reply-To: <qwe6bnzuqkmef5hpwf6hzv5ce447xij7ko67vvasjcnzxy4eho@xnvyvawp5mba>
On Tue, Mar 19, 2024 at 03:59:48PM +0100, Andrey Albershteyn wrote:
> On 2024-03-17 09:39:33, Darrick J. Wong wrote:
> > From: Darrick J. Wong <djwong@kernel.org>
> >
> > Adjust these tests to accomdate the use of xattrs to store fsverity
> > metadata.
> >
> > Signed-off-by: Darrick J. Wong <djwong@kernel.org>
>
> Is it against one of pptrs branches? doesn't seem to apply on
> for-next
See
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfstests-dev.git/log/?h=fsverity
(as mentioned in the cover letter)
--D
>
> > ---
> > tests/xfs/021 | 3 +++
> > tests/xfs/122.out | 1 +
> > 2 files changed, 4 insertions(+)
> >
> >
> > diff --git a/tests/xfs/021 b/tests/xfs/021
> > index ef307fc064..dcecf41958 100755
> > --- a/tests/xfs/021
> > +++ b/tests/xfs/021
> > @@ -118,6 +118,7 @@ _scratch_xfs_db -r -c "inode $inum_1" -c "print a.sfattr" | \
> > perl -ne '
> > /\.secure/ && next;
> > /\.parent/ && next;
> > +/\.verity/ && next;
> > print unless /^\d+:\[.*/;'
> >
> > echo "*** dump attributes (2)"
> > @@ -128,6 +129,7 @@ _scratch_xfs_db -r -c "inode $inum_2" -c "a a.bmx[0].startblock" -c print \
> > | perl -ne '
> > s/,secure//;
> > s/,parent//;
> > +s/,verity//;
> > s/info.hdr/info/;
> > /hdr.info.crc/ && next;
> > /hdr.info.bno/ && next;
> > @@ -135,6 +137,7 @@ s/info.hdr/info/;
> > /hdr.info.lsn/ && next;
> > /hdr.info.owner/ && next;
> > /\.parent/ && next;
> > +/\.verity/ && next;
> > s/^(hdr.info.magic =) 0x3bee/\1 0xfbee/;
> > s/^(hdr.firstused =) (\d+)/\1 FIRSTUSED/;
> > s/^(hdr.freemap\[0-2] = \[base,size]).*/\1 [FREEMAP..]/;
> > diff --git a/tests/xfs/122.out b/tests/xfs/122.out
> > index 3a99ce77bb..ff886b4eec 100644
> > --- a/tests/xfs/122.out
> > +++ b/tests/xfs/122.out
> > @@ -141,6 +141,7 @@ sizeof(struct xfs_scrub_vec) = 16
> > sizeof(struct xfs_scrub_vec_head) = 32
> > sizeof(struct xfs_swap_extent) = 64
> > sizeof(struct xfs_unmount_log_format) = 8
> > +sizeof(struct xfs_verity_merkle_key) = 8
> > sizeof(struct xfs_xmd_log_format) = 16
> > sizeof(struct xfs_xmi_log_format) = 80
> > sizeof(union xfs_rtword_raw) = 4
> >
>
> --
> - Andrey
>
>
next prev parent reply other threads:[~2024-03-19 19:25 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20240317161954.GC1927156@frogsfrogsfrogs>
2024-03-17 16:23 ` [PATCHSET v5.3] fstests: fs-verity support for XFS Darrick J. Wong
2024-03-17 16:39 ` [PATCH 1/3] common/verity: enable fsverity " Darrick J. Wong
2024-03-17 16:39 ` [PATCH 2/3] xfs/{021,122}: adapt to fsverity xattrs Darrick J. Wong
2024-03-19 14:59 ` Andrey Albershteyn
2024-03-19 19:25 ` Darrick J. Wong [this message]
2024-03-17 16:39 ` [PATCH 3/3] common/populate: add verity files to populate xfs images Darrick J. Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240319192508.GK6188@frogsfrogsfrogs \
--to=djwong@kernel.org \
--cc=aalbersh@redhat.com \
--cc=ebiggers@kernel.org \
--cc=fstests@vger.kernel.org \
--cc=fsverity@lists.linux.dev \
--cc=guan@eryu.me \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=zlang@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).