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 0783BC25B46 for ; Mon, 23 Oct 2023 17:21:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 819426B012B; Mon, 23 Oct 2023 13:21:17 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7C96C6B012C; Mon, 23 Oct 2023 13:21:17 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6910B6B012D; Mon, 23 Oct 2023 13:21:17 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 5A6CC6B012B for ; Mon, 23 Oct 2023 13:21:17 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 24A6D160B4C for ; Mon, 23 Oct 2023 17:21:17 +0000 (UTC) X-FDA: 81377392194.09.6535D74 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf22.hostedemail.com (Postfix) with ESMTP id B9D75C0004 for ; Mon, 23 Oct 2023 17:21:14 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=ZOVDksWf; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf22.hostedemail.com: domain of will@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=will@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1698081675; 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=mpBk0bee1Vo9ZQzPXjYzdfJKL27+PJnNMWscFl745aM=; b=xvDh/QLmSDKg64840d5iwWj8xnURf5QgWzlaC28hZlzo4zuKn/Vd67uEb3mf44wpEv1mdn qfe1Irs50BL1YUXVWv72+YPo7SNGVcYpSXgX9kQwWFJw6Rdxhv8oqrgdMviO2bsnnbymCv QHY/+xpG4Vc0OWde7d+qy8msKsLrlqs= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=ZOVDksWf; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf22.hostedemail.com: domain of will@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=will@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1698081675; a=rsa-sha256; cv=none; b=CuqvFhI7X4yjCiKFE1eSn4xzvKTunvYlGKPAvC9I5NsXhUGtE09hsaEMfSRTcOcp3JDYph NGADPpUDwidId+6RkiPi/h/wUvNibWWz6z+RL+AV4/IdUIACxlDumJmuqAVbcVqj4qbyWd R88FM3SkpBFomz2UTUuE/6/3n0ARvm4= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id CF6ADCE0C47; Mon, 23 Oct 2023 17:21:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 977DEC433C7; Mon, 23 Oct 2023 17:21:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1698081670; bh=WQYEKm0Mc7inaH0wFnxcEUmfAmPR1JoMV7fRygVNKQQ=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=ZOVDksWfw+hV9R+Z5ZexM6NcY3xDNdzdq9AsRt4vO9wMdxWhqWWcxLwP+eW4A962q Qk6ekhq2Ipm65VVsfFxXGy8qQeQOWzCvDqLJfEU8nWaZHFbI6flnaXvlVH0CRDWH+w hIMRahts5mdD+tpF+6eXFcpVMEl1Ep7tHL5W7fbVdPmlfZ6yQugf14RafBolwJcEMn 21vyDdZz0h9WC0+Q/QJBX2oIB6fGQ1kXhcFuxCsKB2tbLoPEgU/BSdSOixB9qw31iO OgDPN8A4Uqs6uFqTMJcPk6zjMZ/offJmG+hcHSxPefHsLKYd1oYsfoKs6fvoRIkbKX wMvEth+vb/+ag== Date: Mon, 23 Oct 2023 18:21:00 +0100 From: Will Deacon To: Mike Rapoport 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 , 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 07/13] arm64, execmem: extend execmem_params for generated code allocations Message-ID: <20231023172059.GB4041@willie-the-truck> References: <20230918072955.2507221-1-rppt@kernel.org> <20230918072955.2507221-8-rppt@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230918072955.2507221-8-rppt@kernel.org> User-Agent: Mutt/1.10.1 (2018-07-13) X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: B9D75C0004 X-Stat-Signature: 7e7f7ckp6q6z77myqf89izh9mzk4r38b X-Rspam-User: X-HE-Tag: 1698081674-905535 X-HE-Meta: U2FsdGVkX1+g8HJ4VxeDDq1SMQgOoRL0ahYDwi9FnM+4TrCHLpPT25P6YxWrNJuZCedYIAvtMhOOM7eo38hPqFxB+/6RWbfMFWGopyGFPcjkl5WeYf38ll0n95Jtkx2pTfFjoateulPTz7HKqOPdV9Ha89Sb8AJwgS+H5P/qihDqU+1EhGN7ODzyDvByHxh79Cj/h7vikbGYy7ZZdolQrNzQGBI+IdG8myi54YE7pjCXP64qsjoRjr3ccK+2Gjy32o1XumTJU2wsWmrvxs4S3gg+SfQd+Ze/bgGxNU2K+quEeCvUue7cwble9tQh76kruaURj3b0w1KCzZd5fueQsx60b5+FwUlLCpCnRd0yo3GnGqoUJf1LfBR3yINibO95benwnBbbLXlekisk1Lrzkd5d2BE9qUYFsPnaozdhCm8cJspjtYfsGLnCbxNxULT3UdQWM8Xp+3z3mjg5oUWKqa2A/iDbyCuM4QLDrBC+086eGmRYUfSr0WZj+drotanApFuAfiCf/Y17qnDFC7mfe9B4tyll7uwD3VYc1sf6JPNZXFiKCOZmCrLA2Uh3bAreanaQGYyhaZPxMASRxD40lz19G6dR3F391/xoJTzEIoWW0/D6TvXWMu4uzUSY67uw+G/sXAE8t6WM0jJCyCn4/IAe53ZkLSiwUEGc2H0XLw04JY4d5UuOWKvtPsKTWKq9fwgKkVmXgHETvZhz8TzyAhP44gcVWDgjsnLZy/eFQjiOL3nB5uY+G0bPnCM+H9PdiHvSCFoL4ScrZxUev4TVunz267dSiyybb8c6CrKxmjBg4V0K5H04BrS+pEO7uDzpHeqIUu5alnzMutAlIm25HX6nxx2VtoQuhG5tk9Z3rCQDT8zgQ3CabS6V3kbA8aHT8yZm8SigNGdWmZaOn7zIeZRJjffaLX/cRp4BVaAopcc0b8nWg9bv7X9LM0UJ2wDDoGLEPmybdoLDxO4c00c OLCWh04V K/th5ABy6GWsjj38eWE3fSFHP/346Jdhgh0q0wRO1M6N3NlbqKLOSYv+uxOZcfdgGN2Bvw7POADKuPkloF3muMuCyXau46II8rj2DTgVvrLImbT2D3LJos8cl3Jtb036y1svcHqvuOhaDAEQEJsFjTTQY2Kg49q6vZy6v5kfAQfE8wwV5E8YDXboxPQHxBPPrJ1TwoU4drXLT2LuXEK7yR7IHPozCrwvKykM9z1VQUYYEwDtWZ+7L9IcE1yywn/4hcJIEiDDU25+JQj8sgLcBLl7PJfh3tFWHkeZdvNDCskPhaXlDvEJan16OTd45QMPGDQ3+/q2XtiPS0voBnY8N+KDkbeD8bTBFw04z9HqobKi/04o= 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: List-Subscribe: List-Unsubscribe: On Mon, Sep 18, 2023 at 10:29:49AM +0300, Mike Rapoport wrote: > From: "Mike Rapoport (IBM)" > > The memory allocations for kprobes and BPF on arm64 can be placed > anywhere in vmalloc address space and currently this is implemented with > overrides of alloc_insn_page() and bpf_jit_alloc_exec() in arm64. > > Define EXECMEM_KPROBES and EXECMEM_BPF ranges in arm64::execmem_params and > drop overrides of alloc_insn_page() and bpf_jit_alloc_exec(). > > Signed-off-by: Mike Rapoport (IBM) > --- > arch/arm64/kernel/module.c | 13 +++++++++++++ > arch/arm64/kernel/probes/kprobes.c | 7 ------- > arch/arm64/net/bpf_jit_comp.c | 11 ----------- > 3 files changed, 13 insertions(+), 18 deletions(-) > > diff --git a/arch/arm64/kernel/module.c b/arch/arm64/kernel/module.c > index cd6320de1c54..d27db168d2a2 100644 > --- a/arch/arm64/kernel/module.c > +++ b/arch/arm64/kernel/module.c > @@ -116,6 +116,16 @@ static struct execmem_params execmem_params __ro_after_init = { > .flags = EXECMEM_KASAN_SHADOW, > .alignment = MODULE_ALIGN, > }, > + [EXECMEM_KPROBES] = { > + .start = VMALLOC_START, > + .end = VMALLOC_END, > + .alignment = 1, > + }, > + [EXECMEM_BPF] = { > + .start = VMALLOC_START, > + .end = VMALLOC_END, > + .alignment = 1, > + }, > }, > }; > > @@ -140,6 +150,9 @@ struct execmem_params __init *execmem_arch_params(void) > r->end = module_plt_base + SZ_2G; > } > > + execmem_params.ranges[EXECMEM_KPROBES].pgprot = PAGE_KERNEL_ROX; > + execmem_params.ranges[EXECMEM_BPF].pgprot = PAGE_KERNEL; > + > return &execmem_params; > } > > diff --git a/arch/arm64/kernel/probes/kprobes.c b/arch/arm64/kernel/probes/kprobes.c > index 70b91a8c6bb3..6fccedd02b2a 100644 > --- a/arch/arm64/kernel/probes/kprobes.c > +++ b/arch/arm64/kernel/probes/kprobes.c > @@ -129,13 +129,6 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p) > return 0; > } > > -void *alloc_insn_page(void) > -{ > - return __vmalloc_node_range(PAGE_SIZE, 1, VMALLOC_START, VMALLOC_END, > - GFP_KERNEL, PAGE_KERNEL_ROX, VM_FLUSH_RESET_PERMS, > - NUMA_NO_NODE, __builtin_return_address(0)); > -} It's slightly curious that we didn't clear the tag here, so it's nice that it all happens magically with your series: Acked-by: Will Deacon Will