From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AE54615666D for ; Wed, 29 Jan 2025 00:27:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738110462; cv=none; b=cmRvp4Vryw3l3OFu9h8SU/ImALpkRNUWZFCiRTefqdpXbZASQi9uF1bxPyQXcZwna1qBNdGKhQppOwfnZWOKb/lobuXTvydxXydqafDsmIgFeG+hDoRr5viXkTDGNNLaQu4HJ/dE/sRxNFBGhD6A/xuSZ1xGCBwELdHBrw/tfcA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738110462; c=relaxed/simple; bh=JXR8T33WgTBIEDVxRbVK0LNxlccdzx4b2VLjaRPQh0w=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=gRqzm4NMfhrgy8MtWtQqcFzypuYhq6NU9bkZdGb47fU1F+y9JRdg1qgxfi87WIYQNL/knI0xALy+rqhdL1ws1tUbcSOO+VDPlXL9XNRGx5eDJqqV4wy3SpyYYyujLTgPcTkp2E1IzuIceI+pRkRyuPZhXrP6lgPoN2xkOSo4doQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--ctshao.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=I+W0n3a2; arc=none smtp.client-ip=209.85.216.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--ctshao.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="I+W0n3a2" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-2ef35de8901so11572108a91.3 for ; Tue, 28 Jan 2025 16:27:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1738110460; x=1738715260; darn=lists.linux.dev; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=/kZ7iqAFWEW/1CVmn2pzdj8BRoAIsJA95X92RXs36J8=; b=I+W0n3a2onkA3YgsNT3sihYcmDSiFDfbqlrG00FKTkxtnQm70BUEiJeXu4QkTBYvl+ FfNCsfOTZg0AU2Gslo4s63wt2XkzDoc/E2mBh/huyIcsecG2ArZ/swi8VGdrir66hjA6 cWaOvi8hwd4y16l6go3uEefDQzR5wwvEWfjwfUzefglyYRtiFRQPXi+GKALiKdFOzuGC ZAw+z4zQ32A8RDDFmsJwLMAuNXJfpHIgudzRLMoCoQGjnyCtBoKxNQDaJjZCCZXtnmoF ZSldVIRqiIpky7mTw4ALN2XR3CrYD4qSeNalXUgspG0l/W/6k8N4bfK6K9Eoq1eS6BW3 XZfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738110460; x=1738715260; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=/kZ7iqAFWEW/1CVmn2pzdj8BRoAIsJA95X92RXs36J8=; b=SUrT8U+K5lVjMTUTnhIhz6PIdQloOq5Oboxpjjsk3PVvkEuB5EaGrPtqqvU42957ds HwF2WU0hy+THXQl8knPtpizW0z8s0kW9I4U+okfRP9VvRiYCC2vlOgLuARV7ZCAx06Z8 88+kO7Dcj9I+Ak9HDZHVrBxixWY/J2djkVLxLTU1PX1Dv1mWqZhJawWWTzJXoCLVVBHc W8kcs6NnLztjk+0sHs8VQMnnuIir39G7IRMECKiGc3rDHIh/xRevng1dvRgaWW/1O7Ob 6BJDO7cF2kpLbXuJZNCUs9bL/D6EAz08xZcRl7kN9sTpaac57NqYJ3KuY7u7CFGcjotH 3cWQ== X-Forwarded-Encrypted: i=1; AJvYcCXG1xvgsgaL3bhjyDgq1Fu0YUv1AOEC2qw9RbyqqF0TYSgv+HZgH3VuN7MOXRieSfHbpndB@lists.linux.dev X-Gm-Message-State: AOJu0YxrMGjqmV8Y6O0RMovnbhNOXNgxvFYLvqzDMOVg8g8/xoEAUGSC 6OzHvos/LAd9fGJC6S52RII1aywm1aBF/Hn5owHkC9AuIahVDyo3E+iMItHHuWVMB2b6VjAj7i1 N3A== X-Google-Smtp-Source: AGHT+IHuivb002Myaw3lnKxSivwCEVIBuEWsY7r6mdBhKNiyiCBu9zbawayIbipZdTXtPqU4Sr6JtaI2KY0= X-Received: from pjyr14.prod.google.com ([2002:a17:90a:e18e:b0:2e5:5ffc:1c36]) (user=ctshao job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:5190:b0:2ee:d63f:d8f with SMTP id 98e67ed59e1d1-2f83abb91d4mr1576644a91.13.1738110460020; Tue, 28 Jan 2025 16:27:40 -0800 (PST) Date: Tue, 28 Jan 2025 16:15:01 -0800 In-Reply-To: <20250129001905.619859-1-ctshao@google.com> Precedence: bulk X-Mailing-List: llvm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250129001905.619859-1-ctshao@google.com> X-Mailer: git-send-email 2.48.1.262.g85cc9f2d1e-goog Message-ID: <20250129001905.619859-6-ctshao@google.com> Subject: [PATCH v3 5/5] perf lock: Update documentation for -o option in contention mode From: Chun-Tse Shao To: linux-kernel@vger.kernel.org Cc: Chun-Tse Shao , peterz@infradead.org, mingo@redhat.com, acme@kernel.org, namhyung@kernel.org, mark.rutland@arm.com, alexander.shishkin@linux.intel.com, jolsa@kernel.org, irogers@google.com, adrian.hunter@intel.com, kan.liang@linux.intel.com, nathan@kernel.org, ndesaulniers@google.com, morbo@google.com, justinstitt@google.com, linux-perf-users@vger.kernel.org, bpf@vger.kernel.org, llvm@lists.linux.dev Content-Type: text/plain; charset="UTF-8" This patch also decouple -o with -t, and shows warning to notify the new behavior for -ov. Signed-off-by: Chun-Tse Shao --- tools/perf/builtin-lock.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/perf/builtin-lock.c b/tools/perf/builtin-lock.c index d9b0d7472aea..b925be06b0d8 100644 --- a/tools/perf/builtin-lock.c +++ b/tools/perf/builtin-lock.c @@ -1818,7 +1818,7 @@ static void print_contention_result(struct lock_contention *con) break; } - if (con->owner && con->save_callstack) { + if (con->owner && con->save_callstack && verbose > 0) { struct rb_root root = RB_ROOT; if (symbol_conf.field_sep) @@ -1979,6 +1979,11 @@ static int check_lock_contention_options(const struct option *options, } } + if (show_lock_owner && !show_thread_stats) { + pr_warning("Now -o try to show owner's callstack instead of pid and comm.\n"); + pr_warning("Please use -t option too to keep the old behavior.\n"); + } + return 0; } @@ -2570,7 +2575,8 @@ int cmd_lock(int argc, const char **argv) "Filter specific address/symbol of locks", parse_lock_addr), OPT_CALLBACK('S', "callstack-filter", NULL, "NAMES", "Filter specific function in the callstack", parse_call_stack), - OPT_BOOLEAN('o', "lock-owner", &show_lock_owner, "show lock owners instead of waiters"), + OPT_BOOLEAN('o', "lock-owner", &show_lock_owner, "show lock owners instead of waiters.\n" + "\t\t\tThis option can be combined with -t, which shows owner's per thread lock stats, or -v, which shows owner's stacktrace"), OPT_STRING_NOEMPTY('x', "field-separator", &symbol_conf.field_sep, "separator", "print result in CSV format with custom separator"), OPT_BOOLEAN(0, "lock-cgroup", &show_lock_cgroups, "show lock stats by cgroup"), -- 2.48.1.262.g85cc9f2d1e-goog