From: Jessica Clarke <jrtc27@jrtc27.com>
To: "René Scharfe" <l.s.r@web.de>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] Properly align memory allocations and temporary buffers
Date: Wed, 12 Jan 2022 15:49:09 +0000 [thread overview]
Message-ID: <366952CA-95D1-4912-9E93-1178247AF173@jrtc27.com> (raw)
In-Reply-To: <c4de043e-45e1-6066-37d5-6b06b7a820f7@web.de>
On 12 Jan 2022, at 15:47, René Scharfe <l.s.r@web.de> wrote:
>
> Am 12.01.22 um 14:58 schrieb Jessica Clarke:
>>
>> I can see the alternative fixes for qsort are now in next, as is the
>> cleanup of register_symlink_changes to use string sets, which just
>> leaves the mem-pool.c change to not assume that uintmax_t is
>> sufficiently aligned for every type that git will use. If I move
>> GIT_MAX_ALIGNMENT and its helper aggregates to mem-pool.c would that be
>> acceptable?
>
> Defining it at its single site of use sounds like a good idea to me.
> We can export it to git-compat-util.h later, iff necessary.
>
>>> diff --git a/git-compat-util.h b/git-compat-util.h
>>> index 5fa54a7afe..28581a45c5 100644
>>> --- a/git-compat-util.h
>>> +++ b/git-compat-util.h
>>> @@ -274,6 +274,17 @@ typedef unsigned long uintptr_t;
>>> #define _ALL_SOURCE 1
>>> #endif
>>>
>>> +typedef union {
>>> + uintmax_t max_align_uintmax;
>>> + void *max_align_pointer;
>>> +} git_max_align;
>>> +
>>> +typedef struct {
>>> + char unalign;
>>> + git_max_align aligned;
>>> +} git_max_alignment;
>>> +#define GIT_MAX_ALIGNMENT offsetof(git_max_alignment, aligned)
>
> Style nit: We tend to use typedef sparingly. And the union type doesn't
> even need a name. E.g. this would work as well, while reducing the name
> space footprint:
>
> struct git_max_alignment {
> char unalign;
> union {
> uintmax_t max_align_uintmax;
> void *max_align_pointer;
> } aligned;
> };
> #define GIT_MAX_ALIGNMENT offsetof(struct git_max_alignment, aligned)
>
> When someone uses a mempool for objects that requires 128-bit alignment
> (e.g. because it includes a long double or uint128_t member) then we'd
> need add long double to the union as well, like e.g. compat/obstack.c
> does. That would be the safe route, but currently only add 8 bytes of
> unnecessary overhead to each allocation.
>
> Perhaps mempool alignment should be configurable. For now a comment
> might suffice which indicates that GIT_MAX_ALIGNMENT is only the
> maximum alignment requirement of current mempool users, not the
> highest possible requirement for the machine. Renaming it to something
> with MEMPOOL in the name would help in this regard as well.
Sure, that all makes sense.
Jess
>>> +
>>> /* used on Mac OS X */
>>> #ifdef PRECOMPOSE_UNICODE
>>> #include "compat/precompose_utf8.h"
>>> diff --git a/mem-pool.c b/mem-pool.c
>>> index ccdcad2e3d..748eff925a 100644
>>> --- a/mem-pool.c
>>> +++ b/mem-pool.c
>>> @@ -69,9 +69,9 @@ void *mem_pool_alloc(struct mem_pool *pool, size_t len)
>>> struct mp_block *p = NULL;
>>> void *r;
>>>
>>> - /* round up to a 'uintmax_t' alignment */
>>> - if (len & (sizeof(uintmax_t) - 1))
>>> - len += sizeof(uintmax_t) - (len & (sizeof(uintmax_t) - 1));
>>> + /* round up to a 'GIT_MAX_ALIGNMENT' alignment */
>>> + if (len & (GIT_MAX_ALIGNMENT - 1))
>>> + len += GIT_MAX_ALIGNMENT - (len & (GIT_MAX_ALIGNMENT - 1));
>>>
>>> if (pool->mp_block &&
>>> pool->mp_block->end - pool->mp_block->next_free >= len)
>>> --
>>> 2.33.1
>>>
>>
>
next prev parent reply other threads:[~2022-01-12 15:50 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-05 13:23 [PATCH] Properly align memory allocations and temporary buffers Jessica Clarke
2022-01-06 21:46 ` Taylor Blau
2022-01-06 21:56 ` Jessica Clarke
2022-01-06 22:27 ` Junio C Hamano
2022-01-06 22:56 ` Jessica Clarke
2022-01-07 0:10 ` Junio C Hamano
2022-01-07 0:22 ` Jessica Clarke
2022-01-07 0:31 ` brian m. carlson
2022-01-07 0:39 ` Jessica Clarke
2022-01-07 1:43 ` brian m. carlson
2022-01-07 2:08 ` Jessica Clarke
2022-01-07 2:11 ` Jessica Clarke
2022-01-07 19:30 ` Junio C Hamano
2022-01-07 19:33 ` Jessica Clarke
2022-01-07 20:56 ` René Scharfe
2022-01-07 21:30 ` Junio C Hamano
2022-01-07 23:30 ` René Scharfe
2022-01-08 0:18 ` Elijah Newren
2022-01-06 23:22 ` brian m. carlson
2022-01-06 23:31 ` Jessica Clarke
2022-01-07 14:57 ` Philip Oakley
2022-01-07 16:08 ` René Scharfe
2022-01-07 16:21 ` Jessica Clarke
2022-01-12 13:58 ` Jessica Clarke
2022-01-12 15:47 ` René Scharfe
2022-01-12 15:49 ` Jessica Clarke [this message]
2022-01-23 15:24 ` [PATCH v2] mem-pool: Don't assume uintmax_t is aligned enough for all types Jessica Clarke
2022-01-23 20:17 ` Junio C Hamano
2022-01-23 20:23 ` Jessica Clarke
2022-01-23 20:28 ` Junio C Hamano
2022-01-23 20:33 ` [PATCH v3] " Jessica Clarke
2022-01-24 17:11 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=366952CA-95D1-4912-9E93-1178247AF173@jrtc27.com \
--to=jrtc27@jrtc27.com \
--cc=git@vger.kernel.org \
--cc=l.s.r@web.de \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).