d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cam: turn KASSERTs into printfs for now

Browse Source 
It looks like I've missed a couple of places where we don't clear
stack-allocated CCBs.  Don't panic when that happens, just print
a warning.

This is a temporary measure until I get those cases fixed.

Reviewed By:	markj
Sponsored by:	NetApp, Inc.
Sponsored by:	Klara, Inc.
Differential Revision: https://reviews.freebsd.org/D30296
This commit is contained in:
Edward Tomasz Napierala 2021-05-16 20:11:46 +01:00
parent fb58045145
commit 75b5caa08e
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/cam/ata/ata_xpt.c
View File

@ -1796,10 +1796,18 @@ ata_action(union ccb *start_ccb)
{
if (start_ccb->ccb_h.func_code != XPT_ATA_IO) {
#ifdef notyet
KASSERT((start_ccb->ccb_h.alloc_flags & CAM_CCB_FROM_UMA) == 0,
("%s: ccb %p, func_code %#x should not be allocated "
"from UMA zone\n",
__func__, start_ccb, start_ccb->ccb_h.func_code));
#else
if ((start_ccb->ccb_h.alloc_flags & CAM_CCB_FROM_UMA) != 0) {
printf("%s: ccb %p, func_code %#x should not be allocated "
"from UMA zone\n",
__func__, start_ccb, start_ccb->ccb_h.func_code);
}
#endif
}
switch (start_ccb->ccb_h.func_code) {

8
sys/cam/scsi/scsi_xpt.c
View File

@ -2626,10 +2626,18 @@ scsi_action(union ccb *start_ccb)
{
if (start_ccb->ccb_h.func_code != XPT_SCSI_IO) {
#ifdef notyet
KASSERT((start_ccb->ccb_h.alloc_flags & CAM_CCB_FROM_UMA) == 0,
("%s: ccb %p, func_code %#x should not be allocated "
"from UMA zone\n",
__func__, start_ccb, start_ccb->ccb_h.func_code));
#else
if ((start_ccb->ccb_h.alloc_flags & CAM_CCB_FROM_UMA) != 0) {
printf("%s: ccb %p, func_code %#x should not be allocated "
"from UMA zone\n",
__func__, start_ccb, start_ccb->ccb_h.func_code);
}
#endif
}
switch (start_ccb->ccb_h.func_code) {