From owner-svn-src-projects@freebsd.org Tue Jun 9 01:06:46 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 0BCA9340756 for ; Tue, 9 Jun 2020 01:06:46 +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 49gsQY6Qstz44rG; Tue, 9 Jun 2020 01:06:45 +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 D791AD3BF; Tue, 9 Jun 2020 01:06:45 +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 05916jXv024948; Tue, 9 Jun 2020 01:06:45 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05916jjk024947; Tue, 9 Jun 2020 01:06:45 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <202006090106.05916jjk024947@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Tue, 9 Jun 2020 01:06:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r361949 - projects/nfs-over-tls/sys/kern X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: projects/nfs-over-tls/sys/kern X-SVN-Commit-Revision: 361949 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: Tue, 09 Jun 2020 01:06:46 -0000 Author: rmacklem Date: Tue Jun 9 01:06:45 2020 New Revision: 361949 URL: https://svnweb.freebsd.org/changeset/base/361949 Log: Modify mb_mapped_to_unmapped() as suggested by gallatin@. Modified: projects/nfs-over-tls/sys/kern/kern_mbuf.c Modified: projects/nfs-over-tls/sys/kern/kern_mbuf.c ============================================================================== --- projects/nfs-over-tls/sys/kern/kern_mbuf.c Tue Jun 9 00:27:54 2020 (r361948) +++ projects/nfs-over-tls/sys/kern/kern_mbuf.c Tue Jun 9 01:06:45 2020 (r361949) @@ -1583,37 +1583,35 @@ struct mbuf * mb_mapped_to_unmapped(struct mbuf *mp, int len, int mlen, int how, struct mbuf **mlast) { - struct mbuf *m, *mout = NULL; - char *pgpos = NULL, *mbpos; - int i = 0, mblen, mbufsiz, pglen, xfer; + struct mbuf *m, *mout; + char *pgpos, *mbpos; + int i, mblen, mbufsiz, pglen, xfer; if (len == 0) return (NULL); - m = NULL; - pglen = mblen = 0; + mbufsiz = min(mlen, len); + m = mout = mb_alloc_ext_plus_pages(mbufsiz, how); + if (m == NULL) + return (m); + pgpos = (char *)(void *)PHYS_TO_DMAP(m->m_epg_pa[0]); + pglen = PAGE_SIZE; + mblen = 0; + i = 0; do { if (pglen == 0) { - if (m == NULL || ++i == m->m_epg_npgs) { + if (++i == m->m_epg_npgs) { + m->m_epg_last_len = PAGE_SIZE; mbufsiz = min(mlen, len); + m->m_next = mb_alloc_ext_plus_pages(mbufsiz, + how); + m = m->m_next; if (m == NULL) { - m = mout = mb_alloc_ext_plus_pages( - mbufsiz, how); - if (m == NULL) - return (m); - } else { - m->m_epg_last_len = PAGE_SIZE; - m->m_next = mb_alloc_ext_plus_pages( - mbufsiz, how); - m = m->m_next; - if (m == NULL) { - m_freem(mout); - return (m); - } + m_freem(mout); + return (m); } i = 0; } - pgpos = (char *)(void *) - PHYS_TO_DMAP(m->m_epg_pa[i]); + pgpos = (char *)(void *)PHYS_TO_DMAP(m->m_epg_pa[i]); pglen = PAGE_SIZE; } while (mblen == 0) { @@ -1628,7 +1626,7 @@ mb_mapped_to_unmapped(struct mbuf *mp, int len, int ml mp = mp->m_next; } xfer = min(mblen, pglen); - bcopy(mbpos, pgpos, xfer); + memcpy(pgpos, mbpos, xfer); pgpos += xfer; mbpos += xfer; pglen -= xfer;