From owner-svn-src-head@freebsd.org  Thu Dec 19 19:34:26 2019
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3C2091E95C9;
 Thu, 19 Dec 2019 19:34:26 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 47f2BT73PXz43Sr;
 Thu, 19 Dec 2019 19:34:25 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E89421B6A7;
 Thu, 19 Dec 2019 19:34:25 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBJJYPqu080513;
 Thu, 19 Dec 2019 19:34:25 GMT (envelope-from markj@FreeBSD.org)
Received: (from markj@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBJJYPSD080512;
 Thu, 19 Dec 2019 19:34:25 GMT (envelope-from markj@FreeBSD.org)
Message-Id: <201912191934.xBJJYPSD080512@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: markj set sender to
 markj@FreeBSD.org using -f
From: Mark Johnston <markj@FreeBSD.org>
Date: Thu, 19 Dec 2019 19:34:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r355916 - head/sys/kern
X-SVN-Group: head
X-SVN-Commit-Author: markj
X-SVN-Commit-Paths: head/sys/kern
X-SVN-Commit-Revision: 355916
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Dec 2019 19:34:26 -0000

Author: markj
Date: Thu Dec 19 19:34:25 2019
New Revision: 355916
URL: https://svnweb.freebsd.org/changeset/base/355916

Log:
  Fix SIGINFO stack collection to ignore threads with swapped-out stacks.
  
  We by definition cannot trace the stack of such a thread.  Also remove a
  redundant stack_zero() call in the SIGINFO handler, the stack structure
  is cleared by the MD stack_capture().
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/sys/kern/tty_info.c

Modified: head/sys/kern/tty_info.c
==============================================================================
--- head/sys/kern/tty_info.c	Thu Dec 19 18:22:11 2019	(r355915)
+++ head/sys/kern/tty_info.c	Thu Dec 19 19:34:25 2019	(r355916)
@@ -338,8 +338,9 @@ tty_info(struct tty *tp)
 	pctcpu = (sched_pctcpu(td) * 10000 + FSCALE / 2) >> FSHIFT;
 #ifdef STACK
 	if (tty_info_kstacks) {
-		stack_zero(&stack);
-		if (TD_IS_SWAPPED(td) || TD_IS_RUNNING(td))
+		if (TD_IS_SWAPPED(td))
+			sterr = ENOENT;
+		else if (TD_IS_RUNNING(td))
 			sterr = stack_save_td_running(&stack, td);
 		else {
 			stack_save_td(&stack, td);