Received: by 2002:ac0:950e:0:0:0:0:0 with SMTP id f14csp1321567imc; Sun, 17 Mar 2019 10:26:38 -0700 (PDT) X-Google-Smtp-Source: APXvYqyfCcQcWNoggBkcYPA/fxisD+8J4ts8xcFh8HxcJ5e3VzXkir/duALksyVGElASZwyfTq9i X-Received: by 2002:a63:4a20:: with SMTP id x32mr13955901pga.429.1552843597935; Sun, 17 Mar 2019 10:26:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552843597; cv=none; d=google.com; s=arc-20160816; b=DEvtP1qeDyyY3PiBCHFADAp3XyZ+lSO75vJwdlNJED3WAj2ma/YpN44+CsrVEUmDel AodY6s5VzUAD4O1VTEYqC9gAH5Te7j5P0ph+NemmN9y5UXGSDqq3hxn8LXBbIl3Tv84c KO3d33FgqAJvZ6kciWG0HbYPpB8CKPZcygV9Dl9p/ZncntIvSFXLk1TgDHgnduQ3iWD7 k0VGRuuYuXPaMsaApl0Rcq0YYqR8/LtzrDuD7iHcsJeQKrDUCV0L0A6NO6mFCOKWvxjP anJ2WNUiceuBtAjLCbNBX0e/5aHQKdvZnamctLRD6xxQi49O2muZojGFWcvHSWdE2ELH +htg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=WladTe8jlcSx9bS5/adfFMkL0W3rqyr5vCU5LO5PVdg=; b=eyB82I0+KHtQEj71bhHnH/ZPo7OVUCmKoECUmonBeh+U4NpFvJCrTyu2hh2+vfyIU8 FUMs1WuppE2dfcrXuJ5piRXOeLNfLFZ7EwDwVr2ktwEuRShaG1B6uKpqdiY/hYm5523N gJBucUVe4NkApMOcUJuE9bqO7zEWlUhBtOeIYu0Keo+IQesNI2Tjv8ei5nt8iBKASy8d ko2RtnYGaz1r6bFI59ubm2touh9B7n/q6XHZ+vd/sx+qrdE/2xOrwCwmugHdzDSxE9rI SMTDgJI9umwSq6Gmzt5YRhMtyh3ipQYk2r0YksabY0EQu8ZZxYnTzQ0Hlyzl8p/ERznm NiUw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v31si7515430plg.2.2019.03.17.10.26.23; Sun, 17 Mar 2019 10:26:37 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726717AbfCQRYI (ORCPT + 99 others); Sun, 17 Mar 2019 13:24:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58186 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726744AbfCQRYH (ORCPT ); Sun, 17 Mar 2019 13:24:07 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 262973082D9E; Sun, 17 Mar 2019 17:24:07 +0000 (UTC) Received: from laptop.redhat.com (ovpn-116-102.ams2.redhat.com [10.36.116.102]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0DE4A19C71; Sun, 17 Mar 2019 17:24:02 +0000 (UTC) From: Eric Auger To: eric.auger.pro@gmail.com, eric.auger@redhat.com, iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu, joro@8bytes.org, alex.williamson@redhat.com, jacob.jun.pan@linux.intel.com, yi.l.liu@linux.intel.com, jean-philippe.brucker@arm.com, will.deacon@arm.com, robin.murphy@arm.com Cc: kevin.tian@intel.com, ashok.raj@intel.com, marc.zyngier@arm.com, christoffer.dall@arm.com, peter.maydell@linaro.org, vincent.stehle@arm.com Subject: [PATCH v6 14/22] iommu/smmuv3: Implement cache_invalidate Date: Sun, 17 Mar 2019 18:22:24 +0100 Message-Id: <20190317172232.1068-15-eric.auger@redhat.com> In-Reply-To: <20190317172232.1068-1-eric.auger@redhat.com> References: <20190317172232.1068-1-eric.auger@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Sun, 17 Mar 2019 17:24:07 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Implement domain-selective and page-selective IOTLB invalidations. Signed-off-by: Eric Auger --- v3 -> v4: - adapt to changes in the uapi - add support for leaf parameter - do not use arm_smmu_tlb_inv_range_nosync or arm_smmu_tlb_inv_context anymore v2 -> v3: - replace __arm_smmu_tlb_sync by arm_smmu_cmdq_issue_sync v1 -> v2: - properly pass the asid --- drivers/iommu/arm-smmu-v3.c | 57 +++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c index e41f61844d78..4a05dd66df74 100644 --- a/drivers/iommu/arm-smmu-v3.c +++ b/drivers/iommu/arm-smmu-v3.c @@ -2319,6 +2319,62 @@ static void arm_smmu_detach_pasid_table(struct iommu_domain *domain) mutex_unlock(&smmu_domain->init_mutex); } +static int +arm_smmu_cache_invalidate(struct iommu_domain *domain, struct device *dev, + struct iommu_cache_invalidate_info *inv_info) +{ + struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain); + struct arm_smmu_device *smmu = smmu_domain->smmu; + + if (smmu_domain->stage != ARM_SMMU_DOMAIN_NESTED) + return -EINVAL; + + if (!smmu) + return -EINVAL; + + if (inv_info->cache & IOMMU_CACHE_INV_TYPE_IOTLB) { + if (inv_info->granularity == IOMMU_INV_GRANU_PASID) { + struct arm_smmu_cmdq_ent cmd = { + .opcode = CMDQ_OP_TLBI_NH_ASID, + .tlbi = { + .vmid = smmu_domain->s2_cfg.vmid, + .asid = inv_info->pasid, + }, + }; + + arm_smmu_cmdq_issue_cmd(smmu, &cmd); + arm_smmu_cmdq_issue_sync(smmu); + + } else if (inv_info->granularity == IOMMU_INV_GRANU_ADDR) { + struct iommu_inv_addr_info *info = &inv_info->addr_info; + size_t size = info->nb_granules * info->granule_size; + bool leaf = info->flags & IOMMU_INV_ADDR_FLAGS_LEAF; + struct arm_smmu_cmdq_ent cmd = { + .opcode = CMDQ_OP_TLBI_NH_VA, + .tlbi = { + .addr = info->addr, + .vmid = smmu_domain->s2_cfg.vmid, + .asid = info->pasid, + .leaf = leaf, + }, + }; + + do { + arm_smmu_cmdq_issue_cmd(smmu, &cmd); + cmd.tlbi.addr += info->granule_size; + } while (size -= info->granule_size); + arm_smmu_cmdq_issue_sync(smmu); + } else { + return -EINVAL; + } + } + if (inv_info->cache & IOMMU_CACHE_INV_TYPE_PASID || + inv_info->cache & IOMMU_CACHE_INV_TYPE_DEV_IOTLB) { + return -ENOENT; + } + return 0; +} + static struct iommu_ops arm_smmu_ops = { .capable = arm_smmu_capable, .domain_alloc = arm_smmu_domain_alloc, @@ -2339,6 +2395,7 @@ static struct iommu_ops arm_smmu_ops = { .put_resv_regions = arm_smmu_put_resv_regions, .attach_pasid_table = arm_smmu_attach_pasid_table, .detach_pasid_table = arm_smmu_detach_pasid_table, + .cache_invalidate = arm_smmu_cache_invalidate, .pgsize_bitmap = -1UL, /* Restricted during device attach */ }; -- 2.20.1