D57134.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D57134.diff
View Options

	diff --git a/sys/kern/kern_sendfile.c b/sys/kern/kern_sendfile.c
	--- a/sys/kern/kern_sendfile.c
	+++ b/sys/kern/kern_sendfile.c
	@@ -95,6 +95,8 @@
	vm_pindex_t pindex0;
	#ifdef KERN_TLS
	struct ktls_session *tls;
	+ struct mbuf *tls_m;
	+ int tls_enq_cnt;
	#endif
	vm_page_t pa[];
	};
	@@ -338,7 +340,12 @@
	so->so_proto->pr_abort(so);
	so->so_error = EIO;

	- mb_free_notready(sfio->m, sfio->npages);
	+#ifdef KERN_TLS
	+ if (sfio->tls_m != NULL)
	+ mb_free_notready(sfio->tls_m, sfio->tls_enq_cnt);
	+ else
	+#endif
	+ mb_free_notready(sfio->m, sfio->npages);
	#ifdef KERN_TLS
	} else if (sfio->tls != NULL && sfio->tls->mode == TCP_TLS_MODE_SW) {
	/*
	@@ -350,7 +357,10 @@
	* Donate the socket reference from sfio to rather
	* than explicitly invoking soref().
	*/
	- ktls_enqueue(sfio->m, so, sfio->npages);
	+ if (sfio->tls_m != NULL)
	+ ktls_enqueue(sfio->tls_m, so, sfio->tls_enq_cnt);
	+ else
	+ ktls_enqueue(sfio->m, so, sfio->npages);
	goto out_with_ref;
	#endif
	} else
	@@ -897,6 +907,8 @@
	* for all of sfio's lifetime.
	*/
	sfio->tls = tls;
	+ sfio->tls_m = NULL;
	+ sfio->tls_enq_cnt = 0;
	#endif
	vm_object_pip_add(obj, 1);
	error = sendfile_swapin(obj, sfio, &nios, off, space, rhpages,
	@@ -1125,6 +1137,13 @@
	} else {
	sfio->so = so;
	sfio->m = m0;
	+#ifdef KERN_TLS
	+ if (hdrlen != 0 && tls != NULL &&
	+ tls->mode == TCP_TLS_MODE_SW) {
	+ sfio->tls_m = m;
	+ sfio->tls_enq_cnt = tls_enq_cnt;
	+ }
	+#endif
	soref(so);
	error = pr->pr_send(so, PRUS_NOTREADY, m, NULL, NULL,
	td);