Received: by 2002:a05:6358:5282:b0:b5:90e7:25cb with SMTP id g2csp3328348rwa; Tue, 23 Aug 2022 02:57:45 -0700 (PDT) X-Google-Smtp-Source: AA6agR5wICKur11ZFJ7bSE7pfSqOkiRCmCz31xP+uXnOtD+MfJwfbJ7mpd2ePiT3Qb3FafmCc6vc X-Received: by 2002:a17:907:6288:b0:72f:90ba:f0b2 with SMTP id nd8-20020a170907628800b0072f90baf0b2mr15361769ejc.696.1661248664932; Tue, 23 Aug 2022 02:57:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661248664; cv=none; d=google.com; s=arc-20160816; b=EFvoC4FWYa/VkfhxWZ/pLDXCl7VRqpRFTF2HPq16I2JtBIwmkxEopFE1X3RBbaxZiO 33vq6U9B3XbZjGp66i7EUwzhWhfRyv37pSi56LW+0oL9bG6U5+Bq4g4DK6uOf9pZo16b 9PLUYoigmpnhL+ZPzxhtfv2z4cicH4aj18KeNQ3x4VDEnH6QTpOXclrPlvMg+H/6PpQX ZPaYrWNMURUBNjyTuPH7hc+QcWxXW6S7o8FLQxYkUu6LNlbydhIWhdydJc0MLd8lfLxZ v0osq1Yls9PrR3K56R0jvJM70Ufwe2yWMO2EzZ0jmyHvigM3logKf1zuXwFMi8ZjTKSK +ecQ== 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=cCKQMTP6xTfFZCCr3N1X6TjFUeww1ACcY93xmmZMUF0=; b=1C3qtgpttX+t2x7Cag5an/lgM6GJDlCgGppWJR5QjSxspx0WwFQef6bdQNAUMnyoHK jLpuiEcVZrnGzzubSTlagbTLPZDNJIlp7G6NXmGRjv+xSqkjFxNtZUz8gBa2zi9vo1TY nGU4ysRFT6g01fm+gBDyzwLFMUNT8OCxGAkVBPzozA9jw004yl4E484j2+0TKk0rZd+2 JhC2MnSyILY+J9wKGGFkhnzV8DoXVwCdRbFHN6x+2TAiF5yjZEX0RGxZNHkwEOwIHWh/ Nuah3ZP55ouzIUnjTCpLEX6Tr76PrQvXUD9uF9ZsJalS4R2XkOIbsQ3Hkv62NuUMvNHq 32xQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=maxa2Fz9; 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 ho33-20020a1709070ea100b0073d6d78e986si8075321ejc.470.2022.08.23.02.57.19; Tue, 23 Aug 2022 02:57:44 -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=maxa2Fz9; 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 S243644AbiHWJjt (ORCPT + 99 others); Tue, 23 Aug 2022 05:39:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58626 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238703AbiHWJjE (ORCPT ); Tue, 23 Aug 2022 05:39:04 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7173F71719; Tue, 23 Aug 2022 01:41:02 -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 30D3061555; Tue, 23 Aug 2022 08:40:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 329A1C433C1; Tue, 23 Aug 2022 08:40:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1661244014; bh=yXT7p9wh4HXbnK7OLAUNhB3dmPOuBMTo6K5JG9vx2iU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=maxa2Fz9UJIUiDMYXC87Ou1qna6n4ViNIGkYDg1qw8S0lZJ2c7nvIP5XsPBt8HaRH 2C1Vqesnne+tqmNykHUNP9gWX/EYslbGwLHOUZd7IjhJdl+Eov2Bi1SCa14zah8CnA IuW8imjCHgo+gC+TmmwWCcOdTtHzLUy97/MgF+fA= 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.15 024/244] tracing: Have filter accept "common_cpu" to be consistent Date: Tue, 23 Aug 2022 10:23:03 +0200 Message-Id: <20220823080059.865776107@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220823080059.091088642@linuxfoundation.org> References: <20220823080059.091088642@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 @@ -176,6 +176,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);