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 BAD32EB64D7 for ; Fri, 16 Jun 2023 18:56:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 578458E0001; Fri, 16 Jun 2023 14:56:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 526B46B0075; Fri, 16 Jun 2023 14:56:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3C8248E0001; Fri, 16 Jun 2023 14:56:28 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 2BCE06B0074 for ; Fri, 16 Jun 2023 14:56:28 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 01E01C0D06 for ; Fri, 16 Jun 2023 18:56:27 +0000 (UTC) X-FDA: 80909516856.05.D8DBA77 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf22.hostedemail.com (Postfix) with ESMTP id 05C9DC0002 for ; Fri, 16 Jun 2023 18:56:25 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=DR8ZwzCH; spf=pass (imf22.hostedemail.com: domain of song@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=song@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1686941786; 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=/f477Ejd4lMiCJeEw8A1xwDewgrNZylYMAsO2wSkJSc=; b=e0zaYBNc9MzdOnon+qImrD77SMLSiFepuW34fkfu6dgepUGz3/vHVesZM1kWCgUZo9lsE2 +tBOf5EOjJt6a4VXdZC59A1d3FONFuaDxyPpzo0Glf7ZgMzHfxSawtbbApPVXCblniUwSD ai7Gkv4TxGq0hDHKkfLcx3HMWee7dXM= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1686941786; a=rsa-sha256; cv=none; b=vUFMA3LokmSnk5PWOersSYYYw6ZijGyXJDR13NbdOmB5x3GknJZHnP3eMyX2aW2Shu0NBL tJ3ZqUWRFrD6cVtnDFSnXQn9NMT4qDw0xx1Q8bCh69JMxuwy7GlxBWCHnXUtQzj3ZvoqfQ pmngR4+klQN2mpoXz0w792s82XzPBLA= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=DR8ZwzCH; spf=pass (imf22.hostedemail.com: domain of song@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=song@kernel.org; dmarc=pass (policy=none) header.from=kernel.org 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 3BD3863303 for ; Fri, 16 Jun 2023 18:56:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 20F2DC433AD for ; Fri, 16 Jun 2023 18:56:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1686941784; bh=TiK/t/XTSx2fh8UkKw1baZqCETUm1DZqQZdzQBTpc/g=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=DR8ZwzCHVtydoaaxjVYJNAWu/EazGdygIZ9Srkd4r4zGNu0UV5wrYj4MX5arzEodp UNvhvBrh5U4xGmDl5sewm5lcUokl1lD7VTeAPUPHyzYKCOX5F7Je9AJgJ0HqJqpHT2 dLMHymuA0MzirGgPHvlvL6U36HV4H2mHBFM4sA3+uLQ6uro16QwzRETHZvWuu01q0L oEQm2Ghzu8fuJWG7gSLOHi6X72YNM+NGXR0jzbSIhti31b9mqhQFKwVaQG4h1o8jl3 sPN9LHTye4cTeZayTOrwNQq2w+QcnqfrU6lZ/h2mtxqSWd8YF98VAdngnnwpTSEIq6 2Cv/9seiufkYQ== Received: by mail-lf1-f49.google.com with SMTP id 2adb3069b0e04-4f64fb05a8aso1550282e87.0 for ; Fri, 16 Jun 2023 11:56:23 -0700 (PDT) X-Gm-Message-State: AC+VfDz9Kl9sNNhm+qRsbRmDEm56lllgzXBSrdag+KmAITAg+JB8N+kT PcZeG86mWa9eqRHsVVhBlTpcQ1N+rR3TNFG8xbU= X-Google-Smtp-Source: ACHHUZ5T8e7wpuuhOjnmCbHsB2+OgDZlJJ7sUOEWS0dN9xCa2iZ6+8btSZBMXNDx9vhO1lFKVvsg0dPvz5VmaKvg8Zw= X-Received: by 2002:a2e:80c2:0:b0:2b2:f9c8:6ad1 with SMTP id r2-20020a2e80c2000000b002b2f9c86ad1mr2553844ljg.42.1686941782011; Fri, 16 Jun 2023 11:56:22 -0700 (PDT) MIME-Version: 1.0 References: <20230616085038.4121892-1-rppt@kernel.org> <20230616085038.4121892-6-rppt@kernel.org> In-Reply-To: <20230616085038.4121892-6-rppt@kernel.org> From: Song Liu Date: Fri, 16 Jun 2023 11:56:09 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH v2 05/12] modules, execmem: drop module_alloc 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: 05C9DC0002 X-Rspam-User: X-Stat-Signature: 9jmfjhc1sinuip3it1j77e5wmyg6191t X-Rspamd-Server: rspam03 X-HE-Tag: 1686941785-829645 X-HE-Meta: U2FsdGVkX18w/kwp6rlaOjl5+2TZ9VTq/lRolubj61D9o/scCaSMLDfqozH+H1gbHxuGXf309/SnyODWUsWvcxPxJbA6kcJnyQMbzvPM/f9+fK8cdBoeDxwZlaIPHsLbroFS1BrWa26DkzcSeiVaF7f+oFwcAkvj7jFlECulayEQCji0tMl8N9njnbIyCDMWLacLvkSCsBpBToS5xQwaw6YgcVOeRJAdx946J3hBe1WIIIZ97/K5eY6Jt5AMiAjZ0WWvWX9E4IHmNGd/NKbZDiiPJ64ITr4sKEqf/8huyxhfuuLJCPOvkCm0oBxlLNmgqNNM013+LPfN6N+kPf2vM6Ijui0ATW5u9l57jwDJwnEuZMXy7R3I834lAbgLYcD9NMZeV4VGq3uRa+mgdLmJ52tXkpfsBeMx9Vh1bq2vMsaIxUHxu3WhjqyK7rBcxm6x+a1ogalBsilpSwJ0ZTmY6R5mi6Jf5VE9Nu3b4E+6ioYqPYLZTead/bSsLtwfZxdFRT2T2H1F+QDMb1OpDdw5SCOh9Q5kGCwJCt5FqNj16rh8m6AYROQ02Y/3N+tbGqXQJ9YYYoWOPUO9LB65DxkQhlcNTA6pIWS6Ref2QYrOH+NPphw2XQqDBKqtzbmN/oycP2sX3y2BWK8+lUnZvwdYoLuOOwqTNlCh2K8Z13UkrtWSSSFr/3RdunjqgGfP1Uq5/Zo6Pungu9GRxB+0faRuC5dY02SjIj2a/nGipCOJW8ngK5mMM44MYP53ek8CtMlyV6efj7C8pdM/WUzXYvC0M5AUxe/uFZesM+L440XXYdjydm+dvK9fAQPVlGZbbs2PyMhja6mFsPXYNclmkzLAgcgHzOJbHurmrnMMpsMa0ZvMgeEJJaVVtViaojSya7JI5/cl8aNjFc3nOWBjTlpF8+jqGDIZFXxbK0hh/1jr1rJFDUNUwPB98emtemVSTWSs6qcQfjpQX6XEkFk49IE vA7QB85T EXVrRsNkRrwA3QG8S/5oJIHks7tz9pbGPumnxVHpulHoGIEg8CR4LW3QNm1xIvdbsRUoLvVcZn/UTHkpEHp/ZTzlFC3B0pxMO644K1Mb+820F59m5ikXZZnRW8P+rQ8pYEeuoGAYms19xUyaPCuK+kVn/rQXzahuXh5kLhvUk2irnq2wSyCJmgSEtCyTWQQuMrqs2cFjBTEVdPP+GMaDiXHT8KojVyS9QjYyt6NmhDoIa6tk1wiKKZMNtcQZvCtD5l8ZhMijY906JOu5oEOHoqHsDg/8VYQE21PkBe+iFy0V6nMiPxvCc8b6yjmTrbv2iQcINIt3IrpY/PalSwwvv8cyDvc5mXytr5JBfuV1c4FuFpNLabzQybdDfft5E+vKGYlvaff3lKbEaahWdmXffMfQCHvFAivOtV8VIlC1AWSXh2ZDNjvfSsQKtE1ygiQ7EAHQB2Ep4WgbVyG9nL/zXytCFzkTfkD91GDZ3SqONFMBNlf0HwvYXDTvhPg== 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: > > From: "Mike Rapoport (IBM)" > > Define default parameters for address range for code allocations using > the current values in module_alloc() and make execmem_text_alloc() use > these defaults when an architecure does not supply its specific > parameters. > > With this, execmem_text_alloc() implements memory allocation in a way > compatible with module_alloc() and can be used as a replacement for > module_alloc(). > > Signed-off-by: Mike Rapoport (IBM) Acked-by: Song Liu > --- > include/linux/execmem.h | 8 ++++++++ > include/linux/moduleloader.h | 12 ------------ > kernel/module/main.c | 7 ------- > mm/execmem.c | 12 ++++++++---- > 4 files changed, 16 insertions(+), 23 deletions(-) > > diff --git a/include/linux/execmem.h b/include/linux/execmem.h > index 68b2bfc79993..b9a97fcdf3c5 100644 > --- a/include/linux/execmem.h > +++ b/include/linux/execmem.h > @@ -4,6 +4,14 @@ > > #include > > +#if (defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS)) && = \ > + !defined(CONFIG_KASAN_VMALLOC) > +#include > +#define MODULE_ALIGN (PAGE_SIZE << KASAN_SHADOW_SCALE_SHIFT) > +#else > +#define MODULE_ALIGN PAGE_SIZE > +#endif > + > /** > * struct execmem_range - definition of a memory range suitable for code= and > * related data allocations > diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h > index b3374342f7af..4321682fe849 100644 > --- a/include/linux/moduleloader.h > +++ b/include/linux/moduleloader.h > @@ -25,10 +25,6 @@ int module_frob_arch_sections(Elf_Ehdr *hdr, > /* Additional bytes needed by arch in front of individual sections */ > unsigned int arch_mod_section_prepend(struct module *mod, unsigned int s= ection); > > -/* Allocator used for allocating struct module, core sections and init > - sections. Returns NULL on failure. */ > -void *module_alloc(unsigned long size); > - > /* Determines if the section name is an init section (that is only used = during > * module loading). > */ > @@ -113,12 +109,4 @@ void module_arch_cleanup(struct module *mod); > /* Any cleanup before freeing mod->module_init */ > void module_arch_freeing_init(struct module *mod); > > -#if (defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS)) && = \ > - !defined(CONFIG_KASAN_VMALLOC) > -#include > -#define MODULE_ALIGN (PAGE_SIZE << KASAN_SHADOW_SCALE_SHIFT) > -#else > -#define MODULE_ALIGN PAGE_SIZE > -#endif > - > #endif > diff --git a/kernel/module/main.c b/kernel/module/main.c > index 43810a3bdb81..b445c5ad863a 100644 > --- a/kernel/module/main.c > +++ b/kernel/module/main.c > @@ -1600,13 +1600,6 @@ static void free_modinfo(struct module *mod) > } > } > > -void * __weak module_alloc(unsigned long size) > -{ > - return __vmalloc_node_range(size, 1, VMALLOC_START, VMALLOC_END, > - GFP_KERNEL, PAGE_KERNEL_EXEC, VM_FLUSH_RESET_PERM= S, > - NUMA_NO_NODE, __builtin_return_address(0)); > -} > - > bool __weak module_init_section(const char *name) > { > return strstarts(name, ".init"); > diff --git a/mm/execmem.c b/mm/execmem.c > index 2fe36dcc7bdf..a67acd75ffef 100644 > --- a/mm/execmem.c > +++ b/mm/execmem.c > @@ -59,9 +59,6 @@ void *execmem_text_alloc(size_t size) > unsigned long fallback_end =3D execmem_params.modules.text.fallba= ck_end; > bool kasan =3D execmem_params.modules.flags & EXECMEM_KASAN_SHADO= W; > > - if (!execmem_params.modules.text.start) > - return module_alloc(size); > - > return execmem_alloc(size, start, end, align, pgprot, > fallback_start, fallback_end, kasan); > } > @@ -108,8 +105,15 @@ void __init execmem_init(void) > { > struct execmem_params *p =3D execmem_arch_params(); > > - if (!p) > + if (!p) { > + p =3D &execmem_params; > + p->modules.text.start =3D VMALLOC_START; > + p->modules.text.end =3D VMALLOC_END; > + p->modules.text.pgprot =3D PAGE_KERNEL_EXEC; > + p->modules.text.alignment =3D 1; > + > return; > + } > > if (!execmem_validate_params(p)) > return; > -- > 2.35.1 >