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 X-Spam-Level: X-Spam-Status: No, score=-26.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4FE01C433ED for ; Wed, 19 May 2021 16:44:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 22FDD60E0B for ; Wed, 19 May 2021 16:44:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344924AbhESQqS (ORCPT ); Wed, 19 May 2021 12:46:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44630 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344799AbhESQqR (ORCPT ); Wed, 19 May 2021 12:46:17 -0400 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C01F1C06175F for ; Wed, 19 May 2021 09:44:55 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id 129-20020a2504870000b0290513326cc5e0so5948327ybe.10 for ; Wed, 19 May 2021 09:44:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=9GW1oyTjD/RMsVNdKnza5MLgPiZ/BeX1RWS+tpjbiYw=; b=BDVB0nUCyWHhJG9O9W1D40kV8iKtFjoFdYa+ougq5w9evBqq/0NdxqL5lC5WbNcCa9 CN0IM2jshODOAUP9aON/jRZGz7z8OXqxPmRE4CFjU61ofgtLQJ4upO64S4EMICFPrZ9p ub+SWWPSKbOo2P0EffglejiaT5xtoLrFhNla5FW2SCXLdG7MiIj2aHaHiSXczfCxhvQh i7QJBDu8h87OxtBfQ8LxPYGcAFRu2Tw3fkuIQtMKvXrnvYnDkGCDFiPSNrUKuhExiRIY xVOFdhm4gX8BF6fqXqYmDiJWlPPxx075/bql3xJO+YBj3qPGTJyMhDHJdWAKqV0h4fSQ bZQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=9GW1oyTjD/RMsVNdKnza5MLgPiZ/BeX1RWS+tpjbiYw=; b=dtlSFP1IsWH+7/FbTbWN8Y7NfoOc+wG+5b9vzg6GuBBhlxholvthXR60gvXblB/JPn /swmcaiT7cC0vAG8uMsKf/EutsKOIlje7TJIp+m1KBsBTDPufYMbt9E3Quk9CLzwhjAC HNMBjan5Duy1rX9EkOSXcOOODDcXnjSjveuCmHSC1DllE75eceWkKiPcmt8yRxiWqEIA 23/P0gntQUSEXCeeMtIJCqIGP0ySttd/eDAOwPtOEiN/oJrVnwEvoSkQCYkcSBtbFXV4 fE7zM/YaXgkbP27NAMnM/RQTSxLoU7RRtyCVBZndcyXgIA9aPSSy5ORiajKfxHgwPukP cTkA== X-Gm-Message-State: AOAM5320vsz3QNnIQt/d+fb5ad2EWed66gsCgwnWZIPRlWD8bg2amcKH gfFurKxMj0y9f6FXy9xv6dpR0lVV9G6M X-Google-Smtp-Source: ABdhPJwmU4oMGnaEsx1vLCYzXTBNQfNfjtpdk2+BGRRV0KGZodP/MA1hPvc7645uVpfpJQcwOWc/S+Ruk8na X-Received: from irogers.svl.corp.google.com ([2620:15c:2cd:202:636:a116:b1fd:c4e8]) (user=irogers job=sendgmr) by 2002:a25:c646:: with SMTP id k67mr597071ybf.137.1621442694952; Wed, 19 May 2021 09:44:54 -0700 (PDT) Date: Wed, 19 May 2021 09:44:47 -0700 Message-Id: <20210519164447.2672030-1-irogers@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.31.1.751.gd2f1c929bd-goog Subject: [PATCH] perf: Move debug initialization earlier From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Cc: eranian@google.com, Ian Rogers Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-perf-users@vger.kernel.org This avoids segfaults during option handlers that use pr_err. For example, "perf --debug nopager list" segfaults before this change. Fixes: 8abceacff87d (perf debug: Add debug_set_file function) Signed-off-by: Ian Rogers --- tools/perf/perf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/perf/perf.c b/tools/perf/perf.c index 20cb91ef06ff..2f6b67189b42 100644 --- a/tools/perf/perf.c +++ b/tools/perf/perf.c @@ -443,6 +443,8 @@ int main(int argc, const char **argv) const char *cmd; char sbuf[STRERR_BUFSIZE]; + perf_debug_setup(); + /* libsubcmd init */ exec_cmd_init("perf", PREFIX, PERF_EXEC_PATH, EXEC_PATH_ENVIRONMENT); pager_init(PERF_PAGER_ENVIRONMENT); @@ -531,8 +533,6 @@ int main(int argc, const char **argv) */ pthread__block_sigwinch(); - perf_debug_setup(); - while (1) { static int done_help; -- 2.31.1.751.gd2f1c929bd-goog