From patchwork Fri Aug 9 03:16:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregor Haas X-Patchwork-Id: 1970790 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=Cu9LgFMQ; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=PfUGoWD6; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=patchwork.ozlabs.org) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Wg8GK3z1qz1ybT for ; Fri, 9 Aug 2024 13:16:57 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=6rGt+tZDIbYpfHDsztAlqtmEXmPmVRvFXWW2TFbwm70=; b=Cu9LgFMQzSEx1R HQmqJ8+qLJQDNDK4GdGoi9TOSghP+afVHUF8Xy4UQzE/4LqtgEUPRMKdNgv1yiUsqDZzHqlzwXBzG cWqEaEL7wbOCwGtxkjKJIS4u3kkKN5jSW5rwGAt9xaOnLvjBq6zFV0jQ/j8QksUURO++Y2XhpKW9G Bd8WPbA18wmbSogHKpHhFDyQ3euiQ/du+4ckLGefxGRyTBDqjwz5f4DM1rIFzen7cuHQunHI/vnQ6 wDs4C8RDsUCY+xHfj+1Kmj/U4LVbSIqyUdUSxv+PiNGbJOURMAaBxNktspboCJCY7qmXUX+M/cEtp +ItjSOGEkBIy/aXlqACw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1scG7U-0000000A73r-3LZA; Fri, 09 Aug 2024 03:16:48 +0000 Received: from mail-pg1-x530.google.com ([2607:f8b0:4864:20::530]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1scG7S-0000000A72H-0I8o for opensbi@lists.infradead.org; Fri, 09 Aug 2024 03:16:47 +0000 Received: by mail-pg1-x530.google.com with SMTP id 41be03b00d2f7-7ab09739287so1155910a12.3 for ; Thu, 08 Aug 2024 20:16:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723173405; x=1723778205; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=LcnJ/BmG+5j8Ev3bFGAO4oJROa55vS2nX++Bq4TMrlM=; b=PfUGoWD6LkaCptLqbn0eQDu3RIZnW3I2Mimm0HSoslqkks8+zVdJElHuFnyCsbi8tP wU7Li19QDZICnV0tlUh769HBoIl526urmgiAaWhGdET6WaIzoxz95r8/36pbmf1wF2Yf H10VfUtcfhxYJ0KQC8U1SUye5nCh8huukZYmu1i9RDD3A427G28eExED0/Bqxyy9XkXV havT9r7GgXoay4vc3B1sBYv8ggHlGHIlmAb/ITCxqaGRDsMlr9DN0Repwc8mNIJXa3Di qmZUrv80W8IiGcJay9sS+/WLPMhGs81OOfxkgYlA3IB4ya5dMI0tFmk/MJ3/OFc9Vzfr FV8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723173405; x=1723778205; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LcnJ/BmG+5j8Ev3bFGAO4oJROa55vS2nX++Bq4TMrlM=; b=kxMOirbbhkeLXNbGUMlBzkeTyHKQp9AmmpBmhI0IDiGHazY6PRHLNZ+sYwmvQIFJ3X espcAa1TfSawHLqrRtTIFs8ilp/o2mr8u2gc9xHKJkON1Q2jK5GMuSSKjdKP5Zq6x0aB 17FxQ4qGZlI1GpH+0HnQruSxqfcnMM6coka2mPcmz7FGbfIxIsP+t5yabiK7y8JP4sHN KJAl94Up+xW//TeDZIylek3cyeVNUDKc17klI+aXRe43M046zRdNGslij3sfFPgc6r0b DFoEyo6iGmuszh2elzFhzl6Xq908r6cAVpS4Qf1FMlIGfFDoZOgI5q8NNR2gtnhuHpBV 8+cg== X-Gm-Message-State: AOJu0YxK7QBEEXOnvxl/mTaE+DIlv7tHeC+Eu1uOq3tftlS/YCcXhtXn fx9LnXDDAar/7uujde5EUfBvadU5X6trpp4yeduGVW92yqyng4UvTO1Ud8Nt X-Google-Smtp-Source: AGHT+IE8wTR99Q1UQAdFcKcUTlHOYR+2v4EV/QHeq77YKbsuDfSxDsO6llIcEqknvumn5wcXoBXTZg== X-Received: by 2002:a05:6a20:6f8f:b0:1c4:a2a7:b18e with SMTP id adf61e73a8af0-1c89fe72c6bmr445680637.30.1723173404512; Thu, 08 Aug 2024 20:16:44 -0700 (PDT) Received: from localhost ([136.27.11.53]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-1ff58f5a968sm132704595ad.109.2024.08.08.20.16.44 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 08 Aug 2024 20:16:44 -0700 (PDT) From: Gregor Haas To: opensbi@lists.infradead.org Cc: atishp@rivosinc.com, anup@brainfault.org, jrtc27@jrtc27.com, Gregor Haas Subject: [PATCH v4 3/3] lib: sbi: Implement aligned memory allocators Date: Thu, 8 Aug 2024 20:16:38 -0700 Message-ID: <20240809031638.89146-4-gregorhaas1997@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240809031638.89146-1-gregorhaas1997@gmail.com> References: <20240809031638.89146-1-gregorhaas1997@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240808_201646_129944_09E1D211 X-CRM114-Status: GOOD ( 17.79 ) X-Spam-Score: -1.8 (-) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: This change adds a simple implementation of sbi_aligned_alloc(), for future use in allocating aligned memory for SMMTT tables. Signed-off-by: Gregor Haas --- include/sbi/sbi_heap.h | 9 +++++ lib/sbi/sbi_heap.c | 75 ++++++++++++++++++++++++++++++++++++++---- 2 files changed, 78 insertions(+), 6 deletions(-) Content analysis details: (-1.8 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:530 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [gregorhaas1997(at)gmail.com] 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit [gregorhaas1997(at)gmail.com] X-BeenThere: opensbi@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "opensbi" Errors-To: opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org This change adds a simple implementation of sbi_aligned_alloc(), for future use in allocating aligned memory for SMMTT tables. Signed-off-by: Gregor Haas Reviewed-by: Anup Patel --- include/sbi/sbi_heap.h | 9 +++++ lib/sbi/sbi_heap.c | 75 ++++++++++++++++++++++++++++++++++++++---- 2 files changed, 78 insertions(+), 6 deletions(-) diff --git a/include/sbi/sbi_heap.h b/include/sbi/sbi_heap.h index 9a67090..a4b3f0c 100644 --- a/include/sbi/sbi_heap.h +++ b/include/sbi/sbi_heap.h @@ -31,6 +31,15 @@ static inline void *sbi_malloc(size_t size) return sbi_malloc_from(&global_hpctrl, size); } +/** Allocate aligned from heap area */ +void *sbi_aligned_alloc_from(struct sbi_heap_control *hpctrl, + size_t alignment,size_t size); + +static inline void *sbi_aligned_alloc(size_t alignment, size_t size) +{ + return sbi_aligned_alloc_from(&global_hpctrl, alignment, size); +} + /** Zero allocate from heap area */ void *sbi_zalloc_from(struct sbi_heap_control *hpctrl, size_t size); diff --git a/lib/sbi/sbi_heap.c b/lib/sbi/sbi_heap.c index cc4893d..6d08e44 100644 --- a/lib/sbi/sbi_heap.c +++ b/lib/sbi/sbi_heap.c @@ -37,27 +37,67 @@ struct sbi_heap_control { struct sbi_heap_control global_hpctrl; -void *sbi_malloc_from(struct sbi_heap_control *hpctrl, size_t size) +static void *alloc_with_align(struct sbi_heap_control *hpctrl, + size_t align, size_t size) { void *ret = NULL; - struct heap_node *n, *np; + struct heap_node *n, *np, *rem; + unsigned long lowest_aligned; + size_t pad; if (!size) return NULL; - size += HEAP_ALLOC_ALIGN - 1; - size &= ~((unsigned long)HEAP_ALLOC_ALIGN - 1); + size += align - 1; + size &= ~((unsigned long)align - 1); spin_lock(&hpctrl->lock); np = NULL; sbi_list_for_each_entry(n, &hpctrl->free_space_list, head) { - if (size <= n->size) { + lowest_aligned = ROUNDUP(n->addr, align); + pad = lowest_aligned - n->addr; + + if (size + pad <= n->size) { np = n; break; } } - if (np) { + if (!np) + goto out; + + if (pad) { + if (sbi_list_empty(&hpctrl->free_node_list)) { + goto out; + } + + n = sbi_list_first_entry(&hpctrl->free_node_list, + struct heap_node, head); + sbi_list_del(&n->head); + + if ((size + pad < np->size) && + !sbi_list_empty(&hpctrl->free_node_list)) { + rem = sbi_list_first_entry(&hpctrl->free_node_list, + struct heap_node, head); + sbi_list_del(&rem->head); + rem->addr = np->addr + (size + pad); + rem->size = np->size - (size + pad); + sbi_list_add_tail(&rem->head, + &hpctrl->free_space_list); + } else if (size + pad != np->size) { + /* Can't allocate, return n */ + sbi_list_add(&n->head, &hpctrl->free_node_list); + ret = NULL; + goto out; + } + + n->addr = lowest_aligned; + n->size = size; + sbi_list_add_tail(&n->head, &hpctrl->used_space_list); + + np->size = pad; + ret = (void *)n->addr; + } else { if ((size < np->size) && !sbi_list_empty(&hpctrl->free_node_list)) { n = sbi_list_first_entry(&hpctrl->free_node_list, @@ -76,11 +116,34 @@ void *sbi_malloc_from(struct sbi_heap_control *hpctrl, size_t size) } } +out: spin_unlock(&hpctrl->lock); return ret; } +void *sbi_malloc_from(struct sbi_heap_control *hpctrl, size_t size) +{ + return alloc_with_align(hpctrl, HEAP_ALLOC_ALIGN, size); +} + +void *sbi_aligned_alloc_from(struct sbi_heap_control *hpctrl, + size_t alignment, size_t size) +{ + if (alignment < HEAP_ALLOC_ALIGN) + alignment = HEAP_ALLOC_ALIGN; + + /* Make sure alignment is power of two */ + if ((alignment & (alignment - 1)) != 0) + return NULL; + + /* Make sure size is multiple of alignment */ + if (size % alignment != 0) + return NULL; + + return alloc_with_align(hpctrl, alignment, size); +} + void *sbi_zalloc_from(struct sbi_heap_control *hpctrl, size_t size) { void *ret = sbi_malloc_from(hpctrl, size);