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

Include the trailer in the original dst_iov.

Browse Source 
This avoids creating a duplicate copy on the stack just to
append the trailer.

Reviewed by:	gallatin, markj
Sponsored by:	Netflix
Differential Revision:	https://reviews.freebsd.org/D30139
This commit is contained in:
John Baldwin 2021-05-25 16:59:19 -07:00
parent 21e3c1fbe2
commit 6b313a3a60
2 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/kern/uipc_ktls.c
View File

@ -1981,14 +1981,16 @@ ktls_enqueue(struct mbuf *m, struct socket *so, int page_count)
counter_u64_add(ktls_cnt_tx_queued, 1); counter_u64_add(ktls_cnt_tx_queued, 1);
} }
#define MAX_TLS_PAGES (1 + btoc(TLS_MAX_MSG_SIZE_V10_2))
static __noinline void static __noinline void
ktls_encrypt(struct ktls_wq *wq, struct mbuf *top) ktls_encrypt(struct ktls_wq *wq, struct mbuf *top)
{ {
struct ktls_session *tls; struct ktls_session *tls;
struct socket *so; struct socket *so;
struct mbuf *m; struct mbuf *m;
vm_paddr_t parray[1 + btoc(TLS_MAX_MSG_SIZE_V10_2)]; vm_paddr_t parray[MAX_TLS_PAGES + 1];
struct iovec dst_iov[1 + btoc(TLS_MAX_MSG_SIZE_V10_2)]; struct iovec dst_iov[MAX_TLS_PAGES + 2];
vm_page_t pg; vm_page_t pg;
void *cbuf; void *cbuf;
int error, i, len, npages, off, total_pages; int error, i, len, npages, off, total_pages;
@ -2072,8 +2074,12 @@ ktls_encrypt(struct ktls_wq *wq, struct mbuf *top)
dst_iov[i].iov_len = len; dst_iov[i].iov_len = len;
} }
} }
KASSERT(i + 1 <= nitems(dst_iov),
("dst_iov is too small"));
dst_iov[i].iov_base = m->m_epg_trail;
dst_iov[i].iov_len = m->m_epg_trllen;
error = (*tls->sw_encrypt)(tls, m, dst_iov, i); error = (*tls->sw_encrypt)(tls, m, dst_iov, i + 1);
/* Free the old pages. */ /* Free the old pages. */
m->m_ext.ext_free(m); m->m_ext.ext_free(m);

27
sys/opencrypto/ktls_ocf.c
View File

@ -286,13 +286,8 @@ ktls_ocf_tls_cbc_encrypt(struct ktls_session *tls, struct mbuf *m,
memcpy(crp.crp_iv, hdr + 1, AES_BLOCK_LEN); memcpy(crp.crp_iv, hdr + 1, AES_BLOCK_LEN);
if (outiov != NULL) { if (outiov != NULL) {
/* Duplicate iovec and append vector for trailer. */ uio.uio_iov = outiov;
memcpy(iov, outiov, outiovcnt * sizeof(struct iovec)); uio.uio_iovcnt = outiovcnt;
iov[outiovcnt].iov_base = m->m_epg_trail;
iov[outiovcnt].iov_len = m->m_epg_trllen;
uio.uio_iov = iov;
uio.uio_iovcnt = outiovcnt + 1;
uio.uio_offset = 0; uio.uio_offset = 0;
uio.uio_segflg = UIO_SYSSPACE; uio.uio_segflg = UIO_SYSSPACE;
uio.uio_td = curthread; uio.uio_td = curthread;
@ -336,7 +331,6 @@ ktls_ocf_tls12_aead_encrypt(struct ktls_session *tls, struct mbuf *m,
struct tls_aead_data ad; struct tls_aead_data ad;
struct cryptop crp; struct cryptop crp;
struct ocf_session *os; struct ocf_session *os;
struct iovec iov[outiovcnt + 1];
int error; int error;
uint16_t tls_comp_len; uint16_t tls_comp_len;
@ -376,14 +370,10 @@ ktls_ocf_tls12_aead_encrypt(struct ktls_session *tls, struct mbuf *m,
crp.crp_payload_length = tls_comp_len; crp.crp_payload_length = tls_comp_len;
if (outiov != NULL) { if (outiov != NULL) {
/* Duplicate iovec and append vector for tag. */
memcpy(iov, outiov, outiovcnt * sizeof(struct iovec));
iov[outiovcnt].iov_base = m->m_epg_trail;
iov[outiovcnt].iov_len = tls->params.tls_tlen;
crp.crp_digest_start = crp.crp_payload_length; crp.crp_digest_start = crp.crp_payload_length;
uio.uio_iov = iov; uio.uio_iov = outiov;
uio.uio_iovcnt = outiovcnt + 1; uio.uio_iovcnt = outiovcnt;
uio.uio_offset = 0; uio.uio_offset = 0;
uio.uio_segflg = UIO_SYSSPACE; uio.uio_segflg = UIO_SYSSPACE;
uio.uio_td = curthread; uio.uio_td = curthread;
@ -486,7 +476,6 @@ ktls_ocf_tls13_aead_encrypt(struct ktls_session *tls, struct mbuf *m,
char nonce[12]; char nonce[12];
struct cryptop crp; struct cryptop crp;
struct ocf_session *os; struct ocf_session *os;
struct iovec iov[outiovcnt + 1];
int error; int error;
os = tls->cipher; os = tls->cipher;
@ -516,14 +505,10 @@ ktls_ocf_tls13_aead_encrypt(struct ktls_session *tls, struct mbuf *m,
crp.crp_payload_length++; crp.crp_payload_length++;
if (outiov != NULL) { if (outiov != NULL) {
/* Duplicate iovec and append vector for tag. */
memcpy(iov, outiov, outiovcnt * sizeof(struct iovec));
iov[outiovcnt].iov_base = m->m_epg_trail;
iov[outiovcnt].iov_len = tls->params.tls_tlen;
crp.crp_digest_start = crp.crp_payload_length; crp.crp_digest_start = crp.crp_payload_length;
uio.uio_iov = iov; uio.uio_iov = outiov;
uio.uio_iovcnt = outiovcnt + 1; uio.uio_iovcnt = outiovcnt;
uio.uio_offset = 0; uio.uio_offset = 0;
uio.uio_segflg = UIO_SYSSPACE; uio.uio_segflg = UIO_SYSSPACE;
uio.uio_td = curthread; uio.uio_td = curthread;