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 AFDF1EB64DA for ; Fri, 16 Jun 2023 20:09:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2ED148E0003; Fri, 16 Jun 2023 16:09:20 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2765C8E0001; Fri, 16 Jun 2023 16:09:20 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 117398E0003; Fri, 16 Jun 2023 16:09:20 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id F26B28E0001 for ; Fri, 16 Jun 2023 16:09:19 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id C6AFCC0519 for ; Fri, 16 Jun 2023 20:09:19 +0000 (UTC) X-FDA: 80909700438.23.A82F224 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf19.hostedemail.com (Postfix) with ESMTP id D011B1A000D for ; Fri, 16 Jun 2023 20:09:17 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=LxCbm5cD; spf=pass (imf19.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=1686946157; 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=JSNyJO/V+1CNGJpqRMsKGAprREFB+QGqmuj9Ec+wvzg=; b=bh+VwAd7jE8hsaEqT3wQCUh/Vkr8JVjY1i5Cmax50qmqHVTsNJQYrpFTOU5i/YI15+T5vG soMVgc2zHOnSQmxXT1nId5235EeM8Zzys9N/GMm5vam7bQ9vTAr2vMErPntYm4rQ/S2DAX 8gevz30bSJ6OMYpj4q3efampxZM3MVY= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=LxCbm5cD; spf=pass (imf19.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-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1686946157; a=rsa-sha256; cv=none; b=a3e2wfhNxbtiM/6FD5v2y5ObmeSOv6fQQIBytpkCCsdoKeeyO8BO7+KTagi3KjWGfMyxII K1bBhbx4voX5BDbCCK5lpJfWqqXcYyqbVXMTz/Avz6V2fDpbpH4H9UzWCPFezeD2ZGKARx hq6y9CGaTmiXVicthwBbOqomFcc3rf0= 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 CF8CF639F0 for ; Fri, 16 Jun 2023 20:09:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3CC5DC433C9 for ; Fri, 16 Jun 2023 20:09:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1686946156; bh=OgYjmmyzs2EjPHttaKLNX98CAQTU+jc+5TBMU4O7+WI=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=LxCbm5cDIUCYF8vZ7/LSzW/JsLhlLxX2d0fFu2V1HgTidoI9d4L/VcB0ImMydV0Ee 8YO3x9rZwXIg0Q8DSxAacAiTV2XZF+Tx6U090kqCtI27PsdZZcqcz9z/jPPmjP/BO+ +hkLjrbWsn0v25jP1pDPME4x+2gpLpEY35EjhkIKvEuKe2/3rsozkAcXaNwJmCkb+A X7bmvsPi5j2j5SwoGSlbvPVi8ziT05b2vTUayZaz5G8lhTX7m8dLb1/JKFPYnoJ/IR mFM5oymVsHdTAn2VYpKaZ+WPpolrWfQDdRU+ChUXiqnpZHojozka+L/klHYc/ncUUT POOaZ9hxvTPSA== Received: by mail-lj1-f179.google.com with SMTP id 38308e7fff4ca-2b4619ef079so4820631fa.2 for ; Fri, 16 Jun 2023 13:09:16 -0700 (PDT) X-Gm-Message-State: AC+VfDzWKC1Uw6Rmoeifpx05T+ovsMs8Zt1yQTmag/0/CYQuHNMr6+EM MN1lnyeC+Y7TT9eHMTFv0wX2QD66t66f/uw9USQ= X-Google-Smtp-Source: ACHHUZ5jllDYgbNtI+72IVu/75j7amNBljuYpY3fpVnJlR5XF3n+gM7EWdkroNHXMw4vgK3ry1o4z8o6D6rXoRQsv1A= X-Received: by 2002:a2e:b705:0:b0:2b4:4a0b:8fad with SMTP id j5-20020a2eb705000000b002b44a0b8fadmr2685993ljo.29.1686946154254; Fri, 16 Jun 2023 13:09:14 -0700 (PDT) MIME-Version: 1.0 References: <20230616085038.4121892-1-rppt@kernel.org> <20230616085038.4121892-9-rppt@kernel.org> In-Reply-To: <20230616085038.4121892-9-rppt@kernel.org> From: Song Liu Date: Fri, 16 Jun 2023 13:09:02 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH v2 08/12] riscv: extend execmem_params for kprobes allocations 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: D011B1A000D X-Rspam-User: X-Stat-Signature: u964afskdcwjiuuuf5g7ti5yzmwzi9r9 X-Rspamd-Server: rspam01 X-HE-Tag: 1686946157-472239 X-HE-Meta: U2FsdGVkX1/jNnqBSvQ5M1A77t1tf/aO4nZGAS2dYKsdxlgGSyWrFfYWFo2CULLAGhIPFxx4b8oGHxiAb9Ev5JrY60T7q2ZZ7SMZtueVMiF22DLD3csftaN/auf3Uty4b3pG9UA/mu8nCRxJq1SN7oFL59oXiYjj/Rd22kzdcFXujr8KbAHANYHS/HQxGh45AUBW7fH29L8biUuCmMiJxASfknGv68YeGvucpOHFiYYu3sKDaX0k6z8QFoZgpxdz67e2P+sZ3XVdgavjzATXQIgUVnfO/SYTUA5xPYBSR7RtUtWiLpeuOvS8lG2GJQKN8gVlYEP0lEw/3XpYX5AdGsnUW90B9xOVH/jnArsedQ2AdfYJIxkIFLmeRyWZ7ZpqmoRdokL/5aTvZjQwgbOM4GvIWSGMsVx18FOvitA7jfQ9wmf1th5zOz1sUJ9QtoqKSpzhB1xNnvbx1qjR5cERxa9tMSlJUf7GTwDlv1LvClTbVqdHH1OLdZSfbEsu/Esn10F38blD62SWTfoFssi4y9RRBvqSVJ1cmXWmJCdJcfhmT+fIi05J1YWg5oUifFZ5dCHa1e9a87GSDjsayz502dMDc6s9vtzxrAh6F8lVWWt8bBDoaFHo9BkhRFuOr5+7ppMaCmRGB8/0clXGheCc75o60qg8/SZJ+0zpbNGuGpXGf8/Qu/ssZruaTWheDw9UUcm+S0NFmXV4R1nazg4oYgNsypMvKlw3tfhaLto6iZMeJSlpsMMUiaxxQOGHunYmlEfCr5w7XAFz9ZLda9S/rziVGIJldUn2twwCNY6YBEBLqp5sR3qThZ4hSo4Vur0dKCc1c0EEYCV03C+aA45FRhU0re6xDqfQbEWnpsrLya8crMUJKnQ574RMq8u04RV3wWsoDjy/31Kr0rbahU23paPVwXMm3H7ugUpl7MXTIzmGQOCPANN5r1VpXg6U/ZpJl9B0jB4ci6F0OGGOZd5 ZfgxJYKb DyvLumZou386yJRlRz8O0pbZg6CosfwiBX7qCbdqWZp3QeJQHo89n0qg2TWpiYOLLk016g82VFWABtfZ0vjIR6LmJ2YlDediNsonS/8JgQeaqBITrO+KY+rPMT038Ui2d9I+hJlSlJ+KcV12jb3wmbsNVqTlXTVFqspNLXIHzdkl4Xv7gAqtm92+c57/tWhjrMQsYlIza1x05h9fMX4DDEiChtnf/L9OLVI1X/TgcIjTrIXejv3yHb1lSGvZWkW2sexmeHblWaSIpdVb1iNYvYNv8iy4tcOKs2nc8PoZf0phVVy3J2SRe5LmsSle+a56k2Sxo2Kts1rGAdAeSBMA9sjMqtcf7Q6Ikos5Iegc27GA0eEKoxztOv8r/u0CBx9Fj5qnQIIAF7oNY8NyiuV0C7q/Nl6lp8bb+odRKjjBG4kqmaTa9ZvjKb4u8nv5syG8/STUppKt1gUamTyaBLdqTjnBHdcwG5rHArZNhWukKjXrF9Flna31bjjiPiQ== 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:52=E2=80=AFAM Mike Rapoport wro= te: > > From: "Mike Rapoport (IBM)" > > RISC-V overrides kprobes::alloc_insn_range() to use the entire vmalloc ar= ea > rather than limit the allocations to the modules area. > > Slightly reorder execmem_params initialization to support both 32 and 64 > bit variantsi and add definition of jit area to execmem_params to support > generic kprobes::alloc_insn_page(). > > Signed-off-by: Mike Rapoport (IBM) Acked-by: Song Liu > --- > arch/riscv/kernel/module.c | 16 +++++++++++++++- > arch/riscv/kernel/probes/kprobes.c | 10 ---------- > 2 files changed, 15 insertions(+), 11 deletions(-) > > diff --git a/arch/riscv/kernel/module.c b/arch/riscv/kernel/module.c > index ee5e04cd3f21..cca6ed4e9340 100644 > --- a/arch/riscv/kernel/module.c > +++ b/arch/riscv/kernel/module.c > @@ -436,7 +436,7 @@ 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 =3D { > .modules =3D { > .text =3D { > @@ -444,12 +444,26 @@ static struct execmem_params execmem_params =3D { > .alignment =3D 1, > }, > }, > + .jit =3D { > + .text =3D { > + .pgprot =3D PAGE_KERNEL_READ_EXEC, > + .alignment =3D 1, > + }, > + }, > }; > > struct execmem_params __init *execmem_arch_params(void) > { > +#ifdef CONFIG_64BIT > execmem_params.modules.text.start =3D MODULES_VADDR; > execmem_params.modules.text.end =3D MODULES_END; > +#else > + execmem_params.modules.text.start =3D VMALLOC_START; > + execmem_params.modules.text.end =3D VMALLOC_END; > +#endif > + > + execmem_params.jit.text.start =3D VMALLOC_START; > + execmem_params.jit.text.end =3D VMALLOC_END; > > return &execmem_params; > } > diff --git a/arch/riscv/kernel/probes/kprobes.c b/arch/riscv/kernel/probe= s/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) > { > -- > 2.35.1 >