From patchwork Mon Apr 28 12:59:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 885476 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp5167984wrs; Mon, 28 Apr 2025 06:05:57 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXTH+z+niqdLAhsQwUZFtGjdtGhXpB212sS8CQVfBkjpoKvEb9FsStcT5MCP1ICFFGWW4DVnQ==@linaro.org X-Google-Smtp-Source: AGHT+IHO9PGfA3/oroJei0OngAVfW56T3kpP3FSDnwp/AxIVpjl0eFcqyrfQG32phxyBRVDwnwyx X-Received: by 2002:a17:907:98b:b0:acb:6c92:cbce with SMTP id a640c23a62f3a-ace8493f8f4mr743301266b.32.1745845556775; Mon, 28 Apr 2025 06:05:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745845556; cv=none; d=google.com; s=arc-20240605; b=K70FgS3m2FxpzTjk2lzI1N4QOX8ljrn8BmXAlVOTAx3398GwCw+C8MzS+Vu8lX4L38 y29oGAN7cjjqXyzXR3DwkdOnsrXFG5Pa5ZJOzvj4OhJpEX8a7u0kzFGkjSpr777nQd6q jT68CyoYyhQaKP/VxyE6khoBQPoPcTBd2t/4WJrXwPK1NAgQ6OahqHKDcCUXnh0Z74dt rTt8hmG5ofYRKGpWIap9iRlycU83fCWY7EJlfR7Mjv+j5U5JocjPUBjjXm4iwAtAdwum 47z4r9aXgUDa1AwwvBO3moelBY127TM4MWuJ//oJMQexAQwxZ/OwLWhaEgoO5MhQqKg4 gFKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ZKjH7CjiJYzujGe3Nf/k6lUsudRskeBEN8uYYCNZGto=; fh=MbSZeyuHz1YMF37U3Zh5uEBxqt8d1r6Azei5dqApup4=; b=TMeNyHGlxLZEPsZDyCPGw+as+h1n50sQaumsTkNvUa6GqTINuXPDwa8yfI6TnS/YdM pJVxCphZAYoUXkKMpAwuGXR7ZNCiSAReDCNcMLGj4O29/SZ0sUrnGyb4TSxB1PQj/SfE C6SAx5lmj/yfSHQ+jZ7MqP4xN3pB+wgWDbkaIr2uv6Q5B/fSfm37IAtQOglukYqeQdii S3LHjpNnVJcwAZL//6EoNDrqbiZn//HI+TNdzynq6B8/mUw/j8wspGt+Do/HYGFlMwM1 a44WwAHV3lc/GYQpS4I6sljBODU0A9Y2nlm5R3t9c0k7sCDdfihZDp0XvCTCXK7fJvJ6 d+cg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cl+Cayrq; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id a640c23a62f3a-ace6e41d439si477051266b.38.2025.04.28.06.05.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 28 Apr 2025 06:05:55 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cl+Cayrq; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9O5n-0000o4-HX; Mon, 28 Apr 2025 09:00:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u9O55-0007w3-CM for qemu-devel@nongnu.org; Mon, 28 Apr 2025 08:59:32 -0400 Received: from mail-ed1-x535.google.com ([2a00:1450:4864:20::535]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9O51-000383-PF for qemu-devel@nongnu.org; Mon, 28 Apr 2025 08:59:30 -0400 Received: by mail-ed1-x535.google.com with SMTP id 4fb4d7f45d1cf-5f4d0da2d2cso9075162a12.3 for ; Mon, 28 Apr 2025 05:59:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745845166; x=1746449966; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZKjH7CjiJYzujGe3Nf/k6lUsudRskeBEN8uYYCNZGto=; b=cl+CayrqVe7kYwRjwjmXUfAHlGUdAlVCrQtCN5cfz96GFuZBUonHRfSuv/uLLthijW /SR6yproRGQq5LheSyDYJfXEqmENLDWv4rNJ8gtxLdLtAks8H4Xf82Zq9C+7XyNqAl2t BsPuuNJJPwxx31DSRW/s5AMKhwxfJ8Ow/qqwFCkALETvDod0W2LO2+6m5cT/zTphAuo7 YGXMQiPtIr/C1u7ezfjXcDp+k1g1puBEihbKCO0dIZa3G/+FhEmbP+v/qy/ch1+t2v1y hyUbokhXcju6qB+wrFu39CCw06C4UI3MFwbUCh8BbLTFfE9shk5wd77O9V09PrEMHRy8 +dkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745845166; x=1746449966; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZKjH7CjiJYzujGe3Nf/k6lUsudRskeBEN8uYYCNZGto=; b=tmzjz4FwodlToJyyvIT1eYB9M3Za9gh8KXwY5OAzh6G0b90CijU6gsUn6ctVrpl3PK CFh8aYZBcDxAdra8JpFcXdolSQKO4M4i7pK6m36FIr7p2dU6Ayxjpqo4T9EjVHz3dlRE 1BywSyqLKd4pWKB0GtQfm6FMHzLoFIIflsQLELlbqR+F66yxjQFLG0Ppdt1R2HMPZsKF G4jtAk6dRID+4vsIBMIGA1J2L3B705jCi3wd96/T2Enn5p0KRfZxjHXduELr3gxhCKFr 7wI0U3UsaebCdjpL231teG2YBuIMzTZvV9m8OEFzI6KXBhXs9J6niKqJCX6xp0OAn/P8 0qyw== X-Gm-Message-State: AOJu0YyKpV1z6kbh33oWZaFlNd+UHjQLmeSKWWU2tOUgW+EXXyzAwVIA zUkpVwXrQTDjUYNpHsYHsdYMyJsayWDWC78RCWYbe8dFJmBYQBvQgOFmeKMshL0= X-Gm-Gg: ASbGnctgIqtGd/3xeRFioDcdwJ8cvavOW1OGLck8n2qx1cFDAwKPno2j8pA0uLYDus7 q9CksAeSgjPmkNreuOlqdph/UYB1YaBbHR+LRxzXO55GrCF8Vc3Ng0kqF8UHVzdWXudF1wdytp1 ytsuZZ2ishMZ8Y9jBN3xNiJ4EV5pKbrzxZ4Tkb21gA4CcFbZ3hYzkn59zO7OFw4Mx1jnWSitM6/ iIx3O643ge0BP5wjZRlnwkEWJG6ZBEGP54FMFKRKoYwYAcL6T1xt8zWCG8a0WiO5All/NsxM4cE H7iT7fEeHEXmqtOzwGZ5NOU6WYwXXIhbgw7LXd7baG8= X-Received: by 2002:a05:6402:2345:b0:5dc:c9ce:b022 with SMTP id 4fb4d7f45d1cf-5f7395efc3cmr6818100a12.9.1745845165661; Mon, 28 Apr 2025 05:59:25 -0700 (PDT) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5f7f83ef5f1sm979766a12.21.2025.04.28.05.59.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Apr 2025 05:59:22 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 18C605FAF1; Mon, 28 Apr 2025 13:59:19 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Alexandre Iooss , "Michael S. Tsirkin" , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , David Hildenbrand , Pierrick Bouvier , qemu-arm@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Peter Xu , Peter Maydell , Mahmoud Mandour , Manos Pitsidianakis , qemu-stable@nongnu.org Subject: [PATCH 9/9] virtio-gpu: refactor async blob unmapping Date: Mon, 28 Apr 2025 13:59:18 +0100 Message-Id: <20250428125918.449346-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250428125918.449346-1-alex.bennee@linaro.org> References: <20250428125918.449346-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::535; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x535.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Manos Pitsidianakis Change the 3 part async cleanup of a blob memory mapping to check if the unmapping has finished already after deleting the subregion; this condition allows us to skip suspending the command and responding to the guest right away. Signed-off-by: Manos Pitsidianakis Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20250410122643.1747913-4-manos.pitsidianakis@linaro.org> Cc: qemu-stable@nongnu.org --- hw/display/virtio-gpu-virgl.c | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/hw/display/virtio-gpu-virgl.c b/hw/display/virtio-gpu-virgl.c index 8fbe4e70cc..32a32879f7 100644 --- a/hw/display/virtio-gpu-virgl.c +++ b/hw/display/virtio-gpu-virgl.c @@ -155,7 +155,32 @@ virtio_gpu_virgl_unmap_resource_blob(VirtIOGPU *g, * asynchronously by virtio_gpu_virgl_hostmem_region_free(). * 3. Finish the unmapping with final virgl_renderer_resource_unmap(). */ + + /* 1. Check if we should start unmapping now */ + if (!vmr->finish_unmapping) { + /* begin async unmapping. render will be unblocked once MR is freed */ + b->renderer_blocked++; + + memory_region_set_enabled(mr, false); + memory_region_del_subregion(&b->hostmem, mr); + object_unparent(OBJECT(mr)); + /* + * The unmapping might have already finished at this point if no one + * else held a reference to the MR; if yes, we can skip suspending the + * command and unmap the resource right away. + */ + *cmd_suspended = !vmr->finish_unmapping; + } + + /* + * 2. if virtio_gpu_virgl_hostmem_region_free hasn't been executed yet, we + * have marked the command to be re-processed later by setting + * cmd_suspended to true. The freeing callback will be called from RCU + * context later. + */ + if (vmr->finish_unmapping) { + /* 3. MemoryRegion has been freed, so finish unmapping */ res->mr = NULL; g_free(vmr); @@ -166,16 +191,6 @@ virtio_gpu_virgl_unmap_resource_blob(VirtIOGPU *g, __func__, strerror(-ret)); return ret; } - } else { - *cmd_suspended = true; - - /* render will be unblocked once MR is freed */ - b->renderer_blocked++; - - /* memory region owns self res->mr object and frees it by itself */ - memory_region_set_enabled(mr, false); - memory_region_del_subregion(&b->hostmem, mr); - object_unparent(OBJECT(mr)); } return 0;