git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 2/2] commit-graph: propagate topo_levels slab to all chain layers

From
Kristofer Karlsson <krka@spotify.com>
Date
Jul 7, 2026, 14:57 UTC
Message-ID
<CAL71e4OuU1+KHd0TrcxDX2dyoWEJXmi86m8u+E7vtxhcSF6M1Q@mail.gmail.com>
In-Reply-To
<ak0D44nhSH/98WYD@nand.local>
On Tue, 7 Jul 2026 at 15:49, Taylor Blau <me@ttaylorr.com> wrote:
Show 12 quoted lines
>
> I think that there is a more permanent fix, though, which would have not
> allowed this bug to evade both its author, and reviewer (me). I *think*
> that we may clear up some scoping issues if we removed g->topo_levels
> entirely, and instead stored it in the write_commit_graph_ctx struct.
>
> I haven't thought through the implications of doing so completely, so
> it's entirely possible that this idea is bunk for some other reason. But
> it was the first thing that came to mind, and so feels worth exploring
> to see if it might have prevented something like this from ever
> happening in the first place.
>

I looked into the structural change you suggested and I think it's doable, though not quite as simple as just moving it into ctx (since fill_commit_graph_info() doesn't have ctx).

I found three approaches:
(a) Thread topo_levels through the call chain. This would
affect:
- fill_commit_graph_info()
- fill_commit_in_graph()
- parse_commit_in_graph_one()
- parse_commit_in_graph()
- load_commit_graph_info()
- lookup_commit_in_graph().

This is the most direct approach, but it touches many functions and some callers would need to pass in NULL which makes it a bit noisy.

(b) Move topo_levels to struct object_database. Since fill_commit_graph_info() can already reach the odb via g->odb_source->odb, no signature changes are needed. The write side becomes a single assignment:

    ctx.r->objects->topo_levels = &topo_levels;
and cleanup becomes:
    ctx.r->objects->topo_levels = NULL;

No chain walk needed and the diff is fairly small. I am not sure about the semantics of it though -- should the odb have a reference to topo_levels?

(c) Introduce a struct for the chain as a whole, separating it from the per-layer struct commit_graph. Right now struct commit_graph represents a single layer but also serves as the chain head, so chain-wide state like topo_levels gets duplicated on every layer (only logically -- the actual overhead is still small). A dedicated chain struct could own topo_levels and the linked list of layers. IMO this is the cleanest model but a larger refactoring.

I have a prototype of (b) that compiles and passes the test suite.
For now though, I think the minimal bugfix is the right thing to do.

Thanks, Kristofer

Previous: Kristofer KarlssonNext: Taylor Blau
Message 17 of 28 in “commit-graph: fix topo_levels slab propagation regression”
  1. 0/2 commit-graph: fix topo_levels slab propagation regressionKristofer Karlsson via GitGitGadget, Jul 7, 2026
  2. 1/2 commit-graph: add trace2 instrumentation for generation DFSKristofer Karlsson via GitGitGadget, Jul 7, 2026
  3. Taylor BlauJul 7, 2026
  4. Kristofer KarlssonJul 7, 2026
  5. Taylor BlauJul 10, 2026
  6. Junio C HamanoJul 10, 2026
  7. Taylor BlauJul 10, 2026
  8. Junio C HamanoJul 11, 2026
  9. Kristofer KarlssonJul 13, 2026
  10. Junio C HamanoJul 13, 2026
  11. Kristofer KarlssonJul 13, 2026
  12. Junio C HamanoJul 7, 2026
  13. Kristofer KarlssonJul 7, 2026
  14. 2/2 commit-graph: propagate topo_levels slab to all chain layersKristofer Karlsson via GitGitGadget, Jul 7, 2026
  15. Taylor BlauJul 7, 2026
  16. Kristofer KarlssonJul 7, 2026
  17. Kristofer KarlssonJul 7, 2026
  18. Taylor BlauJul 10, 2026
  19. Patrick SteinhardtJul 13, 2026
  20. Taylor BlauJul 14, 2026
  21. Junio C HamanoJul 7, 2026
  22. Kristofer KarlssonJul 7, 2026
  23. Junio C HamanoJul 7, 2026
  24. Patrick SteinhardtJul 9, 2026
  25. 0/2 commit-graph: fix topo_levels slab propagation regressionKristofer Karlsson via GitGitGadget, Jul 9, 2026
  26. 1/2 commit-graph: add trace2 instrumentation for generation DFSKristofer Karlsson via GitGitGadget, Jul 9, 2026
  27. 2/2 commit-graph: propagate topo_levels slab to all chain layersKristofer Karlsson via GitGitGadget, Jul 9, 2026
  28. Taylor BlauJul 10, 2026

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.