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.129.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 9ADE745FFA0 for ; Fri, 31 Jul 2026 16:43:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785516235; cv=none; b=OQtlhyWb8AR8MF1BfqBy588QskoSmFES4tPrUMh+0XBieIinHvOQO5ZDCBMXUNYF2g0TQEwmkVoc7t/iKxT7CO5Gn7FnWvDi46Myuwwm+Ls4KzSvZrRzpz2YkHRKwGBU0kUdLbbWzPe7e+lXjMfgXezpgpzEFK7eRWJNVtN0Luw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785516235; c=relaxed/simple; bh=dDHSTOzfodwH41AG8mWGo0E+iIXJYN7gqzY27YFcp3Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CERX5YBDDMoIAgbaUWsGqvO2bk4pQf9f6FOCOLULw+mG2IajCN+f+LKvbaKe495vUfuJygXDnFCVX+XPWgmGWEpK8rL7dKxIPVhkUc8ccZ5A1sYntuWob6ykDcG6jKYo7A1Rd/8OU9/RBBzyGtqPOfQka8VIugFiFg1o4KxJb8I= 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=B6FrsRmQ; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=NWPeVabh; arc=none smtp.client-ip=170.10.129.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="B6FrsRmQ"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="NWPeVabh" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1785516232; 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=+ltyqZW5ZfqrwkkeZqLpjTnozgkU+0DHxMfwj6ZzMkA=; b=B6FrsRmQSzL74EZVS3n8K9/ho+i7Hi4du2O9OedyktruTtPpajK/gx59LbJaMQ7wdgolgr n45jJ3L7x4WkHfcJntHBv1VuQQklPv2wFc+nB+DR5U5q9krsFghLSRwG7PswmFN/j4rwcR nxl6N6gpM0n5uQ3ZKQlyR8N3ayb3Wxk= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-321-Q32aQ5YqP9iqotvSq5leFw-1; Fri, 31 Jul 2026 12:43:51 -0400 X-MC-Unique: Q32aQ5YqP9iqotvSq5leFw-1 X-Mimecast-MFC-AGG-ID: Q32aQ5YqP9iqotvSq5leFw_1785516230 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-c15d4224f9dso96562366b.3 for ; Fri, 31 Jul 2026 09:43:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1785516230; x=1786121030; darn=vger.kernel.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:content-type; bh=+ltyqZW5ZfqrwkkeZqLpjTnozgkU+0DHxMfwj6ZzMkA=; b=NWPeVabh4o/ZBbeqqe1VfwQY5p+QG7tqA9FXu3C4MG76tLS5E0IbAyJ3bgVBa1BYul b89f2fMNAf3PE8WGkge3ZWXoF5me46XeG3EaGIA/w6ozDdM3wT8Fi6N2ow6VHSG5/ip/ IJbIbJ2pEqVdMSJ6nFe/amiVrY1U7TgV4g+1Af+JntNDo3oMV5zHFQ9QrBqmNVBQOFgQ honBL7v0+dmsVXUOTUDLi3jLdS1id+rMDWhIrkiedDdnnbVN8i4pTr8W+Dc5IptCv9Eo WQpeA5FvfPso4N4/o1QOFGu2NaBellySCRVBufhKhDLHr2jb+IrNwyb+GqF7C4ulB7/6 57gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785516230; x=1786121030; h=content-transfer-encoding:mime-version:references:in-reply-to :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=+ltyqZW5ZfqrwkkeZqLpjTnozgkU+0DHxMfwj6ZzMkA=; b=Sllv0uUY1JiwvUtFyxGNn5dv/pYArQdqiiqUQbi0RutsgkLPkSyE8qGigZQcnAOZeB m+eqJ0INL+8cmeK8ZuyZXAodrfP/nyl8IBk1e/HUjPS4AbJ67UyI/TwAIIZxhGGuEwXX VD4UjFbRdNu6RA4ceCQLdterF9esuJ0sFMejwU4y7lGn6xBgsDeougKnM4rQZ6hYJ/0y B+R8ksM+j5RkGEqnkaxVVxud3kT08Pp+Rvm/a81dWZMS3thUWmhhjoqQ544+PFWGCeAa MKjlgfQNvcJK5cRkUS9o/bDYYmJYIqftBQ36igUlHGS/GTgicTMrYY2myytz2Wfhjb4z 1j4w== X-Gm-Message-State: AOJu0YwkJ3v+C0cIc+/mEN+FUbJzKpwPdvIP8rfeH8AHsTuV8Ktv8wd8 uNnZEsdOtPd6r//rwCzc65xZ746a8/vp07O4WjhN/cOr6D0ypaD+aXZA9a/X8MQdItXDHYmjgdA +3qhv2yMhioYH1kUWIQ9IWkH/lsnR6v7cVDpoMwbakmmpa4FNVV2m2ej3p+H2l6KC2fEz/3hZ8S rNB9IGOYDV9eXyq7DRVOA0DYLQ3+0z0xZBLCv7fuRtv96MAWnYKg== X-Gm-Gg: AR+sD11uM+/xX32pWNA/c/5W65JrgaOzQCpfN0D2xrwezDOzWTXxtWUL6Lwl715oHXA CVLV6cXFmtIYKsTk1sAEUSh2V69Fl8OQtYoy47lj0hLc+MYOqnAekOs1KZO5tMb4HSUG4zKnhJ3 Z05GdPz7C5af868n1a04K5rEXbAJhTwj25YQOulSyKMp0WwN3SPqVU63x6X6pGbSHMfarXZjc3g qM7dlx1EFK7b9NZh7iT7/vYTNd65EV4u5IWO9ZSak159QyRdp/AfV1WRGlYXNq1KD69twkik05p C3bPyD5/0NFaAT2By/yBSTqFVjlVUQwe3E0JTAPmGt0f+SnQWsXWkNrx5sAEuojch6FROcSfr59 v3gSnrSF16/ojbEyPJ/6q08qqLu5w7fzTpaaU88OnNoldjpZeVqEqMPeWDWNjrTs+KDkSVwPdl5 4dnH0= X-Received: by 2002:a17:907:d1f:b0:c1f:17f6:2a74 with SMTP id a640c23a62f3a-c1fe7fc540fmr36349266b.9.1785516230009; Fri, 31 Jul 2026 09:43:50 -0700 (PDT) X-Received: by 2002:a17:907:d1f:b0:c1f:17f6:2a74 with SMTP id a640c23a62f3a-c1fe7fc540fmr36346066b.9.1785516229473; Fri, 31 Jul 2026 09:43:49 -0700 (PDT) Received: from [192.168.10.48] ([151.95.34.92]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-c1fd4537761sm215223766b.52.2026.07.31.09.43.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Jul 2026 09:43:48 -0700 (PDT) From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: Boris Brezillon , Thomas Zimmermann , David Hildenbrand , Michal Hocko , Sergio Lopez , Christian Koenig , Huang Rui , bcm-kernel-feedback-list@broadcom.com, dri-devel@lists.freedesktop.org, linux-mm@kvack.org Subject: [PATCH RFT 2/3] drm/shmem_helper: use vmf_insert_pfn_mkwrite() Date: Fri, 31 Jul 2026 18:43:40 +0200 Message-ID: <20260731164341.1109827-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260731164341.1109827-1-pbonzini@redhat.com> References: <20260731164341.1109827-1-pbonzini@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 This ensures that KVM or VFIO correctly see a writable PTE when they request one. Otherwise, a guest write to an unpopulated PTE from a mapping backed by a DRM GEM BO triggers a VM exit with EFAULT. The code actually is simpler, because the same logic already applied to the hugepage mapping case using vmf_insert_pfn_pmd(). Reported-by: Sergio Lopez Link: https://lore.kernel.org/kvm/20260729072044.25796-1-slp@redhat.com/ Fixes: 28e3918179aa ("drm/gem-shmem: Track folio accessed/dirty status in mmap") Signed-off-by: Paolo Bonzini --- drivers/gpu/drm/drm_gem_shmem_helper.c | 38 ++++++++++++++------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c index c989459eb215..33a14f558276 100644 --- a/drivers/gpu/drm/drm_gem_shmem_helper.c +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c @@ -589,11 +589,25 @@ static void drm_gem_shmem_record_mkwrite(struct vm_fault *vmf) folio_mark_dirty(page_folio(shmem->pages[page_offset])); } +/* + * Because the vm_ops have a .pfn_mkwrite() callback, vma_set_page_prot() + * has cleared the write bit from vma->vm_page_prot. vmf_insert_pfn() + * would install a read-only entry even for a write fault, relying on a + * second fault to reach .pfn_mkwrite() and upgrade it, but that second + * fault never happens for fixup_user_fault() callers that directly + * walk the page tables with follow_pfnmap_start(). To ensure that + * they don't see the read-only entry, pass FAULT_FLAG_WRITE info down + * to install a writable entry right away. Because .pfn_mkwrite() is + * not invoked, record the write afterwards. + */ static vm_fault_t try_insert_pfn(struct vm_fault *vmf, unsigned int order, unsigned long pfn) { + bool write = vmf->flags & FAULT_FLAG_WRITE; + vm_fault_t ret = VM_FAULT_FALLBACK; + if (!order) { - return vmf_insert_pfn(vmf->vma, vmf->address, pfn); + ret = vmf_insert_pfn_mkwrite(vmf->vma, vmf->address, pfn, write); #ifdef CONFIG_ARCH_SUPPORTS_PMD_PFNMAP } else if (order == PMD_ORDER) { unsigned long paddr = pfn << PAGE_SHIFT; @@ -601,27 +615,15 @@ static vm_fault_t try_insert_pfn(struct vm_fault *vmf, unsigned int order, if (aligned && folio_test_pmd_mappable(page_folio(pfn_to_page(pfn)))) { - vm_fault_t ret; - pfn &= PMD_MASK >> PAGE_SHIFT; - - /* Unlike PTEs which are automatically upgraded to - * writeable entries, the PMD upgrades go through - * .huge_fault(). Make sure we pass the "write" info - * along in that case. - * This also means we have to record the write fault - * here, instead of in .pfn_mkwrite(). - */ - ret = vmf_insert_pfn_pmd(vmf, pfn, - vmf->flags & FAULT_FLAG_WRITE); - if (ret == VM_FAULT_NOPAGE && (vmf->flags & FAULT_FLAG_WRITE)) - drm_gem_shmem_record_mkwrite(vmf); - - return ret; + ret = vmf_insert_pfn_pmd(vmf, pfn, write); } #endif } - return VM_FAULT_FALLBACK; + + if (ret == VM_FAULT_NOPAGE && write) + drm_gem_shmem_record_mkwrite(vmf); + return ret; } static vm_fault_t drm_gem_shmem_any_fault(struct vm_fault *vmf, unsigned int order) -- 2.55.0