From nobody Wed Apr 8 14:01:35 2026 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 4frPqz6tzbz6YB6M for ; Wed, 08 Apr 2026 14:01:35 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4frPqz4Lpbz3gQQ for ; Wed, 08 Apr 2026 14:01:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775656895; 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=OPB6bM4m3/htzl6dEJJA8YVyca5mipRhLlHaPLAWsm4=; b=tS6F5wgCqBbWC/YKpjvldtW9de6jSAgnkGH1GKfHxgiYKvX7oZjH9fvEHhWw4webjVWsB/ BaeRltJuE/3j5V49pURN4GvE1xdRbSR6ZSnCfxluj7pSZkaWy2QEUi5Pe4sZZ552Z/uA5j L83LCLQpZ9qCzIUpr14lcNLnsh6At5p4n7/4e6FdltOYJljbc2PC2FRrW3xE/KponVZtfp RSsHGSQyxQbQLpJKzkpoqtGY+ckqtRWaWxntW+gmvlD7k8UCs3k+iJuHUJ4Le5pYAVnCP5 gQHAjlm8s46yhhvia/C3quqGOm7S1UsfxSp3YcgiCQWHHi5kGG4MZDlryhsHiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775656895; a=rsa-sha256; cv=none; b=gVlvwDpFOSninmUV7kmClCvBisEOZ28Nj/cFXhfpDQp6+18+q2cVaWPYb6CKS3VMVuB1ov Qmsdtn+Ot8tH4gaK5FavjJu3Q1JGFeoU5GpNGgKpSgk827Tv/O2Trt9sH5ngAoL4seEBLz X8wTjsRyHReu2M+YPuJt48Nsspy5r3psgMRPUjik1+hA5N0BaT2/f09OAXeR1kJRMl5pCV 5hxL3hWEa+PWPBfUKzWCVE4tHDhfA3JMJ6QZ8Tqa0EC2/+DzE2mPiYoT4Gbf8zMcPX40Xi h9/IMooxHGE9J7llj9mhpg5qYSlI+cQBkBsQ5d/KbF57l5yt6VtvFAIVcBTdHQ== 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=1775656895; 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=OPB6bM4m3/htzl6dEJJA8YVyca5mipRhLlHaPLAWsm4=; b=M6Bvyyn1kPlpIBRFmaIE3no9Poro5M6MBkFgKn+9gW+VeQUJaBg85au2xaSdh065zVQRcX 3N9K98L6/JAb3hX8SW9uKODM7DDmh19TNZVg1tnmmN31gJmrbWRNoyYN2C3Wdyu9igCEo3 bgmYWfxSiUd8cZSEOD2SRIUTluzQLUKSEgew9aNBjPn0VfbXeAEBdFbxV+5YYfGM8UQL8U pYdRxuiDcA7uPN6sUzKtkZdhzV2OpsMsaWuTPcq9ns8YTDybj4aLTPmuxa/8l0Z8k8CKIX M0lDkdmjJGP81kJcZWLF38m6LbWvjUANUfZrtud4/eR3lpI9scFuRJt8v9uLhQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4frPqz3lzFzTSm for ; Wed, 08 Apr 2026 14:01:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3bc1b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 08 Apr 2026 14:01:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: 91ce7a19120a - stable/15 - vtgpu: Support virtio gpu on Parallels Desktop 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 91ce7a19120a83009348a8bcac6f5af3fd8378f5 Auto-Submitted: auto-generated Date: Wed, 08 Apr 2026 14:01:35 +0000 Message-Id: <69d65fbf.3bc1b.18670afd@gitrepo.freebsd.org> The branch stable/15 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=91ce7a19120a83009348a8bcac6f5af3fd8378f5 commit 91ce7a19120a83009348a8bcac6f5af3fd8378f5 Author: Andrew Turner AuthorDate: 2026-02-10 17:06:31 +0000 Commit: Andrew Turner CommitDate: 2026-04-08 13:59:53 +0000 vtgpu: Support virtio gpu on Parallels Desktop The Parallels Desktop Virtio GPU implementation doesn't handle enqueuing the VIRTIO_GPU_CMD_RESOURCE_ATTACH_BACKING request and memory list together. Work around this by splitting them before sending them to be enqueued. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D55147 (cherry picked from commit 1ea0721e1a566fdb552b0a919c22667844a894d9) --- sys/dev/virtio/gpu/virtio_gpu.c | 51 ++++++++++++++++++++++++++++++----------- 1 file changed, 38 insertions(+), 13 deletions(-) diff --git a/sys/dev/virtio/gpu/virtio_gpu.c b/sys/dev/virtio/gpu/virtio_gpu.c index 668eb170304a..b95bae9fe286 100644 --- a/sys/dev/virtio/gpu/virtio_gpu.c +++ b/sys/dev/virtio/gpu/virtio_gpu.c @@ -445,21 +445,33 @@ vtgpu_alloc_virtqueue(struct vtgpu_softc *sc) } static int -vtgpu_req_resp(struct vtgpu_softc *sc, void *req, size_t reqlen, - void *resp, size_t resplen) +vtgpu_req_resp2(struct vtgpu_softc *sc, void *req1, size_t req1len, + void *req2, size_t req2len, void *resp, size_t resplen) { struct sglist sg; - struct sglist_seg segs[2]; - int error; + struct sglist_seg segs[3]; + int error, rcount; - sglist_init(&sg, 2, segs); + sglist_init(&sg, 3, segs); - error = sglist_append(&sg, req, reqlen); + rcount = 1; + error = sglist_append(&sg, req1, req1len); if (error != 0) { device_printf(sc->vtgpu_dev, - "Unable to append the request to the sglist: %d\n", error); + "Unable to append the request to the sglist: %d\n", + error); return (error); } + if (req2 != NULL) { + error = sglist_append(&sg, req2, req2len); + if (error != 0) { + device_printf(sc->vtgpu_dev, + "Unable to append the request to the sglist: %d\n", + error); + return (error); + } + rcount++; + } error = sglist_append(&sg, resp, resplen); if (error != 0) { device_printf(sc->vtgpu_dev, @@ -467,7 +479,7 @@ vtgpu_req_resp(struct vtgpu_softc *sc, void *req, size_t reqlen, error); return (error); } - error = virtqueue_enqueue(sc->vtgpu_ctrl_vq, resp, &sg, 1, 1); + error = virtqueue_enqueue(sc->vtgpu_ctrl_vq, resp, &sg, rcount, 1); if (error != 0) { device_printf(sc->vtgpu_dev, "Enqueue failed: %d\n", error); return (error); @@ -479,6 +491,13 @@ vtgpu_req_resp(struct vtgpu_softc *sc, void *req, size_t reqlen, return (0); } +static int +vtgpu_req_resp(struct vtgpu_softc *sc, void *req, size_t reqlen, + void *resp, size_t resplen) +{ + return (vtgpu_req_resp2(sc, req, reqlen, NULL, 0, resp, resplen)); +} + static int vtgpu_get_display_info(struct vtgpu_softc *sc) { @@ -559,9 +578,15 @@ static int vtgpu_attach_backing(struct vtgpu_softc *sc) { struct { + /* + * Split the backing and mem request arguments as some + * hypervisors, e.g. Parallels Desktop, don't work when + * they are enqueued together. + */ struct { struct virtio_gpu_resource_attach_backing backing; - struct virtio_gpu_mem_entry mem[1]; + char pad; + struct virtio_gpu_mem_entry mem; } req; char pad; struct virtio_gpu_ctrl_hdr resp; @@ -577,11 +602,11 @@ vtgpu_attach_backing(struct vtgpu_softc *sc) s.req.backing.resource_id = htole32(VTGPU_RESOURCE_ID); s.req.backing.nr_entries = htole32(1); - s.req.mem[0].addr = htole64(sc->vtgpu_fb_info.fb_pbase); - s.req.mem[0].length = htole32(sc->vtgpu_fb_info.fb_size); + s.req.mem.addr = htole64(sc->vtgpu_fb_info.fb_pbase); + s.req.mem.length = htole32(sc->vtgpu_fb_info.fb_size); - error = vtgpu_req_resp(sc, &s.req, sizeof(s.req), &s.resp, - sizeof(s.resp)); + error = vtgpu_req_resp2(sc, &s.req.backing, sizeof(s.req.backing), + &s.req.mem, sizeof(s.req.mem), &s.resp, sizeof(s.resp)); if (error != 0) return (error);