Received: by 2002:a05:6358:5282:b0:b5:90e7:25cb with SMTP id g2csp3407097rwa; Tue, 23 Aug 2022 04:22:50 -0700 (PDT) X-Google-Smtp-Source: AA6agR5mcnUOwm8UlVYo1cJSN9IdfERbtZYLmDCI/v7Mxgrs4OR6dxwdZpIrsc2eG4d8W54OU+Rp X-Received: by 2002:a17:90b:388f:b0:1f5:7748:9667 with SMTP id mu15-20020a17090b388f00b001f577489667mr2886855pjb.158.1661253770513; Tue, 23 Aug 2022 04:22:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661253770; cv=none; d=google.com; s=arc-20160816; b=mFSQLX+BQIlZbRkReICH+csqC7RSXETMc3wi88IfYD17aVnHjUH8aU5e+jIqXe7r9P I4HOuwplHY2xh0pgpTr3+G4mRLIqcXzzIwjCHeRKMxLEIqvYDbTYNC4wydO8h3dnCZtp rCAtZKTXSfZxn5w2z98Ql1EgylayaX3I0jiOlbvAbkNL0F34/GKS2duVQcTwPXbDzEkP 4SsquDKIUAE9y2IsRdyZdOeFbFHNM36dgDuMdGhxcI3PxkT65jeT3msO0jjNPQ+hjNYr KWABAGkxV2mKdd/bobbNhKJ2AGz7NwLKCzCgn7RfG1JZSipEOYSrRh3sqGtwDvXHBvLY MnIA== 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=1yBjji1u80JXt6LVUERqgl3EzhgYxCa2Q+pCZmL98lU=; b=u9sU8P8VM1O6shZAxOBrkX2GvH500C4oL/BFiNtKHKJh27y8hWgkHkz7K0o8YzNFAS uYaQalrpWGVJxJifJljByLap35l4SDYt8w1UHROm/3wX1eNVg84D8sodSzKG4+zJu7eN 4Nxq1zS1bL+Rs6Dfpm38/uHAla6Vk3jNxwXGGnan8nPwjs8VwzU/AxpCkAPy76Zd+9mT GNFy1ZVOY6oSS+/jdZksh0m5nBcuA3VJXGAWhQqXoI8jp4fjGSCp9bpTI02H2XN25daf kHDCGZdX+t3Sx9sXG/J7hjDxKz6XTL8Vt8p01D2dxL/51VPpGjTNk8uq80hZoUSGKkRm aF3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=aT+UaxF6; 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 r10-20020a639b0a000000b003fa8e644434si16793582pgd.39.2022.08.23.04.22.38; Tue, 23 Aug 2022 04:22:50 -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=aT+UaxF6; 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 S1356148AbiHWKxk (ORCPT + 99 others); Tue, 23 Aug 2022 06:53:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34048 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1355907AbiHWKpi (ORCPT ); Tue, 23 Aug 2022 06:45:38 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3A4F56CF45; Tue, 23 Aug 2022 02:11:25 -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 C714260DB4; Tue, 23 Aug 2022 09:11:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BB8DBC433D7; Tue, 23 Aug 2022 09:11:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1661245884; bh=Sre9OUNT1C+sApeMd7ViCEj8XBfVPEfA34NRRnDMWGU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aT+UaxF6VTs9YJqCsvpMlcFlbhepuDwTg9d6GHIiCyYZnwbK/zh6h6QgwxDls0Hdk pgCiy1/z+Wk9WEZ7z6cdmrphxXzECDqn+hJEWpFl34jdBIQt9iIEGf2qOD6N5QYAMW 7/P6FZP9QCuK7d1wPVp82QSMvPsr9zSKKXo28uUU= 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 4.19 221/287] tracing: Have filter accept "common_cpu" to be consistent Date: Tue, 23 Aug 2022 10:26:30 +0200 Message-Id: <20220823080108.418975031@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220823080100.268827165@linuxfoundation.org> References: <20220823080100.268827165@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 @@ -173,6 +173,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);