git: 8dba6a20205d - stable/13 - i386: take pcb and fpu area into account in GET_STACK_USAGE
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 07 Dec 2021 18:14:26 UTC
The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=8dba6a20205dc277aa02fa8c7c56a04cc3715dcd commit 8dba6a20205dc277aa02fa8c7c56a04cc3715dcd Author: Mitchell Horne <mhorne@FreeBSD.org> AuthorDate: 2021-11-25 15:54:33 +0000 Commit: Mitchell Horne <mhorne@FreeBSD.org> CommitDate: 2021-12-07 18:13:46 +0000 i386: take pcb and fpu area into account in GET_STACK_USAGE On this platform, the pcb and FPU save area are allocated from the top of each kernel stack, so they should be excluded from the calculation of the total and used stack sizes. Reviewed by: kib MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D32581 (cherry picked from commit 8bc792b3845ecf64145fda7964a7b5cc54dea777) --- sys/i386/include/proc.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/i386/include/proc.h b/sys/i386/include/proc.h index 2950946ff155..4be836886b21 100644 --- a/sys/i386/include/proc.h +++ b/sys/i386/include/proc.h @@ -70,13 +70,13 @@ struct syscall_args { #ifdef _KERNEL +#include <machine/md_var.h> + /* 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; \ - (used) = (char *)td->td_kstack + \ - td->td_kstack_pages * PAGE_SIZE - \ - (char *)&td; \ + (total) = (vm_offset_t)get_pcb_td(td) - td->td_kstack; \ + (used) = (vm_offset_t)get_pcb_td(td) - (vm_offset_t)&td; \ } while (0) void set_user_ldt(struct mdproc *);