From patchwork Fri Nov 22 03:59:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrii Nakryiko X-Patchwork-Id: 13882754 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 C835FE65D1E for ; Fri, 22 Nov 2024 03:59:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 547836B00C0; Thu, 21 Nov 2024 22:59:44 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4CF786B00C1; Thu, 21 Nov 2024 22:59:44 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 306486B00C2; Thu, 21 Nov 2024 22:59:44 -0500 (EST) 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 00BC96B00C0 for ; Thu, 21 Nov 2024 22:59:43 -0500 (EST) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 796AF141228 for ; Fri, 22 Nov 2024 03:59:43 +0000 (UTC) X-FDA: 82812375324.21.68FD165 Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf11.hostedemail.com (Postfix) with ESMTP id 6F6D140009 for ; Fri, 22 Nov 2024 03:58:35 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=oEMjM3Dg; spf=pass (imf11.hostedemail.com: domain of andrii@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=andrii@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1732247797; 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=BfxMzVavNHdw+CGTzkQ/ait716Tk5SRDXovanvJZ0BY=; b=5eqDDI89xUK5tA8Sr8xFSJdecqmFFo7NbOUdlCjZAlt+a4//zCbr/qDtwhF3dsqbgHc7XU gAvHuJoDDOZDiVi52nCMp4jzlLE/rqLBG9+egqkjPpwERxX1qRVghv4vR91yIrclbX2YkJ kEAk6Y3tXPd7W/CHsp8lG8WhsO/iFNw= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=oEMjM3Dg; spf=pass (imf11.hostedemail.com: domain of andrii@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=andrii@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1732247797; a=rsa-sha256; cv=none; b=bkujSEdJ/DZIULP+UpKMSj7fIr4BBp9O5cn+E8rF8GAUYp3yY/mpa8nKOpx5a3J+tEvsf1 EzW/N3xILgeCBChT0aRAbNE4rf+SYFhMnOYRCrTdo7H8KX5OMhscKbn2FK+AKBIprFLlBh wz0xECM3DPE2tF3yyV4RDD2X0s0CD+g= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id AC79EA40AFF; Fri, 22 Nov 2024 03:57:47 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 84AE7C4CECE; Fri, 22 Nov 2024 03:59:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1732247980; bh=IrM7jUhEG4Z9f//nITfI+eGyW4Lnt6qYBNt5PkL6luM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oEMjM3Dg5YOSh7dsCuJUD6w40TK3OBk1GWuAwaKApntlzya3paJAdHFLEh56H6uYv yIqflIuUP2jbDT8jFBJKMhM1+7pnWeu5LKK0tMgpExDl/NTwRqFTpJtS2ZPnXua/uN FqW5mblLMmkq+2xC18ZZrnLoZsv7EJFaC/8Q/4f9FL2mNhXmIv7ObLUsdsMNOn8tlh 9M3FqqaMNKWxsc3CTMFTQT8usfKrQdETreB3Vb7vb1ZQ73X9S8Fha5EC64fMSHtFOK 8/h9kv/J09xvzr21AqsJHlyvVaPUB5vhEg+9+RKiJcUUUosuDuNNPVwaKzsahksBry WI9YAczrP+iVg== From: Andrii Nakryiko To: linux-trace-kernel@vger.kernel.org, linux-mm@kvack.org, akpm@linux-foundation.org, peterz@infradead.org, mingo@kernel.org, torvalds@linux-foundation.org Cc: oleg@redhat.com, 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, mjguzik@gmail.com, brauner@kernel.org, jannh@google.com, mhocko@kernel.org, vbabka@suse.cz, shakeel.butt@linux.dev, hannes@cmpxchg.org, lorenzo.stoakes@oracle.com, Liam.Howlett@oracle.com, david@redhat.com, arnd@arndb.de, viro@zeniv.linux.org.uk, hca@linux.ibm.com, Andrii Nakryiko Subject: [PATCH v5 tip/perf/core 1/2] uprobes: simplify find_active_uprobe_rcu() VMA checks Date: Thu, 21 Nov 2024 19:59:21 -0800 Message-ID: <20241122035922.3321100-2-andrii@kernel.org> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20241122035922.3321100-1-andrii@kernel.org> References: <20241122035922.3321100-1-andrii@kernel.org> MIME-Version: 1.0 X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 6F6D140009 X-Stat-Signature: wo8besa8ms4tc53okqs9wso3jcqrg55t X-Rspam-User: X-HE-Tag: 1732247915-56577 X-HE-Meta: U2FsdGVkX1+ZFmHG801Y6gRupuzDCCZ8vZeB4iB1fCt5UUvNpQfNivQkvWX6dfS+onRe6vaPFBtZH3FVE7QP5xCLwJ3QK1NPq/Ivi8bT640MWh4nZGvU2Sel2jVkNNcfTxQdojizCOTekIXrhx1v3fbJWXEXpmdE3dawBOjuHn7Aw2qDuIlJNczBRSe4PhP4FFbZzqpcQUhSt5rp44H6RuYlF2znmAEg//r7wMr2ARNg/Wkaip+ipUGocNfRUQcMFrthvdcfSbV2j2IH+rZeQWQh1ssFfUJ49JJPbfJ2PffYkyKe8IFBPsGO46AgZ5MBgTooXQPYPPUePZ7iYAMoyFK7447my0D4czEeiOy7zpHUyTs0uXxKgwYeGfLIVbv08xPDlDbeLO7N0lW8R3X8n/ZXb9y9kr3/kxaXJyVn1S+Sh57BxneEzD/deFlOHzKTDKJmfQ/OCTNLKyStHZVgPk9s/uXvlCR4HbGwCSgiN3heOLjo/rMAu3ZRtIA/h339a1s803miBnDh3a7C2md2Rp0reYVcWni4rF3jbs7iLUsrbN8GDXay8itdMUEudzpgh0wjCwBxJ089XS9ADIJJGcr8ory/8/wvVCleFeejRWrAwPJqeA+5mMDz2pIeVDpI56gPeIr2U75K7BincechZPwurqILuTQu6eotoy7QRi6MtrG7Q54mZ/zVfm8VqHFFl05YhhkeFuYem2fQrolVk80xjqaJL/St+avahZEgySDPuP7gg/BRgzGkVMrRoJNqO5wJ3t7J0MGVtQu7wMEkwangsGL45xGutUru0A3rgE3eCaIlgbPcjac9XvRk5i2g6v+SE5SWJqfeiDJbMUAqmIBx4xZLtPdjTMyZsRlv6JftcHNcd28IPjOVC0qIAFUruCncADsKJvjPcDF2RpeD/VacX8F0aOm9g2jO2dNwH0Esh5Z5j2LsS2PMynaUMqKHGt/E7JopPeRxKzAjqmO evrmDptq hvfPv0BKWje40CgtZdDht7TangWbKg+fLf/ITtuYOKyOPmEv5nyfJrRLFH3e3hcDGN5N7xo41CZqhMNgkk8OxO5maMz2fptY7kSq4t42QTzROiQri5/SWBF2DI9HU/uKNjO4RXya5ujiUglWIqUSs+1RqZQI8Hz9+NnHQu3WhF9iuz840bXZDmtxaFA15OG2MDBu7Fw66G9Fj5fSpZ1OpbeNzdoMBuEudc0SvQ+EZq3BCH/bvg6mjayIjR4sc2nXNoESwaweAN2hvrPbhtbkT8cYi7FzvV2SG4TuFyjscHQvQlryjHC9GsUcKRA== 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: At the point where find_active_uprobe_rcu() is used we know that VMA in question has triggered software breakpoint, so we don't need to validate vma->vm_flags. Keep only vma->vm_file NULL check. Reviewed-by: Masami Hiramatsu (Google) Acked-by: Oleg Nesterov Suggested-by: Oleg Nesterov Signed-off-by: Andrii Nakryiko --- kernel/events/uprobes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c index a76ddc5fc982..c4da8f741f3a 100644 --- a/kernel/events/uprobes.c +++ b/kernel/events/uprobes.c @@ -2305,7 +2305,7 @@ static struct uprobe *find_active_uprobe_rcu(unsigned long bp_vaddr, int *is_swb mmap_read_lock(mm); vma = vma_lookup(mm, bp_vaddr); if (vma) { - if (valid_vma(vma, false)) { + if (vma->vm_file) { struct inode *inode = file_inode(vma->vm_file); loff_t offset = vaddr_to_offset(vma, bp_vaddr); From patchwork Fri Nov 22 03:59:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrii Nakryiko X-Patchwork-Id: 13882755 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 B5729E65D1E for ; Fri, 22 Nov 2024 03:59:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2618F6B0093; Thu, 21 Nov 2024 22:59:47 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1C45D6B009C; Thu, 21 Nov 2024 22:59:47 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0159F6B00C1; Thu, 21 Nov 2024 22:59:46 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id CA5766B0093 for ; Thu, 21 Nov 2024 22:59:46 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 74D88140DAC for ; Fri, 22 Nov 2024 03:59:46 +0000 (UTC) X-FDA: 82812374442.13.DD14C70 Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf23.hostedemail.com (Postfix) with ESMTP id A156D140004 for ; Fri, 22 Nov 2024 03:59:09 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=boGPS3Kj; spf=pass (imf23.hostedemail.com: domain of andrii@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=andrii@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1732247800; 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=+mMqbeL2o6vkDYtgKdjkFpJtnVWvvFegcDtB/ZI2ACw=; b=OQFzaJ8rMoYmVYnLpF0iDuhVOnT9tFVCxkVAgyYzH5a80RL7D1ptMQ2934WcXKGWFuZXto TU1AGWLhFVlPQwK+1XVXMKoXxKg9YonKHFBPEFv0yVXXEOpoHtGIx2L5zl4J6KqI7+K0sd 7zL9eSu/nmYa92njCZGmp1sXxq7PIMw= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=boGPS3Kj; spf=pass (imf23.hostedemail.com: domain of andrii@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=andrii@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1732247800; a=rsa-sha256; cv=none; b=Kcq3liPQ/+3j5/914D7hLcZqqNQF6cQI0o5jnfb84BBfiBqq0p5s0kQ0TZFMUEHOUzTQFe ws+ATvkuI4KuhwL8y8773F3vHdqHIrnYhM0FNz5DcpVi8N1CgcCYM0pMPkeqPc5my8rGT3 yVz4M5oJ7Cq7iFYW6vNGAqkUcdwa0sU= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id E7F6AA40B2F; Fri, 22 Nov 2024 03:57:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B3A31C4CECE; Fri, 22 Nov 2024 03:59:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1732247983; bh=ys8xt4C56rYtjmOzSwyPtxF10s0x/3VqNIJ+VsmJ0ek=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=boGPS3KjNDr/KG+j85/+Yj7deoXpbmw5PBgsj4I0/N5N6XBzhDIPJzB7EXeBGsw9G IkFEk7YvnC/qNEBeIOunDtl1My0YyNf5VV+4uwG8hfs0ie91svLoJSsexyr7Lo5AXT 10+Z6mNku73kl/8WxzKLs4LRR3sE7n9lkDBZeVmTSHJ3bx4WtZSH0KPQFO9Dz0KFHI um3UcBJJBc5WKhoYk6Wy/cZo0K98eXoktIkWowu5amK325mMQgyxYzc9TeFPceYKQQ 3JFHkFA78CRpCGIJc5zKFh9YmRrbpHBJ8b3mcJCgK6Qlh/8iy3I6zoenUArEuXFuh6 QOVKrXx/OxnHQ== From: Andrii Nakryiko To: linux-trace-kernel@vger.kernel.org, linux-mm@kvack.org, akpm@linux-foundation.org, peterz@infradead.org, mingo@kernel.org, torvalds@linux-foundation.org Cc: oleg@redhat.com, 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, mjguzik@gmail.com, brauner@kernel.org, jannh@google.com, mhocko@kernel.org, vbabka@suse.cz, shakeel.butt@linux.dev, hannes@cmpxchg.org, lorenzo.stoakes@oracle.com, Liam.Howlett@oracle.com, david@redhat.com, arnd@arndb.de, viro@zeniv.linux.org.uk, hca@linux.ibm.com, Andrii Nakryiko Subject: [PATCH v5 tip/perf/core 2/2] uprobes: add speculative lockless VMA-to-inode-to-uprobe resolution Date: Thu, 21 Nov 2024 19:59:22 -0800 Message-ID: <20241122035922.3321100-3-andrii@kernel.org> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20241122035922.3321100-1-andrii@kernel.org> References: <20241122035922.3321100-1-andrii@kernel.org> MIME-Version: 1.0 X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: A156D140004 X-Stat-Signature: h61a4o66h9mf6pf957eieqftzi6aixz9 X-Rspam-User: X-HE-Tag: 1732247949-637823 X-HE-Meta: U2FsdGVkX1+xgq9eMS+OMcNyKHevMKJJ+vVHL1TnfkTQu4n4f/hQNHaTCXcR5qg6oKt+cXbnd54765Nr7Rh0FFeOs8N3a5XhZR66l5NtwodlMKqbDXWIRUaaEWJEO9Tv1eltykTYZWBzQqkgOTQz1Pv3cNAAirpQR4rsiVXMj9xVMrXsLeYD2+LehfIXOsRDBhiMyDCT+fz87csN7g1a5Zzg1KQyVda3atwDfROowib1LazqEtEyVUhTRM46FdnqIiK5RpMr9dekPo8m6pSQBwaTjUpGvrTk9/1SZRWOnL1GdWJSyXfK9U4jBuY9yO4y9dax485no72ot36a9YmNcsxA+PNTr3XJuZ25FKHnFrh24gsOuv5o5Wee93MGsjiwIDtFy5vaKt0RjK+ArCGhBn1b97ALnfPGBpr5axPyEuiW8KTWU4JpmfFbx0DdBW0Dsg7hax2tVvCC0M2jvpierHhWYQEiYAmDalNlK2Fu4rIYhqssrybQnHX3/erHAVXY9ZlNvmweyXi3Uzlbru7clAtN4Clz/rMw868PgjEb0/BOV6TDY+2VOZ1/B47Et/dn7V8vj88WAbcPePk5T4g6gOXiYo9dFWMOhcFqBo3lockjwO31MnpLGxUkyW46tii3/IX7JnazrsH64dlwncecA0qzGIj0TY0OQaCDFVu1GzKM4G/b8kaMybTjznEoN25QFMyxHSPjvOlrzzU2NraT5u7cAW+aTjZjGD+aMtABBldkzayIJCPJKwrkqsgwVoWmlRXdfhcHDm5TKnIqdgokwEX5120Nckn5INNCgdESkFJI1yVoqpAvOiqIzSWGzo/CJXoweITj2CMCKtoXbBSFAzN/h4X+pqM55eM0hYk6+WmAcAJEL4nHAgV0KojzX+rtqEfskTHPUYAP/dZrYF0ccsFqHmJWUuoOYydXnnHoaU8VFsDC5luFI03bWvj7A8r3oNg0oJnhSiftVFBNYRL DbLXyZ9D lphmTOYnQrq0I0YdUET/ZBeL5s6HtMqRhbwMmNqwR4dsIRY7z2n3bIaSxHfZxCUPKqo2lmAmBbpM3uVC5THeE1dk4mqg2hOPS/N8sbueQBq03/4hCVkWaIl+r1UsleEZDa4psSaalCtwiGhrQV3LRmX17EU3FyX/Ia5pR5FBqiRVUOyBbBw9WGLibnWs1pthvv61DCi7D8WSdOTqKfqbRKSjnoeMjamzRZ9Cdc/P5W/a+4OzIHe+Cqo0wHQKCJhnFi/vc0sUv90n9K/eeIR92oXe4ABOkkhtqsijh21hrV/uiJAVxsKUVUerfoemCo9KEXSZeoHYsptR69yZWLymmMbxuDEdHNy+HSOVu 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: Given filp_cachep is marked SLAB_TYPESAFE_BY_RCU (and FMODE_BACKING files, a special case, now goes through RCU-delated freeing), we can safely access vma->vm_file->f_inode field locklessly under just rcu_read_lock() protection, which enables looking up uprobe from uprobes_tree completely locklessly and speculatively without the need to acquire mmap_lock for reads. In most cases, anyway, assuming that there are no parallel mm and/or VMA modifications. The underlying struct file's memory won't go away from under us (even if struct file can be reused in the meantime). We rely on newly added mmap_lock_speculate_{try_begin,retry}() helpers to validate that mm_struct stays intact for entire duration of this speculation. If not, we fall back to mmap_lock-protected lookup. The speculative logic is written in such a way that it will safely handle any garbage values that might be read from vma or file structs. Benchmarking results speak for themselves. BEFORE (latest tip/perf/core) ============================= uprobe-nop ( 1 cpus): 3.384 ± 0.004M/s ( 3.384M/s/cpu) uprobe-nop ( 2 cpus): 5.456 ± 0.005M/s ( 2.728M/s/cpu) uprobe-nop ( 3 cpus): 7.863 ± 0.015M/s ( 2.621M/s/cpu) uprobe-nop ( 4 cpus): 9.442 ± 0.008M/s ( 2.360M/s/cpu) uprobe-nop ( 5 cpus): 11.036 ± 0.013M/s ( 2.207M/s/cpu) uprobe-nop ( 6 cpus): 10.884 ± 0.019M/s ( 1.814M/s/cpu) uprobe-nop ( 7 cpus): 7.897 ± 0.145M/s ( 1.128M/s/cpu) uprobe-nop ( 8 cpus): 10.021 ± 0.128M/s ( 1.253M/s/cpu) uprobe-nop (10 cpus): 9.932 ± 0.170M/s ( 0.993M/s/cpu) uprobe-nop (12 cpus): 8.369 ± 0.056M/s ( 0.697M/s/cpu) uprobe-nop (14 cpus): 8.678 ± 0.017M/s ( 0.620M/s/cpu) uprobe-nop (16 cpus): 7.392 ± 0.003M/s ( 0.462M/s/cpu) uprobe-nop (24 cpus): 5.326 ± 0.178M/s ( 0.222M/s/cpu) uprobe-nop (32 cpus): 5.426 ± 0.059M/s ( 0.170M/s/cpu) uprobe-nop (40 cpus): 5.262 ± 0.070M/s ( 0.132M/s/cpu) uprobe-nop (48 cpus): 6.121 ± 0.010M/s ( 0.128M/s/cpu) uprobe-nop (56 cpus): 6.252 ± 0.035M/s ( 0.112M/s/cpu) uprobe-nop (64 cpus): 7.644 ± 0.023M/s ( 0.119M/s/cpu) uprobe-nop (72 cpus): 7.781 ± 0.001M/s ( 0.108M/s/cpu) uprobe-nop (80 cpus): 8.992 ± 0.048M/s ( 0.112M/s/cpu) AFTER ===== uprobe-nop ( 1 cpus): 3.534 ± 0.033M/s ( 3.534M/s/cpu) uprobe-nop ( 2 cpus): 6.701 ± 0.007M/s ( 3.351M/s/cpu) uprobe-nop ( 3 cpus): 10.031 ± 0.007M/s ( 3.344M/s/cpu) uprobe-nop ( 4 cpus): 13.003 ± 0.012M/s ( 3.251M/s/cpu) uprobe-nop ( 5 cpus): 16.274 ± 0.006M/s ( 3.255M/s/cpu) uprobe-nop ( 6 cpus): 19.563 ± 0.024M/s ( 3.261M/s/cpu) uprobe-nop ( 7 cpus): 22.696 ± 0.054M/s ( 3.242M/s/cpu) uprobe-nop ( 8 cpus): 24.534 ± 0.010M/s ( 3.067M/s/cpu) uprobe-nop (10 cpus): 30.475 ± 0.117M/s ( 3.047M/s/cpu) uprobe-nop (12 cpus): 33.371 ± 0.017M/s ( 2.781M/s/cpu) uprobe-nop (14 cpus): 38.864 ± 0.004M/s ( 2.776M/s/cpu) uprobe-nop (16 cpus): 41.476 ± 0.020M/s ( 2.592M/s/cpu) uprobe-nop (24 cpus): 64.696 ± 0.021M/s ( 2.696M/s/cpu) uprobe-nop (32 cpus): 85.054 ± 0.027M/s ( 2.658M/s/cpu) uprobe-nop (40 cpus): 101.979 ± 0.032M/s ( 2.549M/s/cpu) uprobe-nop (48 cpus): 110.518 ± 0.056M/s ( 2.302M/s/cpu) uprobe-nop (56 cpus): 117.737 ± 0.020M/s ( 2.102M/s/cpu) uprobe-nop (64 cpus): 124.613 ± 0.079M/s ( 1.947M/s/cpu) uprobe-nop (72 cpus): 133.239 ± 0.032M/s ( 1.851M/s/cpu) uprobe-nop (80 cpus): 142.037 ± 0.138M/s ( 1.775M/s/cpu) Previously total throughput was maxing out at 11mln/s, and gradually declining past 8 cores. With this change, it now keeps growing with each added CPU, reaching 142mln/s at 80 CPUs (this was measured on a 80-core Intel(R) Xeon(R) Gold 6138 CPU @ 2.00GHz). Reviewed-by: Oleg Nesterov Suggested-by: Matthew Wilcox Suggested-by: Peter Zijlstra Signed-off-by: Andrii Nakryiko Reviewed-by: Liam R. Howlett --- kernel/events/uprobes.c | 45 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c index c4da8f741f3a..3f5577d4032a 100644 --- a/kernel/events/uprobes.c +++ b/kernel/events/uprobes.c @@ -2295,6 +2295,47 @@ static int is_trap_at_addr(struct mm_struct *mm, unsigned long vaddr) return is_trap_insn(&opcode); } +static struct uprobe *find_active_uprobe_speculative(unsigned long bp_vaddr) +{ + struct mm_struct *mm = current->mm; + struct uprobe *uprobe = NULL; + struct vm_area_struct *vma; + struct file *vm_file; + loff_t offset; + unsigned int seq; + + guard(rcu)(); + + if (!mmap_lock_speculate_try_begin(mm, &seq)) + return NULL; + + vma = vma_lookup(mm, bp_vaddr); + if (!vma) + return NULL; + + /* + * vm_file memory can be reused for another instance of struct file, + * but can't be freed from under us, so it's safe to read fields from + * it, even if the values are some garbage values; ultimately + * find_uprobe_rcu() + mmap_lock_speculation_end() check will ensure + * that whatever we speculatively found is correct + */ + vm_file = READ_ONCE(vma->vm_file); + if (!vm_file) + return NULL; + + offset = (loff_t)(vma->vm_pgoff << PAGE_SHIFT) + (bp_vaddr - vma->vm_start); + uprobe = find_uprobe_rcu(vm_file->f_inode, offset); + if (!uprobe) + return NULL; + + /* now double check that nothing about MM changed */ + if (mmap_lock_speculate_retry(mm, seq)) + return NULL; + + return uprobe; +} + /* assumes being inside RCU protected region */ static struct uprobe *find_active_uprobe_rcu(unsigned long bp_vaddr, int *is_swbp) { @@ -2302,6 +2343,10 @@ static struct uprobe *find_active_uprobe_rcu(unsigned long bp_vaddr, int *is_swb struct uprobe *uprobe = NULL; struct vm_area_struct *vma; + uprobe = find_active_uprobe_speculative(bp_vaddr); + if (uprobe) + return uprobe; + mmap_read_lock(mm); vma = vma_lookup(mm, bp_vaddr); if (vma) {