From patchwork Tue Oct 18 15:16:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Valentin Schneider X-Patchwork-Id: 13010753 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 D8EB2C4332F for ; Tue, 18 Oct 2022 15:17:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229930AbiJRPRI (ORCPT ); Tue, 18 Oct 2022 11:17:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42962 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229911AbiJRPRH (ORCPT ); Tue, 18 Oct 2022 11:17:07 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C394CC0989 for ; Tue, 18 Oct 2022 08:17:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666106223; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ynT9IkrYJsbhyOmqoyyaVlY7GdUEFeWxGVQ45kAczMk=; b=DjvM/zV9TSHu6IOExOmZ0sA67X5qco4e7J+b6zaWnZJ2hszddDqWGoy0tzeYLY7L4FaOfh BbGBAQyJvhQEmrDBAZT0+2SAmE8cjo/AUeZlmlpzNdmO4Yca5tpYUFMPkpdJtTP2yQsd8w 8dagf6/VlGS4MVrv+6K37r6CIpDKY48= Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-546-2-Lf8bi7O1OGN_1PCXr-LA-1; Tue, 18 Oct 2022 11:17:02 -0400 X-MC-Unique: 2-Lf8bi7O1OGN_1PCXr-LA-1 Received: by mail-qt1-f197.google.com with SMTP id c11-20020ac87dcb000000b0039cdb815f3bso7692814qte.4 for ; Tue, 18 Oct 2022 08:17:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ynT9IkrYJsbhyOmqoyyaVlY7GdUEFeWxGVQ45kAczMk=; b=DtM7oY2B5NjUlGvhxaw+M/n4TCWJHJ+ZoicTnakp4zqVvoLLwSKQp6tEZBGoqpyWhy E5nHf2ll7Mxedwh3Wj8tCH7V0dDtw6GOYyRHzjVuFTkvwp6/MAcbtIP4BA6Qei1c26Ay qcMzespXs4Rlzje1nC2apz0wOPExHxAX8INLffVWgSPqcMlqr3kwUBdCyleLTaMhIGRU 8fCpq+GwUT+lJjXOT4w2kSRbW94LYDEJvqWD+ivMmzJihUuUUkegqgSDmA8kQr3W+9hg OBF6aP3jLF0dSnyDuaPFBSOaAXAnzvJ6dE0mnQBC51N7JGn5amIxQ4tp1eSWC9mEabpr EjFA== X-Gm-Message-State: ACrzQf2Vdb6AR+Wdq5kHoiIIIqcENR4d+scpzBTIjfRkb4A07XGa2Pxa mGQwNfs5sZO1ogKKx4dzumfwTi5Kwn2/OJaexfh+j2foA/e2w6wT2GF1YJULuUQXLuLckjruL+L Q9Tt68Z8JAn/PwcAyT+f8sRuM6OTsPXpiTP0hxQvoD1x2QqemiP6R/j87ZaB4H/HEMLB/VBb9yJ bRvhhDC7o= X-Received: by 2002:a05:622a:420d:b0:38d:961c:a57c with SMTP id cp13-20020a05622a420d00b0038d961ca57cmr2507775qtb.678.1666106219935; Tue, 18 Oct 2022 08:16:59 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6bmkEH+mX6iPw7gWaF5P4+3bJ96TbvWR/pcVSYyioUkGprya+CG/I62txG1kzTHMzu1N74Ww== X-Received: by 2002:a05:622a:420d:b0:38d:961c:a57c with SMTP id cp13-20020a05622a420d00b0038d961ca57cmr2507739qtb.678.1666106219505; Tue, 18 Oct 2022 08:16:59 -0700 (PDT) Received: from vschneid.remote.csb ([149.71.65.94]) by smtp.gmail.com with ESMTPSA id s23-20020a05622a1a9700b003988b3d5280sm2159646qtc.70.2022.10.18.08.16.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Oct 2022 08:16:58 -0700 (PDT) From: Valentin Schneider To: linux-trace-devel@vger.kernel.org Cc: Steven Rostedt , Daniel Bristot de Oliveira , Clark Williams , Douglas RAILLARD Subject: [PATCH 1/2] libtraceevent: Add boiler-plate code for cpumask types Date: Tue, 18 Oct 2022 16:16:29 +0100 Message-Id: <20221018151630.1513535-2-vschneid@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20221018151630.1513535-1-vschneid@redhat.com> References: <20221018151630.1513535-1-vschneid@redhat.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org A cpumask event field type was recently added to Linux, which helps distinguish any odd bitmask from a cpumask. Right now this field type is not recognized by libtraceevent: [ipi:ipi_send_cpumask] function __get_cpumask not defined CPU 0 is empty CPU 1 is empty CPU 3 is empty cpus=4 echo-173 [002] 11.859745: ipi_send_cpumask: [FAILED TO PARSE] cpumask=ARRAY[02, 00, 00, 00, 00, 00, 00, 00] callsite=0xffffffff81121013 Since a cpumask is still a bitmask, define the boiler plate code for this new field type and wire it all to bitmask handling. Signed-off-by: Valentin Schneider --- include/traceevent/event-parse.h | 1 + src/event-parse.c | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/include/traceevent/event-parse.h b/include/traceevent/event-parse.h index f749cc2..2bb0f3e 100644 --- a/include/traceevent/event-parse.h +++ b/include/traceevent/event-parse.h @@ -242,6 +242,7 @@ enum tep_print_arg_type { TEP_PRINT_OP, TEP_PRINT_FUNC, TEP_PRINT_BITMASK, + TEP_PRINT_CPUMASK, TEP_PRINT_DYNAMIC_ARRAY_LEN, TEP_PRINT_HEX_STR, }; diff --git a/src/event-parse.c b/src/event-parse.c index 980e980..362720c 100644 --- a/src/event-parse.c +++ b/src/event-parse.c @@ -1083,6 +1083,7 @@ static void free_arg(struct tep_print_arg *arg) free(arg->string.string); break; case TEP_PRINT_BITMASK: + case TEP_PRINT_CPUMASK: free(arg->bitmask.bitmask); break; case TEP_PRINT_DYNAMIC_ARRAY: @@ -2816,6 +2817,7 @@ static int arg_num_eval(struct tep_print_arg *arg, long long *val) case TEP_PRINT_STRING: case TEP_PRINT_BSTRING: case TEP_PRINT_BITMASK: + case TEP_PRINT_CPUMASK: default: do_warning("invalid eval type %d", arg->type); ret = 0; @@ -2845,6 +2847,7 @@ static char *arg_eval (struct tep_print_arg *arg) case TEP_PRINT_STRING: case TEP_PRINT_BSTRING: case TEP_PRINT_BITMASK: + case TEP_PRINT_CPUMASK: default: do_warning("invalid eval type %d", arg->type); break; @@ -3325,6 +3328,17 @@ process_bitmask(struct tep_event *event __maybe_unused, struct tep_print_arg *ar return TEP_EVENT_ERROR; } +static enum tep_event_type +process_cpumask(struct tep_event *event __maybe_unused, struct tep_print_arg *arg, + char **tok) +{ + enum tep_event_type type = process_bitmask(event, arg, tok); + if (type != TEP_EVENT_ERROR) + arg->type = TEP_PRINT_CPUMASK; + + return type; +} + static struct tep_function_handler * find_func_handler(struct tep_handle *tep, char *func_name) { @@ -3484,6 +3498,11 @@ process_function(struct tep_event *event, struct tep_print_arg *arg, free_token(token); return process_bitmask(event, arg, tok); } + if (strcmp(token, "__get_cpumask") == 0 || + strcmp(token, "__get_cpumask") == 0) { + free_token(token); + return process_cpumask(event, arg, tok); + } if (strcmp(token, "__get_dynamic_array") == 0 || strcmp(token, "__get_rel_dynamic_array") == 0 || strcmp(token, "__get_sockaddr") == 0 || @@ -4144,6 +4163,7 @@ eval_num_arg(void *data, int size, struct tep_event *event, struct tep_print_arg case TEP_PRINT_STRING: case TEP_PRINT_BSTRING: case TEP_PRINT_BITMASK: + case TEP_PRINT_CPUMASK: return 0; case TEP_PRINT_FUNC: { struct trace_seq s; @@ -4637,6 +4657,7 @@ static void print_str_arg(struct trace_seq *s, void *data, int size, case TEP_PRINT_BSTRING: print_str_to_seq(s, format, len_arg, arg->string.string); break; + case TEP_PRINT_CPUMASK: case TEP_PRINT_BITMASK: { if (!arg->bitmask.field) { arg->bitmask.field = tep_find_any_field(event, arg->bitmask.bitmask); @@ -7158,6 +7179,9 @@ static void print_args(struct tep_print_arg *args) case TEP_PRINT_BITMASK: printf("__get_bitmask(%s)", args->bitmask.bitmask); break; + case TEP_PRINT_CPUMASK: + printf("__get_cpumask(%s)", args->bitmask.bitmask); + break; case TEP_PRINT_TYPE: printf("(%s)", args->typecast.type); print_args(args->typecast.item); From patchwork Tue Oct 18 15:16:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Valentin Schneider X-Patchwork-Id: 13010754 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 054ACC4332F for ; Tue, 18 Oct 2022 15:17:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229832AbiJRPRP (ORCPT ); Tue, 18 Oct 2022 11:17:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43148 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229911AbiJRPRN (ORCPT ); Tue, 18 Oct 2022 11:17:13 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D270FD0CCA for ; Tue, 18 Oct 2022 08:17:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666106226; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SUDmAUGydtZlR/kOcTvw5Xum4UC/l34yYUVzM6Xginc=; b=iGwmUSwiguiOpwL0EHkckh5jMzXUuNiY89Xl+p/c5GlJU+M5FP8W9Svu/vz/slGOueQp/z +QEBH1eH4rYo25P1PWKMPMiMJi46MFdgiZSq4sLoURSx9r+qpDFOs7mKguN4NzhGHKDynK JrSO8bg5qCUrf66w5xTH5ylNescaPEw= Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-624-gQsSr3esNG-9KUr_3V-mog-1; Tue, 18 Oct 2022 11:17:04 -0400 X-MC-Unique: gQsSr3esNG-9KUr_3V-mog-1 Received: by mail-qt1-f197.google.com with SMTP id d12-20020a05622a100c00b0039ce6373d2cso4905926qte.9 for ; Tue, 18 Oct 2022 08:17:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SUDmAUGydtZlR/kOcTvw5Xum4UC/l34yYUVzM6Xginc=; b=KfZukkKyeIH3Ih5yAsFLMKwRKhOogx3daiLrIzYyE9Co03IuVnO0vdVldgWLeUhOpi Hwom9C4snQqJpCXKcz35FcOJJMOh6uCQBCGzlgRqK7fYbaj7xMinkaSd38pxVpSpcrwd DHA3nBcSyeNhVTdsWXk9F5bCrn25Ro4X9NHKvK5eB/8Z+C30u2hkhEfjZMVPJhOpw23K 3NrJNwyfeiMLVfqktiUCYt/U1BOLU+8DhEDkYxuus6AyOkiajwEKfgoRh6gKpuGCnLwo gApxOUmmgNfRotmX9pDfPGt5viPuduW+zoQM6p8Mlxigj9EkqKcgNIANUvuYcAHBmSXH pyzQ== X-Gm-Message-State: ACrzQf1GK/w1xzPSsRd8pPRrFYKDwHGxGZ5cH60Njtw2lszYqMx8ADpN plZ0/WVHwDVcbQReyydXJeJVqDUiyHMUH3Xey8GEyrpKgc11qJhXkwts+utWwIIS3S3nnY582kC E6Iw9AAZm4dHBrduMnYDz56f1VbZYxxONcKsVbu8NSDzU8lENR9ESo3EzoZAGjUBnhXjF68Pj+t b+0Lc6v0Y= X-Received: by 2002:a05:620a:404c:b0:6da:ecec:a072 with SMTP id i12-20020a05620a404c00b006daececa072mr2255411qko.358.1666106223592; Tue, 18 Oct 2022 08:17:03 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5r+aNUUY8XbQTfRVTKvES+EGzp9Y99KEtOCO9QME3/qNyaWJWhknQH59I5ICn/7xoIeE0xoQ== X-Received: by 2002:a05:620a:404c:b0:6da:ecec:a072 with SMTP id i12-20020a05620a404c00b006daececa072mr2255379qko.358.1666106223196; Tue, 18 Oct 2022 08:17:03 -0700 (PDT) Received: from vschneid.remote.csb ([149.71.65.94]) by smtp.gmail.com with ESMTPSA id s23-20020a05622a1a9700b003988b3d5280sm2159646qtc.70.2022.10.18.08.17.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Oct 2022 08:17:02 -0700 (PDT) From: Valentin Schneider To: linux-trace-devel@vger.kernel.org Cc: Steven Rostedt , Daniel Bristot de Oliveira , Clark Williams , Douglas RAILLARD Subject: [PATCH 2/2] libtraceevent: Pretty-print cpumask fields as a cpulist Date: Tue, 18 Oct 2022 16:16:30 +0100 Message-Id: <20221018151630.1513535-3-vschneid@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20221018151630.1513535-1-vschneid@redhat.com> References: <20221018151630.1513535-1-vschneid@redhat.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org Now that we can denote which bitmasks are cpumasks, it makes sense to pretty-print them to a more user-friendly format: a cpulist. There's two hurdles to that: 1) Estimating the required string buffer size. I've tried to condense it down to an estimator function that is computationally simple enough, though it overestimates by ~1/3. For reference, this estimates: 180 bytes for NR_CPUS=64 (x86 defconfig) 911 bytes for NR_CPUS=256 (arm64 defconfig) 2) Iterating through the bits and bytes. The kernel has a collection of carefully crafted bitmask iterators which make this relatively simple (cf. bitmap_list_string()), but I didn't feel justified in importing half a dozen helpers just for one function. I've implemented a "homegrown" byte-parsing logic which isn't the fastest, but is at least condensed to a single function. Signed-off-by: Valentin Schneider --- src/event-parse.c | 168 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 167 insertions(+), 1 deletion(-) diff --git a/src/event-parse.c b/src/event-parse.c index 362720c..6922d5b 100644 --- a/src/event-parse.c +++ b/src/event-parse.c @@ -4454,6 +4454,161 @@ static void print_bitmask_to_seq(struct tep_handle *tep, free(str); } +#define log10(n) \ +( \ + n < 10UL ? 0 : \ + n < 100UL ? 1 : \ + n < 1000UL ? 2 : \ + n < 10000UL ? 3 : \ + n < 100000UL ? 4 : \ + n < 1000000UL ? 5 : \ + n < 10000000UL ? 6 : \ + n < 100000000UL ? 7 : \ + n < 1000000000UL ? 8 : \ + 9 \ +) + +/* ilog10(0) should be 1 but the 0 simplifies below math */ +#define ilog10(n) \ +( \ + n == 0 ? 0UL : \ + n == 1 ? 10UL : \ + n == 2 ? 100UL : \ + n == 3 ? 1000UL : \ + n == 4 ? 10000UL : \ + n == 5 ? 100000UL : \ + n == 6 ? 1000000UL : \ + n == 7 ? 10000000UL : \ + n == 8 ? 100000000UL : \ + 1000000000UL \ +) + +static unsigned int cpumask_worst_size(unsigned int nr_bits) +{ + /* + * Printing all the CPUs separated by a comma is a decent bound for the + * maximum memory required to print a cpumask (a slightly better bound + * is chunks of 2 bits set, i.e. 0-1,3-4,6-7...). + * + * e.g. for nr_bits=132: + * - 131 commas + * - 10 * 1 chars for CPUS [0, 9] + * - 90 * 2 chars for CPUS [10-99] + * - 32 * 3 chars for CPUS [100-131] + */ + unsigned int last_cpu = nr_bits - 1; + unsigned int nr_chars = nr_bits - 1; + int last_lvl = log10(last_cpu); + + /* All log10 levels before the last one have all values used */ + for (int lvl = 0; lvl < last_lvl; lvl++) { + int nr_values = ilog10(lvl + 1) - ilog10(lvl); + + nr_chars += nr_values * (lvl + 1); + } + /* Last level is incomplete */ + nr_chars += (nr_bits - ilog10(last_lvl)) * (last_lvl + 1); + + return nr_chars; +} + +static void print_cpumask_to_seq(struct tep_handle *tep, + struct trace_seq *s, const char *format, + int len_arg, const void *data, int size) +{ + int firstone = -1, firstzero = -1; + int nr_bits = size * 8; + bool first = true; + int str_size = 0; + char buf[12]; /* '-' + log10(2^32) + 1 digits + '\0' */ + char *str; + int index; + int i; + + str = malloc(cpumask_worst_size(nr_bits) + 1); + if (!str) { + do_warning("%s: not enough memory!", __func__); + return; + } + + for (i = 0; i < size; i++) { + unsigned char byte; + int fmtsize; + + if (tep->file_bigendian) + index = size - (i + 1); + else + index = i; + + /* Byte by byte scan, not the best... */ + byte = *(((unsigned char *)data) + index); +more: + /* First find a bit set to one...*/ + if (firstone < 0 && byte) { + /* + * Set all lower bits, so a later ffz on this same byte + * is guaranteed to find a later bit. + */ + firstone = ffs(byte) - 1; + byte |= (1 << firstone) - 1; + firstone += i * 8; + } + + if (firstone < 0) + continue; + + /* ...Then find a bit set to zero */ + if ((~byte) & 0xFF) { + /* + * Clear all lower bits, so a later ffs on this same + * byte is guaranteed to find a later bit. + */ + firstzero = ffs(~byte) - 1; + byte &= ~((1 << (firstzero)) - 1); + firstzero += i * 8; + } else if (i == size - 1) { /* ...Or reach the end of the mask */ + firstzero = nr_bits; + byte = 0; + } else { + continue; + } + + /* We've found a bit set to one, and a later bit set to zero. */ + if (!first) { + str[str_size] = ','; + str_size++; + } + first = false; + + /* It takes {log10(number) + 1} chars to format a number */ + fmtsize = log10(firstone) + 1; + snprintf(buf, fmtsize + 1, "%d", firstone); + memcpy(str + str_size, buf, fmtsize); + str_size += fmtsize; + + if (firstzero > firstone + 1) { + fmtsize = log10(firstzero - 1) + 2; + snprintf(buf, fmtsize + 1, "-%d", firstzero - 1); + memcpy(str + str_size, buf, fmtsize); + str_size += fmtsize; + } + + firstzero = firstone = -1; + if (byte) + goto more; + } + + str[str_size] = 0; + str_size++; + + if (len_arg >= 0) + trace_seq_printf(s, format, len_arg, str); + else + trace_seq_printf(s, format, str); + + free(str); +} + static void print_str_arg(struct trace_seq *s, void *data, int size, struct tep_event *event, const char *format, int len_arg, struct tep_print_arg *arg) @@ -4657,7 +4812,6 @@ static void print_str_arg(struct trace_seq *s, void *data, int size, case TEP_PRINT_BSTRING: print_str_to_seq(s, format, len_arg, arg->string.string); break; - case TEP_PRINT_CPUMASK: case TEP_PRINT_BITMASK: { if (!arg->bitmask.field) { arg->bitmask.field = tep_find_any_field(event, arg->bitmask.bitmask); @@ -4670,6 +4824,18 @@ static void print_str_arg(struct trace_seq *s, void *data, int size, data + offset, len); break; } + case TEP_PRINT_CPUMASK: { + if (!arg->bitmask.field) { + arg->bitmask.field = tep_find_any_field(event, arg->bitmask.bitmask); + arg->bitmask.offset = arg->bitmask.field->offset; + } + if (!arg->bitmask.field) + break; + dynamic_offset_field(tep, arg->bitmask.field, data, size, &offset, &len); + print_cpumask_to_seq(tep, s, format, len_arg, + data + offset, len); + break; + } case TEP_PRINT_OP: /* * The only op for string should be ? :