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 46659C7EE2F for ; Sat, 27 May 2023 03:43:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230256AbjE0Dny (ORCPT ); Fri, 26 May 2023 23:43:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58106 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230024AbjE0Dnt (ORCPT ); Fri, 26 May 2023 23:43:49 -0400 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A04FE114 for ; Fri, 26 May 2023 20:43:46 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-561ceb5b584so33794737b3.3 for ; Fri, 26 May 2023 20:43:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1685159026; x=1687751026; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=9j0CmaHr2uUosemIHAtUjvq8XY3iHL9ps0luhHrIcCk=; b=gP94xvi6b+zhoRwIWTjg46ZhS6rkzx7v2svFGYNNXWxrKKjrKZkCgerCW+USwJJ5lr DphEbgs/fpN3tL9iFWsEFPBd+QjBekbrjKrxPgtRMJMBINdRoYhtv0HLbHsNnNNjTto4 zMvN9LoQtn8FeVFK5PRMnzt2aRP753TSS7fC6UUkL5JanuPV+CXgQjKFSEiYbAnnMpG9 cnE92FWvxzPhyH5dbrPYcZ42MLhrVpMCSwkBajyldLx8h8j3+VLE9sX6eYCWWtoIkuee 2W+LDEDYaiXbiWzCioLXqN1ZLyZ/Jsg+mkIeRy0Qseny+WqOUKzauWYSRsQGe6BioBKT if5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685159026; x=1687751026; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=9j0CmaHr2uUosemIHAtUjvq8XY3iHL9ps0luhHrIcCk=; b=damLiJ8DNob7Jbtz6RXQUHwEf8zq0MltPCxCjeDLGrFLOZrEq3eJWuKhoR3FPIvud+ iXmCUhxfVlsCQ3Q65bx0xFCm9jOHVpeZx1QJ2tTRHBy1ax+tAFDopf4V8zlYQqTwWb1c BRKlpMDMVAGJwUk0HCNjES/ccCZC0O03y5bRqR42BqNmY06CZHwR/g4acx6OtZgUS0rj jEyPTHHc3IUv4JZs9CUqsaQ4JSUCarzZCFR5ltwFWLViUk5CtpQLK3d5U+kZXxX6kBsL MOs9Na12cUZJefs0D0kqQrsENnCeAyc8gQSh7VdDDw5J9uRbO6STVP3AdGsBruDhlgA5 dx/g== X-Gm-Message-State: AC+VfDzb0M4sBwnDF/LRb8t+7ZDOfK/x0h9SH6OLe0VV4PZZ7V7OEWU4 R9D7ffiaLrE8u7O024wdzyfZ66Kr3O6a X-Google-Smtp-Source: ACHHUZ7wKIEQLbYrXocZnASUfMtDn0vBZ80GIpjSaCu532B0ZhkyGJlfAThjscSW670Al1jbCvv3BrlWv1wv X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:3b4e:312c:644:a642]) (user=irogers job=sendgmr) by 2002:a81:4421:0:b0:565:9f59:664f with SMTP id r33-20020a814421000000b005659f59664fmr2275624ywa.6.1685159025953; Fri, 26 May 2023 20:43:45 -0700 (PDT) Date: Fri, 26 May 2023 20:43:20 -0700 In-Reply-To: <20230527034324.2597593-1-irogers@google.com> Message-Id: <20230527034324.2597593-3-irogers@google.com> Mime-Version: 1.0 References: <20230527034324.2597593-1-irogers@google.com> X-Mailer: git-send-email 2.41.0.rc0.172.g3f132b7071-goog Subject: [PATCH v1 2/4] perf script: Remove some large stack allocations From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-perf-users@vger.kernel.org Some char buffers are stack allocated but in total they come to 24kb. Avoid Wstack-usage warnings by moving the arrays to being dynamically allocated. Signed-off-by: Ian Rogers --- tools/perf/builtin-script.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c index 029d5a597233..3875c4b72db1 100644 --- a/tools/perf/builtin-script.c +++ b/tools/perf/builtin-script.c @@ -3299,14 +3299,21 @@ static int list_available_scripts(const struct option *opt __maybe_unused, int unset __maybe_unused) { struct dirent *script_dirent, *lang_dirent; - char scripts_path[MAXPATHLEN]; + char *buf, *scripts_path, *script_path, *lang_path, *first_half; DIR *scripts_dir, *lang_dir; - char script_path[MAXPATHLEN]; - char lang_path[MAXPATHLEN]; struct script_desc *desc; - char first_half[BUFSIZ]; char *script_root; + buf = malloc(3 * MAXPATHLEN + BUFSIZ); + if (!buf) { + pr_err("malloc failed\n"); + exit(-1); + } + scripts_path = buf; + script_path = buf + MAXPATHLEN; + lang_path = buf + 2 * MAXPATHLEN; + first_half = buf + 3 * MAXPATHLEN; + snprintf(scripts_path, MAXPATHLEN, "%s/scripts", get_argv_exec_path()); scripts_dir = opendir(scripts_path); @@ -3315,6 +3322,7 @@ static int list_available_scripts(const struct option *opt __maybe_unused, "open(%s) failed.\n" "Check \"PERF_EXEC_PATH\" env to set scripts dir.\n", scripts_path); + free(buf); exit(-1); } @@ -3345,6 +3353,7 @@ static int list_available_scripts(const struct option *opt __maybe_unused, desc->half_liner ? desc->half_liner : ""); } + free(buf); exit(0); } -- 2.41.0.rc0.172.g3f132b7071-goog