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 X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6BC14CA9EAF for ; Sun, 27 Oct 2019 21:15:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3DCEA214AF for ; Sun, 27 Oct 2019 21:15:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572210920; bh=Wu7KER+EOC8wlor1NMLBzXU7JISnGQq7b8zwi1Rbg1o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Zlu5UQBshhkJsaStbexHRIW58vD+VXdJKAgzwHw7vd7/cJ8x3H1WHrCKfTHSahhgI 4J2OxlrVoe3Nj+tQYl39Q1cgGLQaAb0A+K6Ti/YYu1Zfv8QU0CddhokhNiJC5Rd1fu zl49AAlTRQ4FWvpKRF7uymYd6p4jWIHtXxxeJLio= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730626AbfJ0VPS (ORCPT ); Sun, 27 Oct 2019 17:15:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:34486 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730616AbfJ0VPP (ORCPT ); Sun, 27 Oct 2019 17:15:15 -0400 Received: from localhost (100.50.158.77.rev.sfr.net [77.158.50.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 64445208C0; Sun, 27 Oct 2019 21:15:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572210914; bh=Wu7KER+EOC8wlor1NMLBzXU7JISnGQq7b8zwi1Rbg1o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=C0mnDiyLXjXbIQY7ZEjSFqWz+bsVT0Ez++XqKSQ4cU/KDcLD8pDBmljzCXZ7yzKlv nxtxcXAfWivOrX+ex1cSbwBSsxJe4EhOuZn13+gI2StU7lRjAcpgND+z4/jmZ3aWVu Da+QUgLwZm+I3SVLXit+6iE7s/tTtHP59pFO2R90= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Souptick Joarder , =?UTF-8?q?Christian=20K=C3=B6nig?= , Thomas Hellstrom Subject: [PATCH 4.19 60/93] drm/ttm: Restore ttm prefaulting Date: Sun, 27 Oct 2019 22:01:12 +0100 Message-Id: <20191027203304.610117369@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191027203251.029297948@linuxfoundation.org> References: <20191027203251.029297948@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Thomas Hellstrom commit 941f2f72dbbe0cf8c2d6e0b180a8021a0ec477fa upstream. Commit 4daa4fba3a38 ("gpu: drm: ttm: Adding new return type vm_fault_t") broke TTM prefaulting. Since vmf_insert_mixed() typically always returns VM_FAULT_NOPAGE, prefaulting stops after the second PTE. Restore (almost) the original behaviour. Unfortunately we can no longer with the new vm_fault_t return type determine whether a prefaulting PTE insertion hit an already populated PTE, and terminate the insertion loop. Instead we continue with the pre-determined number of prefaults. Fixes: 4daa4fba3a38 ("gpu: drm: ttm: Adding new return type vm_fault_t") Cc: Souptick Joarder Cc: Christian König Signed-off-by: Thomas Hellstrom Reviewed-by: Christian König Cc: stable@vger.kernel.org # v4.19+ Signed-off-by: Christian König Link: https://patchwork.freedesktop.org/patch/330387/ Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/ttm/ttm_bo_vm.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) --- a/drivers/gpu/drm/ttm/ttm_bo_vm.c +++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c @@ -273,15 +273,13 @@ static vm_fault_t ttm_bo_vm_fault(struct else ret = vmf_insert_pfn(&cvma, address, pfn); - /* - * Somebody beat us to this PTE or prefaulting to - * an already populated PTE, or prefaulting error. - */ - - if (unlikely((ret == VM_FAULT_NOPAGE && i > 0))) - break; - else if (unlikely(ret & VM_FAULT_ERROR)) - goto out_io_unlock; + /* Never error on prefaulted PTEs */ + if (unlikely((ret & VM_FAULT_ERROR))) { + if (i == 0) + goto out_io_unlock; + else + break; + } address += PAGE_SIZE; if (unlikely(++page_offset >= page_last))