From mboxrd@z Thu Jan 1 00:00:00 1970 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 F3FB5C001DC for ; Sat, 29 Jul 2023 19:55:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229627AbjG2Tz6 (ORCPT ); Sat, 29 Jul 2023 15:55:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57656 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229448AbjG2Tz5 (ORCPT ); Sat, 29 Jul 2023 15:55:57 -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 3343730DC; Sat, 29 Jul 2023 12:55:54 -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 A52AE6066F; Sat, 29 Jul 2023 19:55:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EA441C433C7; Sat, 29 Jul 2023 19:55:48 +0000 (UTC) Date: Sat, 29 Jul 2023 15:55:47 -0400 From: Steven Rostedt To: Valentin Schneider Cc: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linux-doc@vger.kernel.org, kvm@vger.kernel.org, linux-mm@kvack.org, bpf@vger.kernel.org, x86@kernel.org, rcu@vger.kernel.org, linux-kselftest@vger.kernel.org, Masami Hiramatsu , Jonathan Corbet , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" , Paolo Bonzini , Wanpeng Li , Vitaly Kuznetsov , Andy Lutomirski , Peter Zijlstra , Frederic Weisbecker , "Paul E. McKenney" , Neeraj Upadhyay , Joel Fernandes , Josh Triplett , Boqun Feng , Mathieu Desnoyers , Lai Jiangshan , Zqiang , Andrew Morton , Uladzislau Rezki , Christoph Hellwig , Lorenzo Stoakes , Josh Poimboeuf , Jason Baron , Kees Cook , Sami Tolvanen , Ard Biesheuvel , Nicholas Piggin , Juerg Haefliger , Nicolas Saenz Julienne , "Kirill A. Shutemov" , Nadav Amit , Dan Carpenter , Chuang Wang , Yang Jihong , Petr Mladek , "Jason A. Donenfeld" , Song Liu , Julian Pidancet , Tom Lendacky , Dionna Glaze , Thomas =?UTF-8?B?V2Vpw59zY2h1aA==?= , Juri Lelli , Daniel Bristot de Oliveira , Marcelo Tosatti , Yair Podemsky Subject: Re: [RFC PATCH v2 06/20] tracing/filters: Optimise scalar vs cpumask filtering when the user mask is a single CPU Message-ID: <20230729155547.35719a1f@rorschach.local.home> In-Reply-To: <20230720163056.2564824-7-vschneid@redhat.com> References: <20230720163056.2564824-1-vschneid@redhat.com> <20230720163056.2564824-7-vschneid@redhat.com> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-trace-kernel@vger.kernel.org On Thu, 20 Jul 2023 17:30:42 +0100 Valentin Schneider wrote: > 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 '==' beforehand. > > Suggested-by: Steven Rostedt > Signed-off-by: Valentin Schneider > --- > 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 2fe65ddeb34ef..54d642fabb7f1 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 = cpumask_weight(pred->mask) == 1; > - if (single && field->filter_type == FILTER_CPUMASK) { > + if (single && field->filter_type != FILTER_CPU) { > pred->val = 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 == FILTER_CPU) { > pred->fn_num = FILTER_PRED_FN_CPU_CPUMASK; > + } else if (single) { > + pred->op = pred->op == OP_BAND ? OP_EQ : pred->op; Nit, the above can be written as: pred->op = pret->op != OP_BAND ? : OP_EQ; -- Steve > + pred->fn_num = select_comparison_fn(pred->op, field->size, false); > + if (pred->op == OP_NE) > + pred->not = 1; > } else { > switch (field->size) { > case 8: