From patchwork Tue Sep 3 17:45:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrii Nakryiko X-Patchwork-Id: 13789154 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 837E2CD37AB for ; Tue, 3 Sep 2024 17:46:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0BC2F8D01B9; Tue, 3 Sep 2024 13:46:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 06C2E8D018A; Tue, 3 Sep 2024 13:46:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E29288D01B9; Tue, 3 Sep 2024 13:46:17 -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 C296B8D018A for ; Tue, 3 Sep 2024 13:46:17 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 696D21408B4 for ; Tue, 3 Sep 2024 17:46:17 +0000 (UTC) X-FDA: 82524155994.04.AA5A5DC Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf26.hostedemail.com (Postfix) with ESMTP id C743314001B for ; Tue, 3 Sep 2024 17:46:15 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="X/XdVGmB"; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf26.hostedemail.com: domain of andrii@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=andrii@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1725385470; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=6NBPB9PniRGCNQ6nesA6SFCH5a0WeOF0+31oZSlk7M8=; b=FmOZ+22V8HFYra6N9uPo8O7aAsqPXSJbRiTgXvaEN1zI8ssh60ft13OTt2NBMXEOKqWeFE nBEsIucffQJTOudldavZkvBeYvLKQpeZfNx/v8+MEkPzIf/YOBvtaa3w6UJ6GcE3c35pj2 wVtMvL58PO5KqIoKqbO0Fgz90YgVUDo= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1725385470; a=rsa-sha256; cv=none; b=KnRdEnXLtj6/aGRmtjxFXVnwNc2BR6UiXUwqfV4VzNhfzNbG6SnToAZrC3k9MZ48UHt3NM a91BE2+j/x7XyMUIJSc6Tld3jMwuhoSgZN55cqFKJcaaLYxDeu9N/xAXy+aOzjolXalZa+ l1fBu/PI3dqZlNBVky9/XBHbEuAPeGc= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="X/XdVGmB"; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf26.hostedemail.com: domain of andrii@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=andrii@kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id BF669A43D30; Tue, 3 Sep 2024 17:46:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 68B77C4CEC4; Tue, 3 Sep 2024 17:46:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1725385574; bh=LuCsrswkk1SUCus28K1voqG+eAVATzH+TzjbVd85GFQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=X/XdVGmButYhQJdzbx5ponCjmRt/zNDCzmG2Il6HZ2ax0xqGfIBVfHlUccBC5Bkeu dFGbWMZzhbFdfALDvspw8D/QZymNrNH1uCSlW5NmfGeY/IGSIkWMrqvI1EiJzBxQ/5 E7Tk4ApmII2xjbYccuPoQgfClLBBtCoJ+LLpW7csprjeGCHL3WNi61MZWfbtHvpxeR o7Lmg5p2vlzl9HlcgXjfSSdu9aCOkPadrqCUqdOuA0XK51+eWY/sIyeGj/nLJgF/jB gQy2J/2Qp6k7mLDaWqS8JU/gYNwEO0BdMJM77Vjp8aQar9/ZtRtE5r0wTxBylj/O76 dDuU85NfnNJNA== From: Andrii Nakryiko To: linux-trace-kernel@vger.kernel.org, peterz@infradead.org, oleg@redhat.com Cc: rostedt@goodmis.org, mhiramat@kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org, jolsa@kernel.org, paulmck@kernel.org, willy@infradead.org, surenb@google.com, akpm@linux-foundation.org, linux-mm@kvack.org, Andrii Nakryiko Subject: [PATCH v5 2/8] uprobes: protected uprobe lifetime with SRCU Date: Tue, 3 Sep 2024 10:45:57 -0700 Message-ID: <20240903174603.3554182-3-andrii@kernel.org> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20240903174603.3554182-1-andrii@kernel.org> References: <20240903174603.3554182-1-andrii@kernel.org> MIME-Version: 1.0 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: C743314001B X-Stat-Signature: ei9x4a47bunsywuwpzgs3j7diejqohcf X-Rspam-User: X-HE-Tag: 1725385575-704792 X-HE-Meta: U2FsdGVkX1/39QI28Jw/Vi4I/PFdhC5/XOHAyIucouUUZTS5h9wTzYCkeYCtH53hNE3mAE4EKssYL1Y3v4NfiPLM7KvLQ3fdF1T6ctvB1EFWCc5Tea/08BEWeDTloAHdqurV/YJK4NcAOb1EDxCPUWdAvUq4UR0O4pwsUJsrJAhZc7GcWRb+icjWJc5KJGNJ49QHBeokszjGiEJZmxsSMTCF23I0ZDGhyjJZcaySTEjg58JqFbWPOcrlk/dbN73RbxVckcD2kLbT4AJ/7Oi8GoNoTeq+ZIww165zcneCjNFIWpLoh/59tGPn8LyPkPmshDbZdBOaZNkWBhVY1T5jMTt1Tzp2STjfPCCgWCYNwNv/PjSHOlvIAuW/7QdSU3xufPH+a79YLhPnt9l1Kdig5Qzi7pydiV6tycmq0DjGC2nKFNhNlLYW7RwtBDBS8bFNpcGJ0YfhYSeUzq7h0gdKNs5zcbxrWxxKMRApy3jveWXZPJm9iyj0yyJobIxZeJ+kDkYjRUc7gDo5Qgh3bJSKwZHOm9bx8F+WdkjV05LOyFtJXoBvDDPnucNnxC8x8oEAZhu8HrHlThW5oJkMU9dGgCG79nGh44/Jd+We0HzGd9ch27t33srHL35+M1HeiO5c3EKXG+kJGS8IssstSQPuiaupnyBuC6g3//YVSpDfFu0g4rRAMgiVlS6xbA4ft8FjztClSwRfIyYllcy+emh/dIMtle4X7ScVhMe+t1aDERa73HxofDuFkuJMdPj3wmS8Y+LRIMtHuHiMUBGXtnnR0yAwR8d44vkUPRkONoVBJjpl6Q5OcV3CCp7a7iomoNrXH5NU8uK3srD4TXaUcdC3qfZ9eF18K0Huc0fc14owphNWo39J/iC1xyz5nQ/ZRYHPRWteMGc1HgF97eqy7dY7Y2wWiOeJCHWZi5c+1YgG66H5xPiFbmF9N6sTIP6eJHPKXx5F/WVzi9IlRVPG+VN jNl2kOvb kpRw2RTgj0D66PYvOAnY9JRtDnf/KMuJGgVMOtW+pywYNIPyVEadEsPKCCy5KRo8KQ81gpJbGev1LTLaGv5cqOqVdawVpM7Z7SAMJkALKjWK8cUR55mDvGbbBIPmo6tEdLZLcCFTgK88sRfacoE3h0BVMYfzHVpif7OrtM/z3eov817g+BCaKpMWVSTZbpJlKGtcu4OyyHSI5aGAgcxeC1YCW4UWT3jtUKJUBk3xLLkZQaj0fLA1qLMRsGulMhrc/u+xy 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: To avoid unnecessarily taking a (brief) refcount on uprobe during breakpoint handling in handle_swbp for entry uprobes, make find_uprobe() not take refcount, but protect the lifetime of a uprobe instance with RCU. This improves scalability, as refcount gets quite expensive due to cache line bouncing between multiple CPUs. Specifically, we utilize our own uprobe-specific SRCU instance for this RCU protection. put_uprobe() will delay actual kfree() using call_srcu(). For now, uretprobe and single-stepping handling will still acquire refcount as necessary. We'll address these issues in follow up patches by making them use SRCU with timeout. Reviewed-by: Oleg Nesterov Signed-off-by: Andrii Nakryiko --- kernel/events/uprobes.c | 94 +++++++++++++++++++++++------------------ 1 file changed, 54 insertions(+), 40 deletions(-) diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c index 147561c19d57..3e3595753e2c 100644 --- a/kernel/events/uprobes.c +++ b/kernel/events/uprobes.c @@ -41,6 +41,8 @@ static struct rb_root uprobes_tree = RB_ROOT; static DEFINE_RWLOCK(uprobes_treelock); /* serialize rbtree access */ +DEFINE_STATIC_SRCU(uprobes_srcu); + #define UPROBES_HASH_SZ 13 /* serialize uprobe->pending_list */ static struct mutex uprobes_mmap_mutex[UPROBES_HASH_SZ]; @@ -59,6 +61,7 @@ struct uprobe { struct list_head pending_list; struct uprobe_consumer *consumers; struct inode *inode; /* Also hold a ref to inode */ + struct rcu_head rcu; loff_t offset; loff_t ref_ctr_offset; unsigned long flags; @@ -617,6 +620,13 @@ static inline bool uprobe_is_active(struct uprobe *uprobe) return !RB_EMPTY_NODE(&uprobe->rb_node); } +static void uprobe_free_rcu(struct rcu_head *rcu) +{ + struct uprobe *uprobe = container_of(rcu, struct uprobe, rcu); + + kfree(uprobe); +} + static void put_uprobe(struct uprobe *uprobe) { if (!refcount_dec_and_test(&uprobe->ref)) @@ -638,7 +648,7 @@ static void put_uprobe(struct uprobe *uprobe) delayed_uprobe_remove(uprobe, NULL); mutex_unlock(&delayed_uprobe_lock); - kfree(uprobe); + call_srcu(&uprobes_srcu, &uprobe->rcu, uprobe_free_rcu); } static __always_inline @@ -680,33 +690,25 @@ static inline int __uprobe_cmp(struct rb_node *a, const struct rb_node *b) return uprobe_cmp(u->inode, u->offset, __node_2_uprobe(b)); } -static struct uprobe *__find_uprobe(struct inode *inode, loff_t offset) +/* + * Assumes being inside RCU protected region. + * No refcount is taken on returned uprobe. + */ +static struct uprobe *find_uprobe_rcu(struct inode *inode, loff_t offset) { struct __uprobe_key key = { .inode = inode, .offset = offset, }; - struct rb_node *node = rb_find(&key, &uprobes_tree, __uprobe_cmp_key); - - if (node) - return try_get_uprobe(__node_2_uprobe(node)); - - return NULL; -} + struct rb_node *node; -/* - * Find a uprobe corresponding to a given inode:offset - * Acquires uprobes_treelock - */ -static struct uprobe *find_uprobe(struct inode *inode, loff_t offset) -{ - struct uprobe *uprobe; + lockdep_assert(srcu_read_lock_held(&uprobes_srcu)); read_lock(&uprobes_treelock); - uprobe = __find_uprobe(inode, offset); + node = rb_find(&key, &uprobes_tree, __uprobe_cmp_key); read_unlock(&uprobes_treelock); - return uprobe; + return node ? __node_2_uprobe(node) : NULL; } /* @@ -1080,10 +1082,10 @@ register_for_each_vma(struct uprobe *uprobe, struct uprobe_consumer *new) goto free; /* * We take mmap_lock for writing to avoid the race with - * find_active_uprobe() which takes mmap_lock for reading. + * find_active_uprobe_rcu() which takes mmap_lock for reading. * Thus this install_breakpoint() can not make - * is_trap_at_addr() true right after find_uprobe() - * returns NULL in find_active_uprobe(). + * is_trap_at_addr() true right after find_uprobe_rcu() + * returns NULL in find_active_uprobe_rcu(). */ mmap_write_lock(mm); vma = find_vma(mm, info->vaddr); @@ -1885,9 +1887,13 @@ static void prepare_uretprobe(struct uprobe *uprobe, struct pt_regs *regs) return; } + /* we need to bump refcount to store uprobe in utask */ + if (!try_get_uprobe(uprobe)) + return; + ri = kmalloc(sizeof(struct return_instance), GFP_KERNEL); if (!ri) - return; + goto fail; trampoline_vaddr = uprobe_get_trampoline_vaddr(); orig_ret_vaddr = arch_uretprobe_hijack_return_addr(trampoline_vaddr, regs); @@ -1914,11 +1920,7 @@ static void prepare_uretprobe(struct uprobe *uprobe, struct pt_regs *regs) } orig_ret_vaddr = utask->return_instances->orig_ret_vaddr; } - /* - * uprobe's refcnt is positive, held by caller, so it's safe to - * unconditionally bump it one more time here - */ - ri->uprobe = get_uprobe(uprobe); + ri->uprobe = uprobe; ri->func = instruction_pointer(regs); ri->stack = user_stack_pointer(regs); ri->orig_ret_vaddr = orig_ret_vaddr; @@ -1929,8 +1931,9 @@ static void prepare_uretprobe(struct uprobe *uprobe, struct pt_regs *regs) utask->return_instances = ri; return; - fail: +fail: kfree(ri); + put_uprobe(uprobe); } /* Prepare to single-step probed instruction out of line. */ @@ -1945,9 +1948,14 @@ pre_ssout(struct uprobe *uprobe, struct pt_regs *regs, unsigned long bp_vaddr) if (!utask) return -ENOMEM; + if (!try_get_uprobe(uprobe)) + return -EINVAL; + xol_vaddr = xol_get_insn_slot(uprobe); - if (!xol_vaddr) - return -ENOMEM; + if (!xol_vaddr) { + err = -ENOMEM; + goto err_out; + } utask->xol_vaddr = xol_vaddr; utask->vaddr = bp_vaddr; @@ -1955,12 +1963,15 @@ pre_ssout(struct uprobe *uprobe, struct pt_regs *regs, unsigned long bp_vaddr) err = arch_uprobe_pre_xol(&uprobe->arch, regs); if (unlikely(err)) { xol_free_insn_slot(current); - return err; + goto err_out; } utask->active_uprobe = uprobe; utask->state = UTASK_SSTEP; return 0; +err_out: + put_uprobe(uprobe); + return err; } /* @@ -2043,7 +2054,8 @@ static int is_trap_at_addr(struct mm_struct *mm, unsigned long vaddr) return is_trap_insn(&opcode); } -static struct uprobe *find_active_uprobe(unsigned long bp_vaddr, int *is_swbp) +/* assumes being inside RCU protected region */ +static struct uprobe *find_active_uprobe_rcu(unsigned long bp_vaddr, int *is_swbp) { struct mm_struct *mm = current->mm; struct uprobe *uprobe = NULL; @@ -2056,7 +2068,7 @@ static struct uprobe *find_active_uprobe(unsigned long bp_vaddr, int *is_swbp) struct inode *inode = file_inode(vma->vm_file); loff_t offset = vaddr_to_offset(vma, bp_vaddr); - uprobe = find_uprobe(inode, offset); + uprobe = find_uprobe_rcu(inode, offset); } if (!uprobe) @@ -2202,13 +2214,15 @@ static void handle_swbp(struct pt_regs *regs) { struct uprobe *uprobe; unsigned long bp_vaddr; - int is_swbp; + int is_swbp, srcu_idx; bp_vaddr = uprobe_get_swbp_addr(regs); if (bp_vaddr == uprobe_get_trampoline_vaddr()) return uprobe_handle_trampoline(regs); - uprobe = find_active_uprobe(bp_vaddr, &is_swbp); + srcu_idx = srcu_read_lock(&uprobes_srcu); + + uprobe = find_active_uprobe_rcu(bp_vaddr, &is_swbp); if (!uprobe) { if (is_swbp > 0) { /* No matching uprobe; signal SIGTRAP. */ @@ -2224,7 +2238,7 @@ static void handle_swbp(struct pt_regs *regs) */ instruction_pointer_set(regs, bp_vaddr); } - return; + goto out; } /* change it in advance for ->handler() and restart */ @@ -2259,12 +2273,12 @@ static void handle_swbp(struct pt_regs *regs) if (arch_uprobe_skip_sstep(&uprobe->arch, regs)) goto out; - if (!pre_ssout(uprobe, regs, bp_vaddr)) - return; + if (pre_ssout(uprobe, regs, bp_vaddr)) + goto out; - /* arch_uprobe_skip_sstep() succeeded, or restart if can't singlestep */ out: - put_uprobe(uprobe); + /* arch_uprobe_skip_sstep() succeeded, or restart if can't singlestep */ + srcu_read_unlock(&uprobes_srcu, srcu_idx); } /*