From patchwork Tue Mar 18 22:14:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 14021646 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 C08ABC35FF3 for ; Tue, 18 Mar 2025 22:15:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6E5D5280004; Tue, 18 Mar 2025 18:15:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 66836280001; Tue, 18 Mar 2025 18:15:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 44A9A280004; Tue, 18 Mar 2025 18:15:09 -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 20224280001 for ; Tue, 18 Mar 2025 18:15:09 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id B37421C7EAB for ; Tue, 18 Mar 2025 22:15:09 +0000 (UTC) X-FDA: 83236078338.01.D4E1E16 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf20.hostedemail.com (Postfix) with ESMTP id 889C71C000F for ; Tue, 18 Mar 2025 22:15:07 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=hpBgQMJl; spf=pass (imf20.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1742336107; 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=nBMqWWSmA8jTU5EpZWWLoWgjipzuL5yIrBN/CPUgt3Q=; b=mGzMHFNRpUELgpv16RjTsSDBMS8Mf1AT9Oll/SfKTuIzQ3j04o/Z1tdlGryKyF7r9DrssW JzIklMkbrqUYMkn485NVN7ajDo+FpnygZVZ8V9bVYaDpbKRHBo3N7juujdhrIE6bEplW7F upavoRw1EsIYr39abQG5jxrJx+765po= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=hpBgQMJl; spf=pass (imf20.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1742336107; a=rsa-sha256; cv=none; b=dq3mnuiVRd5+G1+OuRGghLoZnY8HOGfnx2/YRtV7R6C9hkfRkwozxs4q0paGoRbslvpgOz hmDimsM6UA9krhxT5AWr1IU1qTQ8QGgThAsdJfLxSOVqUVbd6eC4ZrDH1iH5xIGxw+HC2q jHi41iPGju61nwHtCk1lbbLskt19oZ8= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1742336107; h=from:from: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; bh=nBMqWWSmA8jTU5EpZWWLoWgjipzuL5yIrBN/CPUgt3Q=; b=hpBgQMJlPyqLhvqrw7o3OUsuMW3a8CZOOSHMYK1lBfL52rwwHqtfizlXXom1qcsi6ZLBmC T5G9hDjGj+73PzJqYuMazl6XckV56tgj9c7KMCbhdHrssacBanqRQ8dnQLOqckI1TTrcA2 NXFFMcowNrgu/TnvQsMuVXvoefbt/w4= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-630-qMolqr1FOua0ZIP95YexXQ-1; Tue, 18 Mar 2025 18:15:05 -0400 X-MC-Unique: qMolqr1FOua0ZIP95YexXQ-1 X-Mimecast-MFC-AGG-ID: qMolqr1FOua0ZIP95YexXQ_1742336104 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-43cfda30a3cso23591385e9.3 for ; Tue, 18 Mar 2025 15:15:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742336104; x=1742940904; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nBMqWWSmA8jTU5EpZWWLoWgjipzuL5yIrBN/CPUgt3Q=; b=NGO5QoiJZXAG8dlFdE3ez+YxW5sL3LbiGLUqHHplGdwcn6ble1dzjqxLdhkhhrru7H fW2LbIEYhYLONNVGnMaXmk5xRQBBOekQpVuyDRGmTUGPAuCey5c7bj5FX635UtMW5paD 1dcL/y+NFSsNB2Gtt6KCBpBkOOUkZGJrcmQaocSSaM3brOWPE9rOyEdX4ulMaxvg5LCI RD/m8rz/pJEiRBBcwbYiBMixjhxedNsMbuH/nY+mJDj20IIEEQfgNfnZc5CnBxorlB1B zeJcx031dB6ZKtIEGj5lOf2m6o/GxGg2L8Y6OiRNvZHqmik8v5CRcb3sxHsY06WfpGrk 2bzA== X-Gm-Message-State: AOJu0YxB1DAmeA6SFMBd4OAA0furklsh3Sa4rOP3l22cuVkW0j6cq7rf xXyGLPxYANNXJvJxij6YXKZldQwW2pxCnbFFOplXdAcA9jaGBJvn/VTnt3vFvKVkBJNKq4S7DGt 9oEI5BLWEVewcOqvQ3Y69s8PopG5Rp1c2Lie7J0kMXWfAyE3T X-Gm-Gg: ASbGncs++z54t6e1E6fK1yLJQn6Dm/GsaXJ0OIIe8MWGgdhET+VmxGefPDIH3AOgjBo flTGCG7oMPB4TyKSiG+8R5U6Qwd2PlxWakgj81O3kq/zJCSfQZk6Jhe/EcbGnCOhoIRLcbAni7d 1qPrebxnQ7C+fD3Nkr/sA8WCuBqC8Jtc7FIxteOdFR2TOaRTPaWGSKcho6ZktfR1j/JOCcJss50 aynIeC5cnT9Tl9lyl+3DuSbYEkdWRC1bM68SRy+FU+gNBfTzDj4xaSPTZCE5pel1R7Iij+HAF3d I9WogLIq1V4Oj7hVjawQiigeoU5PM1WIZpMxBxQw1sCDNmJLRfDZwm0/S3uzsQkMW1l548IaIS/ R X-Received: by 2002:a5d:47ca:0:b0:391:47d8:de3d with SMTP id ffacd0b85a97d-399739bc959mr401435f8f.16.1742336103818; Tue, 18 Mar 2025 15:15:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHVLQM9GTMoKWmV/uO8RTwFHvBEBsZ0wjM+Jkn+TplyWph+3HhlRdj3hBn4fJ8DOgl1P3A6xg== X-Received: by 2002:a5d:47ca:0:b0:391:47d8:de3d with SMTP id ffacd0b85a97d-399739bc959mr401407f8f.16.1742336103412; Tue, 18 Mar 2025 15:15:03 -0700 (PDT) Received: from localhost (p200300cbc72d250094b54b7dad4afd0b.dip0.t-ipconnect.de. [2003:cb:c72d:2500:94b5:4b7d:ad4a:fd0b]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-395cbbc88f2sm19281199f8f.101.2025.03.18.15.15.02 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 18 Mar 2025 15:15:02 -0700 (PDT) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org, linux-trace-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, David Hildenbrand , Andrew Morton , Andrii Nakryiko , Matthew Wilcox , Russell King , Masami Hiramatsu , Oleg Nesterov , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , "Liang, Kan" , Tong Tiangen Subject: [PATCH v2 2/3] kernel/events/uprobes: pass VMA to set_swbp(), set_orig_insn() and uprobe_write_opcode() Date: Tue, 18 Mar 2025 23:14:56 +0100 Message-ID: <20250318221457.3055598-3-david@redhat.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250318221457.3055598-1-david@redhat.com> References: <20250318221457.3055598-1-david@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 9EDB5XsCr13Axo3RAJmSXKzgf6pIokFI5EmOAT_hIuU_1742336104 X-Mimecast-Originator: redhat.com content-type: text/plain; charset="US-ASCII"; x-default=true X-Rspam-User: X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 889C71C000F X-Stat-Signature: 3g7gtuztqet3i5b8gqy4r6fh1k8eatn7 X-HE-Tag: 1742336107-291509 X-HE-Meta: U2FsdGVkX193HxGhQbIyQ8jrqD9jzqWaboD1mvdbYhcwECX7MepbPfivQVKT2kb4M7jW7/IsJ01Pi0E0SkQjVMU3ge7VB6CAFQ5oqKoHWD1e6Iq1psKuXwJGNggcv18PzuAd9Spb44fIpjzn3g9ljzIC13npyX+RYuV4gG8b827M96fo8svsz9NxVo/14U1I8bLxmC8EShzQQni3DTtrvYg0uK62TxBCXhbO3P+HxLXf8uMsxxNG2M4Ev3DLgTQDcZSif6G3Vk3y7wfXaWTL2V7ZgJREZxVdcQHrewMMQEOYJTJLUTPeCCm2hSmQEQ5jWmsNAyCci2+twO/I9EET35sBldstWgGgYC8DKK0peOBuZY3ZVajvpmzMs2ohzkiQbGtaryHmkMlLw/jHBeJk7f74IEQsE/gQnmCTScY5WfQjjPr4Oy2JdMojVnSsk4QpM9LxobT2KMcr17aRh5mvw4v417inoB2FXWVC/DMYfzcSa6ogb6NireoderxktYTgZ6X6hYG2QdwORCQq8VQ/s8spLoNmI9PFO/dMMCscycBeHU+OfzSAzchpk2RQL95/UhtKWvZzAtssHQH2QF7LCPLeW39z/FdkrDnql/3WVTFeO43BGLVBQSGWUc6tZZclHGMGGr/QwCuWCqz+MfHqkHXgWMMnlWerpSCd/hpQzugs58rQHw/cbABsOQJx2WgK4ylG3INag/Sd5AeadHZ0/BTb0rfwbwKBymxkn8CAZGD0GiXhdKHaN+rYxcJkpHJ3KI6tk4Bbun068F7CzBODYT6pWj5CY3poJcvsDa0SouSxKHqUr1i0037vZcajiN++vb4m+jhn1Sr7YK890qsm5g5sT83jg0zf9zgJCPeJDGLymjXQkQHuofPkDxrAlirO+DWkZDPKi7JhMbuyJ/gQPJmBWSvKUEH8v/Ej+Cqlkc1xQCarssZYDaNO5gQssY38sIUTiRC9+3JvXPeoT2c pgCd1JaM f2cJngafnS7Ncvm5jm9+MZv/+9kLuclA2R05xaIb1gEa5LE6K0AW4/1objlFc6KNpPKMYgHF4SmETrLjpQHvbPk2/rqMd2xdP9kZJ7ReFJ1Zlw4fPP8VlLMpq5j8KTgFXZF7gRn2VfxzyjOQpjPtorbZUDu6VyKc2Cfntt0RSj6bKpk53a6RSmDP0VUNp431G/BR+cjhzhUY2RiIjaTZomMBIQYP8kNjv+3i2WRrsYQyd+5VDEiwFSLTSmPBlwBo3GPlDjVocgDyTdMsBySQGM6amPySya2gPZzKmIG/bhJl36MDQfql7+SAW3gf4qQtR9idOmcknlboq3J4WtySFebE3nWuBkzL4lCdoDBn2VWjnM+ovnE6OTOD6XDtGw409pKKUCGLaFmEqXYSdzGO8nhU3k602cMdCG24QiJbmwHzMmaF7CUMS/YPlejJiMKvUXq5HTvvPX//zhWO0Vnh1Gsyy4OD3sNd1TYdSks2k/A9Scf3iGAKWn1vgjAE7/rVPIKozPK3BExScsg5dMqu+xKihms9aFz6zCB1oD8g5ZbNfsSi2MS8sCsk3Rkxzr6gPHcuVy5xWlei2pSVDrSPBHH4RVycNiesgbSvT 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: We already have the VMA, no need to look it up using get_user_page_vma_remote(). We can now switch to get_user_pages_remote(). Signed-off-by: David Hildenbrand --- arch/arm/probes/uprobes/core.c | 4 ++-- include/linux/uprobes.h | 6 +++--- kernel/events/uprobes.c | 33 +++++++++++++++++---------------- 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/arch/arm/probes/uprobes/core.c b/arch/arm/probes/uprobes/core.c index f5f790c6e5f89..885e0c5e8c20d 100644 --- a/arch/arm/probes/uprobes/core.c +++ b/arch/arm/probes/uprobes/core.c @@ -26,10 +26,10 @@ bool is_swbp_insn(uprobe_opcode_t *insn) (UPROBE_SWBP_ARM_INSN & 0x0fffffff); } -int set_swbp(struct arch_uprobe *auprobe, struct mm_struct *mm, +int set_swbp(struct arch_uprobe *auprobe, struct vm_area_struct *vma, unsigned long vaddr) { - return uprobe_write_opcode(auprobe, mm, vaddr, + return uprobe_write_opcode(auprobe, vma, vaddr, __opcode_to_mem_arm(auprobe->bpinsn)); } diff --git a/include/linux/uprobes.h b/include/linux/uprobes.h index b1df7d792fa16..288a42cc40baa 100644 --- a/include/linux/uprobes.h +++ b/include/linux/uprobes.h @@ -185,13 +185,13 @@ struct uprobes_state { }; extern void __init uprobes_init(void); -extern int set_swbp(struct arch_uprobe *aup, struct mm_struct *mm, unsigned long vaddr); -extern int set_orig_insn(struct arch_uprobe *aup, struct mm_struct *mm, unsigned long vaddr); +extern int set_swbp(struct arch_uprobe *aup, struct vm_area_struct *vma, unsigned long vaddr); +extern int set_orig_insn(struct arch_uprobe *aup, struct vm_area_struct *vma, unsigned long vaddr); extern bool is_swbp_insn(uprobe_opcode_t *insn); extern bool is_trap_insn(uprobe_opcode_t *insn); extern unsigned long uprobe_get_swbp_addr(struct pt_regs *regs); extern unsigned long uprobe_get_trap_addr(struct pt_regs *regs); -extern int uprobe_write_opcode(struct arch_uprobe *auprobe, struct mm_struct *mm, unsigned long vaddr, uprobe_opcode_t); +extern int uprobe_write_opcode(struct arch_uprobe *auprobe, struct vm_area_struct *vma, unsigned long vaddr, uprobe_opcode_t); extern struct uprobe *uprobe_register(struct inode *inode, loff_t offset, loff_t ref_ctr_offset, struct uprobe_consumer *uc); extern int uprobe_apply(struct uprobe *uprobe, struct uprobe_consumer *uc, bool); extern void uprobe_unregister_nosync(struct uprobe *uprobe, struct uprobe_consumer *uc); diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c index 259038d099819..ac17c16f65d63 100644 --- a/kernel/events/uprobes.c +++ b/kernel/events/uprobes.c @@ -474,19 +474,19 @@ static int update_ref_ctr(struct uprobe *uprobe, struct mm_struct *mm, * * uprobe_write_opcode - write the opcode at a given virtual address. * @auprobe: arch specific probepoint information. - * @mm: the probed process address space. + * @vma: the probed virtual memory area. * @vaddr: the virtual address to store the opcode. * @opcode: opcode to be written at @vaddr. * * Called with mm->mmap_lock held for read or write. * Return 0 (success) or a negative errno. */ -int uprobe_write_opcode(struct arch_uprobe *auprobe, struct mm_struct *mm, - unsigned long vaddr, uprobe_opcode_t opcode) +int uprobe_write_opcode(struct arch_uprobe *auprobe, struct vm_area_struct *vma, + unsigned long vaddr, uprobe_opcode_t opcode) { + struct mm_struct *mm = vma->vm_mm; struct uprobe *uprobe; struct page *old_page, *new_page; - struct vm_area_struct *vma; int ret, is_register, ref_ctr_updated = 0; bool orig_page_huge = false; unsigned int gup_flags = FOLL_FORCE; @@ -498,9 +498,9 @@ int uprobe_write_opcode(struct arch_uprobe *auprobe, struct mm_struct *mm, if (is_register) gup_flags |= FOLL_SPLIT_PMD; /* Read the page with vaddr into memory */ - old_page = get_user_page_vma_remote(mm, vaddr, gup_flags, &vma); - if (IS_ERR(old_page)) - return PTR_ERR(old_page); + ret = get_user_pages_remote(mm, vaddr, 1, gup_flags, &old_page, NULL); + if (ret != 1) + return ret; ret = verify_opcode(old_page, vaddr, &opcode); if (ret <= 0) @@ -590,30 +590,31 @@ int uprobe_write_opcode(struct arch_uprobe *auprobe, struct mm_struct *mm, /** * set_swbp - store breakpoint at a given address. * @auprobe: arch specific probepoint information. - * @mm: the probed process address space. + * @vma: the probed virtual memory area. * @vaddr: the virtual address to insert the opcode. * * For mm @mm, store the breakpoint instruction at @vaddr. * Return 0 (success) or a negative errno. */ -int __weak set_swbp(struct arch_uprobe *auprobe, struct mm_struct *mm, unsigned long vaddr) +int __weak set_swbp(struct arch_uprobe *auprobe, struct vm_area_struct *vma, + unsigned long vaddr) { - return uprobe_write_opcode(auprobe, mm, vaddr, UPROBE_SWBP_INSN); + return uprobe_write_opcode(auprobe, vma, vaddr, UPROBE_SWBP_INSN); } /** * set_orig_insn - Restore the original instruction. - * @mm: the probed process address space. + * @vma: the probed virtual memory area. * @auprobe: arch specific probepoint information. * @vaddr: the virtual address to insert the opcode. * * For mm @mm, restore the original opcode (opcode) at @vaddr. * Return 0 (success) or a negative errno. */ -int __weak -set_orig_insn(struct arch_uprobe *auprobe, struct mm_struct *mm, unsigned long vaddr) +int __weak set_orig_insn(struct arch_uprobe *auprobe, + struct vm_area_struct *vma, unsigned long vaddr) { - return uprobe_write_opcode(auprobe, mm, vaddr, + return uprobe_write_opcode(auprobe, vma, vaddr, *(uprobe_opcode_t *)&auprobe->insn); } @@ -1153,7 +1154,7 @@ static int install_breakpoint(struct uprobe *uprobe, struct vm_area_struct *vma, if (first_uprobe) set_bit(MMF_HAS_UPROBES, &mm->flags); - ret = set_swbp(&uprobe->arch, mm, vaddr); + ret = set_swbp(&uprobe->arch, vma, vaddr); if (!ret) clear_bit(MMF_RECALC_UPROBES, &mm->flags); else if (first_uprobe) @@ -1168,7 +1169,7 @@ static int remove_breakpoint(struct uprobe *uprobe, struct vm_area_struct *vma, struct mm_struct *mm = vma->vm_mm; set_bit(MMF_RECALC_UPROBES, &mm->flags); - return set_orig_insn(&uprobe->arch, mm, vaddr); + return set_orig_insn(&uprobe->arch, vma, vaddr); } struct map_info {