From: Jeff King <peff@peff.net>
To: David Emett <dave@sp4m.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] prune: save reachable-from-recent objects with bitmaps
Date: Wed, 28 Apr 2021 11:13:57 -0400 [thread overview]
Message-ID: <YIl7tUJA6sQe2K73@coredump.intra.peff.net> (raw)
In-Reply-To: <CAJ-dYSOHEfRq3p_MQMJoHf5PjwQtbJOzJ9Dzxrfe+BDkov7Q8w@mail.gmail.com>
On Wed, Apr 28, 2021 at 01:20:03PM +0100, David Emett wrote:
> > Here's a fix. Thanks very much for reporting.
>
> Thanks for the quick response! I tried the fix out on the repo I was having
> trouble with. It's hitting a segfault in traverse_commit_list in the
> mark_recent block. It looks like the issue is that the bitmap code leaves
> revs->include_check set, with revs->include_check_data pointing at the stack.
> Setting revs->include_check to NULL after the traverse_commit_list call in
> find_objects in pack-bitmap.c fixes the segfault for me. And the original issue
> appears to be resolved as well, so thanks!
Oof, good catch. I wondered why my test didn't see this. The answer is
that the include_check only applies to commits, not trees. And my test
only has a recent-but-unreachable tree. Beefing it up to include an
actual commit shows the problem (and ASan nicely pinpoints the issue).
The solution, as you noted, is to have the bitmap code clean up after
itself.
I'll prepare a re-roll of the series.
-Peff
next prev parent reply other threads:[~2021-04-28 15:14 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-27 10:45 Two issues with mark_reachable_objects David Emett
2021-04-27 14:41 ` Jeff King
2021-04-27 15:13 ` Jeff King
2021-04-27 15:43 ` [PATCH] prune: save reachable-from-recent objects with bitmaps Jeff King
2021-04-28 12:20 ` David Emett
2021-04-28 15:13 ` Jeff King [this message]
2021-04-28 15:41 ` [PATCH v2 0/2] " Jeff King
2021-04-28 15:42 ` [PATCH v2 1/2] pack-bitmap: clean up include_check after use Jeff King
2021-04-28 15:42 ` [PATCH v2 2/2] prune: save reachable-from-recent objects with bitmaps Jeff King
2021-04-29 1:37 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YIl7tUJA6sQe2K73@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=dave@sp4m.net \
--cc=git@vger.kernel.org \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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).