From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 71F7BC433DF for ; Wed, 5 Aug 2020 21:17:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 491802076E for ; Wed, 5 Aug 2020 21:17:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=ttaylorr-com.20150623.gappssmtp.com header.i=@ttaylorr-com.20150623.gappssmtp.com header.b="lNyAHMVh" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726130AbgHEVRe (ORCPT ); Wed, 5 Aug 2020 17:17:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60854 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725730AbgHEVRd (ORCPT ); Wed, 5 Aug 2020 17:17:33 -0400 Received: from mail-qk1-x741.google.com (mail-qk1-x741.google.com [IPv6:2607:f8b0:4864:20::741]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CF5D9C061575 for ; Wed, 5 Aug 2020 14:17:33 -0700 (PDT) Received: by mail-qk1-x741.google.com with SMTP id 77so10795063qkm.5 for ; Wed, 05 Aug 2020 14:17:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ttaylorr-com.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=o5KC1Bos6uiN5uLM6VXqM6B+K2+o69WHUKxNoyliCyU=; b=lNyAHMVhonrGpKemxt8In2TC2qTbWLPhcJKwxTGkTCECuOI2H2Uc+YSChwNDGjiDPp jSKGofnEpreySIhytvvhgzZPuO0CWgRaE+ewZfEheF475lzN4fTxIRUBLL80kLVrlq2N 1p8FPsUyWeFHK8fKEo97muRsN4/cd40ZY/d8zBWa9BWZcyZv3UVMK/u80V9ZnPEQZvO2 cFK+EwigL0ndxPR8v8zAaAwCIrhprMkP299NSh7Xh5yo2knM5Gw4Hcww+vaTB+uicgF/ RsyaOrPzLIVTNsYtEnmLFWqdjXuRucCZa2cjk75JpU1AadeHwBbELxTyQFvpulnlq37W 3NdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=o5KC1Bos6uiN5uLM6VXqM6B+K2+o69WHUKxNoyliCyU=; b=OcG3YM5BUAf0Chyc4LC1UtAs8xDcjamPRIvK/cmSejDD9ejrs5dKWvNcH2oqtb2+a3 bbMnucKJKxqlk6wUoON4lAFjeuZ6RGBOjCiw0b4iW//UaM9DIEAjyAX5SLhFwxUCsBHo cuWssYH7pNu1WZtXL2AK/3zxwwp2HI+s98UY6Yo1UDohVAylO0g/PZuaza6Ik9FF3W1H 2qW8o8rcmumPzWG8IY9lEo5T1ybmQ9R5UmxTLh6+OfWdHjs5OgotWgY8Ko49k3f9iAxL ah351UcZ9wJ6gg8v/TVBlK7hqUrUHpRHvuFJXPv2sQy0BbHUaCMIOqibPLa302+j1A2h Znkw== X-Gm-Message-State: AOAM533/+pmJvHxQiWdUuBvnBh+UpTSkSRCLLPV2i+7Rdx4x1/wM4vCV bP8w4e7kLBFBDAjs/VvNIQfuFA== X-Google-Smtp-Source: ABdhPJyIXs11YS9nvlGl23E/4cZJUiKBInAffrjCWbRlL8nmkjWCxoIBQiBcsv+h+H8ZKjuK+R+mug== X-Received: by 2002:a05:620a:5f8:: with SMTP id z24mr5534549qkg.372.1596662252798; Wed, 05 Aug 2020 14:17:32 -0700 (PDT) Received: from localhost ([2605:9480:22e:ff10:d118:9acc:fdba:dee7]) by smtp.gmail.com with ESMTPSA id k2sm2734166qkf.127.2020.08.05.14.17.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Aug 2020 14:17:32 -0700 (PDT) Date: Wed, 5 Aug 2020 17:17:30 -0400 From: Taylor Blau To: Junio C Hamano Cc: Taylor Blau , git@vger.kernel.org, peff@peff.net, dstolee@microsoft.com, szeder.dev@gmail.com Subject: Re: [PATCH v2 12/14] commit-graph: add large-filters bitmap chunk Message-ID: <20200805211730.GJ9546@syl.lan> References: <100b26d7c8a5e7ce21a950f33791eadab74e8e70.1596646576.git.me@ttaylorr.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Wed, Aug 05, 2020 at 02:01:29PM -0700, Junio C Hamano wrote: > Taylor Blau writes: > > > @@ -71,6 +72,10 @@ struct commit_graph { > > const unsigned char *chunk_base_graphs; > > const unsigned char *chunk_bloom_indexes; > > const unsigned char *chunk_bloom_data; > > + const unsigned char *chunk_bloom_large_filters; > > + > > + size_t bloom_large_to_alloc; > > + struct bitmap bloom_large; > > Hmph, is the API rich enough to allow users to release the resource > used by such an embedded bitmap? I ask becuase... > > > @@ -2503,6 +2577,7 @@ void free_commit_graph(struct commit_graph *g) > > } > > free(g->filename); > > free(g->bloom_filter_settings); > > + bitmap_free(g->bloom_large); > > free(g); > > } > > ... this hunk cannot be possibly correct as-is, and cannot be made > correct without changing g->bloom_large to a pointer into a heap > allocated bitmap, because bitmap_free() wants to not just release > the resource held by the bitmap but the bitmap itself. Yuck, that's definitely wrong. Serves me right for sneaking this in after I had run `git rebase -x 'make -j40 DEVELOPER=1 test' upstream/master` ;-). Below the scissors line should do the trick. It should apply cleanly at this point in the series, but it'll produce a compilation failure on the very last patch (fixing it is straightforward and looks like the following diff): diff --git a/bloom.c b/bloom.c index d0c0fd049d..8d07209c6b 100644 --- a/bloom.c +++ b/bloom.c @@ -52,7 +52,7 @@ static int load_bloom_filter_from_graph(struct commit_graph *g, start_index = 0; if ((start_index == end_index) && - (g->bloom_large.word_alloc && !bitmap_get(&g->bloom_large, lex_pos))) { + (g->bloom_large && !bitmap_get(g->bloom_large, lex_pos))) { /* * If the filter is zero-length, either (1) the filter has no * changes, (2) the filter has too many changes, or (3) it In either case, this will fix the bad free(): --- >8 --- Subject: [PATCH] fixup! commit-graph: add large-filters bitmap chunk Signed-off-by: Taylor Blau --- commit-graph.c | 18 ++++++++++-------- commit-graph.h | 2 +- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/commit-graph.c b/commit-graph.c index 1fee49d171..add76f1824 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -438,7 +438,10 @@ struct commit_graph *parse_commit_graph(struct repository *r, graph->bloom_large_to_alloc = get_be64(chunk_lookup + 4) - chunk_offset - sizeof(uint32_t); - graph->bloom_large.word_alloc = 0; /* populate when necessary */ + /* + * leave 'bloom_large' uninitialized, and + * populate when necessary + */ graph->chunk_bloom_large_filters = data + chunk_offset + sizeof(uint32_t); graph->bloom_filter_settings->max_changed_paths = get_be32(data + chunk_offset); } @@ -960,17 +963,15 @@ static int get_bloom_filter_large_in_graph(struct commit_graph *g, if (!g || !g->bloom_large_to_alloc) return 0; - if (!g->bloom_large.word_alloc) { + if (!g->bloom_large) { size_t i; - g->bloom_large.word_alloc = g->bloom_large_to_alloc; - g->bloom_large.words = xmalloc(g->bloom_large_to_alloc * sizeof(eword_t)); - + g->bloom_large = bitmap_word_alloc(g->bloom_large_to_alloc); for (i = 0; i < g->bloom_large_to_alloc; i++) - g->bloom_large.words[i] = get_be64(g->chunk_bloom_large_filters - + i * sizeof(eword_t)); + g->bloom_large->words[i] = get_be64(g->chunk_bloom_large_filters + + i * sizeof(eword_t)); } - return bitmap_get(&g->bloom_large, graph_pos - g->num_commits_in_base); + return bitmap_get(g->bloom_large, graph_pos - g->num_commits_in_base); } struct packed_oid_list { @@ -2360,6 +2361,7 @@ int write_commit_graph(struct object_directory *odb, free(ctx->graph_name); free(ctx->commits.list); free(ctx->oids.list); + free(ctx->bloom_large); if (ctx->commit_graph_filenames_after) { for (i = 0; i < ctx->num_commit_graphs_after; i++) { diff --git a/commit-graph.h b/commit-graph.h index f4fb996dd5..b1ab86a3c8 100644 --- a/commit-graph.h +++ b/commit-graph.h @@ -75,7 +75,7 @@ struct commit_graph { const unsigned char *chunk_bloom_large_filters; size_t bloom_large_to_alloc; - struct bitmap bloom_large; + struct bitmap *bloom_large; struct bloom_filter_settings *bloom_filter_settings; }; -- 2.28.0.rc1.13.ge78abce653