From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8974930F819 for ; Mon, 10 Nov 2025 12:52:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762779162; cv=none; b=Sbru1VlMYBzB7EYt9oyUNaj87HMPZq1o1C3Wm+uRiQZlF2cOyO/xhgabpt/Il4TODtISCK+guZW8832dfdBcdcSPi2/yx6ojNZ+BsiwHZ8Ej8WKs/h/We+t5prZFfjc3X7ab0QVOjvNYMw1zUkdyfGhnV7FYxeE/4pQWi6qyFZI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762779162; c=relaxed/simple; bh=5JCcdsXoNi64NNYxeB7Qk4LeZtZ5p3C9XsRvRPTjj7w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EIKM+dCSHqzrODx61FORq6iB7qVyPMmZFN/Mm1vfNr6jw0iiy1iNLB/s6oKPYFfF3oAw9vOGBfPcZVTqAFUbagQoLtoEs2zWrw4t83bdws6xEegYDUHf8AgyjSLM5H2pjimIpEhQr4uqHTfYvdA6qKd7UgPM0iqOTHpWnALXsSQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=Ba5sb8JT; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Ba5sb8JT" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1762779159; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jdF0qcLAT3KqrA3rNU9xsRjKWO55qxtf2gsPNynjwVI=; b=Ba5sb8JTHnHbiiQ4pfvY+FSx86oCnWCp0TteJM4k33/ATVWPJgFPpa/bX/2XPDSdqKieMt LS3AjZo53DrmCYUWku0OL/VSAQnZUtBEDp4L8jp/zBdgnHbFnObA+3cODx04c2kBlLSHOJ /XQm3Ax+81TXb5H7R+kWLvUevKqH6To= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-590-LhhL5zLGMpid6bnqNvANMQ-1; Mon, 10 Nov 2025 07:52:36 -0500 X-MC-Unique: LhhL5zLGMpid6bnqNvANMQ-1 X-Mimecast-MFC-AGG-ID: LhhL5zLGMpid6bnqNvANMQ_1762779154 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4288D195608E; Mon, 10 Nov 2025 12:52:34 +0000 (UTC) Received: from slp-asahi.redhat.com (unknown [10.44.32.9]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 8214230001B9; Mon, 10 Nov 2025 12:52:28 +0000 (UTC) From: Sergio Lopez To: David Airlie , Gerd Hoffmann , Dmitry Osipenko , Gurchetan Singh , Chia-I Wu , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Simona Vetter , "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , =?UTF-8?q?Eugenio=20P=C3=A9rez?= , dri-devel@lists.freedesktop.org, virtualization@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Sergio Lopez Subject: [PATCH 2/3] drm/virtio: honor blob_alignment requirements Date: Mon, 10 Nov 2025 13:52:12 +0100 Message-ID: <20251110125213.12633-3-slp@redhat.com> In-Reply-To: <20251110125213.12633-1-slp@redhat.com> References: <20251110125213.12633-1-slp@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 If VIRTIO_GPU_F_BLOB_ALIGNMENT has been negotiated, both CREATE_BLOB and MAP_BLOB requests must be aligned to blob_alignment. Introduce checks to ensure we don't send invalid requests to the device. Signed-off-by: Sergio Lopez --- drivers/gpu/drm/virtio/virtgpu_drv.h | 2 +- drivers/gpu/drm/virtio/virtgpu_object.c | 6 ++++-- drivers/gpu/drm/virtio/virtgpu_prime.c | 7 +++++-- drivers/gpu/drm/virtio/virtgpu_vq.c | 12 +++++++++++- drivers/gpu/drm/virtio/virtgpu_vram.c | 10 ++++++++-- 5 files changed, 29 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.h b/drivers/gpu/drm/virtio/virtgpu_drv.h index d1fa386a5a99..11a55d4ccd54 100644 --- a/drivers/gpu/drm/virtio/virtgpu_drv.h +++ b/drivers/gpu/drm/virtio/virtgpu_drv.h @@ -433,7 +433,7 @@ int virtio_gpu_cmd_map(struct virtio_gpu_device *vgdev, void virtio_gpu_cmd_unmap(struct virtio_gpu_device *vgdev, struct virtio_gpu_object *bo); -void +int virtio_gpu_cmd_resource_create_blob(struct virtio_gpu_device *vgdev, struct virtio_gpu_object *bo, struct virtio_gpu_object_params *params, diff --git a/drivers/gpu/drm/virtio/virtgpu_object.c b/drivers/gpu/drm/virtio/virtgpu_object.c index e6363c887500..6118344bff84 100644 --- a/drivers/gpu/drm/virtio/virtgpu_object.c +++ b/drivers/gpu/drm/virtio/virtgpu_object.c @@ -246,8 +246,10 @@ int virtio_gpu_object_create(struct virtio_gpu_device *vgdev, if (params->blob_mem == VIRTGPU_BLOB_MEM_GUEST) bo->guest_blob = true; - virtio_gpu_cmd_resource_create_blob(vgdev, bo, params, - ents, nents); + ret = virtio_gpu_cmd_resource_create_blob(vgdev, bo, params, + ents, nents); + if (ret) + goto err_put_objs; } else if (params->virgl) { virtio_gpu_cmd_resource_create_3d(vgdev, bo, params, objs, fence); diff --git a/drivers/gpu/drm/virtio/virtgpu_prime.c b/drivers/gpu/drm/virtio/virtgpu_prime.c index ce49282198cb..06593496c53f 100644 --- a/drivers/gpu/drm/virtio/virtgpu_prime.c +++ b/drivers/gpu/drm/virtio/virtgpu_prime.c @@ -257,8 +257,11 @@ static int virtgpu_dma_buf_init_obj(struct drm_device *dev, params.blob_flags = VIRTGPU_BLOB_FLAG_USE_SHAREABLE; params.size = attach->dmabuf->size; - virtio_gpu_cmd_resource_create_blob(vgdev, bo, ¶ms, - ents, nents); + ret = virtio_gpu_cmd_resource_create_blob(vgdev, bo, ¶ms, + ents, nents); + if (ret) + goto err_import; + bo->guest_blob = true; dma_buf_unpin(attach); diff --git a/drivers/gpu/drm/virtio/virtgpu_vq.c b/drivers/gpu/drm/virtio/virtgpu_vq.c index 8181b22b9b46..d558ba2d213a 100644 --- a/drivers/gpu/drm/virtio/virtgpu_vq.c +++ b/drivers/gpu/drm/virtio/virtgpu_vq.c @@ -1393,6 +1393,10 @@ int virtio_gpu_cmd_map(struct virtio_gpu_device *vgdev, struct virtio_gpu_vbuffer *vbuf; struct virtio_gpu_resp_map_info *resp_buf; + if (vgdev->has_blob_alignment && + !IS_ALIGNED(offset, vgdev->blob_alignment)) + return -EINVAL; + resp_buf = kzalloc(sizeof(*resp_buf), GFP_KERNEL); if (!resp_buf) return -ENOMEM; @@ -1426,7 +1430,7 @@ void virtio_gpu_cmd_unmap(struct virtio_gpu_device *vgdev, virtio_gpu_queue_ctrl_buffer(vgdev, vbuf); } -void +int virtio_gpu_cmd_resource_create_blob(struct virtio_gpu_device *vgdev, struct virtio_gpu_object *bo, struct virtio_gpu_object_params *params, @@ -1436,6 +1440,10 @@ virtio_gpu_cmd_resource_create_blob(struct virtio_gpu_device *vgdev, struct virtio_gpu_resource_create_blob *cmd_p; struct virtio_gpu_vbuffer *vbuf; + if (vgdev->has_blob_alignment && + !IS_ALIGNED(params->size, vgdev->blob_alignment)) + return -EINVAL; + cmd_p = virtio_gpu_alloc_cmd(vgdev, &vbuf, sizeof(*cmd_p)); memset(cmd_p, 0, sizeof(*cmd_p)); @@ -1456,6 +1464,8 @@ virtio_gpu_cmd_resource_create_blob(struct virtio_gpu_device *vgdev, if (nents) bo->attached = true; + + return 0; } void virtio_gpu_cmd_set_scanout_blob(struct virtio_gpu_device *vgdev, diff --git a/drivers/gpu/drm/virtio/virtgpu_vram.c b/drivers/gpu/drm/virtio/virtgpu_vram.c index 5ad3b7c6f73c..6c402eca5726 100644 --- a/drivers/gpu/drm/virtio/virtgpu_vram.c +++ b/drivers/gpu/drm/virtio/virtgpu_vram.c @@ -216,8 +216,14 @@ int virtio_gpu_vram_create(struct virtio_gpu_device *vgdev, return ret; } - virtio_gpu_cmd_resource_create_blob(vgdev, &vram->base, params, NULL, - 0); + ret = virtio_gpu_cmd_resource_create_blob(vgdev, &vram->base, params, + NULL, 0); + if (ret) { + drm_gem_free_mmap_offset(obj); + kfree(vram); + return ret; + } + if (params->blob_flags & VIRTGPU_BLOB_FLAG_USE_MAPPABLE) { ret = virtio_gpu_vram_map(&vram->base); if (ret) { -- 2.51.0