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=-15.2 required=3.0 tests=BAYES_00,DATE_IN_PAST_06_12, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 D111DC433E0 for ; Fri, 19 Feb 2021 06:02:37 +0000 (UTC) Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (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 522BE64E90 for ; Fri, 19 Feb 2021 06:02:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 522BE64E90 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=iommu-bounces@lists.linux-foundation.org Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id C130B8747A; Fri, 19 Feb 2021 06:02:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LZnaqBPIjzHo; Fri, 19 Feb 2021 06:02:35 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by hemlock.osuosl.org (Postfix) with ESMTP id 53FE987372; Fri, 19 Feb 2021 06:02:35 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 36D5DC0016; Fri, 19 Feb 2021 06:02:35 +0000 (UTC) Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by lists.linuxfoundation.org (Postfix) with ESMTP id B3F30C000D for ; Fri, 19 Feb 2021 06:02:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id A3A9E872B2 for ; Fri, 19 Feb 2021 06:02:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RlwHAA8WB5Tp for ; Fri, 19 Feb 2021 06:02:31 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by hemlock.osuosl.org (Postfix) with ESMTPS id 255DA8739D for ; Fri, 19 Feb 2021 06:02:31 +0000 (UTC) IronPort-SDR: EiCWqfRpgLjeEaoNcdlJo3DUmdehaCkz1OOVpf2sJ/Rj9tXHcHvvNo6Fzc7+cv8uZ5rxc2lj0v dRrMmvmxAj8A== X-IronPort-AV: E=McAfee;i="6000,8403,9899"; a="245198118" X-IronPort-AV: E=Sophos;i="5.81,189,1610438400"; d="scan'208";a="245198118" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Feb 2021 22:02:29 -0800 IronPort-SDR: s+fIb4QD/vBaxgq18YunFtfCEmI1STTMWABa4tRhkWoJlKIPQQxjw1HCF6U2gdksyNKviA1V/P iqyqzS80+y5Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,189,1610438400"; d="scan'208";a="362829355" Received: from otc-wp-03.jf.intel.com ([10.54.39.79]) by orsmga003.jf.intel.com with ESMTP; 18 Feb 2021 22:02:29 -0800 From: Jacob Pan To: LKML , iommu@lists.linux-foundation.org, Joerg Roedel , "Lu Baolu" Subject: [PATCH 4/4] iommu/vt-d: Calculate and set flags for handle_mm_fault Date: Thu, 18 Feb 2021 13:31:18 -0800 Message-Id: <1613683878-89946-5-git-send-email-jacob.jun.pan@linux.intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1613683878-89946-1-git-send-email-jacob.jun.pan@linux.intel.com> References: <1613683878-89946-1-git-send-email-jacob.jun.pan@linux.intel.com> MIME-Version: 1.0 Cc: "Tian, Kevin" , Dave Jiang , Raj Ashok , Yi Sun , Jean-Philippe Brucker , Wu Hao X-BeenThere: iommu@lists.linux-foundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Development issues for Linux IOMMU support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: iommu-bounces@lists.linux-foundation.org Sender: "iommu" UGFnZSByZXF1ZXN0cyBhcmUgb3JpZ2luYXRlZCBmcm9tIHRoZSB1c2VyIHBhZ2UgZmF1bHQuIFRo ZXJlZm9yZSwgd2UKc2hhbGwgc2V0wqBGQVVMVF9GTEFHX1VTRVIuwqAKCkZBVUxUX0ZMQUdfUkVN T1RFIGluZGljYXRlcyB0aGF0IHdlIGFyZcKgd2Fsa2luZyBhbiBtbSB3aGljaCBpcyBub3QKZ3Vh cmFudGVlZCB0byBiZSB0aGUgc2FtZSBhcyB0aGXCoGN1cnJlbnQtPm1tIGFuZCBzaG91bGQgbm90 IGJlIHN1YmplY3QKdG8gcHJvdGVjdGlvbiBrZXnCoGVuZm9yY2VtZW50LiBUaGVyZWZvcmUsIHdl IHNob3VsZCBzZXTCoEZBVUxUX0ZMQUdfUkVNT1RFCnRvIGF2b2lkIGZhdWx0cyB3aGVuIGJvdGgg U1ZNIGFuZCBQS0VZIGFyZSB1c2VkLgoKUmVmZXJlbmNlczogY29tbWl0IDFiMmVlMTI2NmVhNiAo Im1tL2NvcmU6IERvIG5vdCBlbmZvcmNlIFBLRVkgcGVybWlzc2lvbnMgb24gcmVtb3RlIG1tIGFj Y2VzcyIpClJldmlld2VkLWJ5OiBSYWogQXNob2sgPGFzaG9rLnJhakBpbnRlbC5jb20+ClNpZ25l ZC1vZmYtYnk6IEphY29iIFBhbiA8amFjb2IuanVuLnBhbkBsaW51eC5pbnRlbC5jb20+Ci0tLQog ZHJpdmVycy9pb21tdS9pbnRlbC9zdm0uYyB8IDkgKysrKysrLS0tCiAxIGZpbGUgY2hhbmdlZCwg NiBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvaW9t bXUvaW50ZWwvc3ZtLmMgYi9kcml2ZXJzL2lvbW11L2ludGVsL3N2bS5jCmluZGV4IGZmN2FlN2Nj MTdkNS4uN2JmZDIwYTI0YTYwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2lvbW11L2ludGVsL3N2bS5j CisrKyBiL2RyaXZlcnMvaW9tbXUvaW50ZWwvc3ZtLmMKQEAgLTEwODYsNiArMTA4Niw3IEBAIHN0 YXRpYyBpcnFyZXR1cm5fdCBwcnFfZXZlbnRfdGhyZWFkKGludCBpcnEsIHZvaWQgKmQpCiAJc3Ry dWN0IGludGVsX2lvbW11ICppb21tdSA9IGQ7CiAJc3RydWN0IGludGVsX3N2bSAqc3ZtID0gTlVM TDsKIAlpbnQgaGVhZCwgdGFpbCwgaGFuZGxlZCA9IDA7CisJdW5zaWduZWQgaW50IGZsYWdzID0g MDsKIAogCS8qIENsZWFyIFBQUiBiaXQgYmVmb3JlIHJlYWRpbmcgaGVhZC90YWlsIHJlZ2lzdGVy cywgdG8KIAkgKiBlbnN1cmUgdGhhdCB3ZSBnZXQgYSBuZXcgaW50ZXJydXB0IGlmIG5lZWRlZC4g Ki8KQEAgLTExODYsOSArMTE4NywxMSBAQCBzdGF0aWMgaXJxcmV0dXJuX3QgcHJxX2V2ZW50X3Ro cmVhZChpbnQgaXJxLCB2b2lkICpkKQogCQlpZiAoYWNjZXNzX2Vycm9yKHZtYSwgcmVxKSkKIAkJ CWdvdG8gaW52YWxpZDsKIAotCQlyZXQgPSBoYW5kbGVfbW1fZmF1bHQodm1hLCBhZGRyZXNzLAot CQkJCSAgICAgIHJlcS0+d3JfcmVxID8gRkFVTFRfRkxBR19XUklURSA6IDAsCi0JCQkJICAgICAg TlVMTCk7CisJCWZsYWdzID0gRkFVTFRfRkxBR19VU0VSIHwgRkFVTFRfRkxBR19SRU1PVEU7CisJ CWlmIChyZXEtPndyX3JlcSkKKwkJCWZsYWdzIHw9IEZBVUxUX0ZMQUdfV1JJVEU7CisKKwkJcmV0 ID0gaGFuZGxlX21tX2ZhdWx0KHZtYSwgYWRkcmVzcywgZmxhZ3MsIE5VTEwpOwogCQlpZiAocmV0 ICYgVk1fRkFVTFRfRVJST1IpCiAJCQlnb3RvIGludmFsaWQ7CiAKLS0gCjIuMjUuMQoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KaW9tbXUgbWFpbGluZyBs aXN0CmlvbW11QGxpc3RzLmxpbnV4LWZvdW5kYXRpb24ub3JnCmh0dHBzOi8vbGlzdHMubGludXhm b3VuZGF0aW9uLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2lvbW11 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=-15.2 required=3.0 tests=BAYES_00,DATE_IN_PAST_06_12, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 DA142C433DB for ; Fri, 19 Feb 2021 06:08:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 884C564ED2 for ; Fri, 19 Feb 2021 06:08:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229803AbhBSGHv (ORCPT ); Fri, 19 Feb 2021 01:07:51 -0500 Received: from mga18.intel.com ([134.134.136.126]:39962 "EHLO mga18.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229771AbhBSGH3 (ORCPT ); Fri, 19 Feb 2021 01:07:29 -0500 IronPort-SDR: ko85Mm1F56+GLAUm7H3fnVpfGHUQ+2svOhzA/L47Vb+UCNc2Ikyac2EKpwhxwVGMY6Nj20+0DJ 3GZrRrVbHxrA== X-IronPort-AV: E=McAfee;i="6000,8403,9899"; a="171424155" X-IronPort-AV: E=Sophos;i="5.81,189,1610438400"; d="scan'208";a="171424155" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Feb 2021 22:02:29 -0800 IronPort-SDR: s+fIb4QD/vBaxgq18YunFtfCEmI1STTMWABa4tRhkWoJlKIPQQxjw1HCF6U2gdksyNKviA1V/P iqyqzS80+y5Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,189,1610438400"; d="scan'208";a="362829355" Received: from otc-wp-03.jf.intel.com ([10.54.39.79]) by orsmga003.jf.intel.com with ESMTP; 18 Feb 2021 22:02:29 -0800 From: Jacob Pan To: LKML , iommu@lists.linux-foundation.org, Joerg Roedel , "Lu Baolu" Cc: Yi Liu , Raj Ashok , "Tian, Kevin" , Wu Hao , Yi Sun , Dave Jiang , Eric Auger , Jean-Philippe Brucker , Jacob Pan Subject: [PATCH 4/4] iommu/vt-d: Calculate and set flags for handle_mm_fault Date: Thu, 18 Feb 2021 13:31:18 -0800 Message-Id: <1613683878-89946-5-git-send-email-jacob.jun.pan@linux.intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1613683878-89946-1-git-send-email-jacob.jun.pan@linux.intel.com> References: <1613683878-89946-1-git-send-email-jacob.jun.pan@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Page requests are originated from the user page fault. Therefore, we shall set FAULT_FLAG_USER.  FAULT_FLAG_REMOTE indicates that we are walking an mm which is not guaranteed to be the same as the current->mm and should not be subject to protection key enforcement. Therefore, we should set FAULT_FLAG_REMOTE to avoid faults when both SVM and PKEY are used. References: commit 1b2ee1266ea6 ("mm/core: Do not enforce PKEY permissions on remote mm access") Reviewed-by: Raj Ashok Signed-off-by: Jacob Pan --- drivers/iommu/intel/svm.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/iommu/intel/svm.c b/drivers/iommu/intel/svm.c index ff7ae7cc17d5..7bfd20a24a60 100644 --- a/drivers/iommu/intel/svm.c +++ b/drivers/iommu/intel/svm.c @@ -1086,6 +1086,7 @@ static irqreturn_t prq_event_thread(int irq, void *d) struct intel_iommu *iommu = d; struct intel_svm *svm = NULL; int head, tail, handled = 0; + unsigned int flags = 0; /* Clear PPR bit before reading head/tail registers, to * ensure that we get a new interrupt if needed. */ @@ -1186,9 +1187,11 @@ static irqreturn_t prq_event_thread(int irq, void *d) if (access_error(vma, req)) goto invalid; - ret = handle_mm_fault(vma, address, - req->wr_req ? FAULT_FLAG_WRITE : 0, - NULL); + flags = FAULT_FLAG_USER | FAULT_FLAG_REMOTE; + if (req->wr_req) + flags |= FAULT_FLAG_WRITE; + + ret = handle_mm_fault(vma, address, flags, NULL); if (ret & VM_FAULT_ERROR) goto invalid; -- 2.25.1