From patchwork Wed Nov 16 14:41:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Valentin Schneider X-Patchwork-Id: 13045322 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 90330C4332F for ; Wed, 16 Nov 2022 14:43:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229942AbiKPOnO (ORCPT ); Wed, 16 Nov 2022 09:43:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35940 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232584AbiKPOnN (ORCPT ); Wed, 16 Nov 2022 09:43:13 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7E2E93E0A0 for ; Wed, 16 Nov 2022 06:42:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1668609736; 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=KTSfZcv0/qr60We+FYe9h91PF39pXr0NSCmVUGdpkqk=; b=FxuFxrg09TEav0dd23KlLbJxxEmgzUAX+ejagsQhfZvqF1g9AF9N9xn09brs4OzxZWNbtF EV7GpAKhjnhcMelylF98zNhIyDd4Znavx8uyRldZfWQvWtAhisn38ygqJCqhxEdbI2hcYx JwFpNBRPzF9UHk58pJ2NmQwozNWmjEg= Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-483-GYiEoTQ7NdaOyW6ecnwk4Q-1; Wed, 16 Nov 2022 09:42:07 -0500 X-MC-Unique: GYiEoTQ7NdaOyW6ecnwk4Q-1 Received: by mail-qt1-f198.google.com with SMTP id cj6-20020a05622a258600b003a519d02f59so13007120qtb.5 for ; Wed, 16 Nov 2022 06:42:07 -0800 (PST) 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=KTSfZcv0/qr60We+FYe9h91PF39pXr0NSCmVUGdpkqk=; b=bRzRVewvGKwBX3H5b27Nit1lxYTLykw/a1j/EF/vHvNOp+/kazy5FZusxDy3JOsim0 d47RY0LIqUPkejFPAfwQtuhguUi4qW1r5V0fFxvF6xUrGdgK/er86B4OjX46Mav/BkDk szN2Uz/azKBQbYsI2svTmUJRE4dhZ0/SpKM/KknlC4VQCIZ6RpgZb4BKH2kKeF2O8+WZ VZW+9+JImBjgg76zYpYKUvtOZiH+vsnNRkoDNTIi4Ekh+934PCTHydL+0sfv8Z8OEcmV zu+t0GHd2ONkpolbhg2Rt9JtKK2nL+8vfurZ54pMrInJy5D6ZzYuOHl0S1n029ik4T5L qF5g== X-Gm-Message-State: ANoB5pkz690cM/7nyrnArJhV2buxhZUkyRTKq61NICelU2/VYAYO+heG hYJNhjDZQKwKrhHUrtp1qhgKfvhwrOFQQcxEoNCYRokq9CTIy+8rUur9sIZLov6dhSQQ4GF+xf0 bgrn/Mdyq1fF62enM9VBlbetJP/V7JS57OOI81KG6DlGxHvmzIoPwVwtsewFDdcBRjwY392CuzB e1shDUJaM= X-Received: by 2002:ae9:ef12:0:b0:6f4:ae8a:8125 with SMTP id d18-20020ae9ef12000000b006f4ae8a8125mr19839082qkg.522.1668609725719; Wed, 16 Nov 2022 06:42:05 -0800 (PST) X-Google-Smtp-Source: AA0mqf5WQPHOR/xomsO+addz+jEtUemvrUgtdTNop8MFF3Db/yxXV4IdXCRaR0ozEBkzcMxYi7PFmg== X-Received: by 2002:ae9:ef12:0:b0:6f4:ae8a:8125 with SMTP id d18-20020ae9ef12000000b006f4ae8a8125mr19839055qkg.522.1668609725376; Wed, 16 Nov 2022 06:42:05 -0800 (PST) Received: from vschneid.remote.csb ([154.57.232.159]) by smtp.gmail.com with ESMTPSA id x12-20020ac8730c000000b003a57f822157sm8707793qto.90.2022.11.16.06.42.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Nov 2022 06:42:04 -0800 (PST) From: Valentin Schneider To: linux-trace-devel@vger.kernel.org Cc: Steven Rostedt , Daniel Bristot de Oliveira , Clark Williams , Douglas RAILLARD Subject: [PATCH v2 1/2] libtraceevent: Add boiler-plate code for cpumask types Date: Wed, 16 Nov 2022 14:41:53 +0000 Message-Id: <20221116144154.3662923-2-vschneid@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20221116144154.3662923-1-vschneid@redhat.com> References: <20221116144154.3662923-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 d842f9d..f447708 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_rel_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 Wed Nov 16 14:46:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Valentin Schneider X-Patchwork-Id: 13045324 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 244E4C433FE for ; Wed, 16 Nov 2022 14:47:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233256AbiKPOr4 (ORCPT ); Wed, 16 Nov 2022 09:47:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39798 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230459AbiKPOrz (ORCPT ); Wed, 16 Nov 2022 09:47:55 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 690383E0A0 for ; Wed, 16 Nov 2022 06:47:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1668610022; 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=tQJ3wH4H9PRF35Xm9OuZm6JIiOqk2qx2m80xxYq+r7Q=; b=KzoMXkwFlaJtT/KirObcVpw7chAZKkWE1Bp3GLYwU5y0aNHN+DYOrxVJ/1NgRMDPhS5mEE z+6OC28fyXobeN9pVvrM3L7o8R87a+E0GWCLUdJNH39Nkrk9CBIff6JCAl+w4JR9jr3dY2 ZYLanDEQpwPcXvwkV/Jo7k58uUO4RDA= Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-639-RmXd3fmdMvCS9QN_Yp1VSQ-1; Wed, 16 Nov 2022 09:46:57 -0500 X-MC-Unique: RmXd3fmdMvCS9QN_Yp1VSQ-1 Received: by mail-qk1-f200.google.com with SMTP id bk30-20020a05620a1a1e00b006fb2378c857so16663820qkb.18 for ; Wed, 16 Nov 2022 06:46:57 -0800 (PST) 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=tQJ3wH4H9PRF35Xm9OuZm6JIiOqk2qx2m80xxYq+r7Q=; b=InOrdhVw9rQ8Ax49imyuvqHoW3wdyVHcYkBEfzeKhBR4gCwUwjQvxha/NgryArMFc6 lnTzsXDv/srx0quoklX0AJkB17TEGdX6ErGUEY51Vs/eVUqcJ/JlkcpU78YhL5fCu3WJ 3HbFvjdb9EBPRDN/OMItE22e0vNK5twKr+ua8Nt5YDQzA94ifM8zWOOwdIutLgz/R9P0 9POqYAO800cZwLVGj0UB790eMbDNiYM5eQ7NTQrC7Tybj8m9aNzAT4AV3rz8RGkO5V8m 51rZChq0pLPOcop0CM+5DKzp6srRN5JK1idweG12IrKIz/FzZzU9g/tVXJbfp8IzY2Wh WcXQ== X-Gm-Message-State: ANoB5pm+tY/bOP6ytOTPpDV780KjgvwXJlgo5vknuxmOlH1QLSLy8YZK uIozQv/9gwdjUcu0RJbcBJAx7MJQRjqclF9Q8gFQsyqWQXZs0c1JbUMhU7R4PieQGPYixzPNWkP 1txe7PrbkAQdKOlybHsIP5hD8DKk0cHSzrzicKunor095PngsoOPqV0F3coxh9noVuj8OoRl/9L HNY5gY8MU= X-Received: by 2002:ac8:7dc1:0:b0:3a5:211f:1f2c with SMTP id c1-20020ac87dc1000000b003a5211f1f2cmr21709028qte.241.1668610016636; Wed, 16 Nov 2022 06:46:56 -0800 (PST) X-Google-Smtp-Source: AA0mqf6RNnVOxSGzAVBv1YWfwM9ukca55wtOp8xrtiCLwW+CPvkWHoD5qtlDqq1o3MCo/y07jz62Mg== X-Received: by 2002:ac8:7dc1:0:b0:3a5:211f:1f2c with SMTP id c1-20020ac87dc1000000b003a5211f1f2cmr21708994qte.241.1668610016292; Wed, 16 Nov 2022 06:46:56 -0800 (PST) Received: from vschneid.remote.csb ([154.57.232.159]) by smtp.gmail.com with ESMTPSA id c22-20020ac87dd6000000b003a55fe9f352sm8916953qte.64.2022.11.16.06.46.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Nov 2022 06:46:55 -0800 (PST) From: Valentin Schneider To: linux-trace-devel@vger.kernel.org Cc: Steven Rostedt , Daniel Bristot de Oliveira , Clark Williams , Douglas RAILLARD Subject: [PATCH v2 2/2] libtraceevent: Pretty-print cpumask fields as a cpulist Date: Wed, 16 Nov 2022 14:46:46 +0000 Message-Id: <20221116144646.3664012-1-vschneid@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20221116144154.3662923-1-vschneid@redhat.com> References: <20221116144154.3662923-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 f447708..5e597f6 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 ? :