Received: by 2002:a05:6358:5282:b0:b5:90e7:25cb with SMTP id g2csp3475412rwa; Tue, 23 Aug 2022 05:29:53 -0700 (PDT) X-Google-Smtp-Source: AA6agR62C8MaCHKT4at+Tp5MEqv2IHzEmJUi4u4PUA9orEd5ibtdtVDhUI76icEpaJR7qG6Yrwl1 X-Received: by 2002:a63:5a10:0:b0:429:d91c:e146 with SMTP id o16-20020a635a10000000b00429d91ce146mr20611017pgb.19.1661257661811; Tue, 23 Aug 2022 05:27:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661257661; cv=none; d=google.com; s=arc-20160816; b=oEhxpgVAkd7SR2U4EEcW2cDVGKWyjsq/Cxg+I71K7y0aaE2dDW7c6CKTV0YAJt8p7H 9b95VSgokaJzPo5SluhzlfoSpMm/i1h/UX08NgSyqYFW0N0JsigVXuwpA1FfY/EQzk1+ CdobdMDrfG2GC/zHzrVKpprv8uG0bci+WzBR5PJbZRQWTnIiSnBjPn9OepDHZtnohRNQ bd4NiAZozDFl2PVZx07/LHs5PKcXNyB6hkqGc2LIV03cE9CMKdERDK3jsaRJa9amJ5VX mkdiFdoq+wA15T7BRYC0TpOeVno9wsL6XFQWfUt7LwZtn8T1NaOl/aaRbD1qn1XeDD+r cO4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=s/pu8xK1LoZcee8OcGSz0JSVqt7LMcsrlGgyxmTQDnw=; b=cO0WrWvPtivZy9yzdigNLoRPEhuuTRsGL2WCYPfpYi8yozf9yqu3uohtmhIqmTJHD2 TtRDAeWg69lbN6tE4yQt0YRPYvjk7Se7t8yxu6eLK10hEW4xPupJOsibvIbtPgVyxPWt MiRIMae5Oj5NAL2AKR/Ibwm1kBi57aX9NBl/RTi5wr3dm+Z5f2tkux4YPgbAQqiI71YF h8sKcHYfT1fB6Rmr7rFfm0j6vO4fHbUUjhsHgCpEKuVxjvpFDuQCmRM613/K3WRpDglU 0V+1VmKSW+w/CpzyQLN4VBUKktBnHSv6xRv6uEHqqL+D7SSC7t53JpZktUU3J0SECp91 fBIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=TY4o4D5v; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y18-20020a170902ed5200b0016ef1d4c4fbsi14943828plb.320.2022.08.23.05.27.31; Tue, 23 Aug 2022 05:27:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=TY4o4D5v; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1358299AbiHWLtR (ORCPT + 99 others); Tue, 23 Aug 2022 07:49:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52882 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1358179AbiHWLrH (ORCPT ); Tue, 23 Aug 2022 07:47:07 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 96B9FD276B; Tue, 23 Aug 2022 02:30:36 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 9A4C0612B5; Tue, 23 Aug 2022 09:30:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A2416C433C1; Tue, 23 Aug 2022 09:30:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1661247021; bh=BHFna084pn5MOacG9nBUkhKjVk4MnmkKBvgPQsiETg0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TY4o4D5v9f1MmHSSAAacLaSNJ8s9ZXcB2y0hbrl7mT/Mxd5SbZIjr0Ker+JCxXzU4 oJHK/uKeiq3y2DnqyCWCpX0a5rB1yHm3hKx3ntYopqLr8zTS5usUzbuxDkxduTJaF4 5Mvns+lKrfkOkNLNN6+0uWFhrVOy/JELNkuRki5s= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ingo Molnar , Andrew Morton , Tzvetomir Stoyanov , Tom Zanussi , "Masami Hiramatsu (Google)" , "Steven Rostedt (Google)" Subject: [PATCH 5.4 292/389] tracing: Have filter accept "common_cpu" to be consistent Date: Tue, 23 Aug 2022 10:26:10 +0200 Message-Id: <20220823080127.750902149@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220823080115.331990024@linuxfoundation.org> References: <20220823080115.331990024@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Steven Rostedt (Google) commit b2380577d4fe1c0ef3fa50417f1e441c016e4cbe upstream. Make filtering consistent with histograms. As "cpu" can be a field of an event, allow for "common_cpu" to keep it from being confused with the "cpu" field of the event. Link: https://lkml.kernel.org/r/20220820134401.513062765@goodmis.org Link: https://lore.kernel.org/all/20220820220920.e42fa32b70505b1904f0a0ad@kernel.org/ Cc: stable@vger.kernel.org Cc: Ingo Molnar Cc: Andrew Morton Cc: Tzvetomir Stoyanov Cc: Tom Zanussi Fixes: 1e3bac71c5053 ("tracing/histogram: Rename "cpu" to "common_cpu"") Suggested-by: Masami Hiramatsu (Google) Acked-by: Masami Hiramatsu (Google) Signed-off-by: Steven Rostedt (Google) Signed-off-by: Greg Kroah-Hartman --- kernel/trace/trace_events.c | 1 + 1 file changed, 1 insertion(+) --- a/kernel/trace/trace_events.c +++ b/kernel/trace/trace_events.c @@ -166,6 +166,7 @@ static int trace_define_generic_fields(v __generic_field(int, CPU, FILTER_CPU); __generic_field(int, cpu, FILTER_CPU); + __generic_field(int, common_cpu, FILTER_CPU); __generic_field(char *, COMM, FILTER_COMM); __generic_field(char *, comm, FILTER_COMM);