From patchwork Fri Mar 21 11:37:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 14025295 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 4D6A7C35FFF for ; Fri, 21 Mar 2025 11:37:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BD326280004; Fri, 21 Mar 2025 07:37:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B83EC280001; Fri, 21 Mar 2025 07:37:23 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A23D7280004; Fri, 21 Mar 2025 07:37:23 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 81543280001 for ; Fri, 21 Mar 2025 07:37:23 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 246E0AD912 for ; Fri, 21 Mar 2025 11:37:25 +0000 (UTC) X-FDA: 83245357650.23.3EC3BE6 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf01.hostedemail.com (Postfix) with ESMTP id E596040005 for ; Fri, 21 Mar 2025 11:37:22 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Br9vMT1A; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf01.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1742557043; a=rsa-sha256; cv=none; b=3w+LHGEIhGAmKQtw4M6dRPpvzcbpUOk2Y4R6iNvg/tuFER2mUG8u9b5YrxsASjVphl0DUL U+FrI6SVQFJt2+rX5jtmZbjgxOekup7jiNBo0aYqFdxkqNLEWyDx8QI9y+kNmT0tbcjd3U qw0HMy5A2kpJNmk5uChDRC+/ERgsorU= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Br9vMT1A; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf01.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1742557043; 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=LA4tQm8B9yk34e6zjAsFaRrtnSy4omTcdpMVJkFUhlY=; b=DUPpYE06CxqUNn1cGs9tcYZiKcVq2eBSVzV3tC7WtLY6PbvMFuqcoVTgyqGfT8CkenOMgG I7vvnOHQJ0JE1W51W0L5sRJQrka3FzldfzniqO0QSEpRI2pL2X3Q6fo/rbaLHAHHH9l/YF 81G+CHfFSCoSAbCerR7aGjnh9apsOug= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1742557042; 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=LA4tQm8B9yk34e6zjAsFaRrtnSy4omTcdpMVJkFUhlY=; b=Br9vMT1ANbZ3H/eBQdaz7la3/nMxpX6exglJ4gvN5Gy242qhj2iZlkXhSqtXdkAtn3WLef oCR2x9SYzzxlr6ounW8KmBB3GGtliCwSNzayZRoGNPPiAoguxneVyv6jjcxfmpxjQS6fbs vAJ5xvmrSuboEeQ/L3UhQGW8n/ZbVX4= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-546-QMPVEjHoMOGMbYnCC0g_oA-1; Fri, 21 Mar 2025 07:37:20 -0400 X-MC-Unique: QMPVEjHoMOGMbYnCC0g_oA-1 X-Mimecast-MFC-AGG-ID: QMPVEjHoMOGMbYnCC0g_oA_1742557040 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-3913f97d115so908024f8f.0 for ; Fri, 21 Mar 2025 04:37:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742557040; x=1743161840; 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=LA4tQm8B9yk34e6zjAsFaRrtnSy4omTcdpMVJkFUhlY=; b=QX4tz/+6Nf/REa/tzvlEDp3Eq+4zDfJYIbwV8bLYgnpFlkhhUtSQ8/SzZrvHHcFb9v 2FyUG4JmGpHTV8CVyVOzyH9loPBVrJtU1Ua4OiYs+OboYHdZ6Pl0JlbAPJRCYMqcOCFT 3WyLyW8U+CdOEb4mSydtmsXAWWKHBDJvqIYH+fd7tcmDR0A+uRoVPfONTuL2GT57itFd i5eygSnOO4/nfTe/sH/X2luY03+d0CeRCjWXGo3J1Way2Q2uc4kd5R9ftCPBEo7c08wH 9rODsdWIL6vCOs1D9oX2NbczPQJRtRYY+QCaZgiD+FGxPhCvigV3agRiYv8SzTSSdS6q TNHw== X-Gm-Message-State: AOJu0Yxl+Yq39sATWRKZAxHzNMLHX7edEq6t956zVF75NTdjZrWVyWby DWLZkfNBduNJZQ+fY9/liG7d8D+HVpXdJ4KBOOWQKq7Knj3ppABFn4r8xHO1gYQ9NbZumn8yj8t DFNg/Ee6OC+C8wYC6Td4g6dBOyejJPyBZHy3jD/dRhr8B0gMP X-Gm-Gg: ASbGncvtzOs4AFd24glsExowZ/2R+zHkMusziBxWQZ0S+CkJMs4aNiVJgTbVyvSjtYd Taneuyi5ZrfIeITkwb8kVHjQCIuN5GNJAio3iybQdw7wAe62CiFuE2e4u6iUariABV2I4d+s3pe m9VSzOJmC5L3kotkwxg6YsEIdGXYX37jxdqXoif+5pQb/fJ5f2mFmiWfleH+CvcSFAcpAcp9XiU alIkOR0TXq/VkQQbqdtz51pTwlvTZjHxqtieKdjBZbv4b/uspZ4smpCd/4rpzgGoiro7yUZymCC KURvydRHE72sA75toysPufbvmsm5Fj+0DCIUgEuG3Rnm+abtmrH85sR55S91WbeUzc9cbA2QJXw U X-Received: by 2002:a05:6000:4021:b0:390:df83:1f22 with SMTP id ffacd0b85a97d-3997959ce52mr7464155f8f.25.1742557039605; Fri, 21 Mar 2025 04:37:19 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEzgIkkOJsHGuf2WyAxCwKihBA43kh5WjBQNfuxP9FngTIZo6gSbHPXNu6WapbxvVPx5btxjA== X-Received: by 2002:a05:6000:4021:b0:390:df83:1f22 with SMTP id ffacd0b85a97d-3997959ce52mr7464123f8f.25.1742557039114; Fri, 21 Mar 2025 04:37:19 -0700 (PDT) Received: from localhost (p200300cbc72a910023d23800cdcc90f0.dip0.t-ipconnect.de. [2003:cb:c72a:9100:23d2:3800:cdcc:90f0]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-43d43f43e50sm74599665e9.12.2025.03.21.04.37.17 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 21 Mar 2025 04:37:18 -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 v3 2/3] kernel/events/uprobes: pass VMA to set_swbp(), set_orig_insn() and uprobe_write_opcode() Date: Fri, 21 Mar 2025 12:37:12 +0100 Message-ID: <20250321113713.204682-3-david@redhat.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250321113713.204682-1-david@redhat.com> References: <20250321113713.204682-1-david@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: u8n55G_0cFEXMoByqR1Qz3jaW1PIGKu6dWr2iXQjDks_1742557040 X-Mimecast-Originator: redhat.com content-type: text/plain; charset="US-ASCII"; x-default=true X-Rspam-User: X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: E596040005 X-Stat-Signature: bdppphxcgzdcnxw85qd5jiqoo3mpg17b X-HE-Tag: 1742557042-204447 X-HE-Meta: U2FsdGVkX19W8GtUH/D9FVlhJ5iUXR9gj6Z9t9e1qXxHbSOMVaHdjG2HnCrlIvU0JaQgkDMTjP2EmoCXn0RJNuwVP6Zs/tZpTHCYz6J8ObsQsM73Xw7UiB9+6BQTRCJeAa1UhKkiPjZOYl7vhpj6wzjgIEb9462r+Tf5pwJctufqwGNssKKmdCOGHNYBOtnhcVnBjGO4WoDEi82UFyIKAC6jpRmd1y/RRtkSkae0BrAcJabUiWJ8kKJ8QztiLadBmNfdvx4e2LvJxUdKFbyrBJlsAU4EQWzve+MjrFNuEZ/2MfnUO1cUwzRFi2KUiTEUY+1RrRupvtX7vHEzK1T5DKH/fweEK2RwqSIZek7QgX7n12v3WcMCZtbDv7wwmk5JlLW1RhXhbA4ndznsxc2Xw+5uTSVNdkMIKkaJY9dtHn4SDp/4q4n95HFJRwhKhzaOxRlPzi4gvgmZPKqtaADhTEYS6cC83Q8La0BlPd69wac0WMpqrzCfXf+7JwUUsiBHcrO5J5meAY0J1ZCNvYfMy734aJsyb3axq/YV1YZOEF/RrgId75wRrDmPscZHv/i3ku+2jPyerSnrYadXNrI9BwmAIu+hKdhdKbFmnmOB51t/zeZ/ipH6/alCJBr2im1WrhCbdDRfahMoZfdUo7z5tF05HGNUC7bbBDsMV6/An28/PMc8+4iQtNw2A7XDNae7F9WGL5tQaQ16xlvuOGYU9AU/XXTk/jJLqPaG3tjcrKIQZ9Sil8IMqr11CBQqBdM9PzHqmlhquIC/QLwDtceYKVcG0/I42f8/bSk+UDkKwCnRBY1Rg+oIhW4HWLDs1AfnBSYd7wdT7uK9Vql96sgHTkeL3pHxEltDd4DSmqQZ9zatRlBYR2DP4mpg+BWSo5tywrArHlr26ihUucJWsTiccw8KDrrxtYVLlMduJociAr47IdJXagnhyLNqvHwzrMRyXqA3/PXRym3EF3iPUCp dt4yLYCl 7oQEQNMyALOJhMEhc6L43O+dj/6+vdK6S0yROZDuMD0smfXJOABz4m+EQudIHRIXJVIJypTp9KherGWYzt9+4mJzw/hkubZpBIcRbmrKmIkPlHGwIB06E5tLP6zXsaYtPHAgiDmp/NDLEMYpBme7kU6zH0Xce4D7gYeWW0tiJiKiY9i4wPitABKKkP1V2Zwo9Gf+dtwnAC0/9jrBul94evJc62Q7eYkwWzZWl7gqXj2JtXdfAkZigfGCAOf0pWRuIk7MXKxVUvgBTA1R+hp29J7KjGvSTjc8H3cfE2OJ/qkuF/MqLu3k6SBCfQLqdiiF8mEh+tlUB7P69UxNmWTqqJP5rlluVYZhFVr02qsmNRkQrQzPxmb3rjNQO7KrUPStl/eDmsbdjIY6MKQ9okmbIY6NKBfQ+QN5ln8ZiRmyI+tmu6xj96VhGeQFl6NCoHai/MbrJ7JNYWchMCkkfOizUDxCn0jFeTz5/vATCu68FQcKB52Yu52F31q74/uNrw1FObKMwO3DTHr4Nf6kxfZcP7Todp5u8DYIgPwsgied84RpOpPRC2Nnbs4gMYjj4Se8f0huPMZLqG5t4CaC0NPURbqa8xZTS716vdh6m 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(). Acked-by: Oleg Nesterov 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 {