From nobody Mon Jul 31 20:26:22 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RF8sP2h34z4pSsj; Mon, 31 Jul 2023 20:26:23 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RF8sB5CMsz4BsF; Mon, 31 Jul 2023 20:26:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690835182; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lqp1/shE7rZwVWjGFaP41SPmXAkydYyvisDhnRmGOgU=; b=BMicV7HoTBkj9eX/X6YWJwfy2zclK08sltaYl+5JsxJU63oGQsWXUgLW8u/Vy+XK5TaKC1 FpQJtJYvzDxmsYa3aXxkp9zr/W0NKSQupGsca46nUwb/3TDjMBQMSl3UHrb5EH6mo631g3 OWAkcVkOOtz9ieglEFqEHMePDLZolV3uH2O5fTk996o8vYYGRonS3+3r8Y9+LZi2okH8ur X9LvLOsSWwdc6hif3pmRJir2bdEQORird5QSlA2drJWrs5I1N91qw4fPqfsgNtwD395uke XK/1BMC9enaz+ExR7UMgdpf2maGKt9lygvtezI++zO1JFr9aXZ4hTLUmeep0MQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690835182; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lqp1/shE7rZwVWjGFaP41SPmXAkydYyvisDhnRmGOgU=; b=p5aV8SdcrXbJRPTH89IeHVPjZHjE/KwQmu8UWUVeipAL5XntkBZ7NBV7vGXAzyDkAwm3Jj tnUSq4ZroStjm+jOQCNj2HqNIR+I+rYmrM4dGQK+0UkaZKXAFQfGYyV2m9Ti+EAilp8Xb3 Qtnw5JSqhmYkBvlsbclKo4G5mjFwePYDmd0UWVajR32ouoBLuZrV0wBDEV0mhN96O4QJgU m3kFINAVG8kR3j4CxFtMFt7Dy/LAhrMvcXQ6Vl8Arb30ohZJdlgitVJGA18a7p/ALM1Cmf opOpKuI9X77VH/oo7qQC+3op1RhoqbCDva2SZKESiIFtWKjauiyWyIfeqFrODw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690835182; a=rsa-sha256; cv=none; b=hVXk8XyzmxG/KbCp5x6255Hv2J3EArwyoNvmvlC3nVCkQ9ZGHUJNUMCCLdzfvlYLGVRPX9 88tOCoXPkrHnk4yaH4fIVvo3+JtGheF8KZsttQaRHytQHlAikbkxurrMohNLqES/C7acJR 2mRdzDm+Qiy8LgXRlYs9nFY1ZSfTuxFeL36+k8kFbYHWhncRBMqgtF1af0RjOk4YAmZhX0 sJ08r7kVnfHv6JGR4Tped1V32SaPFiZTU+a/Pf1cApIga8gwV5THznLkF9Bj4RBkZhIo1m zaAdERuuAHQd93sy1djP23+i1MzD0JnMRxIBugUfQZG7rwMxL0m6Vt/I0sA/pQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RF8sB2s0cz18wd; Mon, 31 Jul 2023 20:26:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36VKQMcq057948; Mon, 31 Jul 2023 20:26:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36VKQMsp057946; Mon, 31 Jul 2023 20:26:22 GMT (envelope-from git) Date: Mon, 31 Jul 2023 20:26:22 GMT Message-Id: <202307312026.36VKQMsp057946@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: f561c2ec087e - main - memdesc: Add routines for copying data to/from memory descriptors List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f561c2ec087e87dc997f6ebd351ccade3a90b7a8 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=f561c2ec087e87dc997f6ebd351ccade3a90b7a8 commit f561c2ec087e87dc997f6ebd351ccade3a90b7a8 Author: John Baldwin AuthorDate: 2023-07-31 20:24:44 +0000 Commit: John Baldwin CommitDate: 2023-07-31 20:24:44 +0000 memdesc: Add routines for copying data to/from memory descriptors These are modeled on the API used for m_copydata/m_copyback and the crypto buffer APIs. One day it might be nice to reduce the proliferation of these by adding cursors and using memdesc directly for crypto request buffers. Reviewed by: markj Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D40615 --- sys/conf/files | 1 + sys/kern/subr_memdesc.c | 325 ++++++++++++++++++++++++++++++++++++++++++++++++ sys/sys/memdesc.h | 10 ++ 3 files changed, 336 insertions(+) diff --git a/sys/conf/files b/sys/conf/files index 6774be310f84..ae83722eaca5 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -3879,6 +3879,7 @@ kern/subr_kobj.c standard kern/subr_lock.c standard kern/subr_log.c standard kern/subr_mchain.c optional libmchain +kern/subr_memdesc.c standard kern/subr_module.c standard kern/subr_msan.c optional kmsan \ compile-with "${NORMAL_C:N-fsanitize*:N-fstack-protector*}" diff --git a/sys/kern/subr_memdesc.c b/sys/kern/subr_memdesc.c new file mode 100644 index 000000000000..9ba9d7fe031b --- /dev/null +++ b/sys/kern/subr_memdesc.c @@ -0,0 +1,325 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Chelsio Communications, Inc. + * Written by: John Baldwin + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static void +phys_copyback(vm_paddr_t pa, int off, int size, const void *src) +{ + const char *cp; + u_int page_off; + int todo; + void *p; + + KASSERT(PMAP_HAS_DMAP, ("direct-map required")); + + cp = src; + pa += off; + page_off = pa & PAGE_MASK; + while (size > 0) { + todo = min(PAGE_SIZE - page_off, size); + p = (void *)PHYS_TO_DMAP(pa); + memcpy(p, cp, todo); + size -= todo; + cp += todo; + pa += todo; + page_off = 0; + } +} + +static void +vlist_copyback(struct bus_dma_segment *vlist, int sglist_cnt, int off, + int size, const void *src) +{ + const char *p; + int todo; + + while (vlist->ds_len <= off) { + KASSERT(sglist_cnt > 1, ("out of sglist entries")); + + off -= vlist->ds_len; + vlist++; + sglist_cnt--; + } + + p = src; + while (size > 0) { + KASSERT(sglist_cnt >= 1, ("out of sglist entries")); + + todo = size; + if (todo > vlist->ds_len - off) + todo = vlist->ds_len - off; + + memcpy((char *)(uintptr_t)vlist->ds_addr + off, p, todo); + off = 0; + vlist++; + sglist_cnt--; + size -= todo; + p += todo; + } +} + +static void +plist_copyback(struct bus_dma_segment *plist, int sglist_cnt, int off, + int size, const void *src) +{ + const char *p; + int todo; + + while (plist->ds_len <= off) { + KASSERT(sglist_cnt > 1, ("out of sglist entries")); + + off -= plist->ds_len; + plist++; + sglist_cnt--; + } + + p = src; + while (size > 0) { + KASSERT(sglist_cnt >= 1, ("out of sglist entries")); + + todo = size; + if (todo > plist->ds_len - off) + todo = plist->ds_len - off; + + phys_copyback(plist->ds_addr, off, todo, p); + off = 0; + plist++; + sglist_cnt--; + size -= todo; + p += todo; + } +} + +static void +vmpages_copyback(vm_page_t *m, int off, int size, const void *src) +{ + struct iovec iov[1]; + struct uio uio; + int error __diagused; + + iov[0].iov_base = __DECONST(void *, src); + iov[0].iov_len = size; + uio.uio_iov = iov; + uio.uio_iovcnt = 1; + uio.uio_offset = 0; + uio.uio_resid = size; + uio.uio_segflg = UIO_SYSSPACE; + uio.uio_rw = UIO_WRITE; + error = uiomove_fromphys(m, off, size, &uio); + KASSERT(error == 0 && uio.uio_resid == 0, ("copy failed")); +} + +void +memdesc_copyback(struct memdesc *mem, int off, int size, const void *src) +{ + KASSERT(off >= 0, ("%s: invalid offset %d", __func__, off)); + KASSERT(size >= 0, ("%s: invalid size %d", __func__, off)); + + switch (mem->md_type) { + case MEMDESC_VADDR: + KASSERT(off + size <= mem->md_len, ("copy out of bounds")); + memcpy((char *)mem->u.md_vaddr + off, src, size); + break; + case MEMDESC_PADDR: + KASSERT(off + size <= mem->md_len, ("copy out of bounds")); + phys_copyback(mem->u.md_paddr, off, size, src); + break; + case MEMDESC_VLIST: + vlist_copyback(mem->u.md_list, mem->md_nseg, off, size, src); + break; + case MEMDESC_PLIST: + plist_copyback(mem->u.md_list, mem->md_nseg, off, size, src); + break; + case MEMDESC_UIO: + panic("Use uiomove instead"); + break; + case MEMDESC_MBUF: + m_copyback(mem->u.md_mbuf, off, size, src); + break; + case MEMDESC_VMPAGES: + KASSERT(off + size <= mem->md_len, ("copy out of bounds")); + vmpages_copyback(mem->u.md_ma, mem->md_offset + off, size, + src); + break; + default: + __assert_unreachable(); + } +} + +static void +phys_copydata(vm_paddr_t pa, int off, int size, void *dst) +{ + char *cp; + u_int page_off; + int todo; + const void *p; + + KASSERT(PMAP_HAS_DMAP, ("direct-map required")); + + cp = dst; + pa += off; + page_off = pa & PAGE_MASK; + while (size > 0) { + todo = min(PAGE_SIZE - page_off, size); + p = (const void *)PHYS_TO_DMAP(pa); + memcpy(cp, p, todo); + size -= todo; + cp += todo; + pa += todo; + page_off = 0; + } +} + +static void +vlist_copydata(struct bus_dma_segment *vlist, int sglist_cnt, int off, + int size, void *dst) +{ + char *p; + int todo; + + while (vlist->ds_len <= off) { + KASSERT(sglist_cnt > 1, ("out of sglist entries")); + + off -= vlist->ds_len; + vlist++; + sglist_cnt--; + } + + p = dst; + while (size > 0) { + KASSERT(sglist_cnt >= 1, ("out of sglist entries")); + + todo = size; + if (todo > vlist->ds_len - off) + todo = vlist->ds_len - off; + + memcpy(p, (char *)(uintptr_t)vlist->ds_addr + off, todo); + off = 0; + vlist++; + sglist_cnt--; + size -= todo; + p += todo; + } +} + +static void +plist_copydata(struct bus_dma_segment *plist, int sglist_cnt, int off, + int size, void *dst) +{ + char *p; + int todo; + + while (plist->ds_len <= off) { + KASSERT(sglist_cnt > 1, ("out of sglist entries")); + + off -= plist->ds_len; + plist++; + sglist_cnt--; + } + + p = dst; + while (size > 0) { + KASSERT(sglist_cnt >= 1, ("out of sglist entries")); + + todo = size; + if (todo > plist->ds_len - off) + todo = plist->ds_len - off; + + phys_copydata(plist->ds_addr, off, todo, p); + off = 0; + plist++; + sglist_cnt--; + size -= todo; + p += todo; + } +} + +static void +vmpages_copydata(vm_page_t *m, int off, int size, void *dst) +{ + struct iovec iov[1]; + struct uio uio; + int error __diagused; + + iov[0].iov_base = dst; + iov[0].iov_len = size; + uio.uio_iov = iov; + uio.uio_iovcnt = 1; + uio.uio_offset = 0; + uio.uio_resid = size; + uio.uio_segflg = UIO_SYSSPACE; + uio.uio_rw = UIO_READ; + error = uiomove_fromphys(m, off, size, &uio); + KASSERT(error == 0 && uio.uio_resid == 0, ("copy failed")); +} + +void +memdesc_copydata(struct memdesc *mem, int off, int size, void *dst) +{ + KASSERT(off >= 0, ("%s: invalid offset %d", __func__, off)); + KASSERT(size >= 0, ("%s: invalid size %d", __func__, off)); + + switch (mem->md_type) { + case MEMDESC_VADDR: + KASSERT(off + size <= mem->md_len, ("copy out of bounds")); + memcpy(dst, (const char *)mem->u.md_vaddr + off, size); + break; + case MEMDESC_PADDR: + KASSERT(off + size <= mem->md_len, ("copy out of bounds")); + phys_copydata(mem->u.md_paddr, off, size, dst); + break; + case MEMDESC_VLIST: + vlist_copydata(mem->u.md_list, mem->md_nseg, off, size, dst); + break; + case MEMDESC_PLIST: + plist_copydata(mem->u.md_list, mem->md_nseg, off, size, dst); + break; + case MEMDESC_UIO: + panic("Use uiomove instead"); + break; + case MEMDESC_MBUF: + m_copydata(mem->u.md_mbuf, off, size, dst); + break; + case MEMDESC_VMPAGES: + KASSERT(off + size <= mem->md_len, ("copy out of bounds")); + vmpages_copydata(mem->u.md_ma, mem->md_offset + off, size, + dst); + break; + default: + __assert_unreachable(); + } +} diff --git a/sys/sys/memdesc.h b/sys/sys/memdesc.h index 9054e2674409..9bd806688e1c 100644 --- a/sys/sys/memdesc.h +++ b/sys/sys/memdesc.h @@ -155,4 +155,14 @@ memdesc_vmpages(struct vm_page **ma, size_t len, u_int ma_offset) struct memdesc memdesc_bio(struct bio *bio); struct memdesc memdesc_ccb(union ccb *ccb); +/* + * Similar to m_copyback/data, *_copyback copy data from the 'src' + * buffer into the memory descriptor's data buffer while *_copydata + * copy data from the memory descriptor's data buffer into the the + * 'dst' buffer. + */ +void memdesc_copyback(struct memdesc *mem, int off, int size, + const void *src); +void memdesc_copydata(struct memdesc *mem, int off, int size, void *dst); + #endif /* _SYS_MEMDESC_H_ */