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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5ED1FC8303C for ; Mon, 7 Jul 2025 16:14:08 +0000 (UTC) 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:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=i/qtXs9s+QdBQr0M8ZCKL9CCSiHQeQvxN6ttPMxUpz8=; b=byzP3gwxHmYPI8bjdEYHFKEI3r OFkqG8jjwT1/+Q/3mEUYzfVxt1zwotgWG+5uOP7TvrdHDmCnN9hv9UsIo6X+E4eFl/2i8gQQP/UDE DK98bI7+biGncP0uGozpNXAirAnWH9OV36Fy9oGeCIHY2qo8yiBy9yb0UFXJoyJdPi6uyDv8be0a5 yfKCVUPCf2fHys7b1yd4BsomG/Zs70gcs85Um87gUZletZkzufmRWweYJV4bx+swF5BWjRW0O1SiH yuTCFLq4L7QH9RVn7fL0dp8hOFtfYJjA4xoYHZyJsf9OU+VDS10DKmm1PXigVVkbvTHcyBjao7wvv Oz5cXosA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1uYoTh-00000002zeV-3YdF; Mon, 07 Jul 2025 16:14:01 +0000 Received: from mail-qt1-f180.google.com ([209.85.160.180]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1uYoHI-00000002x7b-3Sz3 for linux-arm-kernel@lists.infradead.org; Mon, 07 Jul 2025 16:01:14 +0000 Received: by mail-qt1-f180.google.com with SMTP id d75a77b69052e-4a44b9b2af8so17873961cf.3 for ; Mon, 07 Jul 2025 09:01:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751904072; x=1752508872; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=i/qtXs9s+QdBQr0M8ZCKL9CCSiHQeQvxN6ttPMxUpz8=; b=jKGu93Jh1Acp4aep+4DhlFba9OrjXX9WCdmE00KqdX2DhD4Nzy+gj1cj9I1yMzd8Er FOKniEAzI/tE8GmqnU1UW9gluvNuTDo5EiSP2/jnwDcSeUMuX0ZQU8X/v3kNQ4QY+dHc ODIwvr4nUdZh6JcQL50HZwYrH+eCbctYZa/bQrUWPCeU+qEDxq1XPMPoH0ANQWHq33QK CV9v1zHQdgtomBvusZOanpM5w00e9QE1/3uFSox8S71BJ4HsdQ0+VPLjYaBleo4TLPn1 xsuPOt7uCX56EHbzSjyoJXRaoh/W93yahjfP9jlsbj+28zBOwo6GuAvQCtGx++wh95pX 4hcQ== X-Gm-Message-State: AOJu0YzCqf3FSt3uf1TV4+3QucYdQqtocmh66ukgt2w6STBJP4yxxeSR bGQnrgzDvrPhBp4dYin8znhXuK715t2IXiagpt4UvpWcaFlREs97CdUh X-Gm-Gg: ASbGncsXVfWJ9GNlEeAqInq6VxYY7PgqLoBPR+sNsd71LADpKlgKtZpY+uF7WPQ7bBW /pjWaej1/ceLA9fUb4zPItYy1iWszMe7NkSrwB8Sy9zFvJ7XM5JhntZPXcUXCIOn3M6iC/mGvC/ huOTv+Yq58bTw3p9ZQT4OnejFb5IbIjIpKckF87hOpIkoweHx/5itGExoJ6SREkbDx4iTHAhGeX 9474JUDFbKozfeMgF22Mn1x0bYiPtuOGbf1wqgol7AuTMj8LzEzyMbeI0GoAqsdNLZTrTvjAtLk gxQiMwNMuLcbO01VY0H73msgHWdIbsIb6KetBYfN1WdjkWZhkkEj4w== X-Google-Smtp-Source: AGHT+IFpXMddctveiP/QMxx61ibzLPUrbrG9TwhgcDmq5K8qaNkqmg+HzPSadAi9ZoczsHtWQJPCSQ== X-Received: by 2002:a05:622a:11ca:b0:4a7:62da:d0fc with SMTP id d75a77b69052e-4a998692482mr169244441cf.12.1751904071495; Mon, 07 Jul 2025 09:01:11 -0700 (PDT) Received: from localhost ([2a03:2880:20ff:70::]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-4a994aa77d4sm64401341cf.73.2025.07.07.09.01.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Jul 2025 09:01:10 -0700 (PDT) From: Breno Leitao Date: Mon, 07 Jul 2025 09:01:03 -0700 Subject: [PATCH 3/8] arm64: Remove CONFIG_VMAP_STACK conditionals from THREAD_SHIFT and THREAD_ALIGN MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250707-arm64_vmap-v1-3-8de98ca0f91c@debian.org> References: <20250707-arm64_vmap-v1-0-8de98ca0f91c@debian.org> In-Reply-To: <20250707-arm64_vmap-v1-0-8de98ca0f91c@debian.org> To: Catalin Marinas , Will Deacon , Ard Biesheuvel Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-efi@vger.kernel.org, Breno Leitao , leo.yan@arm.com, kernel-team@meta.com, mark.rutland@arm.com X-Mailer: b4 0.15-dev-42535 X-Developer-Signature: v=1; a=openpgp-sha256; l=1555; i=leitao@debian.org; h=from:subject:message-id; bh=NbHeUY+lOtajZkUGdosjdc9I20/L5D/pDbD9Gk28XbU=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBoa+9DPlSZXS9bOCF/XaXYyqeIru4s1W6wF6zBO BVU2VBp9JSJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaGvvQwAKCRA1o5Of/Hh3 bdv4EACwqmPF3xqi38Scok1Gw7W+ofu+/uQeH0vwEOK7PobxMJzQgLb0L/QOe8DaSMrg2Cbnq63 5xEsff8WqrX3KW0vqqUiwMVkTshGyWm08H8579SYW/T/LFfaMQz7ikDTR0GtETBH8ILxs8k1oA/ 0SCPggCCOFGoagXJjsFp0XO3fBBS07+t1UHpeooYP4HEcOM2NLJ/EYIqJ+i/BP6e4h5UtCHMS0F gTkPfQDco8ATKNsubQ7xKrET6cnxdoXoay2JMco4GpTsmL4AOCEHf1f1b1B3HgChGWrxX77E6g2 LYJXLpxAU+Xa+cG8LDeRQpj9KwZaptmQCHtQ+SFmx3biVchlLmvg8DCPZ3lLmHezRVt3NLA8kTZ 8hgjgYpkcc2WGY6kIsK7mQCkZl2smHj8ieiuWuBxFmuELclaLx3L/hQJdQ6qttgKHF8/s+cLdDf poJsCUg01hi50RtGNbIR/EY9VnbhtRMncplUFtycBMKCfI94juWbgxAZMHiytB2KOLUdBsQrs54 qc+Hj3BcVk1jJ6Q9o9r7ahPzvXIIdr0nZGEpkDagRknWFxVApWRp8ObRJH71II/4hE4A31bOLbZ q66MzoSnxFGwdze26wZafxZ+tfjb3sHsnsJDYj61MZdNfQEYgLtf13TfG/+pkWWInnnxiYjUnb6 8L1ZGwJKe7rDEMQ== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250707_090112_867909_252CEA7F X-CRM114-Status: GOOD ( 12.58 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Now that VMAP_STACK is always enabled on arm64, remove the CONFIG_VMAP_STACK conditional logic from the definitions of THREAD_SHIFT and THREAD_ALIGN in arch/arm64/include/asm/memory.h. This simplifies the code by unconditionally setting THREAD_ALIGN to (2 * THREAD_SIZE) and adjusting the THREAD_SHIFT definition to only depend on MIN_THREAD_SHIFT and PAGE_SHIFT. This change reflects the updated arm64 stack model, where all kernel threads use virtually mapped stacks with guard pages, and ensures alignment and stack sizing are consistently handled. Signed-off-by: Breno Leitao --- arch/arm64/include/asm/memory.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h index 717829df294e..5213248e081b 100644 --- a/arch/arm64/include/asm/memory.h +++ b/arch/arm64/include/asm/memory.h @@ -118,7 +118,7 @@ * VMAP'd stacks are allocated at page granularity, so we must ensure that such * stacks are a multiple of page size. */ -#if defined(CONFIG_VMAP_STACK) && (MIN_THREAD_SHIFT < PAGE_SHIFT) +#if (MIN_THREAD_SHIFT < PAGE_SHIFT) #define THREAD_SHIFT PAGE_SHIFT #else #define THREAD_SHIFT MIN_THREAD_SHIFT @@ -135,11 +135,7 @@ * checking sp & (1 << THREAD_SHIFT), which we can do cheaply in the entry * assembly. */ -#ifdef CONFIG_VMAP_STACK #define THREAD_ALIGN (2 * THREAD_SIZE) -#else -#define THREAD_ALIGN THREAD_SIZE -#endif #define IRQ_STACK_SIZE THREAD_SIZE -- 2.47.1