Received: by 2002:a25:824b:0:0:0:0:0 with SMTP id d11csp734868ybn; Tue, 24 Sep 2019 08:42:41 -0700 (PDT) X-Google-Smtp-Source: APXvYqy+KSGW6iJ2fY0Wq2CUXBuOqSY60UITSCGh4FLCsEN5f4f2I+4bUeABC0F3aA+TkDUBmfM+ X-Received: by 2002:a17:906:8258:: with SMTP id f24mr3154438ejx.234.1569339761075; Tue, 24 Sep 2019 08:42:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569339761; cv=none; d=google.com; s=arc-20160816; b=KwvhdNNOYixqyiK3TVolO3g2mNWVi7zW7hXA7/nT2pPAr5BRduNq6seAlLK08v7oMX 52dJJSJNf6kdxE04pGLm/BGGVtojJcgpir1yBvza7WJi5KdMG7rb7UKKEmD2jKi1wZ9R nqetu1BU0E5DzWyRG8pqrr4g3wJ862fLgoeixcWfJ4sVu/auGGs51NWgKsByWdccGq1H 8kPA2ZM72z1QoVbfBE45Jm/0Qwmlv6UHqbDSeQ5UNGPH02Ax1/NOXX8+oTqnVTIVMfdb hKDz83b1YUr2LYsN0YxHM/bWJdqnpID0a6gqDyj1I1J8vpT7jYPfGIQnjjexquHh+NDs nKuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=NxWMenEOks2lUnC06oLWvD9YVUpLLaHwu/xC/7PD1y8=; b=vY0GB6nWrR2Bj3sOLuSF9VRhWgYOqlyvvM/wTltHH5e2PbGhzZGX55wLmNxUnm0gvr jNNkBzycNvRXNLXoOwp/A5LyUT0oeWjWZS59smya+OmZ1L28Szwb7y7pD3Nw/zhgl+6u 1c1AZQ79H60lrFuEuBYevRRnVNj6F9xLgl/1QcODnFNBvYYVs1MTFq7/9urCwBC3g8Xm 4wQ00DLo65HApeXFriMrKaLeAmGuDwlLWkMqBXLCfc6mbJjp3s+Mp5CMN3imSawHI6fz uEdW21g7ILbv9RCoILQUvaSX9U4KBaSLTy6TlG2fyCAvD/GIumxit7cCrvhHDncO0owt 2BdQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=uLLPW3dl; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f2si1106296ejk.25.2019.09.24.08.42.15; Tue, 24 Sep 2019 08:42:41 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=uLLPW3dl; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2438364AbfIVTdv (ORCPT + 99 others); Sun, 22 Sep 2019 15:33:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:43896 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390909AbfIVSra (ORCPT ); Sun, 22 Sep 2019 14:47:30 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5E61D206C2; Sun, 22 Sep 2019 18:47:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569178049; bh=V0RnYzcQU1XuCrNHFEnrM5GjrBtSWIbwGLuJ+vIGQHc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uLLPW3dlA9pXtMDuXgONJBK8ICEJ6xNyPO2tzcqK/V8THJRu5OnEJssA1LWAiDvkV 36ihr9l6SuZhnztwUfbS8S+BBF+mo/DqH73BqT0vJ2ZYX0Vm8yT2FTlspjTyLQoPXp LDpojEvdfbxYZUiftvrjj0/ZxqOpHcg86vHpC3MA= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Benjamin Peterson , Arnaldo Carvalho de Melo , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Peter Zijlstra , Sasha Levin Subject: [PATCH AUTOSEL 5.3 127/203] perf trace beauty ioctl: Fix off-by-one error in cmd->string table Date: Sun, 22 Sep 2019 14:42:33 -0400 Message-Id: <20190922184350.30563-127-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190922184350.30563-1-sashal@kernel.org> References: <20190922184350.30563-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Benjamin Peterson [ Upstream commit b92675f4a9c02dd78052645597dac9e270679ddf ] While tracing a program that calls isatty(3), I noticed that strace reported TCGETS for the request argument of the underlying ioctl(2) syscall while perf trace reported TCSETS. strace is corrrect. The bug in perf was due to the tty ioctl beauty table starting at 0x5400 rather than 0x5401. Committer testing: Using augmented_raw_syscalls.o and settings to make 'perf trace' use strace formatting, i.e. with this in ~/.perfconfig # cat ~/.perfconfig [trace] add_events = /home/acme/git/linux/tools/perf/examples/bpf/augmented_raw_syscalls.c show_zeros = yes show_duration = no no_inherit = yes show_timestamp = no show_arg_names = no args_alignment = 40 show_prefix = yes # strace -e ioctl stty > /dev/null ioctl(0, TCGETS, {B38400 opost isig icanon echo ...}) = 0 ioctl(1, TIOCGWINSZ, 0x7fff8a9b0860) = -1 ENOTTY (Inappropriate ioctl for device) ioctl(1, TCGETS, 0x7fff8a9b0540) = -1 ENOTTY (Inappropriate ioctl for device) +++ exited with 0 +++ # Before: # perf trace -e ioctl stty > /dev/null ioctl(0, TCSETS, 0x7fff2cf79f20) = 0 ioctl(1, TIOCSWINSZ, 0x7fff2cf79f40) = -1 ENOTTY (Inappropriate ioctl for device) ioctl(1, TCSETS, 0x7fff2cf79c20) = -1 ENOTTY (Inappropriate ioctl for device) # After: # perf trace -e ioctl stty > /dev/null ioctl(0, TCGETS, 0x7ffed0763920) = 0 ioctl(1, TIOCGWINSZ, 0x7ffed0763940) = -1 ENOTTY (Inappropriate ioctl for device) ioctl(1, TCGETS, 0x7ffed0763620) = -1 ENOTTY (Inappropriate ioctl for device) # Signed-off-by: Benjamin Peterson Tested-by: Arnaldo Carvalho de Melo Cc: Alexander Shishkin Cc: Jiri Olsa Cc: Namhyung Kim Cc: Peter Zijlstra Fixes: 1cc47f2d46206d67285aea0ca7e8450af571da13 ("perf trace beauty ioctl: Improve 'cmd' beautifier") Link: http://lkml.kernel.org/r/20190823033625.18814-1-benjamin@python.org Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- tools/perf/trace/beauty/ioctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/trace/beauty/ioctl.c b/tools/perf/trace/beauty/ioctl.c index 52242fa4072b0..e19eb6ea361d7 100644 --- a/tools/perf/trace/beauty/ioctl.c +++ b/tools/perf/trace/beauty/ioctl.c @@ -21,7 +21,7 @@ static size_t ioctl__scnprintf_tty_cmd(int nr, int dir, char *bf, size_t size) { static const char *ioctl_tty_cmd[] = { - "TCGETS", "TCSETS", "TCSETSW", "TCSETSF", "TCGETA", "TCSETA", "TCSETAW", + [_IOC_NR(TCGETS)] = "TCGETS", "TCSETS", "TCSETSW", "TCSETSF", "TCGETA", "TCSETA", "TCSETAW", "TCSETAF", "TCSBRK", "TCXONC", "TCFLSH", "TIOCEXCL", "TIOCNXCL", "TIOCSCTTY", "TIOCGPGRP", "TIOCSPGRP", "TIOCOUTQ", "TIOCSTI", "TIOCGWINSZ", "TIOCSWINSZ", "TIOCMGET", "TIOCMBIS", "TIOCMBIC", "TIOCMSET", "TIOCGSOFTCAR", "TIOCSSOFTCAR", -- 2.20.1