From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7017FCA5FCE for ; Mon, 5 Oct 2026 07:24:19 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A38CC10E9FC; Mon, 5 Oct 2026 07:24:18 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="e+ctMgOT"; dkim-atps=neutral Received: from mail-qt1-f175.google.com (mail-qt1-f175.google.com [209.85.160.175]) by gabe.freedesktop.org (Postfix) with ESMTPS id F3D5810E08C for ; Sun, 4 Oct 2026 21:24:08 +0000 (UTC) Received: by mail-qt1-f175.google.com with SMTP id d75a77b69052e-5351d76e1baso7024491cf.1 for ; Sun, 04 Oct 2026 14:24:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1791149048; x=1791753848; darn=lists.freedesktop.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=4FDDBOjHId45sAPhEMEOKQ193Q3Lv9uy6bGqIfQK4UI=; b=e+ctMgOTymF+Tscj1W1FIFRqI4Dwy+XM8Pk6k79X7E8/VxJvQOHYK1uR/bktDOSGwb njE1y5c9Q/iv5GUGKQkTPB7hhccDliwgVaiZLJkNxQ/EYqWa9Pg6DlV8qfCj8BvPkUfk KSqdy6kZ5uXdfedyqKLIE/hIFckfgS0L2UXTzf44/CsLe3nWMrVkCzWk9+8I4Sw3L153 9JmaMMNyXEk1nzC206aO7ISquC4l1m+wV0KswhYJyFPKqMK+v+fFaVC8sWEuu58WkzDz Md7N2CU+Q1lR2MeTBPbciEEzG9MpVYAktZTf+2zXfPFnSpAIjf9SdeqYfr+LftWIrkQi ud7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791149048; x=1791753848; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=4FDDBOjHId45sAPhEMEOKQ193Q3Lv9uy6bGqIfQK4UI=; b=I6K/u4GqxuAMo5O7PAeKmKhlCrR7TEJNvttthmJme74R37+OHyu/paa+LVwfO3b+2M R8ZD+2lttXiHZRW1oged8nXRxuEg0EEWTa+JhHX+J5CHWk5QABlP9Kbo9EGiermwEui5 4JoBwyy3mLs0Z1mFhiDBR2UAhfG/sIHudrdb5MXn8e9QN0Uyga4KcY9s+Uz/HHboWTmF P0iU92w3akOX84scSPcw66OAFk2VA96HNmujE1DU0LT6vPx/LO2y65wD3Fg5lwuj0iA0 YpZqW0jigqrf8znCSIxi7kRqvR+xOhnrj+ekJcRF/i98hQgaEnzY8NzlmntTSc6Nz0EN C1Mw== X-Forwarded-Encrypted: i=1; AKwUvBwkSKUe1S7w8sfDYlvVWTooDTzV+paKZcYvZHtAp89doaV59AUf5f9S1htK/FePHxLtXg/n6+xtL+U=@lists.freedesktop.org X-Gm-Message-State: AFuF++neoB7co8bKJ8y2sT90nIRFRwVItXaHY7wT54kLe+lxGkrZxRfQ QeCqJOwn/M79RsHIZ629ykX+Vil3DlEmywDs+Oo2N4f3U9Whd016Wqzs X-Gm-Gg: AYBFou21g0QUWr9twkzx4Z0p2VRMk5mvrW+81UQFgpGRSemZLTdHizMt+caFDD125z5 bFTlYftWqw3geQq412uRetJ20zmPZiYHvEHWfZyMHA3Z4upDJYolzavLrPTHJ1RyuoHjU5vw7dB PIeXAwmACH490kX9oxHu7bnnN5zB3PBvnbW72u6xa/Pax7upNjQdfYyhvwNTCjyiVu2b9wB0n2o ZD94PA8RCqnARW4ZiugPAlOG0WWpef8hdNh1z+SgvF6aQTnAgBsqBonVDfV7tgT4rQwaNjYgNUE mQ1yateYE4mtO2pfKenbjiWySVzGIKEtocdNRzEW8Fc6lwWSl8xZ7cNe9J1enTw9QE5geE2KuHX cTpVJSkFQYCWvLokhuYIrffuXPn8/mRHsfvlACmwpit64QytqgyY2qqBZCk/rH5ZTGdA3AsyvYJ qBfOZIpGYBco+MsBn6EFxSk2kVfLRBK6tJN9l+y6lyx6a8ySqlUAAq4EigIiBV2LszSVS8aylyU YEjjJvqf///TlzS6YhkPQ== X-Received: by 2002:a05:622a:653:b0:535:1924:d211 with SMTP id d75a77b69052e-5351924d301mr81314081cf.1.1791149047944; Sun, 04 Oct 2026 14:24:07 -0700 (PDT) Received: from i4-gl-tmk5904.ad.psu.edu ([130.203.156.186]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-5339883034csm81689241cf.3.2026.10.04.14.24.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Oct 2026 14:24:07 -0700 (PDT) From: Yuho Choi To: Zhenyu Wang , Zhi Wang Cc: Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , Xiaolin Zhang , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Yuho Choi , stable@vger.kernel.org Subject: [PATCH v1] drm/i915/gvt: Don't replace a DMA mapping that is still in use Date: Sun, 4 Oct 2026 17:22:39 -0400 Message-ID: <20261004212403.208681-1-oss.patchbox@gmail.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Mailman-Approved-At: Mon, 05 Oct 2026 07:24:17 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" intel_gvt_dma_map_guest_page() unmaps and frees the cache entry of a gfn when it is requested with a different size, and maps the page again. The entry is still referenced: shadow GTT entries and dma-bufs keep using its DMA address after the page is unpinned and the DMA mapping is torn down. When the new mapping gets the same DMA address, their later intel_gvt_dma_unmap_guest_page() calls also drop the references of the new entry. Keep the existing entry instead. A 2M mapping covers a 4K request for its first page, so take a reference on it. If the entry is smaller than the request, fail and let the caller split the 2M entry into 4K pages, as it already does when a 2M mapping cannot be set up. Fixes: 7366aeb77cd8 ("drm/i915/gvt: fix incorrect cache entry for guest page mapping") Cc: stable@vger.kernel.org Signed-off-by: Yuho Choi --- Compile-tested only (x86_64 defconfig + DRM_I915_GVT_KVMGT, W=1, sparse). drivers/gpu/drm/i915/gvt/kvmgt.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c b/drivers/gpu/drm/i915/gvt/kvmgt.c index ec62db5cc3675..9a3e305253469 100644 --- a/drivers/gpu/drm/i915/gvt/kvmgt.c +++ b/drivers/gpu/drm/i915/gvt/kvmgt.c @@ -1626,19 +1626,15 @@ int intel_gvt_dma_map_guest_page(struct intel_vgpu *vgpu, unsigned long gfn, ret = __gvt_cache_add(vgpu, gfn, *dma_addr, size); if (ret) goto err_unmap; - } else if (entry->size != size) { - /* the same gfn with different size: unmap and re-map */ - gvt_dma_unmap_page(vgpu, gfn, entry->dma_addr, entry->size); - __gvt_cache_remove_entry(vgpu, entry); - - ret = gvt_dma_map_page(vgpu, gfn, dma_addr, size); - if (ret) - goto err_unlock; - - ret = __gvt_cache_add(vgpu, gfn, *dma_addr, size); - if (ret) - goto err_unmap; + } else if (entry->size < size) { + /* + * The smaller mapping may still be in use, so don't replace + * it. Fail and let the caller map the range in smaller pages. + */ + ret = -EBUSY; + goto err_unlock; } else { + /* A mapping of the same or a larger size covers the request */ kref_get(&entry->ref); *dma_addr = entry->dma_addr; } base-commit: 7704c4c5bb127673b4f0ead839919db573559e38 -- 2.43.0