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 7D4F245FFD1 for ; Fri, 31 Jul 2026 16:43:56 +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=1785516238; cv=none; b=Nw/5N77j5896QtEl2z65rtju/hmtmbuilQFwMSYl3ZxsA59Vm4iZu+L9V/Rh2MiuqPMdvLywKU7vNzeiRziXvfvOVuxYpM4NMiwQIWmPknHskA6gqf8kBPIpUUPcIHsr2DKwD5qkTlFssxJeZFoJv4soAD792TCbgMeA7oaRWFg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785516238; c=relaxed/simple; bh=A45rtVuI2v+Zs4TW0iC+h2We1+nvtl6ZE/yluKW9Tsk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UjtdrcnjsBg+HEvMd47YaMUEeKoE2ly6Zm0bZegQ2cbYzRt9FDB1EIreH6CC4Ge4atVLlVSM6FFBpN3P3E0IaDHzffS0cMqO++VCNfnY8Fix8yptOOipFcuDplGCLYGb5Y58Kbjh0K8p6OFIXqa3Vcsb0TMvahHfYA22XuwJ9zg= 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=B2lG9ztx; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=EBdEqYYm; 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="B2lG9ztx"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="EBdEqYYm" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1785516235; 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=rKIuXVAQxBinLsqe2l2r/I0mxnjKp1xskcVhmjIrGQo=; b=B2lG9ztxVtGSZjJbFaaWiyLZ4gxxU+wvDymLAyx73Eh2NnPNRpnZ8cu91H7uMTXRVaKzAJ VJyzaL8wiIhoYZjbdircAn7L04CoYWClsdV7eK7JxrASTk5NyiN3DpD5c8f15Q8Y/S89fu Pux8XJBmrYeGPpjYTPZBU/nSLUhU6Hw= Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-138-y0FxAryKNmmax5NBxq07eg-1; Fri, 31 Jul 2026 12:43:53 -0400 X-MC-Unique: y0FxAryKNmmax5NBxq07eg-1 X-Mimecast-MFC-AGG-ID: y0FxAryKNmmax5NBxq07eg_1785516233 Received: by mail-ed1-f69.google.com with SMTP id 4fb4d7f45d1cf-69c2f98aa9fso1450373a12.2 for ; Fri, 31 Jul 2026 09:43:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1785516233; x=1786121033; 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=rKIuXVAQxBinLsqe2l2r/I0mxnjKp1xskcVhmjIrGQo=; b=EBdEqYYmQDnxUVUSYkqi5ON0HhBsoDrYbzWE3J4M6v0qm+BUkIDZcogs6YG3AyzseR GL6Bi2LmTa5CiGgf3m7IFBYq91Q+5Z2Rjcyj7EyVN26wkcsOk+hJ7L+iKowdyMf3a99p cfY3dSPLpcPMaVqhknRI2S35gLYRCxY5gUX84kiAqtFX0NaiaeyiV/uugKzK20xzE7R8 5Q3ge211S7rlSx2qMTNA/GBYtSL8LjN2yh9DGVBW+pn7H/gGD04YDWmHObW3TqkOpMkG Ja5mVAMKgXNfhBK4d5mB1QzX1VFB6kdwksRyWFJhOzoJfIyqV722cHilrm/OUvwYk2mo g5WA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785516233; x=1786121033; 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=rKIuXVAQxBinLsqe2l2r/I0mxnjKp1xskcVhmjIrGQo=; b=BkFgpBVk6pLf+w7nBKtJKJmocYxcmC9PMDCitVW+js/7N36+hikhs39Otk4Xw25sZY vE6CLOAqaUR7BFi6aaJbLVtXCEaTiupAZ+NFceJKOVvxXOtfnazy7y72ILZe+XOH2vZf Z9pGKzfXCEIzKSWPWSVl1NHvnzeNd1GXQnoS4GGr5yJT6hydhU07RdVC0O1w1gGu6pIB RkyHJUn1yKDj2E+PqSpzj0NvWkjeqIEUcv8O9N1xuhDsPDDS3wdRlvr9GFOdV2vX2n+R GdVZGnCA2CXYomaVl+8xAfmgLKt3xu3jKo+stmJ8cxWyklnSMRNvsHGt52KGXYr5rKci TuxA== X-Gm-Message-State: AOJu0YzavzivY0UU194yQk6XIVqF9m9HZuVGgPObjWmZbsbt3kSdWmW9 dIr/ncioYBfWh4uoWPlUUFlj5TRPjNADNcX4bBCUvsODYlnsPARPrUVIet0+2Ip30xnrkhiWNnJ GLILm8zDhwKKh6CL1g1qPd8fcfAgxRpKO5dzy8QvLQTnSIpvgI+8SaLPqTE5MvsDOnBSduNTFyZ 9NFtClztEi64PQf880jJiViLZ6PIXL/NaoC5dDJowMs2w8n5jcIA== X-Gm-Gg: AR+sD13UnUI/MYSG7ar5zEA7Ldkdia6TkaaOouTsTWiUzYjlDSSlui0rhmA+2Mg96nr KO6YKDx34B9qfTeqqDHkaNruRnkehcYsLrwLqYV2UrtxcCmsCeq7YqBBZPZcWcamgiNoGeRktTV ZmFelOZVFfpPGWKIQuq2jRJBkZwtXrD4nl+mOwvCBg6SsipPNxS7T8uDq6WWsq1vCeXrktLKvGR 5vWzQDdVnr4KMKbFS4B8HbI0fmjleynKOcVZScU2z1u5ESykhC1oQdp3qmO5kY5NzwikDS54eFj itCrY2yrvJ3OZUiV7Ai4zYAeLHgdlxLEDrzjNNaSYK/xZ4vdkQdVPxyASzdqGaz6XKeaSEQpc+0 wkMj2VA3pyDfIAxTcLrOjpmbb6ov4sxOBPQ1Gqid+wNBCjaSUeiXeLmBPEt+2NL1yoSSNfPRnBu gcccQ= X-Received: by 2002:a05:6402:548a:b0:6a0:923a:cfe7 with SMTP id 4fb4d7f45d1cf-6a0a7cf5cf6mr192246a12.37.1785516232618; Fri, 31 Jul 2026 09:43:52 -0700 (PDT) X-Received: by 2002:a05:6402:548a:b0:6a0:923a:cfe7 with SMTP id 4fb4d7f45d1cf-6a0a7cf5cf6mr192219a12.37.1785516232159; Fri, 31 Jul 2026 09:43:52 -0700 (PDT) Received: from [192.168.10.48] ([151.95.34.92]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-6a09c5a0556sm2582577a12.5.2026.07.31.09.43.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Jul 2026 09:43:51 -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 3/3] drm/ttm, drm/vmwgfx: directly create writable PTEs when mkwrite is in use Date: Fri, 31 Jul 2026 18:43:41 +0200 Message-ID: <20260731164341.1109827-4-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 fixup_user_fault() users see a writable PTE when they request one. The flip side is that vmw_bo_vm_fault() now has to record by hand the write fault, because .pfn_mkwrite() is not invoked. Prefaulting works as before because only the first entry comes out writable, while the following ones still end up executing the .pfn_mkwrite() callback. Signed-off-by: Paolo Bonzini --- drivers/gpu/drm/ttm/ttm_bo_vm.c | 3 +- drivers/gpu/drm/vmwgfx/vmwgfx_page_dirty.c | 42 ++++++++++++---------- 2 files changed, 26 insertions(+), 19 deletions(-) diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c index a80510489c45..ef27a2d7afc0 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_vm.c +++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c @@ -263,7 +263,8 @@ vm_fault_t ttm_bo_vm_fault_reserved(struct vm_fault *vmf, * at arbitrary times while the data is mmap'ed. * See vmf_insert_pfn_prot() for a discussion. */ - ret = vmf_insert_pfn_prot(vma, address, pfn, prot); + ret = __vmf_insert_pfn_prot(vma, address, pfn, prot, + i == 0 && !!(vmf->flags & FAULT_FLAG_WRITE)); /* Never error on prefaulted PTEs */ if (unlikely((ret & VM_FAULT_ERROR))) { diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_page_dirty.c b/drivers/gpu/drm/vmwgfx/vmwgfx_page_dirty.c index 45561bc1c9ef..2cc490e7d758 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_page_dirty.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_page_dirty.c @@ -398,15 +398,33 @@ void vmw_bo_dirty_clear_res(struct vmw_resource *res) dirty->end = res_start; } +static vm_fault_t vmw_bo_dirty_mkwrite(struct vm_fault *vmf, struct ttm_buffer_object *bo) +{ + unsigned long page_offset; + struct vmw_bo *vbo = to_vmw_bo(&bo->base); + + page_offset = vmf->pgoff - drm_vma_node_start(&bo->base.vma_node); + if (unlikely(page_offset >= PFN_UP(bo->resource->size))) + return VM_FAULT_SIGBUS; + + if (vbo->dirty && vbo->dirty->method == VMW_BO_DIRTY_MKWRITE && + !test_bit(page_offset, &vbo->dirty->bitmap[0])) { + struct vmw_bo_dirty *dirty = vbo->dirty; + + __set_bit(page_offset, &dirty->bitmap[0]); + dirty->start = min(dirty->start, page_offset); + dirty->end = max(dirty->end, page_offset + 1); + } + return 0; +} + vm_fault_t vmw_bo_vm_mkwrite(struct vm_fault *vmf) { struct vm_area_struct *vma = vmf->vma; struct ttm_buffer_object *bo = (struct ttm_buffer_object *) vma->vm_private_data; vm_fault_t ret; - unsigned long page_offset; unsigned int save_flags; - struct vmw_bo *vbo = to_vmw_bo(&bo->base); /* * mkwrite() doesn't handle the VM_FAULT_RETRY return value correctly. @@ -419,22 +437,7 @@ vm_fault_t vmw_bo_vm_mkwrite(struct vm_fault *vmf) if (ret) return ret; - page_offset = vmf->pgoff - drm_vma_node_start(&bo->base.vma_node); - if (unlikely(page_offset >= PFN_UP(bo->resource->size))) { - ret = VM_FAULT_SIGBUS; - goto out_unlock; - } - - if (vbo->dirty && vbo->dirty->method == VMW_BO_DIRTY_MKWRITE && - !test_bit(page_offset, &vbo->dirty->bitmap[0])) { - struct vmw_bo_dirty *dirty = vbo->dirty; - - __set_bit(page_offset, &dirty->bitmap[0]); - dirty->start = min(dirty->start, page_offset); - dirty->end = max(dirty->end, page_offset + 1); - } - -out_unlock: + ret = vmw_bo_dirty_mkwrite(vmf, bo); dma_resv_unlock(bo->base.resv); return ret; } @@ -484,6 +487,9 @@ vm_fault_t vmw_bo_vm_fault(struct vm_fault *vmf) prot = vm_get_page_prot(vma->vm_flags); ret = ttm_bo_vm_fault_reserved(vmf, prot, num_prefault); + if (ret == VM_FAULT_NOPAGE && (vmf->flags & FAULT_FLAG_WRITE)) + WARN_ON_ONCE(vmw_bo_dirty_mkwrite(vmf, bo)); + if (ret == VM_FAULT_RETRY && !(vmf->flags & FAULT_FLAG_RETRY_NOWAIT)) return ret; -- 2.55.0