From owner-svn-src-projects@freebsd.org Sat May 23 23:38:37 2020 Return-Path: Delivered-To: svn-src-projects@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1F7172F128E for ; Sat, 23 May 2020 23:38:37 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49V0DF02wNz3cbW; Sat, 23 May 2020 23:38:37 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EC2CA17E81; Sat, 23 May 2020 23:38:36 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04NNcaMC058665; Sat, 23 May 2020 23:38:36 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04NNcaKw058662; Sat, 23 May 2020 23:38:36 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <202005232338.04NNcaKw058662@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Sat, 23 May 2020 23:38:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r361428 - in projects/nfs-over-tls/sys: fs/nfsserver kern sys X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: in projects/nfs-over-tls/sys: fs/nfsserver kern sys X-SVN-Commit-Revision: 361428 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 May 2020 23:38:37 -0000 Author: rmacklem Date: Sat May 23 23:38:35 2020 New Revision: 361428 URL: https://svnweb.freebsd.org/changeset/base/361428 Log: Fix a few problems caused during the code merge of the up-to-date head kernel. I think it now builds, but will it work? Modified: projects/nfs-over-tls/sys/fs/nfsserver/nfs_nfsdcache.c projects/nfs-over-tls/sys/kern/uipc_ktls.c projects/nfs-over-tls/sys/kern/uipc_sockbuf.c projects/nfs-over-tls/sys/sys/socket.h Modified: projects/nfs-over-tls/sys/fs/nfsserver/nfs_nfsdcache.c ============================================================================== --- projects/nfs-over-tls/sys/fs/nfsserver/nfs_nfsdcache.c Sat May 23 23:10:03 2020 (r361427) +++ projects/nfs-over-tls/sys/fs/nfsserver/nfs_nfsdcache.c Sat May 23 23:38:35 2020 (r361428) @@ -1021,22 +1021,8 @@ nfsrc_getlenandcksum(struct mbuf *m1, u_int16_t *cksum len += m->m_len; m = m->m_next; } - /* - * in_cksum() doesn't work for ext_pgs mbufs, so just return a - * random checksum to avoid a false hit. - * Since NFSv4.1 and NFSv4.2 does not actually use - * the DRC, due to sessions, I think this should be ok. - * Also, most NFS over TCP implementations do not implement - * a DRC at all. Unfortunately, the DRC is used for NFSv4.0 - * for the cases where there are sequenced operations, such as - * file lock operations, so it must still be enabled for NFSv4.0. - */ - if ((m1->m_flags & M_NOMAP) == 0) { - cklen = (len > NFSRVCACHE_CHECKLEN) ? NFSRVCACHE_CHECKLEN : - len; - *cksum = in_cksum(m1, cklen); - } else - *cksum = arc4random(); + cklen = (len > NFSRVCACHE_CHECKLEN) ? NFSRVCACHE_CHECKLEN : len; + *cksum = in_cksum(m1, cklen); return (len); } Modified: projects/nfs-over-tls/sys/kern/uipc_ktls.c ============================================================================== --- projects/nfs-over-tls/sys/kern/uipc_ktls.c Sat May 23 23:10:03 2020 (r361427) +++ projects/nfs-over-tls/sys/kern/uipc_ktls.c Sat May 23 23:38:35 2020 (r361428) @@ -2070,8 +2070,7 @@ ktls_work_thread(void *ctx) { struct ktls_wq *wq = ctx; struct socket *so, *son; - struct ktls_session *tls; - struct mbuf *m; + struct mbuf *m, *n; STAILQ_HEAD(, mbuf) local_head; STAILQ_HEAD(, socket) local_so_head; @@ -2093,9 +2092,6 @@ ktls_work_thread(void *ctx) STAILQ_CONCAT(&local_so_head, &wq->so_head); mtx_unlock(&wq->mtx); - STAILQ_FOREACH_SAFE(p, &local_head, stailq, n) { - if (p->mbuf != NULL) { - ktls_encrypt(p); STAILQ_FOREACH_SAFE(m, &local_head, m_epg_stailq, n) { if (m->m_epg_flags & EPG_FLAG_2FREE) { ktls_free(m->m_epg_tls); Modified: projects/nfs-over-tls/sys/kern/uipc_sockbuf.c ============================================================================== --- projects/nfs-over-tls/sys/kern/uipc_sockbuf.c Sat May 23 23:10:03 2020 (r361427) +++ projects/nfs-over-tls/sys/kern/uipc_sockbuf.c Sat May 23 23:38:35 2020 (r361428) @@ -1373,7 +1373,7 @@ sbcompress_ktls_rx(struct sockbuf *sb, struct mbuf *m, ("TLS RX mbuf %p is not MT_DATA", m)); KASSERT((m->m_flags & M_NOTREADY) != 0, ("TLS RX mbuf %p ready", m)); - KASSERT((m->m_flags & M_NOMAP) == 0, + KASSERT((m->m_flags & M_EXTPG) == 0, ("TLS RX mbuf %p unmapped", m)); if (m->m_len == 0) { @@ -1388,7 +1388,7 @@ sbcompress_ktls_rx(struct sockbuf *sb, struct mbuf *m, if (n && M_WRITABLE(n) && ((sb->sb_flags & SB_NOCOALESCE) == 0) && - !(n->m_flags & (M_NOMAP)) && + !(n->m_flags & (M_EXTPG)) && m->m_len <= MCLBYTES / 4 && /* XXX: Don't copy too much */ m->m_len <= M_TRAILINGSPACE(n)) { m_copydata(m, 0, m->m_len, mtodo(n, n->m_len)); Modified: projects/nfs-over-tls/sys/sys/socket.h ============================================================================== --- projects/nfs-over-tls/sys/sys/socket.h Sat May 23 23:10:03 2020 (r361427) +++ projects/nfs-over-tls/sys/sys/socket.h Sat May 23 23:38:35 2020 (r361428) @@ -471,6 +471,7 @@ struct msghdr { #endif #ifdef _KERNEL #define MSG_MORETOCOME 0x00100000 /* additional data pending */ +#define MSG_TLSAPPDATA 0x00200000 /* only soreceive() app. data (TLS) */ #endif /*