Move MPASS() macros to systm.h.
ClosedPublic
Actions

Authored by glebius on Feb 12 2020, 11:03 PM.

Details

Reviewers

kib
mjg

Commits

rS361931: Move MPASS() macros to systm.h. They are widely used all over

Summary

They are widely used all over the kernel and aren't contained only to the locking code.

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

glebius created this revision.Feb 12 2020, 11:03 PM

Harbormaster completed remote builds in B29332: Diff 68224.Feb 12 2020, 11:03 PM

does tinderbox build?

This revision is now accepted and ready to land.Feb 13 2020, 5:07 AM

looks like this is guarded by _KERNEL in the original header, we should stick to it just in case in the new one

In D23656#519337, @mjg wrote:

looks like this is guarded by _KERNEL in the original header, we should stick to it just in case in the new one

Makes sense. I will update.

Shift down under _KERNEL.

This revision now requires review to proceed.Feb 13 2020, 5:48 AM

Harbormaster completed remote builds in B29341: Diff 68241.Feb 13 2020, 5:48 AM

no, keep it grouped with the rest for consistency but #if defined(_KERNEL) around it

In D23656#519345, @mjg wrote:

no, keep it grouped with the rest for consistency but #if defined(_KERNEL) around it

Well, down below are still collection of assertions. I'd rather pull down KASSERT() definitions under _KERNEL. However, that would require additional tinderbox build.

mjg accepted this revision.Feb 13 2020, 6:10 AM

This revision is now accepted and ready to land.Feb 13 2020, 6:10 AM

kib added inline comments.Feb 13 2020, 11:25 AM

sys/sys/systm.h
148 ↗	(On Diff #68241)	I do not understand, from the discussion above you all agreed to have the macros under _KERNEL, but there it is not ?

glebius added inline comments.Feb 13 2020, 4:01 PM

sys/sys/systm.h
148 ↗	(On Diff #68241)	It is. The ifdef is above at line 134.

kib added inline comments.Feb 13 2020, 4:34 PM

sys/sys/systm.h
148 ↗	(On Diff #68241)	But isn't endif at line 138 ends its scope ?

glebius added inline comments.Feb 13 2020, 6:13 PM

sys/sys/systm.h
148 ↗	(On Diff #68241)	You are damn right. So looks like all other kernel related asserts in systm.h aren't covered by _KERNEL. Then I'd suggest to proceed as is, with original patch, where MPASSes were right after KASSERT definition. Then with a new patch tested with separate tinderbox build I will push all kernel related assertions under _KERNEL, all at once.