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 10A03CE7A90 for ; Sat, 23 Sep 2023 16:24:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 862866B026F; Sat, 23 Sep 2023 12:24:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8127F6B0274; Sat, 23 Sep 2023 12:24:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6DA1D6B0277; Sat, 23 Sep 2023 12:24:45 -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 5DBE26B026F for ; Sat, 23 Sep 2023 12:24:45 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 2AAB680369 for ; Sat, 23 Sep 2023 16:24:45 +0000 (UTC) X-FDA: 81268385730.04.1FCEE5B Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by imf04.hostedemail.com (Postfix) with ESMTP id 3E33B40002 for ; Sat, 23 Sep 2023 16:24:42 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=XbZg7GgD; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf04.hostedemail.com: domain of rppt@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=rppt@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1695486283; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=907w4+//aMdwbmxD1FJ+8/t5LQSS9+knjb9iZB733EA=; b=7rISzoXm8vVhc7LQIrTpN4jNp8IvZ5h6tz6nG30GjCrrIRLm+VFFg2y3iTsxt1nHmFDNAM 7Cn51bijPaLRcwi/v4mix4iDdEKAWoywtkbnE4Xx2qp60VJ+XkT/EQFVybPkmWn7ogwVYn kh5gENcBra3HpvWGCiMK/nJd/5dINbM= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=XbZg7GgD; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf04.hostedemail.com: domain of rppt@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=rppt@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1695486283; a=rsa-sha256; cv=none; b=Oz4YfnIpRzpnRsq+b6vNFugUifpQYgta6WaSZ1grp4345q3qirvr7SCvNyeuYKgbRCmLAO JEoRy0t9G7ggOuSOadn81PQkivb30mT0yY0EwwG8J0V+Oj1VscfvS/0E1+ndRv/i+OdJqk EE+Xp7vxxb8taeXrgZMtf6Rxo7ZtqAY= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by ams.source.kernel.org (Postfix) with ESMTP id 53F84B80092; Sat, 23 Sep 2023 16:24:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1C213C433C8; Sat, 23 Sep 2023 16:24:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1695486280; bh=LPa0vOpCN9uFCJLwT0Mv83PIALUPvGiZjoSaYDcpsJE=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=XbZg7GgD8+BmM0EbIou3DUcf1HdG1quOywXNpDmhicICfIw73rq/zzU/h/vI/qZDp XFUEPcYb9UPuknO3UuH9df8jDX6Y2cSrJ80wg4ZDDFpWgi05sPMcC4MzWe2C0cyCeu nP6/UDcZM95kD65En58LM92KcpcWG3KRH0guTPfrV4zfxxO4soUJ8uiNt0flLBa+d0 BLkPfitclvMDS0vd51IsKv7CF8IIIdzK9/P0gBrSPMYS98N2ZZq1Bne2bq5a34spi2 CfuytAh2slWgJP4aWqKBet8FSXiJNiOrIpHAN1uhuJKdaS5HEKlew5LP5bm2Q0OAmM QvG1TNKlGHcFw== Date: Sat, 23 Sep 2023 19:23:40 +0300 From: Mike Rapoport To: Alexandre Ghiti Cc: linux-kernel@vger.kernel.org, Andrew Morton , =?iso-8859-1?Q?Bj=F6rn_T=F6pel?= , 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 , Song Liu , 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 Subject: Re: [PATCH v3 08/13] riscv: extend execmem_params for generated code allocations Message-ID: <20230923162340.GM3303@kernel.org> References: <20230918072955.2507221-1-rppt@kernel.org> <20230918072955.2507221-9-rppt@kernel.org> <6d686c54-078d-8d71-d4e2-c754cf92c557@ghiti.fr> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <6d686c54-078d-8d71-d4e2-c754cf92c557@ghiti.fr> X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 3E33B40002 X-Stat-Signature: 4rm58gtgaijmp9767ik49tuztm8jehkq X-HE-Tag: 1695486282-788775 X-HE-Meta: U2FsdGVkX1+eqJ0tsOCzPQNj4EGDNX/TXD4FICII+3Vn9bkOXfoAWSQZOWTkqu/IA7bjyTg1AcieDDW9Cv/Nh8ooHIKACUY1qjCkwUEKH5GlqsZew57Ei4+UEsRZm4U8GcQtyMUgzB66wN3auJZAwUNRJhjNdebPq9ROg/+ufWTALVHt/EtcfIim3ku0klSkFbWTVuDpIj24UfZ0VYyX+H5zX0cRm/ParP3aM+pEPuIlE3H3qZ9wdE74TlRtDVBXRR3Cp5RlBQRcBJcMGc0HI+aK84kT8VVRmfcAM2UI2c1t3Ts/DirSLzRM5DE7EQRDToKAEmRMj7I1iFsgdNtI+X50P6MmgZsRmd/l2k8SbSd5reEnz4+5jQ3JO5iQEiFOKUle8A+OBPG0QA85D6Ezz+j6hvXXZndTby6b+vRd5nH7bfuGeKWrrLK91gvTDIARUhs9Mxdyoxg6UnN4ycRRgPMcUK3dUleYn02gVTon5FHpJxTBZUM1rkprAmHilRqP4IGTfLfZvTxXueoBUl0bnNnoKVWhkBsLazy3ZvFnJFICfQcvbOBfOeDa6v55WsAg28ExIPJ+ojFf/U7LKKApNg74lCl9A6XvTYQIbvQYf16r6XByNK56UW3lRxPku15PLlyhPGc+ZPPhz5gRZZIC2dbfmY3eoKKk6bvhfMwFoRbW/AmMMFhOy9um8sKmmufv53DzOWBH8PT7ljUxr6ZOmQSBVxsd3cs6KYvZbcciKm6vcyy7RqM9H9f3gBYriN+gPgl6A+PFl1QCDxXaViwET02+5AMJvAXJVaD8in1dWKCzDWmObnsuBhQOEYtmJElJZ1H6DezCDfBrTRkgPQKojslP7cTyIVfZCRe477lV5SGqqThQmlWaRgOVw2HNV+0lYFDPjbskNY1UFrW8GDH8RPnUFWbn86HSyvX2kE5AfB+Do9zi4yj2DAT5RvvnsyW4YdkVZEBv4tWn6wWUYwu 2zjpOcPr OvrJfH5lu8/bJBIls4y9u3lahei73zoyLpmv2m++6Fuy2Z1MpIHf0ElbLPnpuG8yILaQXMVNWe40DqK8TzmTAcF88fTXrX/Spju0gvP5iil6QmiUWpx++zvwxHeNgnTfMfiJ3T6JmqU/02wpkpI6SB4q5ILMzApjxuLqnrNWiFs7LqipEXMbpVC6pv+ZT+hnua2SSoyokpYyPDsWmOgwyYbI4YH/zWseOLVTHyPxkKEt+II04cgPgia0rvcS+ZrqGtVQtO/qO+vYX96TUxrF73B1XQFjqx8ftIlbqxHAyOxgiFCMM5S7UxgNNVsfKgYs2K+l2zo3xbWV6iJWaGCOvh7jSE5IQYy1hXZDoyYI62xKV8IlB68VVV3aQ2AkNVr8qxKODaC2JAjFcPHklowYiaDBA9SWb/16EJo2VEPpl1WK4B+cyjpbVTDn+yg== 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, Sep 22, 2023 at 12:37:07PM +0200, Alexandre Ghiti wrote: > Hi Mike, > > On 18/09/2023 09:29, Mike Rapoport wrote: > > From: "Mike Rapoport (IBM)" > > > > The memory allocations for kprobes and BPF on RISC-V are not placed in > > the modules area and these custom allocations are implemented with > > overrides of alloc_insn_page() and bpf_jit_alloc_exec(). > > > > Slightly reorder execmem_params initialization to support both 32 and 64 > > bit variants, define EXECMEM_KPROBES and EXECMEM_BPF ranges in > > riscv::execmem_params and drop overrides of alloc_insn_page() and > > bpf_jit_alloc_exec(). > > > > Signed-off-by: Mike Rapoport (IBM) > > --- > > arch/riscv/kernel/module.c | 21 ++++++++++++++++++++- > > arch/riscv/kernel/probes/kprobes.c | 10 ---------- > > arch/riscv/net/bpf_jit_core.c | 13 ------------- > > 3 files changed, 20 insertions(+), 24 deletions(-) > > > > diff --git a/arch/riscv/kernel/module.c b/arch/riscv/kernel/module.c > > index 343a0edfb6dd..31505ecb5c72 100644 > > --- a/arch/riscv/kernel/module.c > > +++ b/arch/riscv/kernel/module.c > > @@ -436,20 +436,39 @@ int apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab, > > return 0; > > } > > -#if defined(CONFIG_MMU) && defined(CONFIG_64BIT) > > +#ifdef CONFIG_MMU > > static struct execmem_params execmem_params __ro_after_init = { > > .ranges = { > > [EXECMEM_DEFAULT] = { > > .pgprot = PAGE_KERNEL, > > .alignment = 1, > > }, > > + [EXECMEM_KPROBES] = { > > + .pgprot = PAGE_KERNEL_READ_EXEC, > > + .alignment = 1, > > + }, > > + [EXECMEM_BPF] = { > > + .pgprot = PAGE_KERNEL, > > + .alignment = 1, > > > Not entirely sure it is the same alignment (sorry did not go through the > entire series), but if it is, the alignment above ^ is not the same that is > requested by our current bpf_jit_alloc_exec() implementation which is > PAGE_SIZE. This literally translates vmalloc() in alloc_insn_page() to a set of parameters, so "1" comes from there. And using alignment of 1 with vmalloc() implicitly sets it to PAGE_SIZE. > > + }, > > }, > > }; > > struct execmem_params __init *execmem_arch_params(void) > > { > > +#ifdef CONFIG_64BIT > > execmem_params.ranges[EXECMEM_DEFAULT].start = MODULES_VADDR; > > execmem_params.ranges[EXECMEM_DEFAULT].end = MODULES_END; > > +#else > > + execmem_params.ranges[EXECMEM_DEFAULT].start = VMALLOC_START; > > + execmem_params.ranges[EXECMEM_DEFAULT].end = VMALLOC_END; > > +#endif > > + > > + execmem_params.ranges[EXECMEM_KPROBES].start = VMALLOC_START; > > + execmem_params.ranges[EXECMEM_KPROBES].end = VMALLOC_END; > > + > > + execmem_params.ranges[EXECMEM_BPF].start = BPF_JIT_REGION_START; > > + execmem_params.ranges[EXECMEM_BPF].end = BPF_JIT_REGION_END; > > return &execmem_params; > > } > > diff --git a/arch/riscv/kernel/probes/kprobes.c b/arch/riscv/kernel/probes/kprobes.c > > index 2f08c14a933d..e64f2f3064eb 100644 > > --- a/arch/riscv/kernel/probes/kprobes.c > > +++ b/arch/riscv/kernel/probes/kprobes.c > > @@ -104,16 +104,6 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p) > > return 0; > > } > > -#ifdef CONFIG_MMU > > -void *alloc_insn_page(void) > > -{ > > - return __vmalloc_node_range(PAGE_SIZE, 1, VMALLOC_START, VMALLOC_END, > > - GFP_KERNEL, PAGE_KERNEL_READ_EXEC, > > - VM_FLUSH_RESET_PERMS, NUMA_NO_NODE, > > - __builtin_return_address(0)); > > -} > > -#endif > > - > > /* install breakpoint in text */ > > void __kprobes arch_arm_kprobe(struct kprobe *p) > > { > > diff --git a/arch/riscv/net/bpf_jit_core.c b/arch/riscv/net/bpf_jit_core.c > > index 7b70ccb7fec3..c8a758f0882b 100644 > > --- a/arch/riscv/net/bpf_jit_core.c > > +++ b/arch/riscv/net/bpf_jit_core.c > > @@ -218,19 +218,6 @@ u64 bpf_jit_alloc_exec_limit(void) > > return BPF_JIT_REGION_SIZE; > > } > > -void *bpf_jit_alloc_exec(unsigned long size) > > -{ > > - return __vmalloc_node_range(size, PAGE_SIZE, BPF_JIT_REGION_START, > > - BPF_JIT_REGION_END, GFP_KERNEL, > > - PAGE_KERNEL, 0, NUMA_NO_NODE, > > - __builtin_return_address(0)); > > -} > > - > > -void bpf_jit_free_exec(void *addr) > > -{ > > - return vfree(addr); > > -} > > - > > void *bpf_arch_text_copy(void *dst, void *src, size_t len) > > { > > int ret; > > > Otherwise, you can add: > > Reviewed-by: Alexandre Ghiti > > Thanks, > > Alex > > -- Sincerely yours, Mike.