From nobody Wed Dec 17 02:53:00 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9638FEE49AD for ; Thu, 24 Aug 2023 02:19:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239362AbjHXCTM (ORCPT ); Wed, 23 Aug 2023 22:19:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40778 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239327AbjHXCSe (ORCPT ); Wed, 23 Aug 2023 22:18:34 -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 512CE10DB for ; Wed, 23 Aug 2023 19:18:32 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 8113964F9D for ; Thu, 24 Aug 2023 02:18:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id ED882C433C7; Thu, 24 Aug 2023 02:18:30 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qYzvv-001hSs-2P; Wed, 23 Aug 2023 22:18:51 -0400 Message-ID: <20230824021851.552383762@goodmis.org> User-Agent: quilt/0.66 Date: Wed, 23 Aug 2023 22:18:18 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , Jonathan Corbet , Juri Lelli , Daniel Bristot de Oliveira , Marcelo Tosatti , Leonardo Bras , Frederic Weisbecker , Valentin Schneider Subject: [for-next][PATCH 06/14] tracing/filters: Optimise scalar vs cpumask filtering when the user mask is a single CPU References: <20230824021812.938245293@goodmis.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Valentin Schneider Steven noted that when the user-provided cpumask contains a single CPU, then the filtering function can use a scalar as input instead of a full-fledged cpumask. When the mask contains a single CPU, directly re-use the unsigned field predicate functions. Transform '&' into '=3D=3D' beforehand. Link: https://lkml.kernel.org/r/20230707172155.70873-7-vschneid@redhat.com Cc: Masami Hiramatsu Cc: Jonathan Corbet Cc: Juri Lelli Cc: Daniel Bristot de Oliveira Cc: Marcelo Tosatti Cc: Leonardo Bras Cc: Frederic Weisbecker Suggested-by: Steven Rostedt Signed-off-by: Valentin Schneider Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace_events_filter.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events= _filter.c index 2fe65ddeb34e..54d642fabb7f 100644 --- a/kernel/trace/trace_events_filter.c +++ b/kernel/trace/trace_events_filter.c @@ -1750,7 +1750,7 @@ static int parse_pred(const char *str, void *data, * then we can treat it as a scalar input. */ single =3D cpumask_weight(pred->mask) =3D=3D 1; - if (single && field->filter_type =3D=3D FILTER_CPUMASK) { + if (single && field->filter_type !=3D FILTER_CPU) { pred->val =3D cpumask_first(pred->mask); kfree(pred->mask); } @@ -1761,6 +1761,11 @@ static int parse_pred(const char *str, void *data, FILTER_PRED_FN_CPUMASK; } else if (field->filter_type =3D=3D FILTER_CPU) { pred->fn_num =3D FILTER_PRED_FN_CPU_CPUMASK; + } else if (single) { + pred->op =3D pred->op =3D=3D OP_BAND ? OP_EQ : pred->op; + pred->fn_num =3D select_comparison_fn(pred->op, field->size, false); + if (pred->op =3D=3D OP_NE) + pred->not =3D 1; } else { switch (field->size) { case 8: --=20 2.40.1