From: Kuan-Wei Chiu <visitorckw@gmail.com>
To: Kent Overstreet <kent.overstreet@linux.dev>
Cc: Coly Li <colyli@suse.de>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Matthew Mirvish <matthew@mm12.xyz>
Subject: Re: linux-next: manual merge of the refactor-heap tree with the block tree
Date: Fri, 10 May 2024 11:07:11 +0800 [thread overview]
Message-ID: <Zj2PX6Fy3BEnQc50@visitorckw-System-Product-Name> (raw)
In-Reply-To: <buehluxvo234sj7onzl6wwjmuslmnkh7g6vnpru23kpti6qmpp@7nqak2ser7mw>
On Thu, May 09, 2024 at 07:16:31PM -0400, Kent Overstreet wrote:
> On Fri, May 10, 2024 at 06:44:29AM +0800, Kuan-Wei Chiu wrote:
> > On Thu, May 09, 2024 at 03:58:57PM -0400, Kent Overstreet wrote:
> > > On Thu, May 09, 2024 at 03:27:45PM +1000, Stephen Rothwell wrote:
> > > > Hi all,
> > > >
> > > > Today's linux-next merge of the refactor-heap tree got conflicts in:
> > > >
> > > > drivers/md/bcache/bset.c
> > > > drivers/md/bcache/bset.h
> > > > drivers/md/bcache/btree.c
> > > > drivers/md/bcache/writeback.c
> > > >
> > > > between commit:
> > > >
> > > > 3a861560ccb3 ("bcache: fix variable length array abuse in btree_iter")
> > > >
> > > > from the block tree and commit:
> > > >
> > > > afa5721abaaa ("bcache: Remove heap-related macros and switch to generic min_heap")
> > > >
> > > > from the refactor-heap tree.
> > > >
> > > > Ok, these conflicts are too extensive, so I am dropping the refactor-heap
> > > > tree for today. I suggest you all get together and sort something out.
> > >
> > > Coli and Kuan, you guys will need to get this sorted out quick if we
> > > want refactor-heap to make the merge window
> >
> > Hi Coli and Kent,
> >
> > If I understand correctly, the reported bug is because we attempted to
> > point (heap)->data to a dynamically allocated memory , but at that time
> > (heap)->data was not a regular pointer but a fixed size array with a
> > length of MAX_BSETS.
> >
> > In my refactor heap patch series, I introduced a preallocated array and
> > decided in min_heap_init() whether the data pointer should point to an
> > incoming pointer or to the preallocated array. Therefore, I am
> > wondering if my patch might have unintentionally fixed this bug?
> >
> > I am unsure how to reproduce the reported issue. Could you assist me in
> > verifying whether my assumption is correct?
>
> This is a merge conflict, not a runtime. Can you rebase onto Coli's
> tree? We'll have to retest.
Oh, sorry for the misunderstanding I caused. When I mentioned "bug" [1]
earlier, I was referring to the bug addressed in
3a861560ccb3 ("bcache: fix variable length array abuse in btree_iter"),
not a merge conflict.
Here are the results after the rebase:
https://github.com/visitorckw/linux.git refactor-heap
[1]: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/2039368
Regards,
Kuan-Wei
next prev parent reply other threads:[~2024-05-10 3:07 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-09 5:27 linux-next: manual merge of the refactor-heap tree with the block tree Stephen Rothwell
2024-05-09 19:58 ` Kent Overstreet
2024-05-09 22:44 ` Kuan-Wei Chiu
2024-05-09 23:16 ` Kent Overstreet
2024-05-10 3:07 ` Kuan-Wei Chiu [this message]
2024-05-10 3:46 ` Matthew Mirvish
2024-05-10 9:10 ` Kuan-Wei Chiu
2024-05-11 19:24 ` Kuan-Wei Chiu
2024-05-14 7:40 ` Bagas Sanjaya
2024-05-21 2:18 ` Stephen Rothwell
2024-05-21 2:44 ` Kuan-Wei Chiu
2024-05-21 13:42 ` Kent Overstreet
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=Zj2PX6Fy3BEnQc50@visitorckw-System-Product-Name \
--to=visitorckw@gmail.com \
--cc=colyli@suse.de \
--cc=kent.overstreet@linux.dev \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=matthew@mm12.xyz \
/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).