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_1 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 77EA5C432C0 for ; Mon, 18 Nov 2019 01:36:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 50513206CC for ; Mon, 18 Nov 2019 01:36:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726481AbfKRBgk (ORCPT ); Sun, 17 Nov 2019 20:36:40 -0500 Received: from mga07.intel.com ([134.134.136.100]:21429 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725905AbfKRBgj (ORCPT ); Sun, 17 Nov 2019 20:36:39 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Nov 2019 17:36:38 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,318,1569308400"; d="scan'208";a="203924385" Received: from allen-box.sh.intel.com (HELO [10.239.159.136]) ([10.239.159.136]) by fmsmga008.fm.intel.com with ESMTP; 17 Nov 2019 17:36:36 -0800 Cc: baolu.lu@linux.intel.com, "Tian, Kevin" , Raj Ashok , Yi Liu , Eric Auger Subject: Re: [PATCH 05/10] iommu/vt-d: Avoid duplicated code for PASID setup To: Jacob Pan , iommu@lists.linux-foundation.org, LKML , Joerg Roedel , David Woodhouse References: <1573859377-75924-1-git-send-email-jacob.jun.pan@linux.intel.com> <1573859377-75924-6-git-send-email-jacob.jun.pan@linux.intel.com> From: Lu Baolu Message-ID: Date: Mon, 18 Nov 2019 09:33:35 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 MIME-Version: 1.0 In-Reply-To: <1573859377-75924-6-git-send-email-jacob.jun.pan@linux.intel.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, On 11/16/19 7:09 AM, Jacob Pan wrote: > After each setup for PASID entry, related translation caches must be flushed. nit - maximum 75 chars per line Others look good to me. Acked-by: Lu Baolu Best regards, baolu > We can combine duplicated code into one function which is less error prone. > > Signed-off-by: Jacob Pan > Reviewed-by: Lu Baolu > --- > drivers/iommu/intel-pasid.c | 48 +++++++++++++++++---------------------------- > 1 file changed, 18 insertions(+), 30 deletions(-) > > diff --git a/drivers/iommu/intel-pasid.c b/drivers/iommu/intel-pasid.c > index e7cb0b8a7332..732bfee228df 100644 > --- a/drivers/iommu/intel-pasid.c > +++ b/drivers/iommu/intel-pasid.c > @@ -465,6 +465,21 @@ void intel_pasid_tear_down_entry(struct intel_iommu *iommu, > devtlb_invalidation_with_pasid(iommu, dev, pasid); > } > > +static void pasid_flush_caches(struct intel_iommu *iommu, > + struct pasid_entry *pte, > + int pasid, u16 did) > +{ > + if (!ecap_coherent(iommu->ecap)) > + clflush_cache_range(pte, sizeof(*pte)); > + > + if (cap_caching_mode(iommu->cap)) { > + pasid_cache_invalidation_with_pasid(iommu, did, pasid); > + iotlb_invalidation_with_pasid(iommu, did, pasid); > + } else { > + iommu_flush_write_buffer(iommu); > + } > +} > + > /* > * Set up the scalable mode pasid table entry for first only > * translation type. > @@ -518,16 +533,7 @@ int intel_pasid_setup_first_level(struct intel_iommu *iommu, > /* Setup Present and PASID Granular Transfer Type: */ > pasid_set_translation_type(pte, 1); > pasid_set_present(pte); > - > - if (!ecap_coherent(iommu->ecap)) > - clflush_cache_range(pte, sizeof(*pte)); > - > - if (cap_caching_mode(iommu->cap)) { > - pasid_cache_invalidation_with_pasid(iommu, did, pasid); > - iotlb_invalidation_with_pasid(iommu, did, pasid); > - } else { > - iommu_flush_write_buffer(iommu); > - } > + pasid_flush_caches(iommu, pte, pasid, did); > > return 0; > } > @@ -591,16 +597,7 @@ int intel_pasid_setup_second_level(struct intel_iommu *iommu, > */ > pasid_set_sre(pte); > pasid_set_present(pte); > - > - if (!ecap_coherent(iommu->ecap)) > - clflush_cache_range(pte, sizeof(*pte)); > - > - if (cap_caching_mode(iommu->cap)) { > - pasid_cache_invalidation_with_pasid(iommu, did, pasid); > - iotlb_invalidation_with_pasid(iommu, did, pasid); > - } else { > - iommu_flush_write_buffer(iommu); > - } > + pasid_flush_caches(iommu, pte, pasid, did); > > return 0; > } > @@ -634,16 +631,7 @@ int intel_pasid_setup_pass_through(struct intel_iommu *iommu, > */ > pasid_set_sre(pte); > pasid_set_present(pte); > - > - if (!ecap_coherent(iommu->ecap)) > - clflush_cache_range(pte, sizeof(*pte)); > - > - if (cap_caching_mode(iommu->cap)) { > - pasid_cache_invalidation_with_pasid(iommu, did, pasid); > - iotlb_invalidation_with_pasid(iommu, did, pasid); > - } else { > - iommu_flush_write_buffer(iommu); > - } > + pasid_flush_caches(iommu, pte, pasid, did); > > return 0; > } >