From nobody Wed Apr 10 15:19:10 2024 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 4VF61W2kqGz5HHSJ; Wed, 10 Apr 2024 15:19:11 +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 4VF61W11Sdz4mwm; Wed, 10 Apr 2024 15:19:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712762351; 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=bVIESvXEQkkurVtx0/qEPyAbz6Oj8v3E5gzC+dPi8Vg=; b=GOd3GWayz8ZpKKQ/rtLB0ydIH9lKn8my2PmlpkF00Bmt3Cz0SSjwt96nphjzwkNvXdgfJF ubC6TeQz5DHg2BmY3e62SiWdPlLrwaJblFfC+lPxwhQhJUIZPLcW/04xDLKZD4u1ZML6U+ Y1Et0C+xisg0G8hHYQl2LkvlqtyUmo1RbqX92IjsxonrxW1Xtb/3a4XGucHOV8dRBGQive dl6S3NffITc7dO68+3G2ppqEFGpnyFZD91duvBn842F79GpRPNngGIS0w8A31DlmlUxTZp 9+ddYzab/Sqysr+DVGZvJnPgVWxa4ls4Neu0buX+mvCpyvSkGqfE/bExRm8WpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712762351; a=rsa-sha256; cv=none; b=LcZRahANY8yQY702uO2MHW9T620Gdqr1HQfQO140PEbjxt3KstPZNzIut3/0PN/NUoTWkX F4aa8LEKwreqQ08o6bjb1RwC5SpOhGQxWVnOxKjGwzEI1wNpnUerkb9Dz9tpwzJlShjS80 gmrbUmQPmfy9L4RMKgYzbKJ2pg3xuQN9TfP7WamvvK3xx0FbOHYqF/qCz2EH+0YeSQpgdB 5Zo2fg3KnzM9yXp2MmD+QaPehEbzfC8gvuXwTecOC9FGKJz0JoOjJUVkULu7ES2ooGaLQH 1GNSsFsfZZ+yTyPGqISfA7oLOKy5O/dVKMguqiPRyQPOQZHVLbfZ3QH19rQL1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712762351; 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=bVIESvXEQkkurVtx0/qEPyAbz6Oj8v3E5gzC+dPi8Vg=; b=v6GK85szz00cDx4CBEvN786ZyHoIUny+gG5PnzZ2i3op0YnPTKorFI4vJhM5KdUl/ZOEDp JsnDXcSFvku4/bBgTOj2leKJNM4yFirp0A2aEO33yA06lOD0H7fxf3C+fWJ4VwHPaf0v+1 2I5qi3q3Q8MIVo6LjI5fk0EeciYCEROLhllRtDCcP9Ym7v5Uczqi35AV9ivfsy3vTgA8uu Y3Gaer3j2WJ+6e3YduYQMCn/qJUfT62kNk52xhbPEiU/vS7mO7Yrb1FwhTZ8W0Z7HAYMie vIYjIa0zXCuBYPFzhjDsbXU0HAervSGwvJbd0NAUR6lmlJDv6yFqq/QcYMrRNA== 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 4VF61W0ZMHzjXg; Wed, 10 Apr 2024 15:19:11 +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 43AFJAnr093057; Wed, 10 Apr 2024 15:19:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43AFJA1m093054; Wed, 10 Apr 2024 15:19:10 GMT (envelope-from git) Date: Wed, 10 Apr 2024 15:19:10 GMT Message-Id: <202404101519.43AFJA1m093054@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 5ec6c3007e36 - main - libvmmapi: Add arm64 support 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: dev-commits-src-main+owner@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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5ec6c3007e36736a979434d9bf5c9e22293970b3 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5ec6c3007e36736a979434d9bf5c9e22293970b3 commit 5ec6c3007e36736a979434d9bf5c9e22293970b3 Author: Mark Johnston AuthorDate: 2024-04-03 17:07:51 +0000 Commit: Mark Johnston CommitDate: 2024-04-10 15:17:56 +0000 libvmmapi: Add arm64 support - Define wrappers for some MD ioctls. - Provide a list of vmm device ioctls for cap_ioctl_limit(). - Disable use of the lowmem region. Reviewed by: corvink MFC after: 2 weeks Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D41005 --- lib/libvmmapi/aarch64/Makefile.inc | 1 + lib/libvmmapi/aarch64/vmmapi_machdep.c | 127 +++++++++++++++++++++++++++++++++ lib/libvmmapi/vmmapi.c | 4 ++ lib/libvmmapi/vmmapi.h | 9 +++ 4 files changed, 141 insertions(+) diff --git a/lib/libvmmapi/aarch64/Makefile.inc b/lib/libvmmapi/aarch64/Makefile.inc new file mode 100644 index 000000000000..663ea0ab90a3 --- /dev/null +++ b/lib/libvmmapi/aarch64/Makefile.inc @@ -0,0 +1 @@ +SRCS+= vmmapi_machdep.c diff --git a/lib/libvmmapi/aarch64/vmmapi_machdep.c b/lib/libvmmapi/aarch64/vmmapi_machdep.c new file mode 100644 index 000000000000..5440adaaf3ef --- /dev/null +++ b/lib/libvmmapi/aarch64/vmmapi_machdep.c @@ -0,0 +1,127 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2011 NetApp, Inc. + * All rights reserved. + * + * 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 NETAPP, INC ``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 NETAPP, INC 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 "vmmapi.h" +#include "internal.h" + +const char *vm_capstrmap[] = { + [VM_CAP_MAX] = NULL, +}; + +#define VM_MD_IOCTLS \ + VM_GET_VGIC_VERSION, \ + VM_ATTACH_VGIC, \ + VM_ASSERT_IRQ, \ + VM_DEASSERT_IRQ, \ + VM_RAISE_MSI + +const cap_ioctl_t vm_ioctl_cmds[] = { + VM_COMMON_IOCTLS, + VM_MD_IOCTLS, +}; +size_t vm_ioctl_ncmds = nitems(vm_ioctl_cmds); + +int +vm_attach_vgic(struct vmctx *ctx, uint64_t dist_start, size_t dist_size, + uint64_t redist_start, size_t redist_size) +{ + struct vm_vgic_descr vgic; + int error; + + bzero(&vgic, sizeof(vgic)); + error = ioctl(ctx->fd, VM_GET_VGIC_VERSION, &vgic.ver); + if (error != 0) + return (error); + assert(vgic.ver.version == 3); + vgic.v3_regs.dist_start = dist_start; + vgic.v3_regs.dist_size = dist_size; + vgic.v3_regs.redist_start = redist_start; + vgic.v3_regs.redist_size = redist_size; + + return (ioctl(ctx->fd, VM_ATTACH_VGIC, &vgic)); +} + +int +vm_assert_irq(struct vmctx *ctx, uint32_t irq) +{ + struct vm_irq vi; + + bzero(&vi, sizeof(vi)); + vi.irq = irq; + + return (ioctl(ctx->fd, VM_ASSERT_IRQ, &vi)); +} + +int +vm_deassert_irq(struct vmctx *ctx, uint32_t irq) +{ + struct vm_irq vi; + + bzero(&vi, sizeof(vi)); + vi.irq = irq; + + return (ioctl(ctx->fd, VM_DEASSERT_IRQ, &vi)); +} + +int +vm_raise_msi(struct vmctx *ctx, uint64_t addr, uint64_t msg, int bus, int slot, + int func) +{ + struct vm_msi vmsi; + + bzero(&vmsi, sizeof(vmsi)); + vmsi.addr = addr; + vmsi.msg = msg; + vmsi.bus = bus; + vmsi.slot = slot; + vmsi.func = func; + + return (ioctl(ctx->fd, VM_RAISE_MSI, &vmsi)); +} + +int +vm_inject_exception(struct vcpu *vcpu, uint64_t esr, uint64_t far) +{ + struct vm_exception vmexc; + + bzero(&vmexc, sizeof(vmexc)); + vmexc.esr = esr; + vmexc.far = far; + + return (vcpu_ioctl(vcpu, VM_INJECT_EXCEPTION, &vmexc)); +} diff --git a/lib/libvmmapi/vmmapi.c b/lib/libvmmapi/vmmapi.c index ab20df3f3fc9..073aaddf4c92 100644 --- a/lib/libvmmapi/vmmapi.c +++ b/lib/libvmmapi/vmmapi.c @@ -59,7 +59,11 @@ #define MB (1024 * 1024UL) #define GB (1024 * 1024 * 1024UL) +#ifdef __amd64__ #define VM_LOWMEM_LIMIT (3 * GB) +#else +#define VM_LOWMEM_LIMIT 0 +#endif #define VM_HIGHMEM_BASE (4 * GB) /* diff --git a/lib/libvmmapi/vmmapi.h b/lib/libvmmapi/vmmapi.h index bd182b0914fc..751cfa6ca330 100644 --- a/lib/libvmmapi/vmmapi.h +++ b/lib/libvmmapi/vmmapi.h @@ -158,6 +158,15 @@ int vm_run(struct vcpu *vcpu, struct vm_run *vmrun); int vm_suspend(struct vmctx *ctx, enum vm_suspend_how how); int vm_reinit(struct vmctx *ctx); int vm_apicid2vcpu(struct vmctx *ctx, int apicid); +#ifdef __aarch64__ +int vm_attach_vgic(struct vmctx *ctx, uint64_t dist_start, size_t dist_size, + uint64_t redist_start, size_t redist_size); +int vm_assert_irq(struct vmctx *ctx, uint32_t irq); +int vm_deassert_irq(struct vmctx *ctx, uint32_t irq); +int vm_raise_msi(struct vmctx *ctx, uint64_t addr, uint64_t msg, int bus, + int slot, int func); +int vm_inject_exception(struct vcpu *vcpu, uint64_t esr, uint64_t far); +#endif #ifdef __amd64__ int vm_inject_exception(struct vcpu *vcpu, int vector, int errcode_valid, uint32_t errcode, int restart_instruction);