Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp2774395ybg; Mon, 28 Oct 2019 02:07:03 -0700 (PDT) X-Google-Smtp-Source: APXvYqy2dEj7+eYyxQkfu0mW0Qe3mMNALUFPj1b3gfgrHdvQuoo/yPFzZrC1nJSHgJzn7/IcvENS X-Received: by 2002:a17:906:8046:: with SMTP id x6mr15358707ejw.221.1572253623484; Mon, 28 Oct 2019 02:07:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572253623; cv=none; d=google.com; s=arc-20160816; b=tow0/+rZBYFt+Cx6bqilWnQTQnljxS37hSSUtsSs/tUTSxUfURCw2mF84NFT05Rb/O TqQqxTWOeGrzbl8T21PQQV4I+0Dd/Od3Zk2o5NnR8w2vvrSF0qd1ZL6vGUjAlo8hdtqj qx8fvaOLTkzf72JTdVrlCkL3R0H43zqzFD3c5tINGlPT8zL75i//YjoArZlhHAXVezaI EI8yYujXSh4G9YVDhperUPou5Z8zWwIsp6tubxQRwYX+LqxozIsfDSyTF4Q1KVZD7wUS cUkv1dk8do31l/aV79dNKmjv2lCjc2QDGxpQYZNRXG9esAHMN/CY0v09WCMi1ozQi8/o 70uQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=FMzP2H2kiyOPa7jcfuNSO/f+JZFCZQty5wy/S9e3yJ8=; b=yyUSZ9eQmEhihuyxD5liciVEF/4ePk3S7ruaA4oRTeKctWQTegzI1/MOC3+K+uTDBL VKYfjUbtt/oZwfF9RQ138oEelQeqeqb24sqD/C9Q3IJJKTYDa7nC8YbZZNLdPSRTzY3A YXfYaHmYZHXKPOrLdFlNllzTbXe/VQ3+ENLfT1nwOagANpZhQmh/tuXa+MQ7vv+n6etN ujh5neP4vATLOnVXZCmKFKy1Yqb+AYttCROWAGv37+nmvXYHV5ccT8RgUbb9cpRX5jll AlcyCjhvIgLqSBcKakxsviZ1PMo+FPExUwZ0hOyJ7FerQ42peU+vTB471uqg6QOqm7vr jU2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=WeXRP9on; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id gj9si5886008ejb.215.2019.10.28.02.06.39; Mon, 28 Oct 2019 02:07:03 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=WeXRP9on; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731568AbfJ0VWv (ORCPT + 99 others); Sun, 27 Oct 2019 17:22:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:43900 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728739AbfJ0VWt (ORCPT ); Sun, 27 Oct 2019 17:22:49 -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 19DD4205C9; Sun, 27 Oct 2019 21:22:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572211368; bh=lCqS4E0uEPjyXJmJtHuFFGjg724ePFJdZapNyiHa+hE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WeXRP9onOgp/092WsvlkH7Ul05NIB7IuMzhuJET0wyLRQ41fOycWNzlXCXB34q+PL wC57TEgskHRneBjZTfHYS7WRyU+/j7V9vgtIYOs4OFByDebzapMJPd5kIidqQtajnE nLxjo0K9Ppjl8CDPKATM6H9MULJsgmWRJ9qtJaSc= 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 5.3 125/197] drm/ttm: Restore ttm prefaulting Date: Sun, 27 Oct 2019 22:00:43 +0100 Message-Id: <20191027203358.480134362@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191027203351.684916567@linuxfoundation.org> References: <20191027203351.684916567@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 @@ -278,15 +278,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))