From owner-svn-src-projects@freebsd.org Fri Apr 24 14:55:09 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 0A6762B7D76 for ; Fri, 24 Apr 2020 14:55:09 +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) server-signature RSA-PSS (4096 bits) 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 497xzc6S8Wz4TS7; Fri, 24 Apr 2020 14:55:08 +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 BF1561FA45; Fri, 24 Apr 2020 14:55:08 +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 03OEt8GO031873; Fri, 24 Apr 2020 14:55:08 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03OEt8ut031870; Fri, 24 Apr 2020 14:55:08 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <202004241455.03OEt8ut031870@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Fri, 24 Apr 2020 14:55:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r360264 - in projects/nfs-over-tls/sys: kern rpc xdr X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: in projects/nfs-over-tls/sys: kern rpc xdr X-SVN-Commit-Revision: 360264 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.29 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: Fri, 24 Apr 2020 14:55:09 -0000 Author: rmacklem Date: Fri Apr 24 14:55:07 2020 New Revision: 360264 URL: https://svnweb.freebsd.org/changeset/base/360264 Log: Make the code work with post-r359919 ext_pgs mbufs. The xdr_mbuf.c changes seemed to be missed in previous commits. Modified: projects/nfs-over-tls/sys/kern/uipc_socket.c projects/nfs-over-tls/sys/rpc/rpc_generic.c projects/nfs-over-tls/sys/xdr/xdr_mbuf.c Modified: projects/nfs-over-tls/sys/kern/uipc_socket.c ============================================================================== --- projects/nfs-over-tls/sys/kern/uipc_socket.c Fri Apr 24 14:53:55 2020 (r360263) +++ projects/nfs-over-tls/sys/kern/uipc_socket.c Fri Apr 24 14:55:07 2020 (r360264) @@ -1557,8 +1557,10 @@ sosend_generic(struct socket *so, struct sockaddr *add #endif if (uio != NULL) resid = uio->uio_resid; - else + else if ((top->m_flags & M_PKTHDR) != 0) resid = top->m_pkthdr.len; + else + resid = m_length(top, NULL); /* * In theory resid should be unsigned. However, space must be * signed, as it might be less than 0 if we over-committed, and we Modified: projects/nfs-over-tls/sys/rpc/rpc_generic.c ============================================================================== --- projects/nfs-over-tls/sys/rpc/rpc_generic.c Fri Apr 24 14:53:55 2020 (r360263) +++ projects/nfs-over-tls/sys/rpc/rpc_generic.c Fri Apr 24 14:55:07 2020 (r360264) @@ -954,9 +954,6 @@ _rpc_copym_into_ext_pgs(struct mbuf *mp, int maxextsiz m2 = m2->m_next; } } - KASSERT(tlen == mhead->m_pkthdr.len, - ("_rpc_copym_into_ext_pgs: tlen=%d pkthdrlen=%d", - tlen, mhead->m_pkthdr.len)); return (mhead); } Modified: projects/nfs-over-tls/sys/xdr/xdr_mbuf.c ============================================================================== --- projects/nfs-over-tls/sys/xdr/xdr_mbuf.c Fri Apr 24 14:53:55 2020 (r360263) +++ projects/nfs-over-tls/sys/xdr/xdr_mbuf.c Fri Apr 24 14:55:07 2020 (r360264) @@ -122,9 +122,10 @@ xdrmbuf_getall(XDR *xdrs) xdrs->x_private = NULL; } - if (m) - m_adj(m, xdrs->x_handy); - else + if (m) { + if ((m->m_flags & M_NOMAP) == 0) + m_adj(m, xdrs->x_handy); + } else m = m_get(M_WAITOK, MT_DATA); return (m); } @@ -194,7 +195,10 @@ xdrmbuf_getbytes(XDR *xdrs, char *addr, u_int len) sz = m->m_len - xdrs->x_handy; if (sz > len) sz = len; - bcopy(mtod(m, const char *) + xdrs->x_handy, addr, sz); + if ((m->m_flags & M_NOMAP) != 0) + m_copydata(m, xdrs->x_handy, sz, addr); + else + bcopy(mtod(m, const char *) + xdrs->x_handy, addr, sz); addr += sz; xdrs->x_handy += sz; @@ -286,6 +290,8 @@ xdrmbuf_inline(XDR *xdrs, u_int len) char *p; if (!m) + return (0); + if ((m->m_flags & M_NOMAP) != 0) return (0); if (xdrs->x_op == XDR_ENCODE) { available = M_TRAILINGSPACE(m) + (m->m_len - xdrs->x_handy);