Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp659595pxv; Thu, 15 Jul 2021 12:44:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy5U41cbbp2uqIGvWYo6PAEgwcatFIOsziYc7DF/QbThN4qb8P+NWfxYtHLtN9F3ofZFfzG X-Received: by 2002:a6b:b883:: with SMTP id i125mr4505306iof.104.1626378275955; Thu, 15 Jul 2021 12:44:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626378275; cv=none; d=google.com; s=arc-20160816; b=qRsj9fIF0rP7ohZ65+blktIuuv6YMow4/ZpY8fJePMSB0r6I5RBqq0INikYRw0rQje eyD0yeYaB79s1z5cY7BbzeU6pa/YC9NCC/ySZCUycJhL2ikDLHwq0ByT2/iSM+1XkxJ1 uvQSZK1tbysIEkLmGGcQCvFBy8rucXXmqStq7CfHf7ItNAneFWeuMtg5d1KLvbgfiyUx RC0p99qKZhSePncdRXMi1a+S/2B1FeeTWr7q4FbcQ+B+T8+aLBLLp0GQyjW5Hhl5ZjUj qZEewwsLUc4oMgckGHgjlNzDLThvcB0pAWY0GDB4ARm22xu6y8g3nVUDlcROFdV7yKxw Yykg== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=EFwxSqH0ERE9zHHbSywjVpZL9J52WukPRp9pQWjrUpY=; b=Lgfu+r9h1vOL1FZ5r2FTpuG/gD+nVFmQp3+MRVzX/9n8q1rxPxrqNEcMxmanOLGbJ2 dOeRrfIZxOxXO2VQYjF9P/7ViFncXincM5QBoSc3Zv/fqpq/UG6ZJ0hEKfvba412644W v579qKYUx2QrEIyjFaKmBosiJInWU0jH0aKuYr+cXkoOKrUMYtxb8ieKalv0XdmQNOAh 7yGGv2dvNRbCb3futrOri9WfOCOrxKXKTmU37d80GguC6C8x5b+BImTI8hAp3qFnxpi9 Z+cGnXZJRuWLvZLqoHALKuZl+nWokny9A+tTG84PwR67eVH8hDbrRSz5yTPCSPBkD1CV Hogw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=unwN0Wbp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id u21si7413710jak.34.2021.07.15.12.44.23; Thu, 15 Jul 2021 12:44:35 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=unwN0Wbp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245055AbhGOTql (ORCPT + 99 others); Thu, 15 Jul 2021 15:46:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:51362 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244272AbhGOTQR (ORCPT ); Thu, 15 Jul 2021 15:16:17 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id B773061408; Thu, 15 Jul 2021 19:12:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626376351; bh=i9Pf6XDHwUj8qAH/lWTH5t2HTzE3F+8oeBpscwO63mA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=unwN0Wbpog40gBj5pNfdVkNwS3hGWBpVtrePiiFqNHyUDQw5aiboggA4ns9xQdWPd zxeoFHjlLX5rPWpDgwSMlaDhAqTqS/gybuO1ZxYYx/Nvt4lrHE4IuKd4JkAZcYUdfU uVPCPWuG4z/swnf03hNt/YOahYT7i2Be3N/sQdoo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ingo Molnar , Joel Fernandes , Paul Burton , "Steven Rostedt (VMware)" Subject: [PATCH 5.13 234/266] tracing: Simplify & fix saved_tgids logic Date: Thu, 15 Jul 2021 20:39:49 +0200 Message-Id: <20210715182650.416438456@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210715182613.933608881@linuxfoundation.org> References: <20210715182613.933608881@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Paul Burton commit b81b3e959adb107cd5b36c7dc5ba1364bbd31eb2 upstream. The tgid_map array records a mapping from pid to tgid, where the index of an entry within the array is the pid & the value stored at that index is the tgid. The saved_tgids_next() function iterates over pointers into the tgid_map array & dereferences the pointers which results in the tgid, but then it passes that dereferenced value to trace_find_tgid() which treats it as a pid & does a further lookup within the tgid_map array. It seems likely that the intent here was to skip over entries in tgid_map for which the recorded tgid is zero, but instead we end up skipping over entries for which the thread group leader hasn't yet had its own tgid recorded in tgid_map. A minimal fix would be to remove the call to trace_find_tgid, turning: if (trace_find_tgid(*ptr)) into: if (*ptr) ..but it seems like this logic can be much simpler if we simply let seq_read() iterate over the whole tgid_map array & filter out empty entries by returning SEQ_SKIP from saved_tgids_show(). Here we take that approach, removing the incorrect logic here entirely. Link: https://lkml.kernel.org/r/20210630003406.4013668-1-paulburton@google.com Fixes: d914ba37d714 ("tracing: Add support for recording tgid of tasks") Cc: Ingo Molnar Cc: Joel Fernandes Cc: Signed-off-by: Paul Burton Signed-off-by: Steven Rostedt (VMware) Signed-off-by: Greg Kroah-Hartman --- kernel/trace/trace.c | 38 +++++++++++++------------------------- 1 file changed, 13 insertions(+), 25 deletions(-) --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -5608,37 +5608,20 @@ static const struct file_operations trac static void *saved_tgids_next(struct seq_file *m, void *v, loff_t *pos) { - int *ptr = v; + int pid = ++(*pos); - if (*pos || m->count) - ptr++; - - (*pos)++; - - for (; ptr <= &tgid_map[PID_MAX_DEFAULT]; ptr++) { - if (trace_find_tgid(*ptr)) - return ptr; - } + if (pid > PID_MAX_DEFAULT) + return NULL; - return NULL; + return &tgid_map[pid]; } static void *saved_tgids_start(struct seq_file *m, loff_t *pos) { - void *v; - loff_t l = 0; - - if (!tgid_map) + if (!tgid_map || *pos > PID_MAX_DEFAULT) return NULL; - v = &tgid_map[0]; - while (l <= *pos) { - v = saved_tgids_next(m, v, &l); - if (!v) - return NULL; - } - - return v; + return &tgid_map[*pos]; } static void saved_tgids_stop(struct seq_file *m, void *v) @@ -5647,9 +5630,14 @@ static void saved_tgids_stop(struct seq_ static int saved_tgids_show(struct seq_file *m, void *v) { - int pid = (int *)v - tgid_map; + int *entry = (int *)v; + int pid = entry - tgid_map; + int tgid = *entry; + + if (tgid == 0) + return SEQ_SKIP; - seq_printf(m, "%d %d\n", pid, trace_find_tgid(pid)); + seq_printf(m, "%d %d\n", pid, tgid); return 0; }