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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 812F0C83F12 for ; Tue, 29 Aug 2023 21:54:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:From:References:Cc:To:Subject: MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=W8BEPMyYgbThBa2psPrYeQnVwGuaR7GFH54iujuyuSQ=; b=Ovt24lURfYZdWm x06PbKriG+dGQx5GDyK4CDAZr1tR+tKef3V4tq1/940Rz8mMEaAyLMP6QRbJSi2z61QMG79Jx+8O3 EMIUAB69Bfaiq7FSKjAU+9m9LSIp7raP7nKOd4u55lN5OAHDO/NFJfqwS9yuClNWOBMNzdJioR/P3 G5cjMSCNWvWWL/WYUa4zclIyYbHbyJw/9ssTwrto8Yll+87xTxd6vU/K03zEsNbqM8y9F2XBUZ1bu UzuGtetm9EhKldzjlCarxsp5Hi2Sk+HIJ1ATV/m+Y2wOWizPl09cC0EZt8oHKFXXBqcKiRgXAq466 zklLZK3hESiEixSu6RrA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qb6f6-00CLQ3-2J; Tue, 29 Aug 2023 21:54:12 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qb6f3-00CLPV-2Y for linux-arm-kernel@lists.infradead.org; Tue, 29 Aug 2023 21:54:11 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 894642F4; Tue, 29 Aug 2023 14:54:45 -0700 (PDT) Received: from [10.57.2.162] (unknown [10.57.2.162]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id BAA5A3F64C; Tue, 29 Aug 2023 14:54:04 -0700 (PDT) Message-ID: Date: Tue, 29 Aug 2023 22:54:00 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; rv:102.0) Gecko/20100101 Thunderbird/102.14.0 Subject: Re: [PATCH 2/3] iommu/arm-smmu-v3: Add an arm_smmu_tlb_inv_domain helper Content-Language: en-GB To: Nicolin Chen Cc: will@kernel.org, jgg@nvidia.com, joro@8bytes.org, jean-philippe@linaro.org, apopple@nvidia.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, iommu@lists.linux.dev References: <854e2b3f2d4f1b76f916fcfc288b34526d4d4162.1692693557.git.nicolinc@nvidia.com> <7e97b5a5-6be0-87a8-aaf7-89980b0a35d1@arm.com> From: Robin Murphy In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230829_145409_927778_2B3A8E61 X-CRM114-Status: GOOD ( 26.06 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 2023-08-22 18:03, Nicolin Chen wrote: > On Tue, Aug 22, 2023 at 10:40:18AM +0100, Robin Murphy wrote: > >> On 2023-08-22 09:45, Nicolin Chen wrote: >>> Move the part of per-asid or per-vmid invalidation command issuing into a >>> new helper function, which will be used in the following change. >> >> Why? This achieves nothing except make the code harder to follow and >> disconnect the rather important comment even further from the code it is > > We need the same if-else routine to issue a per-asid or per-vmid > TLBI command. If making a copy of this same routine feels better > to you, yea, I can change that. > >> significant to. It's not like we need a specific prototype to take a >> function pointer from, it's just another internal call - see >> arm_smmu_flush_iotlb_all() for instance. We know the cookie is an >> arm_smmu_domain pointer because we put it there, and converting it back >> from a void pointer is exactly the same *at* the function call boundary >> as immediately afterwards. > > Hmm, I am not quite following this. What do you suggest here? Oh, this is becoming quite the lesson in not reviewing patches in a hurry :( Apparently I managed to misread the diff and the horribly subtle difference between "arm_smmu_tlb_inv_domain" and "arm_smmu_atc_inv_domain", and think that arm_smmu_tlb_inv_context() was already just dealing with the TLBI command and you were moving the entire body into the new helper. Sorry about that. Still, the part about the comment remains true, and I think it goes to show what a thoroughly horrible naming scheme it is to have "tlb_inv" denote a function responsible for TLBI commands and "atc_inv" denote a function responsible for ATC commands and "tlb_inv" denote a function responsible for both TLBI and ATC commands... Thanks, Robin. > > Thanks > Nic > >>> Signed-off-by: Nicolin Chen >>> --- >>> drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 24 +++++++++++++-------- >>> 1 file changed, 15 insertions(+), 9 deletions(-) >>> >>> diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c >>> index 9b0dc3505601..d6c647e1eb01 100644 >>> --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c >>> +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c >>> @@ -1854,12 +1854,24 @@ int arm_smmu_atc_inv_domain(struct arm_smmu_domain *smmu_domain, int ssid, >>> return arm_smmu_cmdq_batch_submit(smmu_domain->smmu, &cmds); >>> } >>> >>> +static void arm_smmu_tlb_inv_domain(struct arm_smmu_domain *smmu_domain) >>> +{ >>> + struct arm_smmu_device *smmu = smmu_domain->smmu; >>> + struct arm_smmu_cmdq_ent cmd; >>> + >>> + if (smmu_domain->stage == ARM_SMMU_DOMAIN_S1) { >>> + arm_smmu_tlb_inv_asid(smmu, smmu_domain->s1_cfg.cd.asid); >>> + } else { >>> + cmd.opcode = CMDQ_OP_TLBI_S12_VMALL; >>> + cmd.tlbi.vmid = smmu_domain->s2_cfg.vmid; >>> + arm_smmu_cmdq_issue_cmd_with_sync(smmu, &cmd); >>> + } >>> +} >>> + >>> /* IO_PGTABLE API */ >>> static void arm_smmu_tlb_inv_context(void *cookie) >>> { >>> struct arm_smmu_domain *smmu_domain = cookie; >>> - struct arm_smmu_device *smmu = smmu_domain->smmu; >>> - struct arm_smmu_cmdq_ent cmd; >>> >>> /* >>> * NOTE: when io-pgtable is in non-strict mode, we may get here with >>> @@ -1868,13 +1880,7 @@ static void arm_smmu_tlb_inv_context(void *cookie) >>> * insertion to guarantee those are observed before the TLBI. Do be >>> * careful, 007. >>> */ >>> - if (smmu_domain->stage == ARM_SMMU_DOMAIN_S1) { >>> - arm_smmu_tlb_inv_asid(smmu, smmu_domain->s1_cfg.cd.asid); >>> - } else { >>> - cmd.opcode = CMDQ_OP_TLBI_S12_VMALL; >>> - cmd.tlbi.vmid = smmu_domain->s2_cfg.vmid; >>> - arm_smmu_cmdq_issue_cmd_with_sync(smmu, &cmd); >>> - } >>> + arm_smmu_tlb_inv_domain(smmu_domain); >>> arm_smmu_atc_inv_domain(smmu_domain, 0, 0, 0); >>> } >>> _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel