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 5B52AE936FF for ; Thu, 5 Oct 2023 05:29:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E32B68D00B3; Thu, 5 Oct 2023 01:29:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DE2438D0002; Thu, 5 Oct 2023 01:29:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CAA628D00B3; Thu, 5 Oct 2023 01:29:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id B7F198D0002 for ; Thu, 5 Oct 2023 01:29:46 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 88D6AC0125 for ; Thu, 5 Oct 2023 05:29:46 +0000 (UTC) X-FDA: 81310280772.12.2DBBEA0 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf30.hostedemail.com (Postfix) with ESMTP id 29C6B80003 for ; Thu, 5 Oct 2023 05:29:42 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=htbvcSdK; spf=pass (imf30.hostedemail.com: domain of rppt@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=rppt@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=1696483783; 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=nAf5AvqwiVW1SB2iAUKfakH3uyPakHpyUVR2NXft5Bw=; b=LkWYIymQs4pp9ut1hv+Cbh2HN5DmmsRLxvsXXIsIEkNYHf41FolForNuQKyUt9DQVJS+fV fQdExbT+4ls08lF7uDoRgpRRbUZ7ypqh3ct6rfL8KCkQ9luqU01aDZNySDlS8MWnz/GcEq DuqppbPAFtPSIIMFMDKzFRgaWjmSJn0= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1696483783; a=rsa-sha256; cv=none; b=i7INQ7VPZrxTOAxsvKrNx+7boY3nrgB/cL8GFsAJzMP/nfN6DThhMqwItC5JQu+4hVL9h/ raPDCT/BZP7KgHVfJrQQ2pk+Qy/mVfswg+IKAkd8mgZ8b6yRo9oo+PFMjO+4n3fWFsxCob BOeY9aD7CEzk+1uwz6WaBDcaipofdCc= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=htbvcSdK; spf=pass (imf30.hostedemail.com: domain of rppt@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=none) header.from=kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 58A05CE1FD1; Thu, 5 Oct 2023 05:29:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8CBD6C433CC; Thu, 5 Oct 2023 05:29:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1696483777; bh=0Btg3YXrlgdZvN9c5GBtYXuhH18hqWIB+5O6R7ueqJA=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=htbvcSdKFwWteJskCo57Zoc+HETH4Yk4itDoLxeJ1ZG4lHI/6dRpo8c5g9SXm397o Eun4d3xnthNfZVwdWsofKvM4QWBVN4HTm3hLqzLiQBrntUL8UgEGY5xtChyLJeLSvA +kiu09tPGlxznwtPobf/uLurpuN8CBF2/SLMhDWs179ymyb2Urny866sSuGF/ojv6+ iWewEluv5jVsvROGeyy57su15Hs4TbNbwzhji63ZqwBfc3BmxOSDIm1/YBjJDN2t9v ZHq7tnS5BF0NS66xJ3m6K4ABlSRKqepeLUIUEhNo390B9QIPXevXF5ZN3BxZUTA4Ed Ef2zRBvRZ4gnQ== Date: Thu, 5 Oct 2023 08:28:24 +0300 From: Mike Rapoport To: "Edgecombe, Rick P" Cc: "linux-kernel@vger.kernel.org" , "tglx@linutronix.de" , "deller@gmx.de" , "mcgrof@kernel.org" , "bjorn@kernel.org" , "davem@davemloft.net" , "nadav.amit@gmail.com" , "linux@armlinux.org.uk" , "netdev@vger.kernel.org" , "linux-mips@vger.kernel.org" , "linux-riscv@lists.infradead.org" , "hca@linux.ibm.com" , "catalin.marinas@arm.com" , "kent.overstreet@linux.dev" , "puranjay12@gmail.com" , "palmer@dabbelt.com" , "linux-s390@vger.kernel.org" , "chenhuacai@kernel.org" , "tsbogend@alpha.franken.de" , "linux-trace-kernel@vger.kernel.org" , "mpe@ellerman.id.au" , "linux-parisc@vger.kernel.org" , "x86@kernel.org" , "mark.rutland@arm.com" , "christophe.leroy@csgroup.eu" , "linuxppc-dev@lists.ozlabs.org" , "rostedt@goodmis.org" , "will@kernel.org" , "dinguyen@kernel.org" , "naveen.n.rao@linux.ibm.com" , "sparclinux@vger.kernel.org" , "linux-modules@vger.kernel.org" , "bpf@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "song@kernel.org" , "linux-mm@kvack.org" , "loongarch@lists.linux.dev" , "akpm@linux-foundation.org" Subject: Re: [PATCH v3 04/13] mm/execmem, arch: convert remaining overrides of module_alloc to execmem Message-ID: <20231005052824.GE3303@kernel.org> References: <20230918072955.2507221-1-rppt@kernel.org> <20230918072955.2507221-5-rppt@kernel.org> <3483c4712306060ac56f07f5db9b146d69fc7e9e.camel@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <3483c4712306060ac56f07f5db9b146d69fc7e9e.camel@intel.com> X-Stat-Signature: ukgmxatir5r6zk17em6iuyi8993sxn78 X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 29C6B80003 X-Rspam-User: X-HE-Tag: 1696483782-412672 X-HE-Meta: U2FsdGVkX19bgUYFQHivgHZ1Ya30gC+tsicyAjHlQnyOq2Cuoo4D8rut2HmIqH93h6mza56OmuWYGx3ZmUV/koNuk0myIrFT++zTz4oyO++62PP80QJuKl+IGw2Kam1SFX2DJHu1kt6iJ15HeWcSfXjuzLXT9vx5IgEUtocmcn/ncM40uFoY8i9nGdn/PHq0LBkUgBilIBVcNr3Uwb+WvI7ZxjYYVVPuNjZaQP4Mm+zoZA+G/bH084PaHI18CvGShQchXM54QViioBQxyVwUwp2HiuuDpx7O/i74uGtR0fvv3DSMIvxz5Z71R7Z896dZ0PgJk+eoXLJgE17VEn0CadLXslGbMpOJzSTEJE2Vq2r3wSHwNbfWSQJOoD5Fp1figFZqVBcefhM0gJfs/KdZWRpPB4cBja3kA9Gpmlvv7pHU42USfNx+uYkQ9YyCWLQBkSGAJwPIpgJu5gIfCro+3ucpa2wq+zw3nyjWDCL+cMKBgMBsZ5MTfwetDGUjeD7ai3R1eRCELZ6ix3sWlDDDYDLqUtvXR6Dqh86vKsqFLiHili6wIBSl00zJDq62ujBwErHDS1kb3gmjNulD4l81SwWSlA2Kq41JXMfUewYcsZvdFzHl9AU99kAmQCi9+0AenE0AmK0kPeSDKIBR1QE8H0JelvOgBb/CQWDPK9W0OWf4YFd0UCQ1oMvLJ9ePDqvlwPLJ7j2Z8yVeE7Nieg9TGQmdQ0TWijU+Gf8D4OQRYhi3Wfa3bAGpFJFmCGqdqzwDlcD61rI0hIysMvBuNDQ2yk/zjPCJLmNi7YXteOFrg7PEg53o//nLySImrdkHii99oLBelUH2j2vrZjzqjYGAHFLwACrf5dNZntdRLllZZp2vFhfhd3uelGazI59CU9cHk4YsT0cnRYBftoSBXyuP0l7k/JxvmsDdVmL+hRk4CjLc0QYXfI36d0dP3a1l5i9gOFZG4nrfKXH8I1imRc/ YQv8G4gs iUnT6nH2RPJxgKakI+qgTNCdLoOrbXfmJD6ZCyudNHrRGl6YJhHUXiOJXRGZSeBjY231Lfst1X+VhM/fM4SG1zuaampcvk2Lq2LGwBfBCj47w6b7h4hDzHNa3DptUORIcK1ay/PdAhm+1m35nf0MJpsWn7BS/XEdhubZp7qGUfkFvERofvArDk/tKI0KLo79lWJ9jKiL6Nwi/UiLbAjfgv8V6CPDy5+8kI4+ltKVFFNEHvMeDXwnHc5xCyJ7jWgYinbg5PAuUkN8NNIau2MuUO0Oqdz5uh4pKlvINUdxVx8LVrlovucu7BrErpTpLudoFw9009RS4qpKI5CfM5j7gyvOvN0dn3i9ryexH0rIlgSkWBds= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000001, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Wed, Oct 04, 2023 at 12:29:36AM +0000, Edgecombe, Rick P wrote: > On Mon, 2023-09-18 at 10:29 +0300, Mike Rapoport wrote: > > diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c > > index 5f71a0cf4399..9d37375e2f05 100644 > > --- a/arch/x86/kernel/module.c > > +++ b/arch/x86/kernel/module.c > > > > -void *module_alloc(unsigned long size) > > +struct execmem_params __init *execmem_arch_params(void) > >  { > > -       gfp_t gfp_mask = GFP_KERNEL; > > -       void *p; > > - > > -       if (PAGE_ALIGN(size) > MODULES_LEN) > > -               return NULL; > > +       unsigned long module_load_offset = 0; > > +       unsigned long start; > >   > > -       p = __vmalloc_node_range(size, MODULE_ALIGN, > > -                                MODULES_VADDR + > > get_module_load_offset(), > > -                                MODULES_END, gfp_mask, PAGE_KERNEL, > > -                                VM_FLUSH_RESET_PERMS | > > VM_DEFER_KMEMLEAK, > > -                                NUMA_NO_NODE, > > __builtin_return_address(0)); > > +       if (IS_ENABLED(CONFIG_RANDOMIZE_BASE) && kaslr_enabled()) > > +               module_load_offset = > > +                       get_random_u32_inclusive(1, 1024) * > > PAGE_SIZE; > > Minor: > I think you can skip the IS_ENABLED(CONFIG_RANDOMIZE_BASE) part because > CONFIG_RANDOMIZE_MEMORY depends on CONFIG_RANDOMIZE_BASE (which is > checked in kaslr_enabled()). Thanks, I'll look into it. -- Sincerely yours, Mike.