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=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 61506C11D12 for ; Thu, 20 Feb 2020 12:27:58 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 356BB2467E for ; Thu, 20 Feb 2020 12:27:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=shipmail.org header.i=@shipmail.org header.b="JfwrQNMC" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 356BB2467E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=shipmail.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CEF416ED4C; Thu, 20 Feb 2020 12:27:45 +0000 (UTC) Received: from pio-pvt-msa1.bahnhof.se (pio-pvt-msa1.bahnhof.se [79.136.2.40]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7B46E6E8F0 for ; Thu, 20 Feb 2020 12:27:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by pio-pvt-msa1.bahnhof.se (Postfix) with ESMTP id AF6F53F5BB; Thu, 20 Feb 2020 13:27:39 +0100 (CET) Authentication-Results: pio-pvt-msa1.bahnhof.se; dkim=pass (1024-bit key; unprotected) header.d=shipmail.org header.i=@shipmail.org header.b="JfwrQNMC"; dkim-atps=neutral X-Virus-Scanned: Debian amavisd-new at bahnhof.se Received: from pio-pvt-msa1.bahnhof.se ([127.0.0.1]) by localhost (pio-pvt-msa1.bahnhof.se [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1DV4f1o14L1h; Thu, 20 Feb 2020 13:27:38 +0100 (CET) Received: from mail1.shipmail.org (h-205-35.A357.priv.bahnhof.se [155.4.205.35]) (Authenticated sender: mb878879) by pio-pvt-msa1.bahnhof.se (Postfix) with ESMTPA id 1D4083F5AE; Thu, 20 Feb 2020 13:27:37 +0100 (CET) Received: from localhost.localdomain.localdomain (h-205-35.A357.priv.bahnhof.se [155.4.205.35]) by mail1.shipmail.org (Postfix) with ESMTPSA id D0FF3360487; Thu, 20 Feb 2020 13:27:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=shipmail.org; s=mail; t=1582201654; bh=YWEV2L/GcJ/BB131ReqWiiuK/xyWwF22eft0YAMzYMA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JfwrQNMCDN+22NaFkpWBESRI892OXgEFrVtj+8Hw+eVw1OS0d9AlQSby79XL964Ay RnFqaE18DlM/jO+vH/mxbvn+dw2tXcOE+qprpLk4TO24ODqgFQvGIv8wUSG9sYz313 SVrWF58WcMfyisPRjpMGtl/Vmoy/jHg7ZNpQ4tzI= From: =?UTF-8?q?Thomas=20Hellstr=C3=B6m=20=28VMware=29?= To: linux-mm@kvack.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 5/9] drm/ttm, drm/vmwgfx: Support huge TTM pagefaults Date: Thu, 20 Feb 2020 13:27:15 +0100 Message-Id: <20200220122719.4302-6-thomas_os@shipmail.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200220122719.4302-1-thomas_os@shipmail.org> References: <20200220122719.4302-1-thomas_os@shipmail.org> MIME-Version: 1.0 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: , Cc: Thomas Hellstrom , Michal Hocko , pv-drivers@vmware.com, Roland Scheidegger , Dan Williams , Ralph Campbell , "Matthew Wilcox \(Oracle\)" , =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , linux-graphics-maintainer@vmware.com, Andrew Morton , =?UTF-8?q?Christian=20K=C3=B6nig?= , "Kirill A. Shutemov" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" RnJvbTogVGhvbWFzIEhlbGxzdHJvbSA8dGhlbGxzdHJvbUB2bXdhcmUuY29tPgoKU3VwcG9ydCBo dWdlIChQTUQtc2l6ZSBhbmQgUFVELXNpemUpIHBhZ2UtdGFibGUgZW50cmllcyBieSBwcm92aWRp bmcgYQpodWdlX2ZhdWx0KCkgY2FsbGJhY2suCldlIHN0aWxsIHN1cHBvcnQgcHJpdmF0ZSBtYXBw aW5ncyBhbmQgd3JpdGUtbm90aWZ5IGJ5IHNwbGl0dGluZyB0aGUgaHVnZQpwYWdlLXRhYmxlIGVu dHJpZXMgb24gd3JpdGUtYWNjZXNzLgoKTm90ZSB0aGF0IGZvciBodWdlIHBhZ2UtZmF1bHRzIHRv IG9jY3VyLCBlaXRoZXIgdGhlIGtlcm5lbCBuZWVkcyB0byBiZQpjb21waWxlZCB3aXRoIHRyYW5z LWh1Z2UtcGFnZXMgYWx3YXlzIGVuYWJsZWQsIG9yIHRoZSBrZXJuZWwgbmVlZHMgdG8gYmUKY29t cGlsZWQgd2l0aCB0cmFucy1odWdlLXBhZ2VzIGVuYWJsZWQgdXNpbmcgbWFkdmlzZSwgYW5kIHRo ZSB1c2VyLXNwYWNlCmFwcCBuZWVkcyB0byBjYWxsIG1hZHZpc2UoKSB0byBlbmFibGUgdHJhbnMt aHVnZSBwYWdlcyBvbiBhIHBlci1tYXBwaW5nCmJhc2lzLgoKRnVydGhlcm1vcmUgaHVnZSBwYWdl LWZhdWx0cyB3aWxsIG5vdCBzdWNjZWVkIHVubGVzcyBidWZmZXIgb2JqZWN0cyBhbmQKdXNlci1z cGFjZSBhZGRyZXNzZXMgYXJlIGFsaWduZWQgb24gaHVnZSBwYWdlIHNpemUgYm91bmRhcmllcy4K CkNjOiBBbmRyZXcgTW9ydG9uIDxha3BtQGxpbnV4LWZvdW5kYXRpb24ub3JnPgpDYzogTWljaGFs IEhvY2tvIDxtaG9ja29Ac3VzZS5jb20+CkNjOiAiTWF0dGhldyBXaWxjb3ggKE9yYWNsZSkiIDx3 aWxseUBpbmZyYWRlYWQub3JnPgpDYzogIktpcmlsbCBBLiBTaHV0ZW1vdiIgPGtpcmlsbC5zaHV0 ZW1vdkBsaW51eC5pbnRlbC5jb20+CkNjOiBSYWxwaCBDYW1wYmVsbCA8cmNhbXBiZWxsQG52aWRp YS5jb20+CkNjOiAiSsOpcsO0bWUgR2xpc3NlIiA8amdsaXNzZUByZWRoYXQuY29tPgpDYzogIkNo cmlzdGlhbiBLw7ZuaWciIDxjaHJpc3RpYW4ua29lbmlnQGFtZC5jb20+CkNjOiBEYW4gV2lsbGlh bXMgPGRhbi5qLndpbGxpYW1zQGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogVGhvbWFzIEhlbGxz dHJvbSA8dGhlbGxzdHJvbUB2bXdhcmUuY29tPgpSZXZpZXdlZC1ieTogUm9sYW5kIFNjaGVpZGVn Z2VyIDxzcm9sYW5kQHZtd2FyZS5jb20+ClJldmlld2VkLWJ5OiBDaHJpc3RpYW4gS8O2bmlnIDxj aHJpc3RpYW4ua29lbmlnQGFtZC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL3R0bS90dG1fYm9f dm0uYyAgICAgICAgICAgIHwgMTYxICsrKysrKysrKysrKysrKysrKysrLQogZHJpdmVycy9ncHUv ZHJtL3Ztd2dmeC92bXdnZnhfcGFnZV9kaXJ0eS5jIHwgICAyICstCiBpbmNsdWRlL2RybS90dG0v dHRtX2JvX2FwaS5oICAgICAgICAgICAgICAgfCAgIDMgKy0KIDMgZmlsZXMgY2hhbmdlZCwgMTYx IGluc2VydGlvbnMoKyksIDUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL3R0bS90dG1fYm9fdm0uYyBiL2RyaXZlcnMvZ3B1L2RybS90dG0vdHRtX2JvX3ZtLmMKaW5k ZXggMzg5MTI4YjhjNGRkLi4wYWYxNDgzNTUwNGMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS90dG0vdHRtX2JvX3ZtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3R0bS90dG1fYm9fdm0uYwpA QCAtMTU2LDYgKzE1Niw4OSBAQCB2bV9mYXVsdF90IHR0bV9ib192bV9yZXNlcnZlKHN0cnVjdCB0 dG1fYnVmZmVyX29iamVjdCAqYm8sCiB9CiBFWFBPUlRfU1lNQk9MKHR0bV9ib192bV9yZXNlcnZl KTsKIAorI2lmZGVmIENPTkZJR19UUkFOU1BBUkVOVF9IVUdFUEFHRQorLyoqCisgKiB0dG1fYm9f dm1faW5zZXJ0X2h1Z2UgLSBJbnNlcnQgYSBwZm4gZm9yIFBVRCBvciBQTUQgZmF1bHRzCisgKiBA dm1mOiBGYXVsdCBkYXRhCisgKiBAYm86IFRoZSBidWZmZXIgb2JqZWN0CisgKiBAcGFnZV9vZmZz ZXQ6IFBhZ2Ugb2Zmc2V0IGZyb20gYm8gc3RhcnQKKyAqIEBmYXVsdF9wYWdlX3NpemU6IFRoZSBz aXplIG9mIHRoZSBmYXVsdCBpbiBwYWdlcy4KKyAqIEBwZ3Byb3Q6IFRoZSBwYWdlIHByb3RlY3Rp b25zLgorICogRG9lcyBhZGRpdGlvbmFsIGNoZWNraW5nIHdoZXRoZXIgaXQncyBwb3NzaWJsZSB0 byBpbnNlcnQgYSBQVUQgb3IgUE1ECisgKiBwZm4gYW5kIHBlcmZvcm1zIHRoZSBpbnNlcnRpb24u CisgKgorICogUmV0dXJuOiBWTV9GQVVMVF9OT1BBR0Ugb24gc3VjY2Vzc2Z1bCBpbnNlcnRpb24s IFZNX0ZBVUxUX0ZBTExCQUNLIGlmCisgKiBhIGh1Z2UgZmF1bHQgd2FzIG5vdCBwb3NzaWJsZSwg b3Igb24gaW5zZXJ0aW9uIGVycm9yLgorICovCitzdGF0aWMgdm1fZmF1bHRfdCB0dG1fYm9fdm1f aW5zZXJ0X2h1Z2Uoc3RydWN0IHZtX2ZhdWx0ICp2bWYsCisJCQkJCXN0cnVjdCB0dG1fYnVmZmVy X29iamVjdCAqYm8sCisJCQkJCXBnb2ZmX3QgcGFnZV9vZmZzZXQsCisJCQkJCXBnb2ZmX3QgZmF1 bHRfcGFnZV9zaXplLAorCQkJCQlwZ3Byb3RfdCBwZ3Byb3QpCit7CisJcGdvZmZfdCBpOworCXZt X2ZhdWx0X3QgcmV0OworCXVuc2lnbmVkIGxvbmcgcGZuOworCXBmbl90IHBmbnQ7CisJc3RydWN0 IHR0bV90dCAqdHRtID0gYm8tPnR0bTsKKwlib29sIHdyaXRlID0gdm1mLT5mbGFncyAmIEZBVUxU X0ZMQUdfV1JJVEU7CisKKwkvKiBGYXVsdCBzaG91bGQgbm90IGNyb3NzIGJvIGJvdW5kYXJ5LiAq LworCXBhZ2Vfb2Zmc2V0ICY9IH4oZmF1bHRfcGFnZV9zaXplIC0gMSk7CisJaWYgKHBhZ2Vfb2Zm c2V0ICsgZmF1bHRfcGFnZV9zaXplID4gYm8tPm51bV9wYWdlcykKKwkJZ290byBvdXRfZmFsbGJh Y2s7CisKKwlpZiAoYm8tPm1lbS5idXMuaXNfaW9tZW0pCisJCXBmbiA9IHR0bV9ib19pb19tZW1f cGZuKGJvLCBwYWdlX29mZnNldCk7CisJZWxzZQorCQlwZm4gPSBwYWdlX3RvX3Bmbih0dG0tPnBh Z2VzW3BhZ2Vfb2Zmc2V0XSk7CisKKwkvKiBwZm4gbXVzdCBiZSBmYXVsdF9wYWdlX3NpemUgYWxp Z25lZC4gKi8KKwlpZiAoKHBmbiAmIChmYXVsdF9wYWdlX3NpemUgLSAxKSkgIT0gMCkKKwkJZ290 byBvdXRfZmFsbGJhY2s7CisKKwkvKiBDaGVjayB0aGF0IG1lbW9yeSBpcyBjb250aWd1b3VzLiAq LworCWlmICghYm8tPm1lbS5idXMuaXNfaW9tZW0pIHsKKwkJZm9yIChpID0gMTsgaSA8IGZhdWx0 X3BhZ2Vfc2l6ZTsgKytpKSB7CisJCQlpZiAocGFnZV90b19wZm4odHRtLT5wYWdlc1twYWdlX29m ZnNldCArIGldKSAhPSBwZm4gKyBpKQorCQkJCWdvdG8gb3V0X2ZhbGxiYWNrOworCQl9CisJfSBl bHNlIGlmIChiby0+YmRldi0+ZHJpdmVyLT5pb19tZW1fcGZuKSB7CisJCWZvciAoaSA9IDE7IGkg PCBmYXVsdF9wYWdlX3NpemU7ICsraSkgeworCQkJaWYgKHR0bV9ib19pb19tZW1fcGZuKGJvLCBw YWdlX29mZnNldCArIGkpICE9IHBmbiArIGkpCisJCQkJZ290byBvdXRfZmFsbGJhY2s7CisJCX0K Kwl9CisKKwlwZm50ID0gX19wZm5fdG9fcGZuX3QocGZuLCBQRk5fREVWKTsKKwlpZiAoZmF1bHRf cGFnZV9zaXplID09IChIUEFHRV9QTURfU0laRSA+PiBQQUdFX1NISUZUKSkKKwkJcmV0ID0gdm1m X2luc2VydF9wZm5fcG1kX3Byb3Qodm1mLCBwZm50LCBwZ3Byb3QsIHdyaXRlKTsKKyNpZmRlZiBD T05GSUdfSEFWRV9BUkNIX1RSQU5TUEFSRU5UX0hVR0VQQUdFX1BVRAorCWVsc2UgaWYgKGZhdWx0 X3BhZ2Vfc2l6ZSA9PSAoSFBBR0VfUFVEX1NJWkUgPj4gUEFHRV9TSElGVCkpCisJCXJldCA9IHZt Zl9pbnNlcnRfcGZuX3B1ZF9wcm90KHZtZiwgcGZudCwgcGdwcm90LCB3cml0ZSk7CisjZW5kaWYK KwllbHNlCisJCVdBUk5fT05fT05DRShyZXQgPSBWTV9GQVVMVF9GQUxMQkFDSyk7CisKKwlpZiAo cmV0ICE9IFZNX0ZBVUxUX05PUEFHRSkKKwkJZ290byBvdXRfZmFsbGJhY2s7CisKKwlyZXR1cm4g Vk1fRkFVTFRfTk9QQUdFOworb3V0X2ZhbGxiYWNrOgorCWNvdW50X3ZtX2V2ZW50KFRIUF9GQVVM VF9GQUxMQkFDSyk7CisJcmV0dXJuIFZNX0ZBVUxUX0ZBTExCQUNLOworfQorI2Vsc2UKK3N0YXRp YyB2bV9mYXVsdF90IHR0bV9ib192bV9pbnNlcnRfaHVnZShzdHJ1Y3Qgdm1fZmF1bHQgKnZtZiwK KwkJCQkJc3RydWN0IHR0bV9idWZmZXJfb2JqZWN0ICpibywKKwkJCQkJcGdvZmZfdCBwYWdlX29m ZnNldCwKKwkJCQkJcGdvZmZfdCBmYXVsdF9wYWdlX3NpemUsCisJCQkJCXBncHJvdF90IHBncHJv dCkKK3sKKwlyZXR1cm4gVk1fRkFVTFRfRkFMTEJBQ0s7Cit9CisjZW5kaWYKKwogLyoqCiAgKiB0 dG1fYm9fdm1fZmF1bHRfcmVzZXJ2ZWQgLSBUVE0gZmF1bHQgaGVscGVyCiAgKiBAdm1mOiBUaGUg c3RydWN0IHZtX2ZhdWx0IGdpdmVuIGFzIGFyZ3VtZW50IHRvIHRoZSBmYXVsdCBjYWxsYmFjawpA QCAtMTYzLDYgKzI0Niw3IEBAIEVYUE9SVF9TWU1CT0wodHRtX2JvX3ZtX3Jlc2VydmUpOwogICog QG51bV9wcmVmYXVsdDogTWF4aW11bSBudW1iZXIgb2YgcHJlZmF1bHQgcGFnZXMuIFRoZSBjYWxs ZXIgbWF5IHdhbnQgdG8KICAqIHNwZWNpZnkgdGhpcyBiYXNlZCBvbiBtYWR2aWNlIHNldHRpbmdz IGFuZCB0aGUgc2l6ZSBvZiB0aGUgR1BVIG9iamVjdAogICogYmFja2VkIGJ5IHRoZSBtZW1vcnku CisgKiBAZmF1bHRfcGFnZV9zaXplOiBUaGUgc2l6ZSBvZiB0aGUgZmF1bHQgaW4gcGFnZXMuCiAg KgogICogVGhpcyBmdW5jdGlvbiBpbnNlcnRzIG9uZSBvciBtb3JlIHBhZ2UgdGFibGUgZW50cmll cyBwb2ludGluZyB0byB0aGUKICAqIG1lbW9yeSBiYWNraW5nIHRoZSBidWZmZXIgb2JqZWN0LCBh bmQgdGhlbiByZXR1cm5zIGEgcmV0dXJuIGNvZGUKQEAgLTE3Niw3ICsyNjAsOCBAQCBFWFBPUlRf U1lNQk9MKHR0bV9ib192bV9yZXNlcnZlKTsKICAqLwogdm1fZmF1bHRfdCB0dG1fYm9fdm1fZmF1 bHRfcmVzZXJ2ZWQoc3RydWN0IHZtX2ZhdWx0ICp2bWYsCiAJCQkJICAgIHBncHJvdF90IHByb3Qs Ci0JCQkJICAgIHBnb2ZmX3QgbnVtX3ByZWZhdWx0KQorCQkJCSAgICBwZ29mZl90IG51bV9wcmVm YXVsdCwKKwkJCQkgICAgcGdvZmZfdCBmYXVsdF9wYWdlX3NpemUpCiB7CiAJc3RydWN0IHZtX2Fy ZWFfc3RydWN0ICp2bWEgPSB2bWYtPnZtYTsKIAlzdHJ1Y3QgdHRtX2J1ZmZlcl9vYmplY3QgKmJv ID0gdm1hLT52bV9wcml2YXRlX2RhdGE7CkBAIC0yNjgsNiArMzUzLDEzIEBAIHZtX2ZhdWx0X3Qg dHRtX2JvX3ZtX2ZhdWx0X3Jlc2VydmVkKHN0cnVjdCB2bV9mYXVsdCAqdm1mLAogCQlwcm90ID0g cGdwcm90X2RlY3J5cHRlZChwcm90KTsKIAl9CiAKKwkvKiBXZSBkb24ndCBwcmVmYXVsdCBvbiBo dWdlIGZhdWx0cy4gWWV0LiAqLworCWlmIChJU19FTkFCTEVEKENPTkZJR19UUkFOU1BBUkVOVF9I VUdFUEFHRSkgJiYgZmF1bHRfcGFnZV9zaXplICE9IDEpIHsKKwkJcmV0ID0gdHRtX2JvX3ZtX2lu c2VydF9odWdlKHZtZiwgYm8sIHBhZ2Vfb2Zmc2V0LAorCQkJCQkgICAgZmF1bHRfcGFnZV9zaXpl LCBwcm90KTsKKwkJZ290byBvdXRfaW9fdW5sb2NrOworCX0KKwogCS8qCiAJICogU3BlY3VsYXRp dmVseSBwcmVmYXVsdCBhIG51bWJlciBvZiBwYWdlcy4gT25seSBlcnJvciBvbgogCSAqIGZpcnN0 IHBhZ2UuCkBAIC0zMzQsNyArNDI2LDcgQEAgdm1fZmF1bHRfdCB0dG1fYm9fdm1fZmF1bHQoc3Ry dWN0IHZtX2ZhdWx0ICp2bWYpCiAJCXJldHVybiByZXQ7CiAKIAlwcm90ID0gdm1hLT52bV9wYWdl X3Byb3Q7Ci0JcmV0ID0gdHRtX2JvX3ZtX2ZhdWx0X3Jlc2VydmVkKHZtZiwgcHJvdCwgVFRNX0JP X1ZNX05VTV9QUkVGQVVMVCk7CisJcmV0ID0gdHRtX2JvX3ZtX2ZhdWx0X3Jlc2VydmVkKHZtZiwg cHJvdCwgVFRNX0JPX1ZNX05VTV9QUkVGQVVMVCwgMSk7CiAJaWYgKHJldCA9PSBWTV9GQVVMVF9S RVRSWSAmJiAhKHZtZi0+ZmxhZ3MgJiBGQVVMVF9GTEFHX1JFVFJZX05PV0FJVCkpCiAJCXJldHVy biByZXQ7CiAKQEAgLTM0NCw2ICs0MzYsNjYgQEAgdm1fZmF1bHRfdCB0dG1fYm9fdm1fZmF1bHQo c3RydWN0IHZtX2ZhdWx0ICp2bWYpCiB9CiBFWFBPUlRfU1lNQk9MKHR0bV9ib192bV9mYXVsdCk7 CiAKKyNpZmRlZiBDT05GSUdfVFJBTlNQQVJFTlRfSFVHRVBBR0UKKy8qKgorICogdHRtX3BncHJv dF9pc193cnByb3RlY3RpbmcgLSBJcyBhIHBhZ2UgcHJvdGVjdGlvbiB2YWx1ZSB3cml0ZS1wcm90 ZWN0aW5nPworICogQHByb3Q6IFRoZSBwYWdlIHByb3RlY3Rpb24gdmFsdWUKKyAqCisgKiBSZXR1 cm46IHRydWUgaWYgQHByb3QgaXMgd3JpdGUtcHJvdGVjdGluZy4gZmFsc2Ugb3RoZXJ3aXNlLgor ICovCitzdGF0aWMgYm9vbCB0dG1fcGdwcm90X2lzX3dycHJvdGVjdGluZyhwZ3Byb3RfdCBwcm90 KQoreworCS8qCisJICogVGhpcyBpcyBtZWFudCB0byBzYXkgInBncHJvdF93cnByb3RlY3QocHJv dCkgPT0gcHJvdCIgaW4gYSBnZW5lcmljCisJICogd2F5LiBVbmZvcnR1bmF0ZWx5IHRoZXJlIGlz IG5vIGdlbmVyaWMgcGdwcm90X3dycHJvdGVjdC4KKwkgKi8KKwlyZXR1cm4gcHRlX3ZhbChwdGVf d3Jwcm90ZWN0KF9fcHRlKHBncHJvdF92YWwocHJvdCkpKSkgPT0KKwkJcGdwcm90X3ZhbChwcm90 KTsKK30KKworc3RhdGljIHZtX2ZhdWx0X3QgdHRtX2JvX3ZtX2h1Z2VfZmF1bHQoc3RydWN0IHZt X2ZhdWx0ICp2bWYsCisJCQkJICAgICAgIGVudW0gcGFnZV9lbnRyeV9zaXplIHBlX3NpemUpCit7 CisJc3RydWN0IHZtX2FyZWFfc3RydWN0ICp2bWEgPSB2bWYtPnZtYTsKKwlwZ3Byb3RfdCBwcm90 OworCXN0cnVjdCB0dG1fYnVmZmVyX29iamVjdCAqYm8gPSB2bWEtPnZtX3ByaXZhdGVfZGF0YTsK Kwl2bV9mYXVsdF90IHJldDsKKwlwZ29mZl90IGZhdWx0X3BhZ2Vfc2l6ZSA9IDA7CisJYm9vbCB3 cml0ZSA9IHZtZi0+ZmxhZ3MgJiBGQVVMVF9GTEFHX1dSSVRFOworCisJc3dpdGNoIChwZV9zaXpl KSB7CisJY2FzZSBQRV9TSVpFX1BNRDoKKwkJZmF1bHRfcGFnZV9zaXplID0gSFBBR0VfUE1EX1NJ WkUgPj4gUEFHRV9TSElGVDsKKwkJYnJlYWs7CisjaWZkZWYgQ09ORklHX0hBVkVfQVJDSF9UUkFO U1BBUkVOVF9IVUdFUEFHRV9QVUQKKwljYXNlIFBFX1NJWkVfUFVEOgorCQlmYXVsdF9wYWdlX3Np emUgPSBIUEFHRV9QVURfU0laRSA+PiBQQUdFX1NISUZUOworCQlicmVhazsKKyNlbmRpZgorCWRl ZmF1bHQ6CisJCVdBUk5fT05fT05DRSgxKTsKKwkJcmV0dXJuIFZNX0ZBVUxUX0ZBTExCQUNLOwor CX0KKworCS8qIEZhbGxiYWNrIG9uIHdyaXRlIGRpcnR5LXRyYWNraW5nIG9yIENPVyAqLworCWlm ICh3cml0ZSAmJiB0dG1fcGdwcm90X2lzX3dycHJvdGVjdGluZyh2bWEtPnZtX3BhZ2VfcHJvdCkp CisJCXJldHVybiBWTV9GQVVMVF9GQUxMQkFDSzsKKworCXJldCA9IHR0bV9ib192bV9yZXNlcnZl KGJvLCB2bWYpOworCWlmIChyZXQpCisJCXJldHVybiByZXQ7CisKKwlwcm90ID0gdm1fZ2V0X3Bh Z2VfcHJvdCh2bWEtPnZtX2ZsYWdzKTsKKwlyZXQgPSB0dG1fYm9fdm1fZmF1bHRfcmVzZXJ2ZWQo dm1mLCBwcm90LCAxLCBmYXVsdF9wYWdlX3NpemUpOworCWlmIChyZXQgPT0gVk1fRkFVTFRfUkVU UlkgJiYgISh2bWYtPmZsYWdzICYgRkFVTFRfRkxBR19SRVRSWV9OT1dBSVQpKQorCQlyZXR1cm4g cmV0OworCisJZG1hX3Jlc3ZfdW5sb2NrKGJvLT5iYXNlLnJlc3YpOworCisJcmV0dXJuIHJldDsK K30KKyNlbmRpZgorCiB2b2lkIHR0bV9ib192bV9vcGVuKHN0cnVjdCB2bV9hcmVhX3N0cnVjdCAq dm1hKQogewogCXN0cnVjdCB0dG1fYnVmZmVyX29iamVjdCAqYm8gPSB2bWEtPnZtX3ByaXZhdGVf ZGF0YTsKQEAgLTQ0NSw3ICs1OTcsMTAgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCB2bV9vcGVyYXRp b25zX3N0cnVjdCB0dG1fYm9fdm1fb3BzID0gewogCS5mYXVsdCA9IHR0bV9ib192bV9mYXVsdCwK IAkub3BlbiA9IHR0bV9ib192bV9vcGVuLAogCS5jbG9zZSA9IHR0bV9ib192bV9jbG9zZSwKLQku YWNjZXNzID0gdHRtX2JvX3ZtX2FjY2VzcworCS5hY2Nlc3MgPSB0dG1fYm9fdm1fYWNjZXNzLAor I2lmZGVmIENPTkZJR19UUkFOU1BBUkVOVF9IVUdFUEFHRQorCS5odWdlX2ZhdWx0ID0gdHRtX2Jv X3ZtX2h1Z2VfZmF1bHQsCisjZW5kaWYKIH07CiAKIHN0YXRpYyBzdHJ1Y3QgdHRtX2J1ZmZlcl9v YmplY3QgKnR0bV9ib192bV9sb29rdXAoc3RydWN0IHR0bV9ib19kZXZpY2UgKmJkZXYsCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9wYWdlX2RpcnR5LmMgYi9kcml2 ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9wYWdlX2RpcnR5LmMKaW5kZXggZjA3YWE4NTc1ODdj Li4xN2E1ZGNhN2I5MjEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4 X3BhZ2VfZGlydHkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9wYWdlX2Rp cnR5LmMKQEAgLTQ3Nyw3ICs0NzcsNyBAQCB2bV9mYXVsdF90IHZtd19ib192bV9mYXVsdChzdHJ1 Y3Qgdm1fZmF1bHQgKnZtZikKIAllbHNlCiAJCXByb3QgPSB2bV9nZXRfcGFnZV9wcm90KHZtYS0+ dm1fZmxhZ3MpOwogCi0JcmV0ID0gdHRtX2JvX3ZtX2ZhdWx0X3Jlc2VydmVkKHZtZiwgcHJvdCwg bnVtX3ByZWZhdWx0KTsKKwlyZXQgPSB0dG1fYm9fdm1fZmF1bHRfcmVzZXJ2ZWQodm1mLCBwcm90 LCBudW1fcHJlZmF1bHQsIDEpOwogCWlmIChyZXQgPT0gVk1fRkFVTFRfUkVUUlkgJiYgISh2bWYt PmZsYWdzICYgRkFVTFRfRkxBR19SRVRSWV9OT1dBSVQpKQogCQlyZXR1cm4gcmV0OwogCmRpZmYg LS1naXQgYS9pbmNsdWRlL2RybS90dG0vdHRtX2JvX2FwaS5oIGIvaW5jbHVkZS9kcm0vdHRtL3R0 bV9ib19hcGkuaAppbmRleCA2NmNhNDlkYjk2MzMuLjRmYzkwZDUzYWExNSAxMDA2NDQKLS0tIGEv aW5jbHVkZS9kcm0vdHRtL3R0bV9ib19hcGkuaAorKysgYi9pbmNsdWRlL2RybS90dG0vdHRtX2Jv X2FwaS5oCkBAIC03MzIsNyArNzMyLDggQEAgdm1fZmF1bHRfdCB0dG1fYm9fdm1fcmVzZXJ2ZShz dHJ1Y3QgdHRtX2J1ZmZlcl9vYmplY3QgKmJvLAogCiB2bV9mYXVsdF90IHR0bV9ib192bV9mYXVs dF9yZXNlcnZlZChzdHJ1Y3Qgdm1fZmF1bHQgKnZtZiwKIAkJCQkgICAgcGdwcm90X3QgcHJvdCwK LQkJCQkgICAgcGdvZmZfdCBudW1fcHJlZmF1bHQpOworCQkJCSAgICBwZ29mZl90IG51bV9wcmVm YXVsdCwKKwkJCQkgICAgcGdvZmZfdCBmYXVsdF9wYWdlX3NpemUpOwogCiB2bV9mYXVsdF90IHR0 bV9ib192bV9mYXVsdChzdHJ1Y3Qgdm1fZmF1bHQgKnZtZik7CiAKLS0gCjIuMjEuMQoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxp bmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJl ZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg== 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=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 B3119C11D05 for ; Thu, 20 Feb 2020 12:27:51 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 5006E2467A for ; Thu, 20 Feb 2020 12:27:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=shipmail.org header.i=@shipmail.org header.b="JfwrQNMC" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5006E2467A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=shipmail.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 34A786B0036; Thu, 20 Feb 2020 07:27:44 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 2AA6E6B0007; Thu, 20 Feb 2020 07:27:44 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BAAEB6B0008; Thu, 20 Feb 2020 07:27:43 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0157.hostedemail.com [216.40.44.157]) by kanga.kvack.org (Postfix) with ESMTP id 632186B0008 for ; Thu, 20 Feb 2020 07:27:43 -0500 (EST) Received: from smtpin22.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id E3F4A180AD807 for ; Thu, 20 Feb 2020 12:27:42 +0000 (UTC) X-FDA: 76510431564.22.glass39_602e652b22155 X-HE-Tag: glass39_602e652b22155 X-Filterd-Recvd-Size: 12456 Received: from pio-pvt-msa1.bahnhof.se (pio-pvt-msa1.bahnhof.se [79.136.2.40]) by imf48.hostedemail.com (Postfix) with ESMTP for ; Thu, 20 Feb 2020 12:27:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by pio-pvt-msa1.bahnhof.se (Postfix) with ESMTP id AF6F53F5BB; Thu, 20 Feb 2020 13:27:39 +0100 (CET) Authentication-Results: pio-pvt-msa1.bahnhof.se; dkim=pass (1024-bit key; unprotected) header.d=shipmail.org header.i=@shipmail.org header.b="JfwrQNMC"; dkim-atps=neutral X-Virus-Scanned: Debian amavisd-new at bahnhof.se Received: from pio-pvt-msa1.bahnhof.se ([127.0.0.1]) by localhost (pio-pvt-msa1.bahnhof.se [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1DV4f1o14L1h; Thu, 20 Feb 2020 13:27:38 +0100 (CET) Received: from mail1.shipmail.org (h-205-35.A357.priv.bahnhof.se [155.4.205.35]) (Authenticated sender: mb878879) by pio-pvt-msa1.bahnhof.se (Postfix) with ESMTPA id 1D4083F5AE; Thu, 20 Feb 2020 13:27:37 +0100 (CET) Received: from localhost.localdomain.localdomain (h-205-35.A357.priv.bahnhof.se [155.4.205.35]) by mail1.shipmail.org (Postfix) with ESMTPSA id D0FF3360487; Thu, 20 Feb 2020 13:27:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=shipmail.org; s=mail; t=1582201654; bh=YWEV2L/GcJ/BB131ReqWiiuK/xyWwF22eft0YAMzYMA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JfwrQNMCDN+22NaFkpWBESRI892OXgEFrVtj+8Hw+eVw1OS0d9AlQSby79XL964Ay RnFqaE18DlM/jO+vH/mxbvn+dw2tXcOE+qprpLk4TO24ODqgFQvGIv8wUSG9sYz313 SVrWF58WcMfyisPRjpMGtl/Vmoy/jHg7ZNpQ4tzI= From: =?UTF-8?q?Thomas=20Hellstr=C3=B6m=20=28VMware=29?= To: linux-mm@kvack.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: pv-drivers@vmware.com, linux-graphics-maintainer@vmware.com, Thomas Hellstrom , Andrew Morton , Michal Hocko , "Matthew Wilcox (Oracle)" , "Kirill A. Shutemov" , Ralph Campbell , =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , =?UTF-8?q?Christian=20K=C3=B6nig?= , Dan Williams , Roland Scheidegger Subject: [PATCH v4 5/9] drm/ttm, drm/vmwgfx: Support huge TTM pagefaults Date: Thu, 20 Feb 2020 13:27:15 +0100 Message-Id: <20200220122719.4302-6-thomas_os@shipmail.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200220122719.4302-1-thomas_os@shipmail.org> References: <20200220122719.4302-1-thomas_os@shipmail.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Thomas Hellstrom Support huge (PMD-size and PUD-size) page-table entries by providing a huge_fault() callback. We still support private mappings and write-notify by splitting the huge page-table entries on write-access. Note that for huge page-faults to occur, either the kernel needs to be compiled with trans-huge-pages always enabled, or the kernel needs to be compiled with trans-huge-pages enabled using madvise, and the user-space app needs to call madvise() to enable trans-huge pages on a per-mapping basis. Furthermore huge page-faults will not succeed unless buffer objects and user-space addresses are aligned on huge page size boundaries. Cc: Andrew Morton Cc: Michal Hocko Cc: "Matthew Wilcox (Oracle)" Cc: "Kirill A. Shutemov" Cc: Ralph Campbell Cc: "J=C3=A9r=C3=B4me Glisse" Cc: "Christian K=C3=B6nig" Cc: Dan Williams Signed-off-by: Thomas Hellstrom Reviewed-by: Roland Scheidegger Reviewed-by: Christian K=C3=B6nig --- drivers/gpu/drm/ttm/ttm_bo_vm.c | 161 ++++++++++++++++++++- drivers/gpu/drm/vmwgfx/vmwgfx_page_dirty.c | 2 +- include/drm/ttm/ttm_bo_api.h | 3 +- 3 files changed, 161 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo= _vm.c index 389128b8c4dd..0af14835504c 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_vm.c +++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c @@ -156,6 +156,89 @@ vm_fault_t ttm_bo_vm_reserve(struct ttm_buffer_objec= t *bo, } EXPORT_SYMBOL(ttm_bo_vm_reserve); =20 +#ifdef CONFIG_TRANSPARENT_HUGEPAGE +/** + * ttm_bo_vm_insert_huge - Insert a pfn for PUD or PMD faults + * @vmf: Fault data + * @bo: The buffer object + * @page_offset: Page offset from bo start + * @fault_page_size: The size of the fault in pages. + * @pgprot: The page protections. + * Does additional checking whether it's possible to insert a PUD or PMD + * pfn and performs the insertion. + * + * Return: VM_FAULT_NOPAGE on successful insertion, VM_FAULT_FALLBACK if + * a huge fault was not possible, or on insertion error. + */ +static vm_fault_t ttm_bo_vm_insert_huge(struct vm_fault *vmf, + struct ttm_buffer_object *bo, + pgoff_t page_offset, + pgoff_t fault_page_size, + pgprot_t pgprot) +{ + pgoff_t i; + vm_fault_t ret; + unsigned long pfn; + pfn_t pfnt; + struct ttm_tt *ttm =3D bo->ttm; + bool write =3D vmf->flags & FAULT_FLAG_WRITE; + + /* Fault should not cross bo boundary. */ + page_offset &=3D ~(fault_page_size - 1); + if (page_offset + fault_page_size > bo->num_pages) + goto out_fallback; + + if (bo->mem.bus.is_iomem) + pfn =3D ttm_bo_io_mem_pfn(bo, page_offset); + else + pfn =3D page_to_pfn(ttm->pages[page_offset]); + + /* pfn must be fault_page_size aligned. */ + if ((pfn & (fault_page_size - 1)) !=3D 0) + goto out_fallback; + + /* Check that memory is contiguous. */ + if (!bo->mem.bus.is_iomem) { + for (i =3D 1; i < fault_page_size; ++i) { + if (page_to_pfn(ttm->pages[page_offset + i]) !=3D pfn + i) + goto out_fallback; + } + } else if (bo->bdev->driver->io_mem_pfn) { + for (i =3D 1; i < fault_page_size; ++i) { + if (ttm_bo_io_mem_pfn(bo, page_offset + i) !=3D pfn + i) + goto out_fallback; + } + } + + pfnt =3D __pfn_to_pfn_t(pfn, PFN_DEV); + if (fault_page_size =3D=3D (HPAGE_PMD_SIZE >> PAGE_SHIFT)) + ret =3D vmf_insert_pfn_pmd_prot(vmf, pfnt, pgprot, write); +#ifdef CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD + else if (fault_page_size =3D=3D (HPAGE_PUD_SIZE >> PAGE_SHIFT)) + ret =3D vmf_insert_pfn_pud_prot(vmf, pfnt, pgprot, write); +#endif + else + WARN_ON_ONCE(ret =3D VM_FAULT_FALLBACK); + + if (ret !=3D VM_FAULT_NOPAGE) + goto out_fallback; + + return VM_FAULT_NOPAGE; +out_fallback: + count_vm_event(THP_FAULT_FALLBACK); + return VM_FAULT_FALLBACK; +} +#else +static vm_fault_t ttm_bo_vm_insert_huge(struct vm_fault *vmf, + struct ttm_buffer_object *bo, + pgoff_t page_offset, + pgoff_t fault_page_size, + pgprot_t pgprot) +{ + return VM_FAULT_FALLBACK; +} +#endif + /** * ttm_bo_vm_fault_reserved - TTM fault helper * @vmf: The struct vm_fault given as argument to the fault callback @@ -163,6 +246,7 @@ EXPORT_SYMBOL(ttm_bo_vm_reserve); * @num_prefault: Maximum number of prefault pages. The caller may want = to * specify this based on madvice settings and the size of the GPU object * backed by the memory. + * @fault_page_size: The size of the fault in pages. * * This function inserts one or more page table entries pointing to the * memory backing the buffer object, and then returns a return code @@ -176,7 +260,8 @@ EXPORT_SYMBOL(ttm_bo_vm_reserve); */ vm_fault_t ttm_bo_vm_fault_reserved(struct vm_fault *vmf, pgprot_t prot, - pgoff_t num_prefault) + pgoff_t num_prefault, + pgoff_t fault_page_size) { struct vm_area_struct *vma =3D vmf->vma; struct ttm_buffer_object *bo =3D vma->vm_private_data; @@ -268,6 +353,13 @@ vm_fault_t ttm_bo_vm_fault_reserved(struct vm_fault = *vmf, prot =3D pgprot_decrypted(prot); } =20 + /* We don't prefault on huge faults. Yet. */ + if (IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE) && fault_page_size !=3D 1) = { + ret =3D ttm_bo_vm_insert_huge(vmf, bo, page_offset, + fault_page_size, prot); + goto out_io_unlock; + } + /* * Speculatively prefault a number of pages. Only error on * first page. @@ -334,7 +426,7 @@ vm_fault_t ttm_bo_vm_fault(struct vm_fault *vmf) return ret; =20 prot =3D vma->vm_page_prot; - ret =3D ttm_bo_vm_fault_reserved(vmf, prot, TTM_BO_VM_NUM_PREFAULT); + ret =3D ttm_bo_vm_fault_reserved(vmf, prot, TTM_BO_VM_NUM_PREFAULT, 1); if (ret =3D=3D VM_FAULT_RETRY && !(vmf->flags & FAULT_FLAG_RETRY_NOWAIT= )) return ret; =20 @@ -344,6 +436,66 @@ vm_fault_t ttm_bo_vm_fault(struct vm_fault *vmf) } EXPORT_SYMBOL(ttm_bo_vm_fault); =20 +#ifdef CONFIG_TRANSPARENT_HUGEPAGE +/** + * ttm_pgprot_is_wrprotecting - Is a page protection value write-protect= ing? + * @prot: The page protection value + * + * Return: true if @prot is write-protecting. false otherwise. + */ +static bool ttm_pgprot_is_wrprotecting(pgprot_t prot) +{ + /* + * This is meant to say "pgprot_wrprotect(prot) =3D=3D prot" in a gener= ic + * way. Unfortunately there is no generic pgprot_wrprotect. + */ + return pte_val(pte_wrprotect(__pte(pgprot_val(prot)))) =3D=3D + pgprot_val(prot); +} + +static vm_fault_t ttm_bo_vm_huge_fault(struct vm_fault *vmf, + enum page_entry_size pe_size) +{ + struct vm_area_struct *vma =3D vmf->vma; + pgprot_t prot; + struct ttm_buffer_object *bo =3D vma->vm_private_data; + vm_fault_t ret; + pgoff_t fault_page_size =3D 0; + bool write =3D vmf->flags & FAULT_FLAG_WRITE; + + switch (pe_size) { + case PE_SIZE_PMD: + fault_page_size =3D HPAGE_PMD_SIZE >> PAGE_SHIFT; + break; +#ifdef CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD + case PE_SIZE_PUD: + fault_page_size =3D HPAGE_PUD_SIZE >> PAGE_SHIFT; + break; +#endif + default: + WARN_ON_ONCE(1); + return VM_FAULT_FALLBACK; + } + + /* Fallback on write dirty-tracking or COW */ + if (write && ttm_pgprot_is_wrprotecting(vma->vm_page_prot)) + return VM_FAULT_FALLBACK; + + ret =3D ttm_bo_vm_reserve(bo, vmf); + if (ret) + return ret; + + prot =3D vm_get_page_prot(vma->vm_flags); + ret =3D ttm_bo_vm_fault_reserved(vmf, prot, 1, fault_page_size); + if (ret =3D=3D VM_FAULT_RETRY && !(vmf->flags & FAULT_FLAG_RETRY_NOWAIT= )) + return ret; + + dma_resv_unlock(bo->base.resv); + + return ret; +} +#endif + void ttm_bo_vm_open(struct vm_area_struct *vma) { struct ttm_buffer_object *bo =3D vma->vm_private_data; @@ -445,7 +597,10 @@ static const struct vm_operations_struct ttm_bo_vm_o= ps =3D { .fault =3D ttm_bo_vm_fault, .open =3D ttm_bo_vm_open, .close =3D ttm_bo_vm_close, - .access =3D ttm_bo_vm_access + .access =3D ttm_bo_vm_access, +#ifdef CONFIG_TRANSPARENT_HUGEPAGE + .huge_fault =3D ttm_bo_vm_huge_fault, +#endif }; =20 static struct ttm_buffer_object *ttm_bo_vm_lookup(struct ttm_bo_device *= bdev, diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_page_dirty.c b/drivers/gpu/drm= /vmwgfx/vmwgfx_page_dirty.c index f07aa857587c..17a5dca7b921 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_page_dirty.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_page_dirty.c @@ -477,7 +477,7 @@ vm_fault_t vmw_bo_vm_fault(struct vm_fault *vmf) else prot =3D vm_get_page_prot(vma->vm_flags); =20 - ret =3D ttm_bo_vm_fault_reserved(vmf, prot, num_prefault); + ret =3D ttm_bo_vm_fault_reserved(vmf, prot, num_prefault, 1); if (ret =3D=3D VM_FAULT_RETRY && !(vmf->flags & FAULT_FLAG_RETRY_NOWAIT= )) return ret; =20 diff --git a/include/drm/ttm/ttm_bo_api.h b/include/drm/ttm/ttm_bo_api.h index 66ca49db9633..4fc90d53aa15 100644 --- a/include/drm/ttm/ttm_bo_api.h +++ b/include/drm/ttm/ttm_bo_api.h @@ -732,7 +732,8 @@ vm_fault_t ttm_bo_vm_reserve(struct ttm_buffer_object= *bo, =20 vm_fault_t ttm_bo_vm_fault_reserved(struct vm_fault *vmf, pgprot_t prot, - pgoff_t num_prefault); + pgoff_t num_prefault, + pgoff_t fault_page_size); =20 vm_fault_t ttm_bo_vm_fault(struct vm_fault *vmf); =20 --=20 2.21.1