From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 31BA5472533 for ; Wed, 2 Sep 2026 10:51:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.69 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788346293; cv=none; b=XoNKP8eWgepPo/qzVEXhL7r4ToAhXkYiu+SAHrRluA5GZUEkVK1tJoYaWh2poKe9/ZVSYQ0FzsoNATqo+KiSjzqDvn/gzCHC2bb1PaUpZrfoIskf6VVTbbzgzXdp5WJxYduPadMzmOPfU/kHTWstixPecjHju2LvYAQ+GtutoX4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788346293; c=relaxed/simple; bh=fI4ct/3pSqJy24dcpl8O0GRnGyvmcETu0BAstHM0k+s=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=fjZ/sAAj0UF2vVqoBOWNzkCiArP6jvkD4gyJf/MoskchzZY5rC8bp411U0ZSf/0glfkh3L7X1uaVp8h6fkC9NhcERiVXHiCwuVMjJUzXma/giL2qS7SziABqurAdvk4BDVKDk9bFvMI9ZI45LtZg2g5Z6qFLFx6rnkt4SGKSpLI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--vdonnefort.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=ruJvCxVs; arc=none smtp.client-ip=209.85.221.69 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--vdonnefort.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="ruJvCxVs" Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-47d81cf0c4cso699765f8f.2 for ; Wed, 02 Sep 2026 03:51:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1788346276; x=1788951076; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=IlzRHwAUXMpKspjrSSJuu5KTpj2eywEkwws+9IOUBiI=; b=ruJvCxVsxGsTKa3DR36ZuhNxvUeZupbt8wJDMaiJ6rkndeRHZzaamJIWlqweFwdyPY uwLnuWEI+h+r7bhZm1/7odgOey6p9IW0Zp4MWTlIsBBeHGYKmu8qTrM4Xfv9iP7bV0Ev q0WTOZjZgsmbYpjOa6HnpwN7z2LIhCdc2ibTUQkiQ4CCB2JcY/WClwIAJaOCdsCc4IxC qZqBcFVAU5GIUoFntNgrwPVOyDzxSrNHCrmm+ry3Nn64qFGR3FpF2EiirMg0Qg3lXdWF GjghRqqX9YMRO9HJfAGM2I1T4Cg7157/DomozoSOL22Ve4Fj9L0vKbiyeDDmoqsTrxR7 brmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788346276; x=1788951076; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=IlzRHwAUXMpKspjrSSJuu5KTpj2eywEkwws+9IOUBiI=; b=Vc3Z/UC+Wbi4m2CT7jyArYwKMdMKLnLinSpERBZ/Or/hR84T3ibqV47pTuRvUe0RDq Ep9B7Sdub+urhCPKbh9LstBbRBgsRnDbZMRVRdbm6ohd/wyqVkooEv85Q2Gl5b64XJVl M1GOu9QqkbZmC0XBz7WDVd4HbSf7qlNJ+/AxnpyhNRCztR5Kh6oTzofuix92PjXZMiiz YMCVknqsoI5VAE6T6DoeZSVknvzBK09dwIhKCry5j6zeieytn7NVqPnt3VVCx7tqwjV8 nhw/ZvnkeX1I90eDsfOwoB2R6IvpQRn6Y/x/W0JS26mSfM87lotEKDLx1Dw+vQrkKMRr W5WA== X-Forwarded-Encrypted: i=1; AKwUvBxjCGs8rCqH1XNh3hbLTfBPRxdeIOJVYBF9x5wyrJu+PTCUQtnB7XMF7orSnQP+K1Q9hTLr5C0fOfQdRcs=@vger.kernel.org X-Gm-Message-State: AFuF++n/56hp5nggA4zrmpNJfDqbaBBIB/8DYVRC7Y64u4Otsz1BTlr9 JnljrOpFqDROXzW9xijUo2Zot73s56gqZG2cCj9JlAkwMzYf7TmnDOAxhZ9BU5aw4Balh8dQ403 Z53Pg6R+LU6OQUQLQgkY3Eg== X-Received: from wrqr17.prod.google.com ([2002:a5d:4991:0:b0:482:abe4:58a8]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a5d:5f47:0:b0:482:fc30:a1b4 with SMTP id ffacd0b85a97d-48488e03952mr6019121f8f.5.1788346276079; Wed, 02 Sep 2026 03:51:16 -0700 (PDT) Date: Wed, 2 Sep 2026 11:47:10 +0100 In-Reply-To: <20260902104712.2399797-1-vdonnefort@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260902104712.2399797-1-vdonnefort@google.com> X-Mailer: git-send-email 2.55.0.970.g62bdec98f9-goog Message-ID: <20260902104712.2399797-9-vdonnefort@google.com> Subject: [PATCH v9 08/10] arm64: Add support for MEMBLOCK_LLMAP From: Vincent Donnefort To: catalin.marinas@arm.com, will@kernel.org, rppt@kernel.org, akpm@linux-foundation.org, sudeep.holla@kernel.org, jenswi@kernel.org, robh@kernel.org Cc: mark.rutland@arm.com, sumit.garg@kernel.org, ardb@kernel.org, thierry.reding@kernel.org, david@kernel.org, danielmentz@google.com, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, op-tee@lists.trustedfirmware.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Vincent Donnefort Content-Type: text/plain; charset="UTF-8" With the MEMBLOCK_LLMAP flag, force a last-level mapping. Signed-off-by: Vincent Donnefort diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index 79d90226fd5d..c0fcc76914d1 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -1184,9 +1184,8 @@ static void __init map_mem(void) phys_addr_t init_begin = __pa_symbol(__init_begin); phys_addr_t init_end = __pa_symbol(__init_end); phys_addr_t kernel_end = __pa_symbol(__bss_stop); - phys_addr_t start, end; int flags = NO_EXEC_MAPPINGS; - u64 i; + struct memblock_region *r; /* * Setting hierarchical PXNTable attributes on table entries covering @@ -1226,9 +1225,13 @@ static void __init map_mem(void) flags); /* map all the memory banks */ - for_each_mem_range(i, &start, &end) { + for_each_mem_region(r) { + phys_addr_t start, end; + + if (memblock_is_nomap(r)) + continue; /* - * for_each_mem_range may return sub-page-aligned boundaries + * for_each_mem_region may return sub-page-aligned boundaries * after memblock_mark_nomap() splits regions at byte precision. * __create_pgd_mapping_locked aligns phys down to PAGE_MASK, * which could accidentally map no-map memory on the boundary. @@ -1237,17 +1240,23 @@ static void __init map_mem(void) * regions. The cost is at most one page of unmapped gap at * each boundary. */ - start = PAGE_ALIGN(start); - end = end & PAGE_MASK; + start = PAGE_ALIGN(r->base); + end = (r->base + r->size) & PAGE_MASK; if (start >= end) continue; + + int rflags = flags; + + if (memblock_is_llmap(r)) + rflags |= NO_BLOCK_MAPPINGS | NO_CONT_MAPPINGS; + /* * The linear map must allow allocation tags reading/writing * if MTE is present. Otherwise, it has the same attributes as * PAGE_KERNEL. */ __map_memblock(start, end, pgprot_tagged(PAGE_KERNEL), - flags); + rflags); } } -- 2.55.0.970.g62bdec98f9-goog