Author: tuexen
Date: Wed Nov 7 22:11:38 2012
New Revision: 242714
URL: http://svnweb.freebsd.org/changeset/base/242714
Log:
Add per outgoing stream accounting for chunks in the send
and sent queue. This provides no functional change, but is
a preparation for an upcoming stream reset improvement.
Done with rrs@.
MFC after: 1 week
Modified:
head/sys/netinet/sctp_indata.c
head/sys/netinet/sctp_input.c
head/sys/netinet/sctp_pcb.c
head/sys/netinet/sctp_structs.h
head/sys/netinet/sctp_timer.c
head/sys/netinet/sctputil.c
Modified: head/sys/netinet/sctp_indata.c
==============================================================================
--- head/sys/netinet/sctp_indata.c Wed Nov 7 22:03:59 2012
(r242713)
+++ head/sys/netinet/sctp_indata.c Wed Nov 7 22:11:38 2012
(r242714)
@@ -3963,7 +3963,15 @@ sctp_express_handle_sack(struct sctp_tcb
tp1->whoTo->cwnd -= tp1->book_size;
tp1->rec.data.chunk_was_revoked = 0;
}
- tp1->sent = SCTP_DATAGRAM_ACKED;
+ if (tp1->sent != SCTP_DATAGRAM_NR_MARKED) {
+ if
(asoc->strmout[tp1->rec.data.stream_number].chunks_on_queues > 0) {
+
asoc->strmout[tp1->rec.data.stream_number].chunks_on_queues--;
+#ifdef INVARIANTS
+ } else {
+ panic("No chunks on the queues
for sid %u.", tp1->rec.data.stream_number);
+#endif
+ }
+ }
TAILQ_REMOVE(&asoc->sent_queue, tp1, sctp_next);
if (tp1->data) {
/* sa_ignore NO_NULL_CHK */
@@ -4699,10 +4707,14 @@ sctp_handle_sack(struct mbuf *m, int off
if (SCTP_TSN_GT(tp1->rec.data.TSN_seq, cum_ack)) {
break;
}
- if (tp1->sent == SCTP_DATAGRAM_UNSENT) {
- /* no more sent on list */
- SCTP_PRINTF("Warning, tp1->sent == %d and its now
acked?\n",
- tp1->sent);
+ if (tp1->sent != SCTP_DATAGRAM_NR_MARKED) {
+ if
(asoc->strmout[tp1->rec.data.stream_number].chunks_on_queues > 0) {
+
asoc->strmout[tp1->rec.data.stream_number].chunks_on_queues--;
+#ifdef INVARIANTS
+ } else {
+ panic("No chunks on the queues for sid %u.",
tp1->rec.data.stream_number);
+#endif
+ }
}
TAILQ_REMOVE(&asoc->sent_queue, tp1, sctp_next);
if (tp1->pr_sctp_on) {
Modified: head/sys/netinet/sctp_input.c
==============================================================================
--- head/sys/netinet/sctp_input.c Wed Nov 7 22:03:59 2012
(r242713)
+++ head/sys/netinet/sctp_input.c Wed Nov 7 22:11:38 2012
(r242714)
@@ -311,6 +311,13 @@ sctp_process_init(struct sctp_init_chunk
if (chk->rec.data.stream_number >= newcnt) {
TAILQ_REMOVE(&asoc->send_queue, chk, sctp_next);
asoc->send_queue_cnt--;
+ if
(asoc->strmout[chk->rec.data.stream_number].chunks_on_queues > 0) {
+
asoc->strmout[chk->rec.data.stream_number].chunks_on_queues--;
+#ifdef INVARIANTS
+ } else {
+ panic("No chunks on the queues for sid
%u.", chk->rec.data.stream_number);
+#endif
+ }
if (chk->data != NULL) {
sctp_free_bufspace(stcb, asoc, chk, 1);
sctp_ulp_notify(SCTP_NOTIFY_UNSENT_DG_FAIL, stcb,
Modified: head/sys/netinet/sctp_pcb.c
==============================================================================
--- head/sys/netinet/sctp_pcb.c Wed Nov 7 22:03:59 2012 (r242713)
+++ head/sys/netinet/sctp_pcb.c Wed Nov 7 22:11:38 2012 (r242714)
@@ -4949,6 +4949,15 @@ sctp_free_assoc(struct sctp_inpcb *inp,
}
/* sent queue SHOULD be empty */
TAILQ_FOREACH_SAFE(chk, &asoc->sent_queue, sctp_next, nchk) {
+ if (chk->sent != SCTP_DATAGRAM_NR_MARKED) {
+ if
(asoc->strmout[chk->rec.data.stream_number].chunks_on_queues > 0) {
+
asoc->strmout[chk->rec.data.stream_number].chunks_on_queues--;
+#ifdef INVARIANTS
+ } else {
+ panic("No chunks on the queues for sid %u.",
chk->rec.data.stream_number);
+#endif
+ }
+ }
TAILQ_REMOVE(&asoc->sent_queue, chk, sctp_next);
if (chk->data) {
if (so) {
Modified: head/sys/netinet/sctp_structs.h
==============================================================================
--- head/sys/netinet/sctp_structs.h Wed Nov 7 22:03:59 2012
(r242713)
+++ head/sys/netinet/sctp_structs.h Wed Nov 7 22:11:38 2012
(r242714)
@@ -588,6 +588,7 @@ union scheduling_parameters {
struct sctp_stream_out {
struct sctp_streamhead outqueue;
union scheduling_parameters ss_params;
+ uint32_t chunks_on_queues;
uint16_t stream_no;
uint16_t next_sequence_send; /* next one I expect to send out */
uint8_t last_msg_incomplete;
Modified: head/sys/netinet/sctp_timer.c
==============================================================================
--- head/sys/netinet/sctp_timer.c Wed Nov 7 22:03:59 2012
(r242713)
+++ head/sys/netinet/sctp_timer.c Wed Nov 7 22:11:38 2012
(r242714)
@@ -440,6 +440,11 @@ sctp_recover_sent_list(struct sctp_tcb *
if (SCTP_TSN_GE(asoc->last_acked_seq, chk->rec.data.TSN_seq)) {
SCTP_PRINTF("Found chk:%p tsn:%x <=
last_acked_seq:%x\n",
(void *)chk, chk->rec.data.TSN_seq,
asoc->last_acked_seq);
+ if (chk->sent != SCTP_DATAGRAM_NR_MARKED) {
+ if
(asoc->strmout[chk->rec.data.stream_number].chunks_on_queues > 0) {
+
asoc->strmout[chk->rec.data.stream_number].chunks_on_queues--;
+ }
+ }
TAILQ_REMOVE(&asoc->sent_queue, chk, sctp_next);
if (chk->pr_sctp_on) {
if (asoc->pr_sctp_cnt != 0)
Modified: head/sys/netinet/sctputil.c
==============================================================================
--- head/sys/netinet/sctputil.c Wed Nov 7 22:03:59 2012 (r242713)
+++ head/sys/netinet/sctputil.c Wed Nov 7 22:11:38 2012 (r242714)
@@ -3727,6 +3727,15 @@ sctp_report_all_outbound(struct sctp_tcb
TAILQ_FOREACH_SAFE(chk, &asoc->sent_queue, sctp_next, nchk) {
TAILQ_REMOVE(&asoc->sent_queue, chk, sctp_next);
asoc->sent_queue_cnt--;
+ if (chk->sent != SCTP_DATAGRAM_NR_MARKED) {
+ if
(asoc->strmout[chk->rec.data.stream_number].chunks_on_queues > 0) {
+
asoc->strmout[chk->rec.data.stream_number].chunks_on_queues--;
+#ifdef INVARIANTS
+ } else {
+ panic("No chunks on the queues for sid %u.",
chk->rec.data.stream_number);
+#endif
+ }
+ }
if (chk->data != NULL) {
sctp_free_bufspace(stcb, asoc, chk, 1);
sctp_ulp_notify(SCTP_NOTIFY_SENT_DG_FAIL, stcb,
@@ -3743,6 +3752,13 @@ sctp_report_all_outbound(struct sctp_tcb
TAILQ_FOREACH_SAFE(chk, &asoc->send_queue, sctp_next, nchk) {
TAILQ_REMOVE(&asoc->send_queue, chk, sctp_next);
asoc->send_queue_cnt--;
+ if (asoc->strmout[chk->rec.data.stream_number].chunks_on_queues
> 0) {
+
asoc->strmout[chk->rec.data.stream_number].chunks_on_queues--;
+#ifdef INVARIANTS
+ } else {
+ panic("No chunks on the queues for sid %u.",
chk->rec.data.stream_number);
+#endif
+ }
if (chk->data != NULL) {
sctp_free_bufspace(stcb, asoc, chk, 1);
sctp_ulp_notify(SCTP_NOTIFY_UNSENT_DG_FAIL, stcb,
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
