system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-09-06 09:10:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correct padding length for RISC-V PCPU data.

Browse source 
There was an additional 7 bytes of compiler-inserted padding at the
end of the structure visible via 'ptype /o' in gdb.

Reviewed by:	mhorne
Obtained from:	CheriBSD
Sponsored by:	DARPA
Differential Revision:	https://reviews.freebsd.org/D25867
This commit is contained in:
John Baldwin 2020-08-12 18:45:36 +00:00
parent d5c62a6f03
commit 90699f2a76
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=364176
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sys/riscv/include/pcpu.h
View file

@ -48,7 +48,7 @@
struct pmap *pc_curpmap; /* Currently active pmap */ \
uint32_t pc_pending_ipis; /* IPIs pending to this CPU */ \
uint32_t pc_hart; /* Hart ID */ \
char __pad[49]
char __pad[56] /* Pad to factor of PAGE_SIZE */
#ifdef _KERNEL

3
sys/riscv/include/pcpu_aux.h
View file

@ -46,6 +46,9 @@
* be a multiple of the size of struct pcpu.
*/
_Static_assert(PAGE_SIZE % sizeof(struct pcpu) == 0, "fix pcpu size");
_Static_assert(offsetof(struct pcpu, __pad) +
sizeof(((struct pcpu *)0)->__pad) == sizeof(struct pcpu),
"fix pcpu padding");
extern struct pcpu __pcpu[];