From: Eric Wong <e@80x24.org>
To: git@vger.kernel.org
Subject: [PATCH 1/4] use_pack: attempt to handle ENOMEM from mmap
Date: Tue, 29 Jun 2021 08:11:05 +0000 [thread overview]
Message-ID: <20210629081108.28657-2-e@80x24.org> (raw)
In-Reply-To: <20210629081108.28657-1-e@80x24.org>
Since use_pack() can already safely munmap packs to respect
core.packedGitLimit, attempt to gracefully handle ENOMEM
errors the same way by unmapping a window and retrying.
This benefits unprivileged users who lack permissions to raise
the `sys.vm.max_map_count' sysctl and/or RLIMIT_DATA resource
limit.
I've also verified it is safe to release a pack here by
unconditionally calling unuse_one_window() before
xmmap_gently():
--- a/packfile.c
+++ b/packfile.c
@@ -649,6 +649,7 @@ unsigned char *use_pack(struct packed_git *p,
&& unuse_one_window(p))
; /* nothing */
do {
+ unuse_one_window(p);
win->base = xmmap_gently(NULL, win->len,
PROT_READ, MAP_PRIVATE,
p->pack_fd, win->offset);
Signed-off-by: Eric Wong <e@80x24.org>
---
packfile.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/packfile.c b/packfile.c
index 755aa7aec5..a0da790fb4 100644
--- a/packfile.c
+++ b/packfile.c
@@ -648,9 +648,12 @@ unsigned char *use_pack(struct packed_git *p,
while (packed_git_limit < pack_mapped
&& unuse_one_window(p))
; /* nothing */
- win->base = xmmap_gently(NULL, win->len,
- PROT_READ, MAP_PRIVATE,
- p->pack_fd, win->offset);
+ do {
+ win->base = xmmap_gently(NULL, win->len,
+ PROT_READ, MAP_PRIVATE,
+ p->pack_fd, win->offset);
+ } while (win->base == MAP_FAILED && errno == ENOMEM
+ && unuse_one_window(p));
if (win->base == MAP_FAILED)
die_errno("packfile %s cannot be mapped",
p->pack_name);
next prev parent reply other threads:[~2021-06-29 8:11 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-29 8:11 [PATCH 0/4] gracefully handling mmap failures Eric Wong
2021-06-29 8:11 ` Eric Wong [this message]
2021-06-30 2:30 ` [PATCH 1/4] use_pack: attempt to handle ENOMEM from mmap Jeff King
2021-06-29 8:11 ` [PATCH 2/4] map_loose_object_1: " Eric Wong
2021-06-30 2:41 ` Jeff King
2021-06-30 6:06 ` Ævar Arnfjörð Bjarmason
2021-06-29 8:11 ` [PATCH 3/4] check_packed_git_idx: " Eric Wong
2021-06-29 20:21 ` [HOLD " Eric Wong
2021-06-29 21:33 ` Junio C Hamano
2021-06-29 22:31 ` Eric Wong
2021-06-29 8:11 ` [PATCH 4/4] xmmap: inform Linux users of tuning knobs on ENOMEM Eric Wong
2021-06-30 0:01 ` [PATCH v2] " Eric Wong
2021-06-30 2:46 ` Jeff King
2021-06-30 10:07 ` Eric Wong
2021-06-30 17:18 ` Jeff King
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=20210629081108.28657-2-e@80x24.org \
--to=e@80x24.org \
--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.
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 NNTP newsgroup(s).