Received: by 2002:a05:6358:5282:b0:b5:90e7:25cb with SMTP id g2csp3291690rwa; Tue, 23 Aug 2022 02:07:07 -0700 (PDT) X-Google-Smtp-Source: AA6agR4YW4P79mWCB7kry0c+Fu85fbj52SuKqbE+caPJuKHAHnaItGtdSA56STMFira3QfRlk6U4 X-Received: by 2002:a17:906:cc4a:b0:73d:a494:5205 with SMTP id mm10-20020a170906cc4a00b0073da4945205mr713264ejb.737.1661245627086; Tue, 23 Aug 2022 02:07:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661245627; cv=none; d=google.com; s=arc-20160816; b=ZkuqiWbJcCxSRP3xOIB+WZ+moBDLqPkq3G9Q11Nv1hlaj7EFplJWC+4vd1gQWEt9IL u0RJJWRuiH5bkBnaUcDaqcN57OdAqKkI81Gxqau14N419DYh2M9Hma9MAxgb5GlKnoif MLJfUXfER6caDJD5bP26K5DTtKm9rnZLmRG/U3+PwiYnYedTqXMfif7IcjfTpkoneaRK Ii3fHyGNiDh3obn39HXsGYv15uuGfyFGfQ2vwK0/i0+dxzEV1bbZ8qifYFBldiiuJ20A ZWmMK52PbIurjdNbuuX947WXJ9zQTGkl0izFEXDnXs0y2QtTF8vyDO8gB/l5IwwhiAez TWsw== 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=a6LrCOTKQQ2Jq1qZNKn87HuP1dskH4Tj5t/O6dDWHQR9HE5IJFNK9V0FxI5XefxAZE wNitwSmMLNvMtOeonu8tJlmKQt2GobuADlCyWsCpb+524cwe1oPdJzr3pt/huC7Mrjpn xs3IClYKPQxGMjoAcA6GMpJ8xuzHkyNJX6vYSxlQUAUAvEw1eErHmp6ia+roflfErJQ4 h4F0dUHppeMhRfz5zY/4M6/JY4YrJdg4WEoLHv2q2/02gcKjfccsOuiBDiLLE2cJQaFo VXoQBgbpRXY3UFCcMkDU2iJNhrCu2/897Qs087Vnsaufh47g4R/GsKHM4KdlXCtpQ0jE aL8A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ssVVp2w7; 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 17-20020a508e51000000b0044202060b7csi1598531edx.430.2022.08.23.02.06.41; Tue, 23 Aug 2022 02:07:07 -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=ssVVp2w7; 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 S242551AbiHWIRz (ORCPT + 99 others); Tue, 23 Aug 2022 04:17:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34446 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242517AbiHWIL2 (ORCPT ); Tue, 23 Aug 2022 04:11:28 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ED8086170A; Tue, 23 Aug 2022 01:08:40 -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 B8D06611A8; Tue, 23 Aug 2022 08:08:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BD78CC433D6; Tue, 23 Aug 2022 08:08:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1661242119; bh=yXT7p9wh4HXbnK7OLAUNhB3dmPOuBMTo6K5JG9vx2iU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ssVVp2w7rKbcc6Kg38OK/17GwbmAuPpsYnYBKgn9srLdqwGi57jBfai7a3Kl7pkDg qVi30VZrE6dIelkopBc6WJfkpOFJka/bsdjX8tYRUZ8NXpIhwXTmcqQj2RGSKAESzJ YPgsGtjltEdDiKCycYlvC/EVjrwzzvwl+opiRvMY= 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.19 036/365] tracing: Have filter accept "common_cpu" to be consistent Date: Tue, 23 Aug 2022 09:58:57 +0200 Message-Id: <20220823080119.705956620@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220823080118.128342613@linuxfoundation.org> References: <20220823080118.128342613@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);