From nobody Wed Dec 17 08:52:19 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2B078206F31 for ; Tue, 18 Mar 2025 22:15:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742336106; cv=none; b=cp8GrGSw0HxxPS45hqvS4l6o4qYLSPH3ncqmoP63MY5jzh5s/htzkFyNOgur5Be7H4KNMPlUAzVg2mcweooh27xUa7z081In0zBpb3Eg4Bv/jdDsft8fBSwFAW4nJiUg23Jhce7DP+GAGNw3HWthSHlXNcnN5evX8IrizSUTI7A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742336106; c=relaxed/simple; bh=dmIEFpP5Vzp4R9JKUVjUJzGbQUrzscJCuLnCPzsk7xQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UGuXtWIt2hPnWmGuRHvbyO5cSq+JB1t8e9p8VZ6/7oBwjbw+BJex3Fbbd9ZHt7bFtWa6kSNIqf+ilN8yJKHnzmR4zQlDL+B9WyTC+1tPxg8n1pckvUnzOcmhqAKNm1g0QagqUCiszlHTt7kPBw7aq9A3xizjnPgdArUKJoHeEew= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=ho9cpfUF; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="ho9cpfUF" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1742336104; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Rus6kw9XsBL2c9jHGjOEjWiY0U6NqB+KHNJXO9LzuQY=; b=ho9cpfUFXwd2Fny0SJer32ZaUx+q33uj+lmS2tD3QdvQ2me7xjOJZXEeupEmu+Lr7RMCh4 Cqb3QAxhKlJnGqvQvAMOApin8AVYUgpKOFLpbKJg+WvWTyGok80T+DNxl6hHrEKMdWUZtL YgLY9LjS91KD9ZAHq1BKMQWkangI6Aw= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-308-UV6FgeMIMjuVgAgiNfzQew-1; Tue, 18 Mar 2025 18:15:03 -0400 X-MC-Unique: UV6FgeMIMjuVgAgiNfzQew-1 X-Mimecast-MFC-AGG-ID: UV6FgeMIMjuVgAgiNfzQew_1742336102 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-391345e3aa3so3650444f8f.0 for ; Tue, 18 Mar 2025 15:15:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742336102; x=1742940902; 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=Rus6kw9XsBL2c9jHGjOEjWiY0U6NqB+KHNJXO9LzuQY=; b=XnMWbJvs3WB1JtZXsKEd32eAZPyGS6wRhRUzAWlVYBoVs9EjDiSByMdiBdp/1dm62f MK64oH4IYtIS1Ped/1b2hXkF8/6EyNsGbnmrabnrqM1X59HEpsef3fNSqPmxOjYOLZS4 jBp4BZzaqwrNUMTjmyf/7zpCrkzhlRpnKsAcirhZAGEbdwa8ZCOrP7U8TzgqYgp3Pz+h D+OkLu8+r4p17My7CY5KWEg2umWc+5zDXhM6EgklhCWGk6b6keXpsHIJtudNdZRo7x09 RVO5NXXekZSm5gBuUfo2Ig3c1qmGmudWhNVNCl7pBxFwngVe4q5dQGkZx1WEwrmUKVC0 G8qA== X-Gm-Message-State: AOJu0YxzqCd4pb1cl1oBNTGHNQ656h1pSIewgMr4bVu80Nzz4E2c5E2L qfZU18ZI/t0SrGZfRqMGIaUEAUD3MNcBGBVqCD5Pk+NjCP+A2Z+LtWj3BcdQHqJgCt7gLL20Pb1 jSZtLL6M/Q4cGiXnOOw9GGPYnj2dhkeTYlhDWp+VRcjDOodXn9zjx+DD6X4RP7IZabgYofnWnOL IQgNeFy3vgqBH8jIN/Ghp42D31+3+RIh7v2G/RaE7jb2kv X-Gm-Gg: ASbGncvf4CHWD9wAVUbk83YR415Ca0xwZn/Cd3TeGGEdgJVyt2oMJ6nJRdwhlJjsILu hCpEZmxpluEO4FfaJENmBmqznoRzDgUq9dsH4rh66gwnaXb/1isiV/td8WwGS1WZgPCKY1I60yP d4y708gFvpiet8FhAThhH+4sR+UeolPo8G2ElaLwEjKXt5Y7bW59cOvCVrz1nDfEhqV6QaxEPXV z221JL9RJq2ydmZ3EFPh27EqwDvFi19PW3DbGW1GHP54qmsr8H5OOV/rA2DzrnUwYR4xzz7LVtU m0IuIt200/AfRGkVGPxrpVi3I6rPxVslmdYaiDWTtj4+eexv+IMsqkVv5cGZd0AXcKyZkW8H/J1 6 X-Received: by 2002:a05:6000:2a6:b0:390:e8e4:7e3e with SMTP id ffacd0b85a97d-399739b484emr390681f8f.6.1742336101786; Tue, 18 Mar 2025 15:15:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHEntLQOUh/Nv/fGa/REaqlKcGpxmQ8E/qfsoQdKPfCKbsE1Lco5OztnXYuajlRpXhgshxCpw== X-Received: by 2002:a05:6000:2a6:b0:390:e8e4:7e3e with SMTP id ffacd0b85a97d-399739b484emr390645f8f.6.1742336101239; Tue, 18 Mar 2025 15:15:01 -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-395cb318a8bsm19682001f8f.66.2025.03.18.15.15.00 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 18 Mar 2025 15:15:00 -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 1/3] kernel/events/uprobes: pass VMA instead of MM to remove_breakpoint() Date: Tue, 18 Mar 2025 23:14:55 +0100 Message-ID: <20250318221457.3055598-2-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" ... and remove the "MM" argument from install_breakpoint(), because it can easily be derived from the VMA. Signed-off-by: David Hildenbrand --- kernel/events/uprobes.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c index 5d6f3d9d29f44..259038d099819 100644 --- a/kernel/events/uprobes.c +++ b/kernel/events/uprobes.c @@ -1134,10 +1134,10 @@ static bool filter_chain(struct uprobe *uprobe, str= uct mm_struct *mm) return ret; } =20 -static int -install_breakpoint(struct uprobe *uprobe, struct mm_struct *mm, - struct vm_area_struct *vma, unsigned long vaddr) +static int install_breakpoint(struct uprobe *uprobe, struct vm_area_struct= *vma, + unsigned long vaddr) { + struct mm_struct *mm =3D vma->vm_mm; bool first_uprobe; int ret; =20 @@ -1162,9 +1162,11 @@ install_breakpoint(struct uprobe *uprobe, struct mm_= struct *mm, return ret; } =20 -static int -remove_breakpoint(struct uprobe *uprobe, struct mm_struct *mm, unsigned lo= ng vaddr) +static int remove_breakpoint(struct uprobe *uprobe, struct vm_area_struct = *vma, + unsigned long vaddr) { + struct mm_struct *mm =3D vma->vm_mm; + set_bit(MMF_RECALC_UPROBES, &mm->flags); return set_orig_insn(&uprobe->arch, mm, vaddr); } @@ -1296,10 +1298,10 @@ register_for_each_vma(struct uprobe *uprobe, struct= uprobe_consumer *new) if (is_register) { /* consult only the "caller", new consumer. */ if (consumer_filter(new, mm)) - err =3D install_breakpoint(uprobe, mm, vma, info->vaddr); + err =3D install_breakpoint(uprobe, vma, info->vaddr); } else if (test_bit(MMF_HAS_UPROBES, &mm->flags)) { if (!filter_chain(uprobe, mm)) - err |=3D remove_breakpoint(uprobe, mm, info->vaddr); + err |=3D remove_breakpoint(uprobe, vma, info->vaddr); } =20 unlock: @@ -1472,7 +1474,7 @@ static int unapply_uprobe(struct uprobe *uprobe, stru= ct mm_struct *mm) continue; =20 vaddr =3D offset_to_vaddr(vma, uprobe->offset); - err |=3D remove_breakpoint(uprobe, mm, vaddr); + err |=3D remove_breakpoint(uprobe, vma, vaddr); } mmap_read_unlock(mm); =20 @@ -1610,7 +1612,7 @@ int uprobe_mmap(struct vm_area_struct *vma) if (!fatal_signal_pending(current) && filter_chain(uprobe, vma->vm_mm)) { unsigned long vaddr =3D offset_to_vaddr(vma, uprobe->offset); - install_breakpoint(uprobe, vma->vm_mm, vma, vaddr); + install_breakpoint(uprobe, vma, vaddr); } put_uprobe(uprobe); } --=20 2.48.1 From nobody Wed Dec 17 08:52:19 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BF641207DE2 for ; Tue, 18 Mar 2025 22:15:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742336109; cv=none; b=jtU8hgMjvSX/HFzjBSIedpgZd/w3Q39wH7FPaK6ZOMauemjBzikc8rAwr9y2nw4wrEcX3Kul+emBeG2ftg1E2NFVVwSKB75X042+saFtWXcHDh20rwUmTtlmsTJCbA38NAwGB1zv99yDEnP6tZCR/YwYOlIbdjjJMIwKsPO0Nxs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742336109; c=relaxed/simple; bh=9o1sGRawhMhE83lK347pgMnxLiJgYGjZ2/N4XtWqcOU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PUppysGU1VjsvMdPPN19FGppf/bw++WWlO4SwWmcidDcL1JFcQewBZy+t8UsihLPQiy93782rmcZFS/gcIdkioZvhJcn+kzXdQ0lfcYubwn4nqpIOhoWRsBoW1d6nn+qlBL458epWjduOe/uUSemh6oy2VjEjW1IEZl/82MJJvg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=hb9nAnIz; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="hb9nAnIz" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1742336106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nBMqWWSmA8jTU5EpZWWLoWgjipzuL5yIrBN/CPUgt3Q=; b=hb9nAnIz2dx7GHzfrh9bINeANaWtOFXqEIlc9CGUmg1baDt6lmyxeAFUTZeQbF3EPe5BA5 HfnQFLo5mnWc0bA5+DxPvNx/zWa80qRWmSgWxTxa4/Ik2skQZBtyqmXkJjsvUTJX8hIlOe 3fNnHRYQVCdYjoVeUhvTP/igzVOPXho= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-674-bVm7ohtuPQSGfVyANmeaYQ-1; Tue, 18 Mar 2025 18:15:05 -0400 X-MC-Unique: bVm7ohtuPQSGfVyANmeaYQ-1 X-Mimecast-MFC-AGG-ID: bVm7ohtuPQSGfVyANmeaYQ_1742336104 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-43cec217977so25918405e9.0 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=TU3ZHlmc4byGTd3dt3rEcBo9y4DnBDpuFCfoPS3zsuop7bFNHNBDmpiV8C8VhhaPeI pgvWJA/iT//ZcwHr0N5sEcYaCJrbWPgPKm6yuibiPukcoBJDEg8zeGdF3aXTiwYgyAI2 ee/9gpJL18oWt0hWucoC0nx7d2mvGmnVj6fhnUAZNJ8cF43cQGMAQnwJj7cUhRD5wMWI QvEW3D5By1hYbUQ9eO7BlPY1lR2dJRzfYfzN/t4g7B07X4/lrWqaKHRJufo9sv+MB4rj Yx3jyCKM/Pwy+bZbAbHdSZ3TUvbLGxpQB7oqd+zzLqxIL4SyPwZBjP0k8LFjkSCPjvtG XgVQ== X-Gm-Message-State: AOJu0YxPANAIYBWtftQ2Mrham+1S+P9McmRd+ion4nBEeeYyUIP1XLi4 woSp1/EcVBOD77OXIcfxgOxGlgt9pupYTWDTmMqn1uWVEVbqIF0JPuGI/YXd7Ad/64Ahs5NC5g1 kAA4ntJBKpmvkeGd8HXhORce74VkP4Q5Xodof1VBEJJ7oYQcpvaJhmOjDJsz3XEot4LrOLDecOv 8TsKiiRhSGyghe92X1DC9jnOnB5rS+12pxZKq7X/21tHy6 X-Gm-Gg: ASbGncvYOBcS1nuNzFtxcgtjAkBBwCKfDwfZLAB3mU7PHY3TdExIq1lf9B0DFqv3Yox jvx/KcPMynOLXwnYnpnujXRa4E47lg8sQQaP/wsvow4cVItabQHTHHVX+GJkasK1YtjTS1LwzjA MNqAj8BNt3jfdj1Ka+8yiz+BthgbPfQdCBMuZjVwxxCEEZlDAkwmTaCIGqDFJ4Ls0mluC8NuUJa VA+OLOLzgi7W30DFTPIesdgtpW/tVCSUu8ZoxKJhkQNa5yyiQRl29bomiT3Zfrc5+gw2lAeq9SH UhUNQ4Etaonx++Jvo8A1ZA4hwuXFMQYB7QnNAtC7kEWZ1kVgusemF7yOoLPkn228tPnR0WJIpiL n X-Received: by 2002:a5d:47ca:0:b0:391:47d8:de3d with SMTP id ffacd0b85a97d-399739bc959mr401452f8f.16.1742336103912; 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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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); } =20 -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)); } =20 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 { }; =20 extern void __init uprobes_init(void); -extern int set_swbp(struct arch_uprobe *aup, struct mm_struct *mm, unsigne= d long vaddr); -extern int set_orig_insn(struct arch_uprobe *aup, struct mm_struct *mm, un= signed long vaddr); +extern int set_swbp(struct arch_uprobe *aup, struct vm_area_struct *vma, u= nsigned long vaddr); +extern int set_orig_insn(struct arch_uprobe *aup, struct vm_area_struct *v= ma, 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_stru= ct *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, stru= ct 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 =3D vma->vm_mm; struct uprobe *uprobe; struct page *old_page, *new_page; - struct vm_area_struct *vma; int ret, is_register, ref_ctr_updated =3D 0; bool orig_page_huge =3D false; unsigned int gup_flags =3D FOLL_FORCE; @@ -498,9 +498,9 @@ int uprobe_write_opcode(struct arch_uprobe *auprobe, st= ruct mm_struct *mm, if (is_register) gup_flags |=3D FOLL_SPLIT_PMD; /* Read the page with vaddr into memory */ - old_page =3D get_user_page_vma_remote(mm, vaddr, gup_flags, &vma); - if (IS_ERR(old_page)) - return PTR_ERR(old_page); + ret =3D get_user_pages_remote(mm, vaddr, 1, gup_flags, &old_page, NULL); + if (ret !=3D 1) + return ret; =20 ret =3D verify_opcode(old_page, vaddr, &opcode); if (ret <=3D 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, uns= igned long vaddr) +int __weak set_swbp(struct arch_uprobe *auprobe, struct vm_area_struct *vm= a, + unsigned long vaddr) { - return uprobe_write_opcode(auprobe, mm, vaddr, UPROBE_SWBP_INSN); + return uprobe_write_opcode(auprobe, vma, vaddr, UPROBE_SWBP_INSN); } =20 /** * 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); } =20 @@ -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); =20 - ret =3D set_swbp(&uprobe->arch, mm, vaddr); + ret =3D 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, s= truct vm_area_struct *vma, struct mm_struct *mm =3D vma->vm_mm; =20 set_bit(MMF_RECALC_UPROBES, &mm->flags); - return set_orig_insn(&uprobe->arch, mm, vaddr); + return set_orig_insn(&uprobe->arch, vma, vaddr); } =20 struct map_info { --=20 2.48.1 From nobody Wed Dec 17 08:52:19 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E77DA2135AD for ; Tue, 18 Mar 2025 22:15:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742336111; cv=none; b=QLcUt9Vc8S3+/fKctiw5cfMStb/bFK8Bc1sDIZgdIKXaAa9TSUAOFwa+JI/EPCTTZ2e1+rrxl+kOebICRIWJOhvvG105FMeOvaAphJ2LDFWRv+fHYtbyJWKdnGDnKFXTTjpHarVMkyLIfUhBSf46OqMx6/o/FkiEavsr0YYHOLc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742336111; c=relaxed/simple; bh=mU328JtwnWUGk8kLS+0oxWA6TQEFOu3c6qj25HkhLgA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fcQJC+hoTPDSkx4E1yE49k8Geasd9yJvQIa+0JThgG+h8gOUt6p86ICy73TX6t96kWicIVnqBvy2ktHaMYukN18C6n4JZAY+p82WGuS9AjIJzjyB9enkFW6HVZJUNw/LI+Id6kfBXzd9ERCocCSz8umRvqUUghtbVCydacwny7E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=AYzyqdLf; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="AYzyqdLf" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1742336108; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=V5W1IqTkr6wDzZNkwgWJDbhBMCl0QK4SwST8Ho7En/8=; b=AYzyqdLfnUsyQz14IXkXVfJJdjs+hpm92IUprZawmyvjJOYroVPmLuD3YtSXCjYhOgLFpg dr1/66AorDSpVtGfFQ5SwSyl/Y02G42p0oGmLQb4AGoCNLoA9ouo1MP76ymSQs5PsrIy7e SjCGlhVYOFIoMBzjc9z9o18EOZOkZmY= 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-231-2ZOvoBXsOZ-i5No3W_zpEw-1; Tue, 18 Mar 2025 18:15:07 -0400 X-MC-Unique: 2ZOvoBXsOZ-i5No3W_zpEw-1 X-Mimecast-MFC-AGG-ID: 2ZOvoBXsOZ-i5No3W_zpEw_1742336106 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-43d007b2c79so29092365e9.2 for ; Tue, 18 Mar 2025 15:15:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742336106; x=1742940906; 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=V5W1IqTkr6wDzZNkwgWJDbhBMCl0QK4SwST8Ho7En/8=; b=gfjrVsjH1rudIUAp4xlfXfSBmBO+s39lkQsEZpylDuolcISQ7AHItGhamdXYtI7Kw6 a1bxNhe/g8vmKx4131Ya+glSdBAeUk/WsU6Q/rhqPGXM+VArC2NOA3QbP5PRvkI8+kSJ TUMxS37xmlcUc/1brDPczp/0nngZ0hi+5xYZ3IrLSBwtsCCfOomzIGNsMCofp7RmE4pc l1C8o8BTkTuCwfDY5byq6yFOJOEsDbCwYSASgzVg15rnz7GKjW06ZUKHHZCWrMBm7UA6 Lh4XyNJtn3EWtCZTy/MyjdIgFKVfL0FH/8feGKt+EQlD1xXG8eTAXq4/A5hvC6YV13Ia GPrg== X-Gm-Message-State: AOJu0Yz2hnlgGXp9kDumWdrGBldF5HnXxS1zwaMXERODvhPRPWE0w4xW cLCrp8f5EEAAf3bes0UNjlyeZflhzx7gq2ic+k6nDvfs9ekdFbPHjv09pFrnWpN0j6Fj/Ez85j9 OjmWas3woMa6GZLcm2xBQ+zhstOsNCaSzBHRqLlQwN7yIogcBy0qqjmNpGmRirmSeCrSL9UWj4f 17/vUw9hz1JjfBPprujxqzQTX2wn6ZH4afU/3aXExUM519 X-Gm-Gg: ASbGncsRXlnZDhu/Rmjr/hr0b5cmJCASRPzHMNw6TzU1ql0Xe8QdUUG/zsBZiyXprrY AgR6Ak0tIDJP8m5kTCbYIm69mJ9uR14LieBhMuO+laL3N0ef4bnwLKa25WPFlEjqC6LsG7ww7kV PsmL5/FfsWZ1/j6GNnTYq6yZRX6N5LBxyKcMGsGcNIZWF1mGGrK+3Y9ahCWFB83H95Gq8n94g1s UV1Y4L5/AaYNcEBiIHaee9xLI9VzCQ5s0cfkD60iDhmnkueV27FHMMT5G94MLtGYVj7YYs/YPrl +gVHTfxvqnv7j1y3hoY0hG1XK4B3ABpVxGvjLcRyW/9XQOyY+GWd0wSgxr0qJi8M3dKYAMOXis9 j X-Received: by 2002:a05:6000:18af:b0:391:4052:a232 with SMTP id ffacd0b85a97d-39973b08ed4mr377886f8f.55.1742336106132; Tue, 18 Mar 2025 15:15:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGRn8SLUZF1otjALjo9h8G83+kClNDhOJq3ekHXBkIIONIsWk2AaqwLhi6ne/EApjU79CJUNQ== X-Received: by 2002:a05:6000:18af:b0:391:4052:a232 with SMTP id ffacd0b85a97d-39973b08ed4mr377840f8f.55.1742336105475; Tue, 18 Mar 2025 15:15:05 -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-395c888117csm18989501f8f.44.2025.03.18.15.15.04 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 18 Mar 2025 15:15:05 -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 3/3] kernel/events/uprobes: uprobe_write_opcode() rewrite Date: Tue, 18 Mar 2025 23:14:57 +0100 Message-ID: <20250318221457.3055598-4-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" uprobe_write_opcode() does some pretty low-level things that really, it shouldn't be doing: for example, manually breaking COW by allocating anonymous folios and replacing mapped pages. Further, it does seem to do some shaky things: for example, writing to possible COW-shared anonymous pages or zapping anonymous pages that might be pinned. We're also not taking care of uffd, uffd-wp, softdirty ... although rather corner cases here. Let's just get it right like ordinary ptrace writes would. Let's rewrite the code, leaving COW-breaking to core-MM, triggered by FOLL_FORCE|FOLL_WRITE (note that the code was already using FOLL_FORCE). We'll use GUP to lookup/faultin the page and break COW if required. Then, we'll walk the page tables using a folio_walk to perform our page modification atomically by temporarily unmap the PTE + flushing the TLB. Likely, we could avoid the temporary unmap in case we can just atomically write the instruction, but that will be a separate project. Unfortunately, we still have to implement the zapping logic manually, because we only want to zap in specific circumstances (e.g., page content identical). Note that we can now handle large folios (compound pages) and the shared zeropage just fine, so drop these checks. Signed-off-by: David Hildenbrand Acked-by: Oleg Nesterov --- kernel/events/uprobes.c | 311 ++++++++++++++++++++-------------------- 1 file changed, 157 insertions(+), 154 deletions(-) diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c index ac17c16f65d63..671b8b6ad4e1b 100644 --- a/kernel/events/uprobes.c +++ b/kernel/events/uprobes.c @@ -29,6 +29,7 @@ #include #include #include /* check_stable_address_space */ +#include =20 #include =20 @@ -151,91 +152,6 @@ static loff_t vaddr_to_offset(struct vm_area_struct *v= ma, unsigned long vaddr) return ((loff_t)vma->vm_pgoff << PAGE_SHIFT) + (vaddr - vma->vm_start); } =20 -/** - * __replace_page - replace page in vma by new page. - * based on replace_page in mm/ksm.c - * - * @vma: vma that holds the pte pointing to page - * @addr: address the old @page is mapped at - * @old_page: the page we are replacing by new_page - * @new_page: the modified page we replace page by - * - * If @new_page is NULL, only unmap @old_page. - * - * Returns 0 on success, negative error code otherwise. - */ -static int __replace_page(struct vm_area_struct *vma, unsigned long addr, - struct page *old_page, struct page *new_page) -{ - struct folio *old_folio =3D page_folio(old_page); - struct folio *new_folio; - struct mm_struct *mm =3D vma->vm_mm; - DEFINE_FOLIO_VMA_WALK(pvmw, old_folio, vma, addr, 0); - int err; - struct mmu_notifier_range range; - pte_t pte; - - mmu_notifier_range_init(&range, MMU_NOTIFY_CLEAR, 0, mm, addr, - addr + PAGE_SIZE); - - if (new_page) { - new_folio =3D page_folio(new_page); - err =3D mem_cgroup_charge(new_folio, vma->vm_mm, GFP_KERNEL); - if (err) - return err; - } - - /* For folio_free_swap() below */ - folio_lock(old_folio); - - mmu_notifier_invalidate_range_start(&range); - err =3D -EAGAIN; - if (!page_vma_mapped_walk(&pvmw)) - goto unlock; - VM_BUG_ON_PAGE(addr !=3D pvmw.address, old_page); - pte =3D ptep_get(pvmw.pte); - - /* - * Handle PFN swap PTES, such as device-exclusive ones, that actually - * map pages: simply trigger GUP again to fix it up. - */ - if (unlikely(!pte_present(pte))) { - page_vma_mapped_walk_done(&pvmw); - goto unlock; - } - - if (new_page) { - folio_get(new_folio); - folio_add_new_anon_rmap(new_folio, vma, addr, RMAP_EXCLUSIVE); - folio_add_lru_vma(new_folio, vma); - } else - /* no new page, just dec_mm_counter for old_page */ - dec_mm_counter(mm, MM_ANONPAGES); - - if (!folio_test_anon(old_folio)) { - dec_mm_counter(mm, mm_counter_file(old_folio)); - inc_mm_counter(mm, MM_ANONPAGES); - } - - flush_cache_page(vma, addr, pte_pfn(pte)); - ptep_clear_flush(vma, addr, pvmw.pte); - if (new_page) - set_pte_at(mm, addr, pvmw.pte, - mk_pte(new_page, vma->vm_page_prot)); - - folio_remove_rmap_pte(old_folio, old_page, vma); - if (!folio_mapped(old_folio)) - folio_free_swap(old_folio); - page_vma_mapped_walk_done(&pvmw); - folio_put(old_folio); - - err =3D 0; - unlock: - mmu_notifier_invalidate_range_end(&range); - folio_unlock(old_folio); - return err; -} - /** * is_swbp_insn - check if instruction is breakpoint instruction. * @insn: instruction to be checked. @@ -463,6 +379,95 @@ static int update_ref_ctr(struct uprobe *uprobe, struc= t mm_struct *mm, return ret; } =20 +static bool orig_page_is_identical(struct vm_area_struct *vma, + unsigned long vaddr, struct page *page, bool *pmd_mappable) +{ + const pgoff_t index =3D vaddr_to_offset(vma, vaddr) >> PAGE_SHIFT; + struct folio *orig_folio =3D filemap_get_folio(vma->vm_file->f_mapping, + index); + struct page *orig_page; + bool identical; + + if (IS_ERR(orig_folio)) + return false; + orig_page =3D folio_file_page(orig_folio, index); + + *pmd_mappable =3D folio_test_pmd_mappable(orig_folio); + identical =3D folio_test_uptodate(orig_folio) && + pages_identical(page, orig_page); + folio_put(orig_folio); + return identical; +} + +static int __uprobe_write_opcode(struct vm_area_struct *vma, + struct folio_walk *fw, struct folio *folio, + unsigned long opcode_vaddr, uprobe_opcode_t opcode) +{ + const unsigned long vaddr =3D opcode_vaddr & PAGE_MASK; + const bool is_register =3D !!is_swbp_insn(&opcode); + bool pmd_mappable; + + /* For now, we'll only handle PTE-mapped folios. */ + if (fw->level !=3D FW_LEVEL_PTE) + return -EFAULT; + + /* + * See can_follow_write_pte(): we'd actually prefer a writable PTE here, + * but the VMA might not be writable. + */ + if (!pte_write(fw->pte)) { + if (!PageAnonExclusive(fw->page)) + return -EFAULT; + if (unlikely(userfaultfd_pte_wp(vma, fw->pte))) + return -EFAULT; + /* SOFTDIRTY is handled via pte_mkdirty() below. */ + } + + /* + * We'll temporarily unmap the page and flush the TLB, such that we can + * modify the page atomically. + */ + flush_cache_page(vma, vaddr, pte_pfn(fw->pte)); + fw->pte =3D ptep_clear_flush(vma, vaddr, fw->ptep); + copy_to_page(fw->page, opcode_vaddr, &opcode, UPROBE_SWBP_INSN_SIZE); + + /* + * When unregistering, we may only zap a PTE if uffd is disabled and + * there are no unexpected folio references ... + */ + if (is_register || userfaultfd_missing(vma) || + (folio_ref_count(folio) !=3D folio_mapcount(folio) + 1 + + folio_test_swapcache(folio) * folio_nr_pages(folio))) + goto remap; + + /* + * ... and the mapped page is identical to the original page that + * would get faulted in on next access. + */ + if (!orig_page_is_identical(vma, vaddr, fw->page, &pmd_mappable)) + goto remap; + + dec_mm_counter(vma->vm_mm, MM_ANONPAGES); + folio_remove_rmap_pte(folio, fw->page, vma); + if (!folio_mapped(folio) && folio_test_swapcache(folio) && + folio_trylock(folio)) { + folio_free_swap(folio); + folio_unlock(folio); + } + folio_put(folio); + + return pmd_mappable; +remap: + /* + * Make sure that our copy_to_page() changes become visible before the + * set_pte_at() write. + */ + smp_wmb(); + /* We modified the page. Make sure to mark the PTE dirty. */ + set_pte_at(vma->vm_mm, vaddr, fw->ptep, pte_mkdirty(fw->pte)); + return 0; +} + /* * NOTE: * Expect the breakpoint instruction to be the smallest size instruction f= or @@ -475,116 +480,114 @@ static int update_ref_ctr(struct uprobe *uprobe, st= ruct mm_struct *mm, * uprobe_write_opcode - write the opcode at a given virtual address. * @auprobe: arch specific probepoint information. * @vma: the probed virtual memory area. - * @vaddr: the virtual address to store the opcode. - * @opcode: opcode to be written at @vaddr. + * @opcode_vaddr: the virtual address to store the opcode. + * @opcode: opcode to be written at @opcode_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 vm_area_struct= *vma, - unsigned long vaddr, uprobe_opcode_t opcode) + const unsigned long opcode_vaddr, uprobe_opcode_t opcode) { + const unsigned long vaddr =3D opcode_vaddr & PAGE_MASK; struct mm_struct *mm =3D vma->vm_mm; struct uprobe *uprobe; - struct page *old_page, *new_page; int ret, is_register, ref_ctr_updated =3D 0; - bool orig_page_huge =3D false; unsigned int gup_flags =3D FOLL_FORCE; + struct mmu_notifier_range range; + struct folio_walk fw; + struct folio *folio; + struct page *page; =20 is_register =3D is_swbp_insn(&opcode); uprobe =3D container_of(auprobe, struct uprobe, arch); =20 -retry: + if (WARN_ON_ONCE(!is_cow_mapping(vma->vm_flags))) + return -EINVAL; + + /* + * When registering, we have to break COW to get an exclusive anonymous + * page that we can safely modify. Use FOLL_WRITE to trigger a write + * fault if required. When unregistering, we might be lucky and the + * anon page is already gone. So defer write faults until really + * required. Use FOLL_SPLIT_PMD, because __uprobe_write_opcode() + * cannot deal with PMDs yet. + */ if (is_register) - gup_flags |=3D FOLL_SPLIT_PMD; - /* Read the page with vaddr into memory */ - ret =3D get_user_pages_remote(mm, vaddr, 1, gup_flags, &old_page, NULL); - if (ret !=3D 1) - return ret; + gup_flags |=3D FOLL_WRITE | FOLL_SPLIT_PMD; =20 - ret =3D verify_opcode(old_page, vaddr, &opcode); +retry: + ret =3D get_user_pages_remote(mm, vaddr, 1, gup_flags, &page, NULL); if (ret <=3D 0) - goto put_old; - - if (is_zero_page(old_page)) { - ret =3D -EINVAL; - goto put_old; - } + goto out; + folio =3D page_folio(page); =20 - if (WARN(!is_register && PageCompound(old_page), - "uprobe unregister should never work on compound page\n")) { - ret =3D -EINVAL; - goto put_old; + ret =3D verify_opcode(page, opcode_vaddr, &opcode); + if (ret <=3D 0) { + folio_put(folio); + goto out; } =20 /* We are going to replace instruction, update ref_ctr. */ if (!ref_ctr_updated && uprobe->ref_ctr_offset) { ret =3D update_ref_ctr(uprobe, mm, is_register ? 1 : -1); - if (ret) - goto put_old; + if (ret) { + folio_put(folio); + goto out; + } =20 ref_ctr_updated =3D 1; } =20 ret =3D 0; - if (!is_register && !PageAnon(old_page)) - goto put_old; - - ret =3D anon_vma_prepare(vma); - if (ret) - goto put_old; - - ret =3D -ENOMEM; - new_page =3D alloc_page_vma(GFP_HIGHUSER_MOVABLE, vma, vaddr); - if (!new_page) - goto put_old; - - __SetPageUptodate(new_page); - copy_highpage(new_page, old_page); - copy_to_page(new_page, vaddr, &opcode, UPROBE_SWBP_INSN_SIZE); + if (unlikely(!folio_test_anon(folio))) { + VM_WARN_ON_ONCE(is_register); + goto out; + } =20 if (!is_register) { - struct page *orig_page; - pgoff_t index; - - VM_BUG_ON_PAGE(!PageAnon(old_page), old_page); - - index =3D vaddr_to_offset(vma, vaddr & PAGE_MASK) >> PAGE_SHIFT; - orig_page =3D find_get_page(vma->vm_file->f_inode->i_mapping, - index); - - if (orig_page) { - if (PageUptodate(orig_page) && - pages_identical(new_page, orig_page)) { - /* let go new_page */ - put_page(new_page); - new_page =3D NULL; - - if (PageCompound(orig_page)) - orig_page_huge =3D true; - } - put_page(orig_page); - } + /* + * In the common case, we'll be able to zap the page when + * unregistering. So trigger MMU notifiers now, as we won't + * be able to do it under PTL. + */ + mmu_notifier_range_init(&range, MMU_NOTIFY_CLEAR, 0, mm, + vaddr, vaddr + PAGE_SIZE); + mmu_notifier_invalidate_range_start(&range); + } + + ret =3D -EAGAIN; + /* Walk the page tables again, to perform the actual update. */ + if (folio_walk_start(&fw, vma, vaddr, 0)) { + if (fw.page =3D=3D page) + ret =3D __uprobe_write_opcode(vma, &fw, folio, opcode_vaddr, opcode); + folio_walk_end(&fw, vma); } =20 - ret =3D __replace_page(vma, vaddr & PAGE_MASK, old_page, new_page); - if (new_page) - put_page(new_page); -put_old: - put_page(old_page); + if (!is_register) + mmu_notifier_invalidate_range_end(&range); =20 - if (unlikely(ret =3D=3D -EAGAIN)) + folio_put(folio); + switch (ret) { + case -EFAULT: + gup_flags |=3D FOLL_WRITE | FOLL_SPLIT_PMD; + fallthrough; + case -EAGAIN: goto retry; + default: + break; + } =20 +out: /* Revert back reference counter if instruction update failed. */ - if (ret && is_register && ref_ctr_updated) + if (ret < 0 && is_register && ref_ctr_updated) update_ref_ctr(uprobe, mm, -1); =20 /* try collapse pmd for compound page */ - if (!ret && orig_page_huge) + if (ret > 0) collapse_pte_mapped_thp(mm, vaddr, false); =20 - return ret; + return ret < 0 ? ret : 0; } =20 /** --=20 2.48.1