From patchwork Tue Oct 1 14:57:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Tzvetomir Stoyanov (VMware)" X-Patchwork-Id: 11169005 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 089BE15AB for ; Tue, 1 Oct 2019 14:57:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DA638215EA for ; Tue, 1 Oct 2019 14:57:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="HEYi+4us" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727194AbfJAO5r (ORCPT ); Tue, 1 Oct 2019 10:57:47 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:52333 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389329AbfJAO5r (ORCPT ); Tue, 1 Oct 2019 10:57:47 -0400 Received: by mail-wm1-f68.google.com with SMTP id r19so3767355wmh.2 for ; Tue, 01 Oct 2019 07:57:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ugZYebTA8xjE45oYi746SmlcKozZIFe+310+2L99MNc=; b=HEYi+4us5q2OWRVk7CIEpv1QVNnUmQGhl8jIyw78xhe8FxV1V3OJvvxQ80/GqsdW4k i6DkrzRiZqtadtJZea64QIpfjkOC8Vvrsnum+Uu6nFb2L1m0PFp2FS+kXqwtC+C5ZObB Tk/DUWj5CXkL+L3B6Ml+y7fbX/PYAljodc/rpUMFgYWNEH7sbiByjqgXeZuZCDnuscmy Les0AEkXjaD2VPVkJnUcGNvUAAr8k9/J0L/7I743mU1NFlKP5L95HY/EqYr0J+KN0+gM ojfKah2hfjNYasyQI5brHIkUPi/P0TsqBw5Yvb6TPl8Ii4a7PHU37Lxwo755QwD40D0F mHag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ugZYebTA8xjE45oYi746SmlcKozZIFe+310+2L99MNc=; b=aF0SDczNZtCtwtfd/8U0BDc1v9CsGbgHCqmhs38rnTkOv5X1LeIncPn7n6jQz5F4tJ squbn7ayaCDdDCpypjGSdtOqwtH/4rNUKfXg087Tu6AzZ6IJ+ENLskL05WFYAskY/nuN a1ek607khnE4ggA8HIcRhfIdNxsZWqWzZHhStFWrkH4e7pryNVuf9hYt4o7aVjtXNc5F EOStQhpzyqD1EOHko7vyDcPH6HGuo+GQM4UxF+64Dxl4R4FZm1Ai4c63aIWrG0YYcFgV ugAegVHFnnwSXJP2Y49SUuEtdpifTlo/iYhpRjychT/AGPLxL1+N1btXg8GuhKmo78mF cCWg== X-Gm-Message-State: APjAAAWrSznSS9f2utI2FFC9vnFx0N58/4GL0TzT5jGukaDmHT8DsTfp ccEikmYtUG48VDWjGw3nLlM9yGYf X-Google-Smtp-Source: APXvYqz6Egq4bMqDM4NJ9TOH0PBPwf/huob6UpBT+Du9AxhaHhk1HDqDtzsS/FlxeVCNMtGYglmNkQ== X-Received: by 2002:a05:600c:230d:: with SMTP id 13mr4345648wmo.114.1569941865788; Tue, 01 Oct 2019 07:57:45 -0700 (PDT) Received: from oberon.eng.vmware.com ([146.247.46.5]) by smtp.gmail.com with ESMTPSA id f13sm3220758wmj.17.2019.10.01.07.57.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Oct 2019 07:57:45 -0700 (PDT) From: "Tzvetomir Stoyanov (VMware)" To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org Subject: [PATCH v2 2/2] trace-cmd: Reset CPU mask to its default value with "trace-cmd reset". Date: Tue, 1 Oct 2019 17:57:40 +0300 Message-Id: <20191001145740.8866-3-tz.stoyanov@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191001145740.8866-1-tz.stoyanov@gmail.com> References: <20191001145740.8866-1-tz.stoyanov@gmail.com> MIME-Version: 1.0 Sender: linux-trace-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org "trace-cmd reset" command should put all ftrace config to its default state, but trace cpumask was not reseted. The patch sets cpumask to its default value - all CPUs are enabled for tracing. Signed-off-by: Tzvetomir Stoyanov (VMware) --- tracecmd/trace-record.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/tracecmd/trace-record.c b/tracecmd/trace-record.c index 69de82a..6f3520c 100644 --- a/tracecmd/trace-record.c +++ b/tracecmd/trace-record.c @@ -4096,6 +4096,40 @@ static void reset_clock(void) write_instance_file(instance, "trace_clock", "local", "clock"); } +static void reset_cpu_mask(void) +{ + struct buffer_instance *instance; + int cpus = count_cpus(); + int fullwords; + char *buf; + int bits; + int len; + + fullwords = cpus / 32; + bits = cpus % 32; + len = (fullwords + 1) * 9; + + buf = malloc(len + 1); + if (!buf) { + warning("Unable to allocate %d bytes for cpu mask", len + 1); + return; + } + buf[0] = '\0'; + if (bits) { + sprintf(buf, "%x", (1 << bits) - 1); + } else if (fullwords) { + strcat(buf, "ffffffff"); + fullwords--; + } + while (fullwords-- > 0) + strcat(buf, ",ffffffff"); + + for_all_instances(instance) + write_instance_file(instance, "tracing_cpumask", buf, "cpumask"); + + free(buf); +} + static void reset_event_pid(void) { add_event_pid(""); @@ -4808,6 +4842,7 @@ void trace_reset(int argc, char **argv) reset_clock(); reset_event_pid(); reset_max_latency_instance(); + reset_cpu_mask(); tracecmd_remove_instances(); clear_func_filters(); /* restore tracing_on to 1 */