From nobody Wed May 11 18:56:06 2022 X-Original-To: dev-commits-src-all@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 E746F1ACE551; Wed, 11 May 2022 18:56:06 +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 4Kz3yt67VRz4dZM; Wed, 11 May 2022 18:56:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652295366; 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=FYQido+P93douAGzWy0nr5CXw4GhjNVtoZOaKOmMv6M=; b=MhfwtQyAOU6qfsWVCAOyFNvUXDKYubaJdqRoebqS8NeRVPV7b3iRQbNifW6Y4OcyNwPqDH uGtMHHA3Y4HV2M9k7D2v0+fjQfYe0IyhYd9qiOwSB75aIQr66wh5cpnQ/b4emGbaTOfd08 i0MWAa0K45zMaa8uDgdDGO6gn2ig9lEoGC8ulga9CF3m/qIvifkfBxZY5z3QOZTuIsLFSa iaFd8WREkKaNEUT/JJwvgs8weuiKI0MNjivGSw/PfiPKfhDrxWArBHg1Em7+5bkvKjXdWS uSGu4eK00bfnuCDq6CIEGxoTh3NZrioBecQ6W/REljwGBkwNrEhCZ/o277ShYw== 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 AE2F31F176; Wed, 11 May 2022 18:56:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24BIu6a9049022; Wed, 11 May 2022 18:56:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24BIu68E049021; Wed, 11 May 2022 18:56:06 GMT (envelope-from git) Date: Wed, 11 May 2022 18:56:06 GMT Message-Id: <202205111856.24BIu68E049021@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 2412b82929a6 - stable/13 - bhyve: Allocate mmio_hint array based on number of guest CPUs. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 2412b82929a6a31d40f396b3c20fc1d2d9e31289 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652295366; 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=FYQido+P93douAGzWy0nr5CXw4GhjNVtoZOaKOmMv6M=; b=HsPoFk2PqxJZKGnuxapti7NaEPeDHgc8JLWJEpJAM8+aGvJi0bKP0pxQ4LI7/r+cmnjdEg lAsNiBGsQOglOlg/8i6TBGtVzpsQ2TvU4QwHDt1AV1jJKGmscELZx/IIR7+q1aetiRhJii y8AaRa72wuz25WF5Fjc7lCdO04v6NIhIM/+TppVRm81gnE+cYjnU4ZOggQ0zwI4e8Nig2f 5EyMdWavUCVoPNm9Kl0R3fjRve4FXCLV2GUu4av3j5+9592cinOtjmuRmEtozaDyaLq8Mz HYVZWFNvBb5hMHk0RW/FYQ38RniWbMPZJVPZlUkF48sWJP+TUJv0PUiaMaXNkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652295366; a=rsa-sha256; cv=none; b=RXwJtoZwI1sjBzBySKwSii25tol3ziX2PlTOCZzzkJja2yE3b4nufTUbC7W7iKDyIJG5oO YlZ/Jx7zPIEOLMJndz+Kb3g31AZxdYHmIZDg7FmhtYcD1jimNLuSlbqAZcOkqlCjlGcBAf yBC34FOMYr8/q4k3nH3j7dMREktYNFKAi9JS18Zy0sKVA/RREzfRAsDBqCkBgDpLgvQfm5 vmry63mYMtwvud9mhXKdpkjScmmEYt6B8O0V4jZuoRHfRZypZPQizMArvsh7buGepL2aSV ZLtcRbLoxjY56Rx2UOGIe11eaHdPgT/Sh51YbKDM2GQEa2m1pbD+N+kvW8MkEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=2412b82929a6a31d40f396b3c20fc1d2d9e31289 commit 2412b82929a6a31d40f396b3c20fc1d2d9e31289 Author: John Baldwin AuthorDate: 2022-03-09 23:38:49 +0000 Commit: John Baldwin CommitDate: 2022-05-11 18:47:58 +0000 bhyve: Allocate mmio_hint array based on number of guest CPUs. This avoids an instance of hardcoding VM_MAXCPU in userspace. Reviewed by: grehan Differential Revision: https://reviews.freebsd.org/D34489 (cherry picked from commit 730510dc1ab2049d707706241d9a6e73a6952a4e) --- usr.sbin/bhyve/bhyverun.c | 2 +- usr.sbin/bhyve/mem.c | 11 +++++++---- usr.sbin/bhyve/mem.h | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c index e4d96d2293fa..8a1a82cefc7c 100644 --- a/usr.sbin/bhyve/bhyverun.c +++ b/usr.sbin/bhyve/bhyverun.c @@ -1421,7 +1421,7 @@ main(int argc, char *argv[]) exit(4); } - init_mem(); + init_mem(guest_ncpus); init_inout(); kernemu_dev_init(); init_bootrom(ctx); diff --git a/usr.sbin/bhyve/mem.c b/usr.sbin/bhyve/mem.c index 90aefe45c856..85c4ad0eaf46 100644 --- a/usr.sbin/bhyve/mem.c +++ b/usr.sbin/bhyve/mem.c @@ -68,7 +68,8 @@ RB_HEAD(mmio_rb_tree, mmio_rb_range) mmio_rb_root, mmio_rb_fallback; * consecutive addresses in a range, it makes sense to cache the * result of a lookup. */ -static struct mmio_rb_range *mmio_hint[VM_MAXCPU]; +static struct mmio_rb_range **mmio_hint; +static int mmio_ncpu; static pthread_rwlock_t mmio_rwlock; @@ -349,8 +350,8 @@ unregister_mem(struct mem_range *memp) assert((mr->flags & MEM_F_IMMUTABLE) == 0); RB_REMOVE(mmio_rb_tree, &mmio_rb_root, entry); - /* flush Per-vCPU cache */ - for (i=0; i < VM_MAXCPU; i++) { + /* flush Per-vCPU cache */ + for (i = 0; i < mmio_ncpu; i++) { if (mmio_hint[i] == entry) mmio_hint[i] = NULL; } @@ -365,9 +366,11 @@ unregister_mem(struct mem_range *memp) } void -init_mem(void) +init_mem(int ncpu) { + mmio_ncpu = ncpu; + mmio_hint = calloc(ncpu, sizeof(*mmio_hint)); RB_INIT(&mmio_rb_root); RB_INIT(&mmio_rb_fallback); pthread_rwlock_init(&mmio_rwlock, NULL); diff --git a/usr.sbin/bhyve/mem.h b/usr.sbin/bhyve/mem.h index 38d773c43fdb..965079107476 100644 --- a/usr.sbin/bhyve/mem.h +++ b/usr.sbin/bhyve/mem.h @@ -52,7 +52,7 @@ struct mem_range { #define MEM_F_RW 0x3 #define MEM_F_IMMUTABLE 0x4 /* mem_range cannot be unregistered */ -void init_mem(void); +void init_mem(int ncpu); int emulate_mem(struct vmctx *, int vcpu, uint64_t paddr, struct vie *vie, struct vm_guest_paging *paging);