From nobody Tue Dec 07 18:14:28 2021 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 5DDB718B687D; Tue, 7 Dec 2021 18:14:29 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J7pNN604Tz4YVn; Tue, 7 Dec 2021 18:14:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A0CFE246E7; Tue, 7 Dec 2021 18:14:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1B7IESRt047961; Tue, 7 Dec 2021 18:14:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B7IESsL047960; Tue, 7 Dec 2021 18:14:28 GMT (envelope-from git) Date: Tue, 7 Dec 2021 18:14:28 GMT Message-Id: <202112071814.1B7IESsL047960@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 1d640e613584 - stable/13 - Implement GET_STACK_USAGE on remaining archs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1d640e61358469c17fb0ce340f78104a50b26959 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638900868; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P6/VSSlCYqvVofP3Vi/++6FKKSBSmo/KVxWcij0bmNo=; b=eJFR8q2YhG1Ixbxmsq2/X+DCJ1LfP9tpRhee6nRxj3ciW/PkYPZs4e8B6sjcrql1qffzHM d3DKNk5sPJUwU2m7fGJHw2+aOpA2vXlYt6O9I78xAs2F0JDEJ1SD1A0f7sngrpA//7A1bA FBi0X3A3/TKBz4pS4aqIJt0ZXNJudgFkWiXuZundL0mGBojz9FxTdy7uVDynBKhWmpwq0r HSarVkBV43Bb665OImzrnNi7h2en0nULQuYIwiZf/IY7JCQrqG8mzmyfjs80KXaRY+6B37 mrAmYuEeYweQ7FTjm3paA2gze5VuUEvNftEg8VcpqZnCfljqkNJ46beDxYa0Ig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638900868; a=rsa-sha256; cv=none; b=TPMopva6BLLZd8o7EQe2UjeduBoMiNkbsIti4dR/+urp9mxKplzn/WbckF1BkmCjzSSUZf 70SsdOKDg+sx9bn7FOH/BMpQsD75bBLN+YpRrQvJmPWt1kdVwV5kYzsQuORKLcRKcOM7qW gI9AJbL8RYJ6J28DSllP3hLBhvQ03d7DUGWX4Kj2brkHQZZbRuLxx8Vgv9ux+ZIfHcQ4Bu bdydf1T7tjfNMaQYiLlZiizZJGkSInjMgWj/Qj5mqdlmcXbPpkZy0flpsBfr5ZjLLXVCq0 Vd5cEB4c9iS1dugB6C+ljzYGOmPNMsywYu7uE1nKLPmIi7asnbmBS9TpiDqu1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=1d640e61358469c17fb0ce340f78104a50b26959 commit 1d640e61358469c17fb0ce340f78104a50b26959 Author: Mitchell Horne AuthorDate: 2021-11-25 16:01:11 +0000 Commit: Mitchell Horne CommitDate: 2021-12-07 18:13:47 +0000 Implement GET_STACK_USAGE on remaining archs This definition enables callers to estimate remaining space on the kstack, and take action on it. Notably, it enables optimizations in the GEOM and netgraph subsystems to directly dispatch work items when there is sufficient stack space, rather than queuing them for a worker thread. Implement it for riscv, arm, and mips. Remove the #ifdefs, so it will not go unimplemented elsewhere. PR: 259157 Reviewed by: mav, kib, markj (previous version) MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D32580 (cherry picked from commit 0d2224733e970aaa67a4e1af7b340044adda92f6) --- sys/arm/include/proc.h | 11 +++++++++++ sys/geom/geom_io.c | 8 -------- sys/mips/include/proc.h | 11 +++++++++++ sys/netgraph/ng_base.c | 3 +-- sys/riscv/include/proc.h | 11 +++++++++++ 5 files changed, 34 insertions(+), 10 deletions(-) diff --git a/sys/arm/include/proc.h b/sys/arm/include/proc.h index cdd64479c851..9e3cdf142205 100644 --- a/sys/arm/include/proc.h +++ b/sys/arm/include/proc.h @@ -71,4 +71,15 @@ struct syscall_args { register_t args[MAXARGS]; } __aligned(8); +#ifdef _KERNEL +#include + +/* Get the current kernel thread stack usage. */ +#define GET_STACK_USAGE(total, used) do { \ + struct thread *td = curthread; \ + (total) = td->td_kstack_pages * PAGE_SIZE - sizeof(struct pcb); \ + (used) = td->td_kstack + (total) - (vm_offset_t)&td; \ +} while (0) + +#endif /* _KERNEL */ #endif /* !_MACHINE_PROC_H_ */ diff --git a/sys/geom/geom_io.c b/sys/geom/geom_io.c index 31213f0f2b22..2536549762f3 100644 --- a/sys/geom/geom_io.c +++ b/sys/geom/geom_io.c @@ -559,7 +559,6 @@ g_io_request(struct bio *bp, struct g_consumer *cp) atomic_add_int(&cp->nstart, 1); #endif -#ifdef GET_STACK_USAGE direct = (cp->flags & G_CF_DIRECT_SEND) != 0 && (pp->flags & G_PF_DIRECT_RECEIVE) != 0 && !g_is_geom_thread(curthread) && @@ -573,9 +572,6 @@ g_io_request(struct bio *bp, struct g_consumer *cp) if (su * 2 > st) direct = 0; } -#else - direct = 0; -#endif if (direct) { error = g_io_check(bp); @@ -655,7 +651,6 @@ g_io_deliver(struct bio *bp, int error) bp->bio_bcount = bp->bio_length; bp->bio_resid = bp->bio_bcount - bp->bio_completed; -#ifdef GET_STACK_USAGE direct = (pp->flags & G_PF_DIRECT_SEND) && (cp->flags & G_CF_DIRECT_RECEIVE) && !g_is_geom_thread(curthread); @@ -666,9 +661,6 @@ g_io_deliver(struct bio *bp, int error) if (su * 2 > st) direct = 0; } -#else - direct = 0; -#endif /* * The statistics collection is lockless, as such, but we diff --git a/sys/mips/include/proc.h b/sys/mips/include/proc.h index 0cb1d433387c..8f6f46b86513 100644 --- a/sys/mips/include/proc.h +++ b/sys/mips/include/proc.h @@ -95,4 +95,15 @@ struct syscall_args { #define KINFO_PROC_SIZE 816 #endif +#ifdef _KERNEL +#include + +/* Get the current kernel thread stack usage. */ +#define GET_STACK_USAGE(total, used) do { \ + struct thread *td = curthread; \ + (total) = td->td_kstack_pages * PAGE_SIZE - sizeof(struct pcb); \ + (used) = td->td_kstack + (total) - (vm_offset_t)&td; \ +} while (0) + +#endif /* _KERNEL */ #endif /* !_MACHINE_PROC_H_ */ diff --git a/sys/netgraph/ng_base.c b/sys/netgraph/ng_base.c index ba60acb53502..7f3b103aeaeb 100644 --- a/sys/netgraph/ng_base.c +++ b/sys/netgraph/ng_base.c @@ -2281,7 +2281,7 @@ ng_snd_item(item_p item, int flags) queue = 1; } else { queue = 0; -#ifdef GET_STACK_USAGE + /* * Most of netgraph nodes have small stack consumption and * for them 25% of free stack space is more than enough. @@ -2296,7 +2296,6 @@ ng_snd_item(item_p item, int flags) ((node->nd_flags & NGF_HI_STACK) || (hook && (hook->hk_flags & HK_HI_STACK))))) queue = 1; -#endif } if (queue) { diff --git a/sys/riscv/include/proc.h b/sys/riscv/include/proc.h index 4b5ae9ebe3ed..b0497a4523f2 100644 --- a/sys/riscv/include/proc.h +++ b/sys/riscv/include/proc.h @@ -52,4 +52,15 @@ struct syscall_args { register_t args[MAXARGS]; }; +#ifdef _KERNEL +#include + +/* Get the current kernel thread stack usage. */ +#define GET_STACK_USAGE(total, used) do { \ + struct thread *td = curthread; \ + (total) = td->td_kstack_pages * PAGE_SIZE - sizeof(struct pcb); \ + (used) = td->td_kstack + (total) - (vm_offset_t)&td; \ +} while (0) + +#endif /* _KERNEL */ #endif /* !_MACHINE_PROC_H_ */