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=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_2 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 B31B7C432C0 for ; Mon, 18 Nov 2019 21:48:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8FA47206DA for ; Mon, 18 Nov 2019 21:48:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726909AbfKRVsE (ORCPT ); Mon, 18 Nov 2019 16:48:04 -0500 Received: from mga02.intel.com ([134.134.136.20]:3811 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726647AbfKRVsE (ORCPT ); Mon, 18 Nov 2019 16:48:04 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Nov 2019 13:48:03 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,321,1569308400"; d="scan'208";a="209213554" Received: from jacob-builder.jf.intel.com (HELO jacob-builder) ([10.7.199.155]) by orsmga006.jf.intel.com with ESMTP; 18 Nov 2019 13:48:03 -0800 Date: Mon, 18 Nov 2019 13:52:38 -0800 From: Jacob Pan To: Auger Eric Cc: iommu@lists.linux-foundation.org, LKML , Joerg Roedel , Lu Baolu , David Woodhouse , "Tian, Kevin" , Raj Ashok , Yi Liu , jacob.jun.pan@linux.intel.com Subject: Re: [PATCH v2 04/10] iommu/vt-d: Match CPU and IOMMU paging mode Message-ID: <20191118135238.49f5d957@jacob-builder> In-Reply-To: <601ca9c3-9f83-3d95-8d26-d4f46eee82ba@redhat.com> References: <1574106153-45867-1-git-send-email-jacob.jun.pan@linux.intel.com> <1574106153-45867-5-git-send-email-jacob.jun.pan@linux.intel.com> <601ca9c3-9f83-3d95-8d26-d4f46eee82ba@redhat.com> Organization: OTC X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.30; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 18 Nov 2019 21:55:03 +0100 Auger Eric wrote: > Hi Jacob, > > On 11/18/19 8:42 PM, Jacob Pan wrote: > > When setting up first level page tables for sharing with CPU, we > > need to ensure IOMMU can support no less than the levels supported > > by the CPU. > > It is not adequate, as in the current code, to set up 5-level paging > > in PASID entry First Level Paging Mode(FLPM) solely based on CPU. > > > > Fixes: 437f35e1cd4c8 ("iommu/vt-d: Add first level page table > > interface") > > Signed-off-by: Jacob Pan > > Acked-by: Lu Baolu > > --- > > drivers/iommu/intel-pasid.c | 12 ++++++++++-- > > 1 file changed, 10 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/iommu/intel-pasid.c > > b/drivers/iommu/intel-pasid.c index 040a445be300..e7cb0b8a7332 > > 100644 --- a/drivers/iommu/intel-pasid.c > > +++ b/drivers/iommu/intel-pasid.c > > @@ -499,8 +499,16 @@ int intel_pasid_setup_first_level(struct > > intel_iommu *iommu, } > > > > #ifdef CONFIG_X86 > > - if (cpu_feature_enabled(X86_FEATURE_LA57)) > > - pasid_set_flpm(pte, 1); > > + /* Both CPU and IOMMU paging mode need to match */ > > + if (cpu_feature_enabled(X86_FEATURE_LA57)) { > > + if (cap_5lp_support(iommu->cap)) { > > + pasid_set_flpm(pte, 1); > > + } else { > > + pr_err("VT-d has no 5-level paging support > > for CPU\n"); > > + pasid_clear_entry(pte); > > + return -EINVAL; > Can it happen? If I am not wrong intel_pasid_setup_first_level() only > seems to be called from intel_svm_bind_mm which now checks the > SVM_CAPABLE flag. > You are right, this check is not needed any more. I will drop the patch. > Thanks > > Eric > > + } > > + } > > #endif /* CONFIG_X86 */ > > > > pasid_set_domain_id(pte, did); > > > [Jacob Pan]