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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 47043EB64D7 for ; Fri, 16 Jun 2023 18:54:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D8E6D6B0078; Fri, 16 Jun 2023 14:54:12 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D3E8B6B007B; Fri, 16 Jun 2023 14:54:12 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BDF608E0001; Fri, 16 Jun 2023 14:54:12 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id ADB8B6B0078 for ; Fri, 16 Jun 2023 14:54:12 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 77F0DA0A34 for ; Fri, 16 Jun 2023 18:54:12 +0000 (UTC) X-FDA: 80909511144.18.B136545 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf05.hostedemail.com (Postfix) with ESMTP id 7C727100012 for ; Fri, 16 Jun 2023 18:54:10 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=rSMEmus+; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf05.hostedemail.com: domain of song@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=song@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1686941650; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=BdYJO6pcmmzGR77QxUIYaK1RYrkkIcAvnn4QKk2l5rE=; b=IoFqMKFB2+/cbP3aysmOa+6Wwa4DPv8nwNUJ0riCNEmQRse36IEcT4+eZhqL0h0ZhRsPpb KQg3MQJRmLUjteeXbf/NjpeDdUoIszMtU3ufb9eaQt0LgL+aoxMSGASUnFmES8/c0skCTR A3wiXr1LguruHGWljzuTVoNBhBN5xzQ= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=rSMEmus+; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf05.hostedemail.com: domain of song@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=song@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1686941650; a=rsa-sha256; cv=none; b=1k1CGhheaSw77KpEMRFzhkBpmKpt+ZypC9QK/K4XJ/vXsbHiUe1jPwVQ6yBAg3aqgO1w4H gd7BBxCbRHFfc0QJgVC6KzSWTmTb188tEWYPAgbbA1yW5b392tkiAq23+7ZS9gDyIk5t+D /VmaD+8NB/J5BqPcb0fY+9LbDi9GRrg= Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 8557462D6D for ; Fri, 16 Jun 2023 18:54:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E56FBC433C9 for ; Fri, 16 Jun 2023 18:54:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1686941648; bh=Yn4AaKJNeoRa5k6Rpqw8rOaWUpFfj0b/8Nallv5Pzds=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=rSMEmus+AZFK+VN+mCx4VlBJQohSA/MG6hEQZk+jOBQO192GoW+WaXVNNQHSQGZ8l lBJuS4uSISGQvovU0rw4QsdDZa6YDAOO/p8UzmPMb4BqbKxcHfrhT1ATHI+KsQNC7/ ZXrJdGeecDBM9K3dNnTAQ5NZoqz/fzsF6gquhcyAFF7GF3MJkSMcg9MahKRZtw2CoE PBr4XDpy+NDD7kZ/QxIiyia+84X92nJ0skys7N4S7ur+fhj29MesQk3aUHpvYraMpZ QVA7+uQ9MBatlS6z6aW9jIGdEeKEMO/cMOMrYmwn/wFA8qztHZw+Dff+AICQAMb9Ln KXSM6y8Vtghdg== Received: by mail-lf1-f45.google.com with SMTP id 2adb3069b0e04-4f611ac39c5so1473709e87.2 for ; Fri, 16 Jun 2023 11:54:08 -0700 (PDT) X-Gm-Message-State: AC+VfDwgGXhLHYDTWS311PYEneG7da1b+D/wTSzJASziOLRrympxmYSw 1zIC4roI1Rxq9eIyA69uEzaeVhu28ufwUEHp1uk= X-Google-Smtp-Source: ACHHUZ6uZ3NRfESc1LLdM7pG5QakOfq/c/daJr3jT6A/NUchGYkSu86UqZO3PB3EltPOLvcz17COALW9nYWOKlX1r+w= X-Received: by 2002:a19:7b05:0:b0:4f6:d9e:7c3b with SMTP id w5-20020a197b05000000b004f60d9e7c3bmr2147967lfc.44.1686941646932; Fri, 16 Jun 2023 11:54:06 -0700 (PDT) MIME-Version: 1.0 References: <20230616085038.4121892-1-rppt@kernel.org> <20230616085038.4121892-5-rppt@kernel.org> In-Reply-To: <20230616085038.4121892-5-rppt@kernel.org> From: Song Liu Date: Fri, 16 Jun 2023 11:53:54 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH v2 04/12] mm/execmem, arch: convert remaining overrides of module_alloc to execmem To: Mike Rapoport Cc: linux-kernel@vger.kernel.org, Andrew Morton , Catalin Marinas , Christophe Leroy , "David S. Miller" , Dinh Nguyen , Heiko Carstens , Helge Deller , Huacai Chen , Kent Overstreet , Luis Chamberlain , Mark Rutland , Michael Ellerman , Nadav Amit , "Naveen N. Rao" , Palmer Dabbelt , Puranjay Mohan , Rick Edgecombe , Russell King , Steven Rostedt , Thomas Bogendoerfer , Thomas Gleixner , Will Deacon , bpf@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mips@vger.kernel.org, linux-mm@kvack.org, linux-modules@vger.kernel.org, linux-parisc@vger.kernel.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, loongarch@lists.linux.dev, netdev@vger.kernel.org, sparclinux@vger.kernel.org, x86@kernel.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 7C727100012 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: anca5agew91caboatef666c9r4oenr7e X-HE-Tag: 1686941650-533729 X-HE-Meta: U2FsdGVkX18XaQC8hvWeb3zrhwyfZJ8sNiDnUepE/jtF84+CVJ1h8lQCaXXSsd23DwlJzuzTDHRuFjPHWzjpuOfdCejbJZoEK8Xv/QfVohrqT/3d5231TAulFnBmHIUZJSdREmVsgDmBYt7OKY2fcz+gnm0EdIj5f9baFvZOcsQavjWYzHXaDw9dAGY4P9ZcxVvTm7Y9vb8+EPZmSpJdK3UsUE1UTfPc5+ShaNkwXEpTqLljTapBw2i+3d2A4r1vQxmUtuvLnQvx3I7jJfViyqu+BDNvMzoJdU4AHXlsjcZoOgOCniL0EiSM6LcMp9i/bp4D6uvwPlotVXOlHZFtVhuIAkDUZCL3T3R8VyIOtEal+RChnabvahbq0vXHSjPd2zqgkLNNuxslfQNAiiuubJ4JSpYYpuXeRj8iQVjvBoKoek1VSREDhWjsX4VIQS9ZbBbk+NSGwJ8k0psrrOaoa57IOCgmZoQY/mKF6OVh/TLGqN3ggjHl7HeseAIzC0kuXBgc6GROj1Xi2hWodru0fmz/8zVywnYZYYKcDKEnAHyBE3QobvxXGqAHmC5W0YbYBNWdcLB2oaGukNLTISWYuFypaZ8Arp9tVTHpS2meABucE2E3kEevYQtQsHyzKGlkIluiDV0zQcu3pD+K32pZkmoDTbW3wleYJhPy7udxTMupx4dJ+hVT64J+WPwau7ngNBJtp8EIeD5kD8PvQ8IXdLqVqh1zVqES4s9LVj4gUUAupcEnDYhApNi5c3bJYnzVT5mN/ixs+MgnwnO/xveAMutJUeZUoJIyHxTNmYZnIV5KbWJPlXQz/FV1FZWGf/x5TuDNfQ4tkqz3H9Cv3jS9+J8K300cOyBQFdRvzw+iPARKWElzMT35OFQeXNPkAJBoD4C/rvViRJ40xbrgwI7DSeRW7NccSOwYYGS7gLzlvGsA46j0xupC8QxMXcN5TYlmxQcDRe17+fY6QRQ0D+4 YGfH0rmk G8Hwx8WlVDeU+T80msxniirXm5wAbQMfipk/v2H/sBkchWdjM6EYEE/gZwiWYsEMM20d5Gc51wJceJpbXBM1b9SJFuR1XcKy46hG9BdjY0gl+15el2ZMHkAkqpoUAyrM0pTz7cMPMzy504j0SnCLIVUi76U6Z8PX/IFP9J/dYlxw6m5TYMuRKcH8PiqM4LhuqzItqMHAKom3jUmkrVBc9x7iBPfaYey2VfBsH6t32g+iLOyyG0SyHTBbn6lA1X/nkbplOFTIO3UKAMi4fnrJzO3xWbtQTphdRiQrV7RmzpMbwonXI+frAoc0/tAXz1yLASDVLJNJXJMEicrn03lZQjwBnhGTLoFVqezYYQaWzyyiLgHcJ0QIlq0NyOvYd1pmQPezUGWXarwG/yg9+zj22CLEJCqPhjs9i3L9GRsNRKTAnV/Iu+dHk2+U3oVPrFZzwmFz1u5RzUg65dm9JfLM2dMlI6xBhACdRN2jmPQoHOFOv+YN+4Kx9wrwy9gacYYtxp4oVTMxn1IJq0xydIdeE3Xtjpg== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Fri, Jun 16, 2023 at 1:51=E2=80=AFAM Mike Rapoport wro= te: [...] > diff --git a/arch/arm64/kernel/module.c b/arch/arm64/kernel/module.c > index 5af4975caeb5..c3d999f3a3dd 100644 > --- a/arch/arm64/kernel/module.c > +++ b/arch/arm64/kernel/module.c > @@ -17,56 +17,50 @@ > #include > #include > #include > +#include > #include > #include > #include > #include > > -void *module_alloc(unsigned long size) > +static struct execmem_params execmem_params =3D { > + .modules =3D { > + .flags =3D EXECMEM_KASAN_SHADOW, > + .text =3D { > + .alignment =3D MODULE_ALIGN, > + }, > + }, > +}; > + > +struct execmem_params __init *execmem_arch_params(void) > { > u64 module_alloc_end =3D module_alloc_base + MODULES_VSIZE; > - gfp_t gfp_mask =3D GFP_KERNEL; > - void *p; > - > - /* Silence the initial allocation */ > - if (IS_ENABLED(CONFIG_ARM64_MODULE_PLTS)) > - gfp_mask |=3D __GFP_NOWARN; > > - if (IS_ENABLED(CONFIG_KASAN_GENERIC) || > - IS_ENABLED(CONFIG_KASAN_SW_TAGS)) > - /* don't exceed the static module region - see below */ > - module_alloc_end =3D MODULES_END; > + execmem_params.modules.text.pgprot =3D PAGE_KERNEL; > + execmem_params.modules.text.start =3D module_alloc_base; I think I mentioned this earlier. For arm64 with CONFIG_RANDOMIZE_BASE, module_alloc_base is not yet set when execmem_arch_params() is called. So we will need some extra logic for this. Thanks, Song > + execmem_params.modules.text.end =3D module_alloc_end; > > - p =3D __vmalloc_node_range(size, MODULE_ALIGN, module_alloc_base, > - module_alloc_end, gfp_mask, PAGE_KERNEL, = VM_DEFER_KMEMLEAK, > - NUMA_NO_NODE, __builtin_return_address(0)= ); > - > - if (!p && IS_ENABLED(CONFIG_ARM64_MODULE_PLTS) && > + /* > + * KASAN without KASAN_VMALLOC can only deal with module > + * allocations being served from the reserved module region, > + * since the remainder of the vmalloc region is already > + * backed by zero shadow pages, and punching holes into it > + * is non-trivial. Since the module region is not randomized > + * when KASAN is enabled without KASAN_VMALLOC, it is even > + * less likely that the module region gets exhausted, so we > + * can simply omit this fallback in that case. > + */ > + if (IS_ENABLED(CONFIG_ARM64_MODULE_PLTS) && > (IS_ENABLED(CONFIG_KASAN_VMALLOC) || > (!IS_ENABLED(CONFIG_KASAN_GENERIC) && > - !IS_ENABLED(CONFIG_KASAN_SW_TAGS)))) > - /* > - * KASAN without KASAN_VMALLOC can only deal with module > - * allocations being served from the reserved module regi= on, > - * since the remainder of the vmalloc region is already > - * backed by zero shadow pages, and punching holes into i= t > - * is non-trivial. Since the module region is not randomi= zed > - * when KASAN is enabled without KASAN_VMALLOC, it is eve= n > - * less likely that the module region gets exhausted, so = we > - * can simply omit this fallback in that case. > - */ > - p =3D __vmalloc_node_range(size, MODULE_ALIGN, module_all= oc_base, > - module_alloc_base + SZ_2G, GFP_KERNEL, > - PAGE_KERNEL, 0, NUMA_NO_NODE, > - __builtin_return_address(0)); > - > - if (p && (kasan_alloc_module_shadow(p, size, gfp_mask) < 0)) { > - vfree(p); > - return NULL; > + !IS_ENABLED(CONFIG_KASAN_SW_TAGS)))) { > + unsigned long end =3D module_alloc_base + SZ_2G; > + > + execmem_params.modules.text.fallback_start =3D module_all= oc_base; > + execmem_params.modules.text.fallback_end =3D end; > } > > - /* Memory is intended to be executable, reset the pointer tag. */ > - return kasan_reset_tag(p); > + return &execmem_params; > } > > enum aarch64_reloc_op {