From nobody Tue Jun 04 07:11:13 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 4Vthb56czJz5MfXy; Tue, 04 Jun 2024 07:11:13 +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 4Vthb569yHz4q9d; Tue, 4 Jun 2024 07:11:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717485073; 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=u7FpMMW32FVhcb1rsNatgf7KLJY8hbLhjC9ywwUyDOk=; b=U4PFfuDFEdT7oFz81zVcbsviwY06jebfSStM1qbzHk/5VFox2E7G+QWp0UuGoNmzBmMqqc tawkhybfc1wEaNT7tVOIDODahPrHzSL/aVd3gQpFEeXEDyI42R4Yx7mnGyeY8/0UKXYIyw /6kAgnc6i07CPuUp8mr1hVRLBos1Bd+2bUCRCKY6ARzJLvwdCcX1JgotFsC7WfmEHjaJs9 d/uUijksegucmiI3SH8hXeDJJNZfu57c/3/Ui1mm3MyOelw18zU30U0VTFXmPrfdd4ESs2 3Pgi7b+KvLkQNjMheC+U7yi5baQyGFlAlPpxaIcnk+fHtOfWsJYQ37O/fC7+ig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717485073; a=rsa-sha256; cv=none; b=ZRNK7i6UQnddeXLUvCxsSroIDMNJgx2bBcZL8mnNl8/oJOKCXHtf4MX+VoBCN58uuXKECm dXxsz3jTW6hla6xhjooep1vRNumIcBH8X7Zl8TkmKwQu+XuPh8Ey6PIq8Sje3uKX+8QiPI gBMyUq0XdRKU9NX2RVX3EerBKQWCY0ZidLGqJEMZBWnEbWw3ZpMka9y91O5ayFEm9mCyTY 9eFC1cVax4SMom+Fo1/plbduyJypNAOT67XdXQiNFrFiwZuOM0Q0efKK53eZGKopwNOs+N S7uhyO1dCJ72ysH5abDayCppPlXJYmHWFnKS0VI+bjO4g/8Fu3GXjFCIS5k0Vg== 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=1717485073; 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=u7FpMMW32FVhcb1rsNatgf7KLJY8hbLhjC9ywwUyDOk=; b=d+NI9YRZbLT52VBrNrgYIVKVSZnud5LzTPG+1grp+JWgk4ciOvjNNonTv03UZhhDqzwZVx S6Bkjyl700c2ygv4fUrabFYdd7dWwcM/u84rOAhmYC0YI+ipV/5djtO12kNtH8jfveNTsl UjzSjP5bqFjce6YlKl5hpREgLCi2ekNe0XFCqh8pbyblkv5lZad6weC5QY4ozQ+hfSDTw9 H5eImTMnAMOy0UziVKUSxmus6wAilAPHaN1BJABPTPbRV2KWdLn8fRqXjtewSoaV2lwDp+ urS+dUUgd1klFKSLulzbwDe3a+dIOtQKRnVKdxBmTlTEVkVZMAoyfgHrZxfksw== 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 4Vthb55nHNz17jw; Tue, 4 Jun 2024 07:11:13 +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 4547BDQR071059; Tue, 4 Jun 2024 07:11:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4547BDS2071056; Tue, 4 Jun 2024 07:11:13 GMT (envelope-from git) Date: Tue, 4 Jun 2024 07:11:13 GMT Message-Id: <202406040711.4547BDS2071056@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Corvin =?utf-8?Q?K=C3=B6hne?= Subject: git: 5e09c5a1ed66 - main - bhyve: use correct size to map the OpRegion 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5e09c5a1ed66f58c499884ebf44e1633be195578 Auto-Submitted: auto-generated The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=5e09c5a1ed66f58c499884ebf44e1633be195578 commit 5e09c5a1ed66f58c499884ebf44e1633be195578 Author: Corvin Köhne AuthorDate: 2023-12-18 12:44:04 +0000 Commit: Corvin Köhne CommitDate: 2024-06-04 07:08:34 +0000 bhyve: use correct size to map the OpRegion We're already converting the size reported by the OpRegion header from kilobytes to bytes. We don't have to do that twice when mapping the OpRegion. Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D45334 --- usr.sbin/bhyve/amd64/pci_gvt-d.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bhyve/amd64/pci_gvt-d.c b/usr.sbin/bhyve/amd64/pci_gvt-d.c index dfcd6a8f68c8..95f9066498d6 100644 --- a/usr.sbin/bhyve/amd64/pci_gvt-d.c +++ b/usr.sbin/bhyve/amd64/pci_gvt-d.c @@ -222,8 +222,8 @@ gvt_d_setup_opregion(struct pci_devinst *const pi) opregion->len = header->size * KB; munmap(header, sizeof(*header)); - opregion->hva = mmap(NULL, opregion->len * KB, PROT_READ, MAP_SHARED, - memfd, opregion->hpa); + opregion->hva = mmap(NULL, opregion->len, PROT_READ, MAP_SHARED, memfd, + opregion->hpa); if (opregion->hva == MAP_FAILED) { warn("%s: Unable to map host OpRegion", __func__); close(memfd);