From patchwork Mon Feb 3 09:28:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vlastimil Babka X-Patchwork-Id: 13957129 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 7D73DC02192 for ; Mon, 3 Feb 2025 09:29:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E54D028000F; Mon, 3 Feb 2025 04:29:32 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DE806280010; Mon, 3 Feb 2025 04:29:32 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C2CE828000F; Mon, 3 Feb 2025 04:29:32 -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 A06A9280002 for ; Mon, 3 Feb 2025 04:29:32 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 4A621142688 for ; Mon, 3 Feb 2025 09:29:32 +0000 (UTC) X-FDA: 83078110584.05.61E744C Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by imf14.hostedemail.com (Postfix) with ESMTP id 26391100003 for ; Mon, 3 Feb 2025 09:29:29 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf14.hostedemail.com: domain of vbabka@suse.cz designates 195.135.223.130 as permitted sender) smtp.mailfrom=vbabka@suse.cz ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738574970; 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; bh=NLVxjPmr18uIiWai3L/1VQFpWIRfTic1Kusz0acFGBc=; b=iUO/hbKnpTN7r1QuXLKIY98L11Tlq1eJBXZSoUY2suXfzmDG7hQuPZb03SeGvBR6Ht32lE ZvON9J5sIVxcG4lB2dpXpnmxTU4eUqm2/pB3XWSR8+zuc5BaArwrIIB8vEL/UYTjJGv1kp QW1gzCzMDoJGJl+mie8wYmWs8Feifaw= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738574970; a=rsa-sha256; cv=none; b=FXCWouEIOyYV7GfEOnfmWtRDvc1xxz8HfUu7fIVKv0cL5gn851WmGipOoc6zwxmxvjSLww 2CUCddAJ54N9cbjch5fsyjsbUqNyI6BPtOvhXYS784GI8iboIyudZgfzjB6hVmhDxJ2JHN a8R3gU+lejpJBitSQuCl5Nf+6/i9Qiw= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf14.hostedemail.com: domain of vbabka@suse.cz designates 195.135.223.130 as permitted sender) smtp.mailfrom=vbabka@suse.cz Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 98FFC21137; Mon, 3 Feb 2025 09:29:28 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 78FEC13A96; Mon, 3 Feb 2025 09:29:28 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id ALNDHXiMoGfwYAAAD6G6ig (envelope-from ); Mon, 03 Feb 2025 09:29:28 +0000 From: Vlastimil Babka Date: Mon, 03 Feb 2025 10:28:48 +0100 Subject: [PATCH 2/4] rcu: remove trace_rcu_kvfree_callback MIME-Version: 1.0 Message-Id: <20250203-slub-tiny-kfree_rcu-v1-2-d4428bf9a8a1@suse.cz> References: <20250203-slub-tiny-kfree_rcu-v1-0-d4428bf9a8a1@suse.cz> In-Reply-To: <20250203-slub-tiny-kfree_rcu-v1-0-d4428bf9a8a1@suse.cz> To: Christoph Lameter , David Rientjes , "Paul E. McKenney" , Joel Fernandes , Josh Triplett , Boqun Feng , Uladzislau Rezki Cc: Andrew Morton , Roman Gushchin , Hyeonggon Yoo <42.hyeyoo@gmail.com>, linux-mm@kvack.org, Steven Rostedt , Mathieu Desnoyers , Lai Jiangshan , Zqiang , rcu@vger.kernel.org, Vlastimil Babka X-Mailer: b4 0.14.2 X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Action: no action X-Stat-Signature: gisoo4uusg4h7nifbshqym98eopw5ky6 X-Rspam-User: X-Rspamd-Queue-Id: 26391100003 X-Rspamd-Server: rspam03 X-HE-Tag: 1738574969-541509 X-HE-Meta: U2FsdGVkX18jvao2yMeZpRD5JjgQrx4eSH+/8GYNjyYZiHvubudfcyY5RRvAlfy6gRZr26YsXXMgz7TH9H9TUrHgQlcetfOid33XbYlSO3rau5AMXA5LLA5pWa6ELLBDWlnQA9K37oeXl4/+7tuyz6CyP8a3SG6cofwLnQeTSiCqcBy6gox/tDMqVck19zao0gvR7MMraumUigG5e/+Ycs4qj6JQRP1PqtpUWsj6gNqb+1UADkArR7eXnSMjSDzXnRdcWKzrZSWMLwd5Ol2BTH1kr7umTUTYQQZCTTUNx9UGHtRrfXesgHWIpX0TQ9TzwAI5nDpn+VPEUrNBtT2Q9RCnUmxI6aVDZLHUqFsU+4/O7M1+Ru8k4YSAGKQTxxGHuw2HJvZfggUu7S4PPSjHaxEQMZWrMc4liNf89a6LhG6RokIJP2jukXI6inrNeLAJ9jR+ZdZDMZImStuihNnLak2jxvXTLkYEsAmIazl0/SnstoMCpNpwlio6poQChmrcZFb4vLdgBb4MoHlXiNAYKREHbQtF8icUrfmW9TWFHbm5Jbf4pnwryrP2iE9hGHVtApY/dsjDeALRkksNGV1Plbx3SG9uccjKrfhM/jUH0gahJ2xqDKQeazANYhmFfK7XIwDkSQypk/nE9NIeUePPHHIcUPXjMUBxZcc42GAmfxJciGdiONYsns0EueZbV1YqXk42x2/dqjk13xtFUJcf28m5E7TV+atOMynywHA87BySNvsTnoHSYLxQGFEF5buvqaSjJPrFJ6z5iTc+cZtWhpl/wWnyj6aMspD0rxzfE0VzmXhfNN+0clVDNL3xro8j93y4GcIQWchL+6y1yyvmmAlvgmDNC50uBAoGc1gM23jUdn3jHYy5dwqr6KiUygFMYqFLizUL7ZxJ2BFqGzAls0x6qFDFbZe3Qd/GXaoG51Yp94cbX7isOoW+Lyb3BO+7vulSIdqXQPlmly4fYud mnYlqO4D VTPQ/YVkMLVHdoYvd8v8akHksLpo69lONUtpkkeG++pyVh9QQZT3lwTIggKxCbEiazVZU8rN0ZwzTmKSD5mXmZkJz4/mT435Uce0H7pSgucO/w+/fFfa+y3u+Z5Ysdc8qZ18QjYv0DGlC/e7ULaUtkGUdBO7iTfK0O4e9C50h5j89D/OCLmIg2IbhwBXuXgtMucufmnaptektIzvanvZCEJOgcpE5viA+ni1NXX1Wt6LKm7kpVNjeWLBYsiwxTf10sBGmFB13J1KapkzivdDTo2l23ZpjMyZl8AMd 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: Tree RCU does not handle kvfree_rcu() by queueing individual objects by call_rcu() anymore, thus the tracepoint and associated __is_kvfree_rcu_offset() check is dead code now. Remove it. Reviewed-by: Joel Fernandes (Google) Signed-off-by: Vlastimil Babka Reviewed-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> --- include/trace/events/rcu.h | 34 ---------------------------------- kernel/rcu/tree.c | 9 ++------- 2 files changed, 2 insertions(+), 41 deletions(-) diff --git a/include/trace/events/rcu.h b/include/trace/events/rcu.h index e81431deaa50b21725b08ad7c1a2992a0074065a..ac3b28b8939b78843aecb44bed8cb76c451ab060 100644 --- a/include/trace/events/rcu.h +++ b/include/trace/events/rcu.h @@ -560,40 +560,6 @@ TRACE_EVENT_RCU(rcu_segcb_stats, ); -/* - * Tracepoint for the registration of a single RCU callback of the special - * kvfree() form. The first argument is the RCU type, the second argument - * is a pointer to the RCU callback, the third argument is the offset - * of the callback within the enclosing RCU-protected data structure, - * the fourth argument is the number of lazy callbacks queued, and the - * fifth argument is the total number of callbacks queued. - */ -TRACE_EVENT_RCU(rcu_kvfree_callback, - - TP_PROTO(const char *rcuname, struct rcu_head *rhp, unsigned long offset, - long qlen), - - TP_ARGS(rcuname, rhp, offset, qlen), - - TP_STRUCT__entry( - __field(const char *, rcuname) - __field(void *, rhp) - __field(unsigned long, offset) - __field(long, qlen) - ), - - TP_fast_assign( - __entry->rcuname = rcuname; - __entry->rhp = rhp; - __entry->offset = offset; - __entry->qlen = qlen; - ), - - TP_printk("%s rhp=%p func=%ld %ld", - __entry->rcuname, __entry->rhp, __entry->offset, - __entry->qlen) -); - /* * Tracepoint for marking the beginning rcu_do_batch, performed to start * RCU callback invocation. The first argument is the RCU flavor, diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c index 475f31deed1418d73d097bb4d39fe714814fefa3..5dbc4189037c501b8c671598131ed5ea6d4afd71 100644 --- a/kernel/rcu/tree.c +++ b/kernel/rcu/tree.c @@ -2931,13 +2931,8 @@ static int __init rcu_spawn_core_kthreads(void) static void rcutree_enqueue(struct rcu_data *rdp, struct rcu_head *head, rcu_callback_t func) { rcu_segcblist_enqueue(&rdp->cblist, head); - if (__is_kvfree_rcu_offset((unsigned long)func)) - trace_rcu_kvfree_callback(rcu_state.name, head, - (unsigned long)func, - rcu_segcblist_n_cbs(&rdp->cblist)); - else - trace_rcu_callback(rcu_state.name, head, - rcu_segcblist_n_cbs(&rdp->cblist)); + trace_rcu_callback(rcu_state.name, head, + rcu_segcblist_n_cbs(&rdp->cblist)); trace_rcu_segcb_stats(&rdp->cblist, TPS("SegCBQueued")); }