From nobody Mon Aug 21 14:17:16 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RTvgc6Nwhz4qqX8; Mon, 21 Aug 2023 14:17:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RTvgc5qvlz3c1y; Mon, 21 Aug 2023 14:17:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692627436; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lnjy9krDG9y70jlCX0pm68NhWHaWHI/m3r7TUj0F/lk=; b=hwSjKAeCtweZ1hhJPnQ3BvY/1D2i7PW175zANbpA6Kfv8Rnt2oaGZyWTD7KHhLCfYjlh6d cVdgn/sQmYw/WlgqpAqBAzhgbNal7xijvfUytmVOcpOHru1LK0/vKX4dqg2RcDmKtggd9l AiBIbpy7ohB9DsN9mq/vv+y4MEqQouoaLXjSb6OkfDaSPpS4+yKuD9ZYOwXbOu9FvTfPYh lOrL6LJuUUbdZNt84aGu3HN4WXDkrIYBf0LzKbvDmBRho4L+eoZldaVvdxUC7iASwhA/3l vRYWSDwnco5JDk7AddXSo0ZidwrLufAuAysP440kMXR4xqsRmI+evw+IH7ca5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692627436; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lnjy9krDG9y70jlCX0pm68NhWHaWHI/m3r7TUj0F/lk=; b=BHyMBbxZ5VtPArXSjNUrkb+RnxeTftXnRwURNvHhW40cqXpt9vr7YX2qSLHkh6zXsGxtO/ Qx3lvNNIpdp/4ZMfxXlMn6DsjbOCIDTVVrv4gr4nbH7umKIizxhtxr4weKmtCYOrBAsPJl AYijEY5GPD6iS0HQYodSGh/MRCxazwEh//SJ2bkfX4746LkB+QOHt6qWRntceD4XNotgkF I8GO+NY89iQiwYu6BD3iOIWLKtjZKBsL5oQxwV3lU444qEHkk4ILAe/mMK4srSRpJEs/dU ua5Mwg9mqx731eKc5JIYyfaTGaJeZuEs6erBMzljaMJghpdTrHnCCw6TQJ5E3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692627436; a=rsa-sha256; cv=none; b=gRoUTiwConggdm0NS71BITZ46T4SwuBjI1YUaGVLUgz06deW7eJ0C+BsIXU3WmkC33jkwn /6d1kqaTVjKV2MGipN2ZUWQLuno1hmMpWKkRhHJ/AEZ9rvfLpOHVX+AaiP5OcpwMaJFg6j BUSgHkGwDMnRodaqPNpLRdSsflFbPtR5KUGSI6JU6u1x9vO7C39vG6DpzwAI7BXLJ3DeYa Vy9NTEr9Cg0UD5I+T7QxEbOEgDM+orzBmEudEzVWDbXOgump9HsKVbpIyoUrXs2avXHIii MFsiLwwP2mfCOhcXQjBriwrOvW08voTTv/ege2V60C/jzX/N/9lwobSJ/sd20w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RTvgc4snjz8dl; Mon, 21 Aug 2023 14:17:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37LEHG8M097402; Mon, 21 Aug 2023 14:17:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37LEHGXj097399; Mon, 21 Aug 2023 14:17:16 GMT (envelope-from git) Date: Mon, 21 Aug 2023 14:17:16 GMT Message-Id: <202308211417.37LEHGXj097399@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: d60130bf32a3 - main - rtld_malloc: increase overhead index to uint16 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d60130bf32a3c35417f276507dcdfa569397dae3 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d60130bf32a3c35417f276507dcdfa569397dae3 commit d60130bf32a3c35417f276507dcdfa569397dae3 Author: Konstantin Belousov AuthorDate: 2023-07-25 12:54:45 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-21 14:16:42 +0000 rtld_malloc: increase overhead index to uint16 Reorder it with magic, to keep alignment. Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D41150 --- libexec/rtld-elf/rtld_malloc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libexec/rtld-elf/rtld_malloc.c b/libexec/rtld-elf/rtld_malloc.c index 1246238b3941..ac8af4d6b6e1 100644 --- a/libexec/rtld-elf/rtld_malloc.c +++ b/libexec/rtld-elf/rtld_malloc.c @@ -75,8 +75,8 @@ static caddr_t pagepool_start, pagepool_end; union overhead { union overhead *ov_next; /* when free */ struct { - u_char ovu_magic; /* magic number */ - u_char ovu_index; /* bucket # */ + uint16_t ovu_index; /* bucket # */ + uint8_t ovu_magic; /* magic number */ } ovu; #define ov_magic ovu.ovu_magic #define ov_index ovu.ovu_index