From patchwork Tue Feb 20 14:06:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 203624 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp430413dyc; Tue, 20 Feb 2024 06:18:52 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWkRLbLVNk89MEAYDMwWXI9Kqc1mntVqyrMheYNHHJkZqfvsATavShWTA+hrq6rZxYZFAIMgrCH/W9Y2um5dNaws+50aA== X-Google-Smtp-Source: AGHT+IEaghj5+rLzNYjv7qlSGmksAKzwi7tZjzG36JiAVntDWkAKSu0ymTZWxqBchyS++GxVwxaM X-Received: by 2002:a05:6a00:180d:b0:6e4:68fa:f1f9 with SMTP id y13-20020a056a00180d00b006e468faf1f9mr6179706pfa.2.1708438732268; Tue, 20 Feb 2024 06:18:52 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708438732; cv=pass; d=google.com; s=arc-20160816; b=B79pRI1oleVj9KTQQXX5U54uzrlLmYmPGX2kU3g+1CuFS6BOZqi0nYmBZro1hfrmRo O7daqQTkXgkV9tjDalg2E7R0quocx2z0VGzV+30ZkiKU8Ssyb8QkENChttMkBIc2L1zn tzZVjx4LOYwQP9s1Ihb8J9fzJwuq3VP+6my5Q8AZH4AS8QKeCkW2sD4YpfhtphO5Lqi+ qAk80M6K5RYGYCCYTEk06x80olxNeGyg0PEAWeleJ1n4VSi35yw6NbtNarvPlsVDU1LF fFA3M6foXB8h5uNB0wr9ekMw7DiZvmYJCAT+KAxa9V3wG7bk2UDsMisbLZaBGdURtBP9 m7xQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :references:subject:cc:to:from:date:user-agent:message-id; bh=ytkQHM3rN7f64VSnUC6Ez+L8HS49rIF6r1MpiCj79AM=; fh=agDjUWYo9fuGLwPVzoFqoP6tQUAdz5VzwVjdQhFyOi4=; b=zhBy8iZdpS/lTrn2xkjDLy/Jl8L/thHMDZkuhWcTm7Dx4v3A7+4KE+cWJc5Vfnh7Jp i/qSgDimbbe0VlxeKeTDe6S5z9RY1VmXRlQdaiJ+yNUgg5PAhggBRU7uhvY+toN5UYQx fMMaDC2mP3QX/KT/iqKpRNVLgCvVrbR1Qki3j8Scq1/rvx8TOODrOaKAjaOwDxiQ3QaL LgK4K2S9DfDJVVHtz8Z49yelj4pU2zah5i0ieJxs7gTEBVjBnDXxE2GVGAuyy7mjIXT6 ANrkLZeQjM+E6FFYObUsdLvpznIR7Gcq/rieKb2Jt1x9EMsFphTixr89xc5rIAR0Uis7 Kx4g==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of linux-kernel+bounces-73138-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-73138-ouuuleilei=gmail.com@vger.kernel.org" Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id t13-20020aa78f8d000000b006de378fb498si6238155pfs.249.2024.02.20.06.18.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 06:18:52 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-73138-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of linux-kernel+bounces-73138-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-73138-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id E4A5AB23B6F for ; Tue, 20 Feb 2024 14:05:54 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 55B536F074; Tue, 20 Feb 2024 14:05:20 +0000 (UTC) Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 04F136A351; Tue, 20 Feb 2024 14:05:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708437918; cv=none; b=KXzEcOQ2QkRfSQXNHorzL+eTEHZQgI+DD1QZIh2q8AgeSadVpF8ekiF/xxBJ7aQsQruc4TsADEI5wv0DXD8/VgEO3RY2JiFV/QWOQMnV8SY1v7wiLViVb8ppYvr2fVeDLlcyJlQRR/Wnfe3tSfDDwOPJvEQbjs9GuzLPYE5MVQI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708437918; c=relaxed/simple; bh=3QSNHN93sGXVCGki/9m6nhWZGDsN8nXFzji0P87AlhE=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=BglWZvpVx/4hDPZGZ67qvey6P/MbLug91D3mx49Y7vkK48QY6spfZS0MiFGlP7VrbGJ5LdOLZSvBvrNGq+Dsuca0qS1xaZERkndFHZooApuDnQwwJi4cP8ZKs71KhHkxxofS3bNWcBmjWBSz5mvaMDplVWGsLYoD8L5dsnsJOPM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id B0B1BC433A6; Tue, 20 Feb 2024 14:05:17 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.97) (envelope-from ) id 1rcQlz-0000000267G-1zMG; Tue, 20 Feb 2024 09:07:03 -0500 Message-ID: <20240220140703.338116216@goodmis.org> User-Agent: quilt/0.67 Date: Tue, 20 Feb 2024 09:06:15 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , Tim Chen , Vincent Donnefort , Sven Schnelle , Mete Durlu Subject: [PATCH v4 2/3] tracing: Move open coded processing of tgid_map into helper function References: <20240220140613.782679360@goodmis.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791427852013028451 X-GMAIL-MSGID: 1791427852013028451 From: "Steven Rostedt (Google)" In preparation of moving the saved_cmdlines logic out of trace.c and into trace_sched_switch.c, replace the open coded manipulation of tgid_map in set_tracer_flag() into a helper function trace_alloc_tgid_map() so that it can be easily moved into trace_sched_switch.c without changing existing functions in trace.c. No functional changes. Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace.c | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 52faa30e64ed..06c593fc93d0 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -5432,10 +5432,31 @@ int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set) return 0; } -int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled) +static int trace_alloc_tgid_map(void) { int *map; + if (tgid_map) + return 0; + + tgid_map_max = pid_max; + map = kvcalloc(tgid_map_max + 1, sizeof(*tgid_map), + GFP_KERNEL); + if (!map) + return -ENOMEM; + + /* + * Pairs with smp_load_acquire() in + * trace_find_tgid_ptr() to ensure that if it observes + * the tgid_map we just allocated then it also observes + * the corresponding tgid_map_max value. + */ + smp_store_release(&tgid_map, map); + return 0; +} + +int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled) +{ if ((mask == TRACE_ITER_RECORD_TGID) || (mask == TRACE_ITER_RECORD_CMD)) lockdep_assert_held(&event_mutex); @@ -5458,20 +5479,7 @@ int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled) trace_event_enable_cmd_record(enabled); if (mask == TRACE_ITER_RECORD_TGID) { - if (!tgid_map) { - tgid_map_max = pid_max; - map = kvcalloc(tgid_map_max + 1, sizeof(*tgid_map), - GFP_KERNEL); - - /* - * Pairs with smp_load_acquire() in - * trace_find_tgid_ptr() to ensure that if it observes - * the tgid_map we just allocated then it also observes - * the corresponding tgid_map_max value. - */ - smp_store_release(&tgid_map, map); - } - if (!tgid_map) { + if (trace_alloc_tgid_map() < 0) { tr->trace_flags &= ~TRACE_ITER_RECORD_TGID; return -ENOMEM; }