From: Camila Alvarez Inostroza <cam.alvarez.i@gmail.com>
To: Kent Overstreet <kent.overstreet@linux.dev>
Cc: Camila Alvarez <cam.alvarez.i@gmail.com>,
Brian Foster <bfoster@redhat.com>,
linux-bcachefs@vger.kernel.org, linux-kernel@vger.kernel.org,
syzbot+10b936c5eaee2819b49b@syzkaller.appspotmail.com
Subject: Re: [PATCH] bcachefs: fix last_seq and last_empty_seq in bch2_fs_journal_start()
Date: Sun, 19 May 2024 22:42:52 -0400 (-04) [thread overview]
Message-ID: <69dde6ef-69d3-047c-c1b2-64ac51ac0302@macbook-pro-de-camila.local> (raw)
In-Reply-To: <c7qpzaeqhyvkbgaplvazj6steii5ayta7gtidmy24u7gfnnkuc@nhc2swhzmuff>
On Sun, 19 May 2024, Kent Overstreet wrote:
> On Wed, May 15, 2024 at 11:19:20PM -0400, Camila Alvarez wrote:
>> Values were left as the next possible sequence number when there were no
>> entries.
>>
>> The fix involves updating the last_seq initial value and
>> setting last_empty_seq to cur_seq - 1.
>
> I think this is correct, but we should try to come up with some better
> assertions or something to make the code clearer; we don't want off by
> ones to lurk so easily.
>
> Could you give it some thought?
>
You're right. I think the code is written in a confusing way. In
particular it seems that cur_seq - 1 is used all over the place.
I believe we can abstract cur_seq - 1 in an independent variable (since
it represents the actual last sequence number), that should make it
clearer.
I'll share an updated version of the patch.
Thanks for the response!
>>
>> Reported-by: syzbot+10b936c5eaee2819b49b@syzkaller.appspotmail.com
>> Signed-off-by: Camila Alvarez <cam.alvarez.i@gmail.com>
>> ---
>> fs/bcachefs/journal.c | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/fs/bcachefs/journal.c b/fs/bcachefs/journal.c
>> index adec8e1ea73e..3835c458eec9 100644
>> --- a/fs/bcachefs/journal.c
>> +++ b/fs/bcachefs/journal.c
>> @@ -1196,7 +1196,7 @@ int bch2_fs_journal_start(struct journal *j, u64 cur_seq)
>> struct journal_replay *i, **_i;
>> struct genradix_iter iter;
>> bool had_entries = false;
>> - u64 last_seq = cur_seq, nr, seq;
>> + u64 last_seq = cur_seq - 1, nr, seq;
>>
>> genradix_for_each_reverse(&c->journal_entries, iter, _i) {
>> i = *_i;
>> @@ -1256,7 +1256,7 @@ int bch2_fs_journal_start(struct journal *j, u64 cur_seq)
>> }
>>
>> if (!had_entries)
>> - j->last_empty_seq = cur_seq;
>> + j->last_empty_seq = cur_seq - 1;
>>
>> spin_lock(&j->lock);
>>
>> --
>> 2.34.1
>>
>
prev parent reply other threads:[~2024-05-20 2:42 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-16 3:19 [PATCH] bcachefs: fix last_seq and last_empty_seq in bch2_fs_journal_start() Camila Alvarez
2024-05-19 18:25 ` Kent Overstreet
2024-05-20 2:42 ` Camila Alvarez Inostroza [this message]
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=69dde6ef-69d3-047c-c1b2-64ac51ac0302@macbook-pro-de-camila.local \
--to=cam.alvarez.i@gmail.com \
--cc=bfoster@redhat.com \
--cc=kent.overstreet@linux.dev \
--cc=linux-bcachefs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=syzbot+10b936c5eaee2819b49b@syzkaller.appspotmail.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).