From mboxrd@z Thu Jan 1 00:00:00 1970 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 430DC2063EC for ; Tue, 18 Mar 2025 22:15:04 +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=1742336106; cv=none; b=UcujNRtXYRREGt6uWtie/OtYTIKGRyyWzNw7wIPc8012WZx0ZYW6kWmI0u5rCfU+BC8ZIO8OnNKYZDJKKi59GDYHPqbsTea0tzL0TNQLijmiR+AdQf2kVXXa9GFUSstEcnqrleiAJNkNO54IDUWZ/PAOOsjNG7EKECnVJ+Y/44M= 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.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="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-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-591-nWZFiaPtPKKW-1Ree-9Qvw-1; Tue, 18 Mar 2025 18:15:02 -0400 X-MC-Unique: nWZFiaPtPKKW-1Ree-9Qvw-1 X-Mimecast-MFC-AGG-ID: nWZFiaPtPKKW-1Ree-9Qvw_1742336102 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-3912580843fso4728163f8f.2 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=SBim346ba17eAfm7eF1rPb+3mMtzRHxe2wSkgNgL+fibmGsBNmCakUXCiYBsHzyNbt g448Ow99S96c/LoVXMFFGRLUGcv2Tyt55ypikQOFyOT0fkcHrJFWaOmB7r2pMjgiSkVA P+zyonx4cBuCeb/epC4CHJz9poUHOQ2jp8kV4uCqGqsMA8QbrdOXe4o7JDIREDs3ubxO gSBQrd0OahhO0ZkgwaizTUS7+rKNZg2uoetIJvNS8ZdCDGM3sVVZCyzYxIZUDkg/QJk/ EAILfbdd+sH9u9/9D1/Ol6IR+LGMJrZZpMvz5OW2o7lzJdzsv4IkE7+qRg+m4NquFc4C S3gg== X-Forwarded-Encrypted: i=1; AJvYcCWrzBTtdN64Jj0h1Opbms7QstdJ+WIw33oPRCD3HOjJz2c4FvdE0bXGXp3ruOa/BLatkNGeJRaVBOJPPOwM2ECl@vger.kernel.org X-Gm-Message-State: AOJu0YztBeQLb9uOoCW44BUQPXFPw8AjabvZ0S16rIZY2DItM8JPML9g lQ/NfSAH761yJDMLgrAhTVySUDhOyRP+z1hR+zewLZUgTS/cdGLbDy8oCkF2EAjzZoc1rphBcZJ /F6vyKYjYgvREmEGYUXFjEFttWUnAwxlUv39w4biKICjlSTvVk80m+5QYhH8KGo2quu4= X-Gm-Gg: ASbGncu3gcH/qZ4Kak0bhMv/nAMphEikOBrl1WQC1Xa+Ca2ZHnrdsgu8Nspna8KZ8tz wUElDMEg733JMa7MQYkaHneb15QbWyATwKZsAvCCsfYEKvODrW5MRnWR7fDYHgxZJFPL7XNdPLn 5K5MztI2A+TFbG4umFohxgc/Ne/b2ECmYLjU79vKvuXfaC3Yxcc1EKrgoThbguhIeBwL4m37/MG HUw/+ZF0g8JQWZaynP+HpZsq9RTTnq5HComPsYUGDAep377YpVrM5kJHIbM90+fAYCowIy7xsDI o6vfCf7aNFBE71P916T1rtgrsx/iMVR2szommK8CWoA/pba3QdsizOeASH4aHW058AU/xt+oeh6 D X-Received: by 2002:a05:6000:2a6:b0:390:e8e4:7e3e with SMTP id ffacd0b85a97d-399739b484emr390660f8f.6.1742336101722; 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-perf-users@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ... 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, struct mm_struct *mm) return ret; } -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 = vma->vm_mm; bool first_uprobe; int ret; @@ -1162,9 +1162,11 @@ install_breakpoint(struct uprobe *uprobe, struct mm_struct *mm, return ret; } -static int -remove_breakpoint(struct uprobe *uprobe, struct mm_struct *mm, unsigned long vaddr) +static int remove_breakpoint(struct uprobe *uprobe, struct vm_area_struct *vma, + unsigned long vaddr) { + struct mm_struct *mm = 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 = install_breakpoint(uprobe, mm, vma, info->vaddr); + err = install_breakpoint(uprobe, vma, info->vaddr); } else if (test_bit(MMF_HAS_UPROBES, &mm->flags)) { if (!filter_chain(uprobe, mm)) - err |= remove_breakpoint(uprobe, mm, info->vaddr); + err |= remove_breakpoint(uprobe, vma, info->vaddr); } unlock: @@ -1472,7 +1474,7 @@ static int unapply_uprobe(struct uprobe *uprobe, struct mm_struct *mm) continue; vaddr = offset_to_vaddr(vma, uprobe->offset); - err |= remove_breakpoint(uprobe, mm, vaddr); + err |= remove_breakpoint(uprobe, vma, vaddr); } mmap_read_unlock(mm); @@ -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 = offset_to_vaddr(vma, uprobe->offset); - install_breakpoint(uprobe, vma->vm_mm, vma, vaddr); + install_breakpoint(uprobe, vma, vaddr); } put_uprobe(uprobe); } -- 2.48.1