git: bd19202c92e3 - main - sctp: improve KASSERT messages

The branch main has been updated by tuexen:

URL: https://cgit.FreeBSD.org/src/commit/?id=bd19202c92e3d73e90aedd518f0963797744e50f

commit bd19202c92e3d73e90aedd518f0963797744e50f
Author:     Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2021-10-08 09:32:55 +0000
Commit:     Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2021-10-08 09:33:56 +0000

    sctp: improve KASSERT messages
    
    MFC after:      1 week
---
 sys/netinet/sctp_ss_functions.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/sys/netinet/sctp_ss_functions.c b/sys/netinet/sctp_ss_functions.c
index c08bec07c588..23b1dc20e4cf 100644
--- a/sys/netinet/sctp_ss_functions.c
+++ b/sys/netinet/sctp_ss_functions.c
@@ -165,20 +165,20 @@ sctp_ss_default_select(struct sctp_tcb *stcb SCTP_UNUSED, struct sctp_nets *net,
 {
 	struct sctp_stream_out *strq, *strqt;
 
-	if (asoc->ss_data.locked_on_sending) {
+	if (asoc->ss_data.locked_on_sending != NULL) {
 		KASSERT(asoc->ss_data.locked_on_sending->ss_params.scheduled,
-		    ("strq %p not scheduled",
+		    ("locked_on_sending %p not scheduled",
 		    (void *)asoc->ss_data.locked_on_sending));
 		return (asoc->ss_data.locked_on_sending);
 	}
 	strqt = asoc->ss_data.last_out_stream;
+	KASSERT(strqt == NULL || strqt->ss_params.scheduled,
+	    ("last_out_stream %p not scheduled", (void *)strqt));
 default_again:
 	/* Find the next stream to use */
 	if (strqt == NULL) {
 		strq = TAILQ_FIRST(&asoc->ss_data.out.wheel);
 	} else {
-		KASSERT(strqt->ss_params.scheduled,
-		    ("strq %p not scheduled", (void *)strqt));
 		strq = TAILQ_NEXT(strqt, ss_params.ss.rr.next_spoke);
 		if (strq == NULL) {
 			strq = TAILQ_FIRST(&asoc->ss_data.out.wheel);
@@ -332,13 +332,13 @@ sctp_ss_rrp_packet_done(struct sctp_tcb *stcb SCTP_UNUSED, struct sctp_nets *net
 	struct sctp_stream_out *strq, *strqt;
 
 	strqt = asoc->ss_data.last_out_stream;
+	KASSERT(strqt == NULL || strqt->ss_params.scheduled,
+	    ("last_out_stream %p not scheduled", (void *)strqt));
 rrp_again:
 	/* Find the next stream to use */
 	if (strqt == NULL) {
 		strq = TAILQ_FIRST(&asoc->ss_data.out.wheel);
 	} else {
-		KASSERT(strqt->ss_params.scheduled,
-		    ("strq %p not scheduled", (void *)strqt));
 		strq = TAILQ_NEXT(strqt, ss_params.ss.rr.next_spoke);
 		if (strq == NULL) {
 			strq = TAILQ_FIRST(&asoc->ss_data.out.wheel);
@@ -484,20 +484,20 @@ sctp_ss_prio_select(struct sctp_tcb *stcb SCTP_UNUSED, struct sctp_nets *net,
 {
 	struct sctp_stream_out *strq, *strqt, *strqn;
 
-	if (asoc->ss_data.locked_on_sending) {
+	if (asoc->ss_data.locked_on_sending != NULL) {
 		KASSERT(asoc->ss_data.locked_on_sending->ss_params.scheduled,
-		    ("strq %p not scheduled",
+		    ("locked_on_sending %p not scheduled",
 		    (void *)asoc->ss_data.locked_on_sending));
 		return (asoc->ss_data.locked_on_sending);
 	}
 	strqt = asoc->ss_data.last_out_stream;
+	KASSERT(strqt == NULL || strqt->ss_params.scheduled,
+	    ("last_out_stream %p not scheduled", (void *)strqt));
 prio_again:
 	/* Find the next stream to use */
 	if (strqt == NULL) {
 		strq = TAILQ_FIRST(&asoc->ss_data.out.wheel);
 	} else {
-		KASSERT(strqt->ss_params.scheduled,
-		    ("strq %p not scheduled", (void *)strqt));
 		strqn = TAILQ_NEXT(strqt, ss_params.ss.prio.next_spoke);
 		if (strqn != NULL &&
 		    strqn->ss_params.ss.prio.priority == strqt->ss_params.ss.prio.priority) {
@@ -656,9 +656,9 @@ sctp_ss_fb_select(struct sctp_tcb *stcb SCTP_UNUSED, struct sctp_nets *net,
 {
 	struct sctp_stream_out *strq = NULL, *strqt;
 
-	if (asoc->ss_data.locked_on_sending) {
+	if (asoc->ss_data.locked_on_sending != NULL) {
 		KASSERT(asoc->ss_data.locked_on_sending->ss_params.scheduled,
-		    ("strq %p not scheduled",
+		    ("locked_on_sending %p not scheduled",
 		    (void *)asoc->ss_data.locked_on_sending));
 		return (asoc->ss_data.locked_on_sending);
 	}