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

Re: [PATCH 2/2] upload-pack: reduce lock contention when writing packfile data

From
Patrick Steinhardt <ps@pks.im>
Date
Mar 2, 2026, 12:12 UTC
Message-ID
<aaV-l_NyWpkKDDp6@pks.im>
In-Reply-To
<20260227193758.GA2931515@coredump.intra.peff.net>
On Fri, Feb 27, 2026 at 02:37:58PM -0500, Jeff King wrote:
Show 17 quoted lines
> On Fri, Feb 27, 2026 at 12:23:01PM +0100, Patrick Steinhardt wrote:
> 
> > Extend our use of the buffering infrastructure so that we soak up bytes
> > until the buffer is filled up at least 2/3rds of its capacity. The
> > change is relatively simple to implement as we already know to flush the
> > buffer in `create_pack_file()` after git-pack-objects(1) has finished.
> 
> We are relaying write() calls from pack-objects here, which is writing
> to us in 8kb chunks (due to csum-file.c buffering). So most of our
> writes will be 8k.
> 
> Rather than buffering in upload-pack, would it not be simpler to just
> increase the write size from pack-objects? Then we do not have to worry
> about disrupting upload-pack's keepalive timeouts. And as a bonus, if
> you are worried about the system-wide number of calls, you will likewise
> be reducing the number of read() and write() calls over the pipe between
> pack-objects and upload-pack.

We can do that. But we also have to keep in mind that downstream in the pipe may be a process that's not even git-pack-objects(1) in the first place because of "uploadpack.packObjectsHook". So maybe we should have a look at doing both.

Show 11 quoted lines
> > Now git-upload-pack(1) already has the infrastructure in place to buffer
> > some of the data it reads from git-pack-objects(1) before actually
> > sending it out. We only use this infrastructure in very limited ways
> > though, so we generally end up matching one read(3p) call with one
> > write(3p) call. Even worse, when the sideband is enabled we end up
> > matching one read with _two_ writes: one for the pkt-line length, and
> > one for the packfile data.
> 
> Using writev() would be an easy-ish fix here, modulo portability
> concerns (though of course it is easy to implement a fallback writev()
> in terms of write()). Doing this:

Right, I was also wondering about whether we might want to use writev(), but I didn't have the time yet to have a deeper look. I'll have a look at whether I can integrate your change in a platform-compatible way.

Show 5 quoted lines
> Out of curiosity, how did you end up measuring? I first tried with
> strace (without "-f") on the upload-pack process, but strace slowed it
> enough that it ended up collecting multiple of pack-object's 8k write()
> calls in a single read() call. ;) The "perf stat" above seemed to work
> OK, though of course it's counting child processes, too.

I used strace for this. I didn't really dig into it too deep as I was rather busy handling the havoc that this issue caused :)

I'll send a v2 soonish, thanks!
Patrick
Previous: Jeff KingNext: Jeff King
Message 8 of 53 in “upload-pack: reduce lock contention when writing packfile data”
  1. 0/2 upload-pack: reduce lock contention when writing packfile dataPatrick Steinhardt, Feb 27, 2026
  2. 1/2 upload-pack: fix debug statement when flushing packfile dataPatrick Steinhardt, Feb 27, 2026
  3. 2/2 upload-pack: reduce lock contention when writing packfile dataPatrick Steinhardt, Feb 27, 2026
  4. brian m. carlsonFeb 27, 2026
  5. Patrick SteinhardtFeb 27, 2026
  6. Junio C HamanoFeb 27, 2026
  7. Jeff KingFeb 27, 2026
  8. Patrick SteinhardtMar 2, 2026
  9. Jeff KingMar 2, 2026
  10. Patrick SteinhardtMar 3, 2026
  11. Jeff KingMar 3, 2026
  12. Patrick SteinhardtMar 3, 2026
  13. 00/10 upload-pack: reduce lock contention when writing packfile dataPatrick Steinhardt, Mar 3, 2026
  14. 01/10 upload-pack: fix debug statement when flushing packfile dataPatrick Steinhardt, Mar 3, 2026
  15. 02/10 upload-pack: adapt keepalives based on bufferingPatrick Steinhardt, Mar 3, 2026
  16. Jeff KingMar 5, 2026
  17. Patrick SteinhardtMar 10, 2026
  18. 03/10 upload-pack: reduce lock contention when writing packfile dataPatrick Steinhardt, Mar 3, 2026
  19. Jeff KingMar 5, 2026
  20. Patrick SteinhardtMar 10, 2026
  21. 04/10 git-compat-util: introduce `cast_size_t_to_ssize_t()`Patrick Steinhardt, Mar 3, 2026
  22. 05/10 compat/posix: introduce writev(3p) wrapperPatrick Steinhardt, Mar 3, 2026
  23. Junio C HamanoMar 4, 2026
  24. Jeff KingMar 5, 2026
  25. brian m. carlsonMar 5, 2026
  26. Johannes SixtMar 5, 2026
  27. brian m. carlsonMar 5, 2026
  28. Patrick SteinhardtMar 10, 2026
  29. 06/10 wrapper: introduce writev(3p) wrappersPatrick Steinhardt, Mar 3, 2026
  30. 07/10 sideband: use writev(3p) to send pktlinesPatrick Steinhardt, Mar 3, 2026
  31. Junio C HamanoMar 4, 2026
  32. 08/10 csum-file: introduce `hashfd_ext()`Patrick Steinhardt, Mar 3, 2026
  33. Junio C HamanoMar 4, 2026
  34. Patrick SteinhardtMar 10, 2026
  35. 09/10 csum-file: drop `hashfd_throughput()`Patrick Steinhardt, Mar 3, 2026
  36. 10/10 builtin/pack-objects: reduce lock contention when writing packfile dataPatrick Steinhardt, Mar 3, 2026
  37. 00/10 upload-pack: reduce lock contention when writing packfile dataPatrick Steinhardt, Mar 10, 2026
  38. 01/10 upload-pack: fix debug statement when flushing packfile dataPatrick Steinhardt, Mar 10, 2026
  39. 02/10 upload-pack: adapt keepalives based on bufferingPatrick Steinhardt, Mar 10, 2026
  40. 03/10 upload-pack: prefer flushing data over sending keepalivePatrick Steinhardt, Mar 10, 2026
  41. Junio C HamanoMar 10, 2026
  42. Patrick SteinhardtMar 10, 2026
  43. 04/10 upload-pack: reduce lock contention when writing packfile dataPatrick Steinhardt, Mar 10, 2026
  44. 05/10 compat/posix: introduce writev(3p) wrapperPatrick Steinhardt, Mar 10, 2026
  45. Junio C HamanoMar 10, 2026
  46. 06/10 wrapper: introduce writev(3p) wrappersPatrick Steinhardt, Mar 10, 2026
  47. 07/10 sideband: use writev(3p) to send pktlinesPatrick Steinhardt, Mar 10, 2026
  48. 08/10 csum-file: introduce `hashfd_ext()`Patrick Steinhardt, Mar 10, 2026
  49. 09/10 csum-file: drop `hashfd_throughput()`Patrick Steinhardt, Mar 10, 2026
  50. 10/10 builtin/pack-objects: reduce lock contention when writing packfile dataPatrick Steinhardt, Mar 10, 2026
  51. Junio C HamanoMar 10, 2026
  52. Johannes SixtMar 10, 2026
  53. Patrick SteinhardtMar 11, 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.