From patchwork Sun Jan 8 06:23:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Yan X-Patchwork-Id: 40482 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp1588879wrt; Sat, 7 Jan 2023 22:25:24 -0800 (PST) X-Google-Smtp-Source: AMrXdXu6Yq8z7ZxS1DpwkKBGb9YjcmApj2t0aHLINfOyXPzHMJFEAOrk06LrI35XleTXL2gmsGRo X-Received: by 2002:aa7:cb88:0:b0:499:8849:5fb8 with SMTP id r8-20020aa7cb88000000b0049988495fb8mr886888edt.30.1673159124743; Sat, 07 Jan 2023 22:25:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673159124; cv=none; d=google.com; s=arc-20160816; b=zV6Lo5jI6heKlMRVZIxj20amKBJ43zms/60XOVqbrmDs5i/X5NVy6go27ZYbAP7v+A 6dywkCrEIrSyqWoOWKazOwgryGLv6gqAMCC3gFLpgd6VK6syJsZu2iYIRg9h9HklFS+V 3e7QjnXGYiEiUFojoS5joCh0D61gbx/hZ6N0qgd8gYn5ewHyi/ygAbkkTBxM5SpMVx24 fevWC0vfkGuZG9Gs2bPZseTJV88JczBcJ2JDBMjS1EaQKj7jMMZpjj+CJlw9rZYKkzLl Om+NVr491r5U+GTh2L4p0LbPjpmqIkyHinnsvhgZLgC8I7be69JjYrqbr61A/75kBqbr NM2Q== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=QeoGX28pohH6YTyGGTvoqbUNJvhignnE3xBPpX1iJkM=; b=qweS6xVBE2/SiYX6p/znLl2vfuxr7CdWSXLi50I2j3pOlf7niQQrT9n9no5zMzjlSN 6LrK9UOklJsrtC0C9XPlwl+6rojPGzTtyCnvnt2Xm7ijNVVucnKjyuEhSzlOkrb7dsIA J3yrZ5pQDitiOyUM8khdEuT1eUtxc1WHxx+Jk540dxji2Zrjuqf+BO9NlgWJg/gkkBW5 xVDoL2/+Wc19JILpBMGTymFuYJzr/yxFLxZp/pPiv/RmnJFE4M4sSP84uavRaOrUYRzB kw1eYOajYJU+NUfOIcNzS1jwepL0me00qrsS0vTNzZCVXnhQ4puWez51JI+QaQ/0nXw+ PvoA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=oPpOYvzG; 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=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m8-20020a509988000000b0048e8835b929si6845483edb.200.2023.01.07.22.24.55; Sat, 07 Jan 2023 22:25:24 -0800 (PST) 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=@linaro.org header.s=google header.b=oPpOYvzG; 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=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231269AbjAHGYX (ORCPT + 99 others); Sun, 8 Jan 2023 01:24:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57482 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229627AbjAHGYS (ORCPT ); Sun, 8 Jan 2023 01:24:18 -0500 Received: from mail-pj1-x1029.google.com (mail-pj1-x1029.google.com [IPv6:2607:f8b0:4864:20::1029]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6F1181EADF for ; Sat, 7 Jan 2023 22:24:16 -0800 (PST) Received: by mail-pj1-x1029.google.com with SMTP id q64so5638522pjq.4 for ; Sat, 07 Jan 2023 22:24:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=QeoGX28pohH6YTyGGTvoqbUNJvhignnE3xBPpX1iJkM=; b=oPpOYvzGEBhoEz7H0UVS3gcV6apwfYI5SqyEAXBIMM2i0CZVkACiJXbX4PeL0h0kw+ 7ufDhbcnKdFJL8ZA6DdJfaFkzvg8ZHoCoXKL3n0sP4UlUBkggg9o5BJkGso6Idvh1p7P YNmzdHPDRHEgf7Iw1aIQlPlk3vNzAGNFHhHes/m5V0Uu3VYnMDjJSAcQQLAQPqiDqL8n NZj3MbWLlaUSIg8NZCnHnrsUVUJ4S8GMbWhr+IT2NZmJq9UFn0cJ1EH4qZJ2gH+2TMKg yhESY87lPfYMASmA1h0/1Hf3xsvKxzsQSFroPnCa2ndPVgfVV1Y/2xQnBFYgEaR0pA2S vN0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=QeoGX28pohH6YTyGGTvoqbUNJvhignnE3xBPpX1iJkM=; b=tLcrATiIg1uTxqsXzN3zcMfBFq6x8iZIHNlXwwIsnboq3dVg6Vovttm5xXSDgEMvRz aXySbvKt86wyNTlZWoCo3yBt1/JBEfvwvTIycuBKPdWp9x4ysWEgTb4oCCkd4ltR+YpT vDjxNI9xezdu5bZH6ObDXcfERtLkY4wzBKNIsMOEh9xXBpjoHzaGpFNOnaKeUhCxSpxd 3ur4Pnk5z45cCvuXIXCsRtecuFQi3Uz9xMbecev4DG+V2kGsjrSR8h2CDZnymE/WoPlx dXBynH0PkltImGrWwQo2FUH7EAd/AS9gwT32z/2JhF/XuH5K4yTa3W9xg8t8sJ9r3hW+ Cbvw== X-Gm-Message-State: AFqh2kpkrqxhkonkG+N590/rLNOBleoHFA54IlGxUHCzpqUNNi/NdG4l fka5F7CQkAdH/OcFYDQk5cMn8w== X-Received: by 2002:a05:6a20:d38c:b0:af:a276:2f94 with SMTP id iq12-20020a056a20d38c00b000afa2762f94mr77308581pzb.35.1673159055712; Sat, 07 Jan 2023 22:24:15 -0800 (PST) Received: from leoy-huanghe.lan (211-23-48-221.hinet-ip.hinet.net. [211.23.48.221]) by smtp.gmail.com with ESMTPSA id s1-20020a63f041000000b004784cdc196dsm3146510pgj.24.2023.01.07.22.24.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Jan 2023 22:24:15 -0800 (PST) From: Leo Yan To: Arnaldo Carvalho de Melo , Ravi Bangoria , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Vlastimil Babka , Hyeonggon Yoo <42.hyeyoo@gmail.com>, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Leo Yan Subject: [PATCH 1/2] perf kmem: Support legacy tracepoints Date: Sun, 8 Jan 2023 14:23:59 +0800 Message-Id: <20230108062400.250690-1-leo.yan@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754434502251497507?= X-GMAIL-MSGID: =?utf-8?q?1754434502251497507?= Commit 11e9734bcb6a ("mm/slab_common: unify NUMA and UMA version of tracepoints") removed tracepoints 'kmalloc_node' and 'kmem_cache_alloc_node', these two tracepoints have disappeared in the latest kernel, but we also need to consider the tool should be backward compatible with old kernels. If detects the tracepoint "kmem:kmalloc_node" is existed on a system, this patch enables the legacy tracepoints, otherwise, it will ignore them for the new kernels. Reported-by: Ravi Bangoria Fixes: 11e9734bcb6a ("mm/slab_common: unify NUMA and UMA version of tracepoints") Signed-off-by: Leo Yan Reviewed-by: James Clark --- tools/perf/builtin-kmem.c | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/tools/perf/builtin-kmem.c b/tools/perf/builtin-kmem.c index e20656c431a4..50a3df5dc18a 100644 --- a/tools/perf/builtin-kmem.c +++ b/tools/perf/builtin-kmem.c @@ -1824,6 +1824,19 @@ static int parse_line_opt(const struct option *opt __maybe_unused, return 0; } +static bool slab_legacy_tp_is_exposed(void) +{ + /* + * The tracepoints "kmem:kmalloc_node" and + * "kmem:kmem_cache_alloc_node" have been removed on the latest + * kernel, if the tracepoint "kmem:kmalloc_node" is existed it + * means the tool is running on an old kernel, we need to + * rollback to support these legacy tracepoints. + */ + return IS_ERR(trace_event__tp_format("kmem", "kmalloc_node")) ? + false : true; +} + static int __cmd_record(int argc, const char **argv) { const char * const record_args[] = { @@ -1831,22 +1844,28 @@ static int __cmd_record(int argc, const char **argv) }; const char * const slab_events[] = { "-e", "kmem:kmalloc", - "-e", "kmem:kmalloc_node", "-e", "kmem:kfree", "-e", "kmem:kmem_cache_alloc", - "-e", "kmem:kmem_cache_alloc_node", "-e", "kmem:kmem_cache_free", }; + const char * const slab_legacy_events[] = { + "-e", "kmem:kmalloc_node", + "-e", "kmem:kmem_cache_alloc_node", + }; const char * const page_events[] = { "-e", "kmem:mm_page_alloc", "-e", "kmem:mm_page_free", }; unsigned int rec_argc, i, j; const char **rec_argv; + unsigned int slab_legacy_tp_exposed = slab_legacy_tp_is_exposed(); rec_argc = ARRAY_SIZE(record_args) + argc - 1; - if (kmem_slab) + if (kmem_slab) { rec_argc += ARRAY_SIZE(slab_events); + if (slab_legacy_tp_exposed) + rec_argc += ARRAY_SIZE(slab_legacy_events); + } if (kmem_page) rec_argc += ARRAY_SIZE(page_events) + 1; /* for -g */ @@ -1861,6 +1880,10 @@ static int __cmd_record(int argc, const char **argv) if (kmem_slab) { for (j = 0; j < ARRAY_SIZE(slab_events); j++, i++) rec_argv[i] = strdup(slab_events[j]); + if (slab_legacy_tp_exposed) { + for (j = 0; j < ARRAY_SIZE(slab_legacy_events); j++, i++) + rec_argv[i] = strdup(slab_legacy_events[j]); + } } if (kmem_page) { rec_argv[i++] = strdup("-g");