From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 11 Sep 2023 17:26:00 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1qfinZ-00Bdce-F8 for lore@lore.pengutronix.de; Mon, 11 Sep 2023 17:26:00 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qfinX-0007PY-6C for lore@pengutronix.de; Mon, 11 Sep 2023 17:25:59 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=mRhdxmDEtlWX/ovfi6v8XBvlfaBJhoyeky4Ks0xcQo0=; b=wcF0UTsruT27JZjw2qCrhKpzc0 brsrlox6Tmd0gBgbRh1qu6bPGlaWPmqfAoj8rjTB2P4+Hij1XUxljX7Zg3wNt4WFovcVKgLPFbMka 2Hbl6F/EHi58t/txkBYkGGBUx5bzFeooeBKZfR8Ea224dje1mciOBvvk5xXekTqKdQQLSP8NTLYnr SHkzRpU8xUp/hukFeFGeTPYpDCpOEbE1zlZYZ86cxkxVP073a8S3K8/0q8SRsxxHdLwlaQUMD5mcc Hw1Ve8SFlEprBiJZYEII7KqSWS8zwZOaMNxtoha5iW5yz3/giC9Lnk8YLPETP2DLndLgDou3/x6BO 4UqWsiwQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qfimW-000sDp-0Z; Mon, 11 Sep 2023 15:24:56 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qfimO-000s9K-2a for barebox@lists.infradead.org; Mon, 11 Sep 2023 15:24:52 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qfimN-00071o-Mn; Mon, 11 Sep 2023 17:24:47 +0200 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1qfimN-005a9C-9P; Mon, 11 Sep 2023 17:24:47 +0200 Received: from afa by dude05.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1qfimL-00FHKk-2L; Mon, 11 Sep 2023 17:24:45 +0200 From: Ahmad Fatoum To: barebox@lists.infradead.org Cc: Ahmad Fatoum Date: Mon, 11 Sep 2023 17:24:31 +0200 Message-Id: <20230911152433.3640781-6-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230911152433.3640781-1-a.fatoum@pengutronix.de> References: <20230911152433.3640781-1-a.fatoum@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230911_082448_834632_9CFC2487 X-CRM114-Status: GOOD ( 13.77 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-4.9 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH v2 5/7] common: malloc: ensure alignment is always at least 8 byte X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.whiteo.stw.pengutronix.de) We used to have following alignments: 32-bit CPU 64-bit CPU dummy 8 bytes 8 bytes dlmalloc 8 bytes 16 bytes tlsf 4 bytes 8 bytes With recent change to TLSF, we now always have at least 8 bytes as alignment. To make this clearer, define a new CONFIG_MALLOC_ALIGNMENT and either use it as the alignment (as done for dummy) or add static asserts to ensure we have at least this alignment. Signed-off-by: Ahmad Fatoum --- common/Kconfig | 5 +++++ common/dlmalloc.c | 3 +++ common/dummy_malloc.c | 2 +- common/tlsf.c | 2 ++ 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/common/Kconfig b/common/Kconfig index afa591cb76ff..15c648de5d79 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -277,6 +277,11 @@ config MALLOC_SIZE hex default 0x400000 prompt "malloc area size" + +config MALLOC_ALIGNMENT + hex + default 8 + endmenu config BROKEN diff --git a/common/dlmalloc.c b/common/dlmalloc.c index ae10c9ae30dd..16ea3cafb624 100644 --- a/common/dlmalloc.c +++ b/common/dlmalloc.c @@ -3,6 +3,7 @@ #include #include #include +#include #include #include @@ -884,6 +885,8 @@ static mbinptr av_[NAV * 2 + 2] = { /* Other static bookkeeping data */ +static_assert(MALLOC_ALIGNMENT >= CONFIG_MALLOC_ALIGNMENT); + /* variables holding tunable values */ #ifndef __BAREBOX__ static unsigned long trim_threshold = DEFAULT_TRIM_THRESHOLD; diff --git a/common/dummy_malloc.c b/common/dummy_malloc.c index d99b5059cf91..7a96afec76e0 100644 --- a/common/dummy_malloc.c +++ b/common/dummy_malloc.c @@ -23,7 +23,7 @@ void *memalign(size_t alignment, size_t bytes) void *malloc(size_t size) { - return memalign(8, size); + return memalign(CONFIG_MALLOC_ALIGNMENT, size); } void free(void *ptr) diff --git a/common/tlsf.c b/common/tlsf.c index 692dabbdedd9..ba2ed367c0b9 100644 --- a/common/tlsf.c +++ b/common/tlsf.c @@ -96,6 +96,8 @@ tlsf_static_assert(sizeof(unsigned int) * CHAR_BIT >= SL_INDEX_COUNT); /* Ensure we've properly tuned our sizes. */ tlsf_static_assert(ALIGN_SIZE == SMALL_BLOCK_SIZE / SL_INDEX_COUNT); +tlsf_static_assert(ALIGN_SIZE >= CONFIG_MALLOC_ALIGNMENT); + /* ** Data structures and associated constants. */ -- 2.39.2