git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Eric Wong <e@80x24.org>
To: git@vger.kernel.org
Subject: [HOLD 3/4] check_packed_git_idx: attempt to handle ENOMEM from mmap
Date: Tue, 29 Jun 2021 20:21:01 +0000	[thread overview]
Message-ID: <20210629202101.GA18279@dcvr> (raw)
In-Reply-To: <20210629081108.28657-4-e@80x24.org>

Eric Wong <e@80x24.org> wrote:
> --- a/packfile.c
> +++ b/packfile.c
> @@ -97,7 +97,11 @@ static int check_packed_git_idx(const char *path, struct packed_git *p)
>  		close(fd);
>  		return error("index file %s is too small", path);
>  	}
> -	idx_map = xmmap(NULL, idx_size, PROT_READ, MAP_PRIVATE, fd, 0);
> +	do {
> +		idx_map = xmmap_gently(NULL, idx_size, PROT_READ, MAP_PRIVATE,
> +					fd, 0);
> +	} while (idx_map == MAP_FAILED && errno == ENOMEM
> +		&& unuse_one_window(p));

Oops, I dropped extra error handling here :x

>  	close(fd);
>  
>  	ret = load_idx(path, hashsz, idx_map, idx_size, p);

  reply	other threads:[~2021-06-29 20:21 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 ` [PATCH 1/4] use_pack: attempt to handle ENOMEM from mmap Eric Wong
2021-06-30  2:30   ` 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   ` Eric Wong [this message]
2021-06-29 21:33     ` [HOLD " 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=20210629202101.GA18279@dcvr \
    --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).