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=-6.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED 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 BA54FC4646B for ; Mon, 24 Jun 2019 23:41:38 +0000 (UTC) Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (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 8A0B220663 for ; Mon, 24 Jun 2019 23:41:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8A0B220663 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 mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 071BFB8E; Mon, 24 Jun 2019 23:41:38 +0000 (UTC) Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 898D7B6D for ; Mon, 24 Jun 2019 23:41:37 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id DF0A87FB for ; Mon, 24 Jun 2019 23:41:36 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 24 Jun 2019 16:41:35 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,413,1557212400"; d="scan'208";a="244876675" Received: from jacob-builder.jf.intel.com (HELO jacob-builder) ([10.7.199.155]) by orsmga001.jf.intel.com with ESMTP; 24 Jun 2019 16:41:35 -0700 Date: Mon, 24 Jun 2019 16:44:50 -0700 From: Jacob Pan To: Jonathan Cameron Subject: Re: [PATCH v4 17/22] iommu/vt-d: Avoid duplicated code for PASID setup Message-ID: <20190624164450.732e5539@jacob-builder> In-Reply-To: <20190618170335.000078db@huawei.com> References: <1560087862-57608-1-git-send-email-jacob.jun.pan@linux.intel.com> <1560087862-57608-18-git-send-email-jacob.jun.pan@linux.intel.com> <20190618170335.000078db@huawei.com> Organization: OTC X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.30; x86_64-pc-linux-gnu) MIME-Version: 1.0 Cc: "Tian, Kevin" , Raj Ashok , Jean-Philippe Brucker , iommu@lists.linux-foundation.org, LKML , Alex Williamson , Andriy Shevchenko , David Woodhouse X-BeenThere: iommu@lists.linux-foundation.org X-Mailman-Version: 2.1.12 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="us-ascii" Content-Transfer-Encoding: 7bit Sender: iommu-bounces@lists.linux-foundation.org Errors-To: iommu-bounces@lists.linux-foundation.org On Tue, 18 Jun 2019 17:03:35 +0100 Jonathan Cameron wrote: > On Sun, 9 Jun 2019 06:44:17 -0700 > Jacob Pan wrote: > > > After each setup for PASID entry, related translation caches must > > be flushed. We can combine duplicated code into one function which > > is less error prone. > > > > Signed-off-by: Jacob Pan > Formatting nitpick below ;) > > Otherwise it's cut and paste > > --- > > 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 1e25539..1ff2ecc 100644 > > --- a/drivers/iommu/intel-pasid.c > > +++ b/drivers/iommu/intel-pasid.c > > @@ -522,6 +522,21 @@ void intel_pasid_tear_down_entry(struct > > intel_iommu *iommu, devtlb_invalidation_with_pasid(iommu, dev, > > pasid); } > > > > +static inline 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); > > I have some vague recollection kernel style says use brackets around > single lines if other blocks in an if / else stack have multiple > lines.. > > I checked, this case is specifically called out > > https://www.kernel.org/doc/html/v5.1/process/coding-style.html > > + > This blank line doesn't add anything either ;) indeed. i will add the braces and remove the blank line. Thanks for looking it up. > > +} > > + > > /* > > * Set up the scalable mode pasid table entry for first only > > * translation type. > > @@ -567,16 +582,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; > > } > > @@ -640,16 +646,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; > > } > > @@ -683,16 +680,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; > > } > > [Jacob Pan] _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu