From nobody Thu Jul 3 15:43:22 2025 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1621896580; cv=none; d=zohomail.com; s=zohoarc; b=VVCA3TgqJNUS/yJ2YUPiY897gv6yn4TjIdfeZ3VppDoQ8dNiILHiRyjksr3v0DEwdSZgnsyWytKFUwH3vKpcMeilmQ6jl3f3FHvodIMzQ3pNafyiBU346H4tBxePzn2Jv3eNQoyvqsvSTOgZ24Bae5QD+lBu8W9z21ruaZDz5tE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621896580; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=vKwmCJFuX+uI5l+3CvF+qDXcQ6VKNhkZUQq05PXGEN8=; b=XUtZkgcRbeQOQ/F8XMeSMDLSHt79l5s6WHP1qcfJp6oLNCNnEbJeu2gRne9I2E8wYMIKnlSiDXJxcvu9k6CBqQZK26DqWarF3Ua3kvsb1Xm4m3LWy0SKb7QppCkK+tl+oep9u25u7Qd53tAGIUJRTTCIL5eGhTYeMyXQr5/rCXg= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16218965804687.620553215615928; Mon, 24 May 2021 15:49:40 -0700 (PDT) Received: from localhost ([::1]:43868 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1llJOF-0001Dx-HL for importer2@patchew.org; Mon, 24 May 2021 18:49:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33490) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llJIO-00070B-3B for qemu-devel@nongnu.org; Mon, 24 May 2021 18:43:36 -0400 Received: from mga05.intel.com ([192.55.52.43]:11755) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llJIL-0006he-83 for qemu-devel@nongnu.org; Mon, 24 May 2021 18:43:35 -0400 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 May 2021 15:43:17 -0700 Received: from vkasired-desk2.fm.intel.com ([10.105.128.127]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 May 2021 15:43:17 -0700 IronPort-SDR: DivFBK4JIfGrU1QOS+h1Z7RvqqYuj8MR1Ola1srsqhrWcq5efM2emGMjRM+DDDiIEs2B58RiwI O7Nu9RhFAdaA== X-IronPort-AV: E=McAfee;i="6200,9189,9994"; a="287620903" X-IronPort-AV: E=Sophos;i="5.82,327,1613462400"; d="scan'208";a="287620903" IronPort-SDR: bCpIaXpoprYxQqyujUaAnewu1STczHTLyLGfHgoHGqa+yTYubWdNcVi/z/+ohisM5UJTifSKnz wgcmV7PwVd7g== X-IronPort-AV: E=Sophos;i="5.82,327,1613462400"; d="scan'208";a="546246757" From: Vivek Kasireddy To: qemu-devel@nongnu.org Subject: [PATCH v6 06/13] virtio-gpu: Refactor virtio_gpu_create_mapping_iov Date: Mon, 24 May 2021 15:30:56 -0700 Message-Id: <20210524223103.922910-7-vivek.kasireddy@intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210524223103.922910-1-vivek.kasireddy@intel.com> References: <20210524223103.922910-1-vivek.kasireddy@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=192.55.52.43; envelope-from=vivek.kasireddy@intel.com; helo=mga05.intel.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vivek Kasireddy , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Instead of passing the attach_backing object to extract nr_entries and offset, explicitly pass these as arguments to this function. This will be helpful when adding create_blob API. Cc: Gerd Hoffmann Signed-off-by: Vivek Kasireddy --- hw/display/virtio-gpu-virgl.c | 3 ++- hw/display/virtio-gpu.c | 19 +++++++++---------- include/hw/virtio/virtio-gpu.h | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/hw/display/virtio-gpu-virgl.c b/hw/display/virtio-gpu-virgl.c index 72c14d9132..092c6dc380 100644 --- a/hw/display/virtio-gpu-virgl.c +++ b/hw/display/virtio-gpu-virgl.c @@ -289,7 +289,8 @@ static void virgl_resource_attach_backing(VirtIOGPU *g, VIRTIO_GPU_FILL_CMD(att_rb); trace_virtio_gpu_cmd_res_back_attach(att_rb.resource_id); =20 - ret =3D virtio_gpu_create_mapping_iov(g, &att_rb, cmd, NULL, &res_iovs= , &res_niov); + ret =3D virtio_gpu_create_mapping_iov(g, att_rb.nr_entries, sizeof(att= _rb), + cmd, NULL, &res_iovs, &res_niov); if (ret !=3D 0) { cmd->error =3D VIRTIO_GPU_RESP_ERR_UNSPEC; return; diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index fdcedfc61e..7a0db3a860 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -615,7 +615,7 @@ static void virtio_gpu_set_scanout(VirtIOGPU *g, } =20 int virtio_gpu_create_mapping_iov(VirtIOGPU *g, - struct virtio_gpu_resource_attach_backin= g *ab, + uint32_t nr_entries, uint32_t offset, struct virtio_gpu_ctrl_command *cmd, uint64_t **addr, struct iovec **iov, uint32_t *niov) @@ -624,17 +624,17 @@ int virtio_gpu_create_mapping_iov(VirtIOGPU *g, size_t esize, s; int e, v; =20 - if (ab->nr_entries > 16384) { + if (nr_entries > 16384) { qemu_log_mask(LOG_GUEST_ERROR, "%s: nr_entries is too big (%d > 16384)\n", - __func__, ab->nr_entries); + __func__, nr_entries); return -1; } =20 - esize =3D sizeof(*ents) * ab->nr_entries; + esize =3D sizeof(*ents) * nr_entries; ents =3D g_malloc(esize); s =3D iov_to_buf(cmd->elem.out_sg, cmd->elem.out_num, - sizeof(*ab), ents, esize); + offset, ents, esize); if (s !=3D esize) { qemu_log_mask(LOG_GUEST_ERROR, "%s: command data size incorrect %zu vs %zu\n", @@ -647,7 +647,7 @@ int virtio_gpu_create_mapping_iov(VirtIOGPU *g, if (addr) { *addr =3D NULL; } - for (e =3D 0, v =3D 0; e < ab->nr_entries; e++) { + for (e =3D 0, v =3D 0; e < nr_entries; e++) { uint64_t a =3D le64_to_cpu(ents[e].addr); uint32_t l =3D le32_to_cpu(ents[e].length); hwaddr len; @@ -659,8 +659,7 @@ int virtio_gpu_create_mapping_iov(VirtIOGPU *g, a, &len, DMA_DIRECTION_TO_DEVICE); if (!map) { qemu_log_mask(LOG_GUEST_ERROR, "%s: failed to map MMIO mem= ory for" - " resource %d element %d\n", - __func__, ab->resource_id, e); + " element %d\n", __func__, e); virtio_gpu_cleanup_mapping_iov(g, *iov, v); g_free(ents); *iov =3D NULL; @@ -743,8 +742,8 @@ virtio_gpu_resource_attach_backing(VirtIOGPU *g, return; } =20 - ret =3D virtio_gpu_create_mapping_iov(g, &ab, cmd, &res->addrs, - &res->iov, &res->iov_cnt); + ret =3D virtio_gpu_create_mapping_iov(g, ab.nr_entries, sizeof(ab), cm= d, + &res->addrs, &res->iov, &res->iov_= cnt); if (ret !=3D 0) { cmd->error =3D VIRTIO_GPU_RESP_ERR_UNSPEC; return; diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h index b83a91a67f..dad9a1d221 100644 --- a/include/hw/virtio/virtio-gpu.h +++ b/include/hw/virtio/virtio-gpu.h @@ -238,7 +238,7 @@ void virtio_gpu_get_display_info(VirtIOGPU *g, void virtio_gpu_get_edid(VirtIOGPU *g, struct virtio_gpu_ctrl_command *cmd); int virtio_gpu_create_mapping_iov(VirtIOGPU *g, - struct virtio_gpu_resource_attach_backin= g *ab, + uint32_t nr_entries, uint32_t offset, struct virtio_gpu_ctrl_command *cmd, uint64_t **addr, struct iovec **iov, uint32_t *niov); --=20 2.30.2