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=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 B58F2C433DF for ; Mon, 17 Aug 2020 17:18:58 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 6D44B206FA for ; Mon, 17 Aug 2020 17:18:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="ZlrgqDXj" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6D44B206FA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 7FE906B0022; Mon, 17 Aug 2020 13:18:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7D8A76B0023; Mon, 17 Aug 2020 13:18:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 601EB6B0024; Mon, 17 Aug 2020 13:18:42 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0085.hostedemail.com [216.40.44.85]) by kanga.kvack.org (Postfix) with ESMTP id 460EB6B0022 for ; Mon, 17 Aug 2020 13:18:42 -0400 (EDT) Received: from smtpin08.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 04B10365D for ; Mon, 17 Aug 2020 17:18:42 +0000 (UTC) X-FDA: 77160720084.08.patch34_400773427018 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin08.hostedemail.com (Postfix) with ESMTP id BA3371819E76F for ; Mon, 17 Aug 2020 17:18:41 +0000 (UTC) X-HE-Tag: patch34_400773427018 X-Filterd-Recvd-Size: 7585 Received: from mail-ej1-f66.google.com (mail-ej1-f66.google.com [209.85.218.66]) by imf21.hostedemail.com (Postfix) with ESMTP for ; Mon, 17 Aug 2020 17:18:41 +0000 (UTC) Received: by mail-ej1-f66.google.com with SMTP id c16so18630764ejx.12 for ; Mon, 17 Aug 2020 10:18:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uVIyFHZb67nPyqGSNTl6SLW0rGbdcbuom6jvAVnSl5E=; b=ZlrgqDXjXrfzYaSrJaCs3m8CoajSgawzWUNjbn518VdXR6RlsBfH6g/3JZP2jboX6y HMFs0mU3FZcE116kAUSagq7M+rKDkMzA1DdyHwYo/x5u/MBiTVRMuF/q4Dnsis1zOQOB n6bhr9tNoJhHB88uM6dvJXlOr7uNs9Pv7RJafW84fTQLXjwKccjS/iJmPeerAw+s7k5g 5i78nzICphJrTa6tI8ZuUGdbLUb951wkc1CNASxZhR5Hecq+qB2V2ZhAWStnPh5ACntF Uoncqjci8Ge1JpN1lSBkVsuj3bll6GUxsVvM3lOfatBpMv3Nl5Jm/an2SHfEnapTWRsQ 12VA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uVIyFHZb67nPyqGSNTl6SLW0rGbdcbuom6jvAVnSl5E=; b=ec51YpgxtHiD/5Qbtgm8a5kuxRn6yiltLhdZWbid/g0hdPHCtd5KZkKPCYyRk2vBxV /YJC9L9FyBUSxk49C5Gbl7Uyu40UhmQVLwUPMON9bzPXCo4B6QpuBsNUk7h9wzGCOrjk ENv9hJkbRn63eRIiRIryji/c6rtgsKFkNxAyr+2GtZrDMXUzEuqnt9L0F4Pav82EWGm4 vrqbHLAWd6hC425YTuHgGmQMp3AnLx0dkwTz0KnoBAMjjMbpOoX5wGok59hbxntXNOff UgJbDqriipSxm84DZOkhp/8Odph1POEjLDbmtRRP4D/bxDpx/4ol6VRYyPwe409+ugy4 ILhQ== X-Gm-Message-State: AOAM530qyotgmZsyabhVYmnCITMX2SRMe+vh0rpGQ10TdB3qj14aVWId Y3bMgLaOAyc3tF2hv3+HCPEw7g== X-Google-Smtp-Source: ABdhPJw6wtAggQJhHnDvr/08Xvnm7vBN4/zTDbyZpNJSMdOz/V//Ci3fmVb953UU3UiIa317fN//IA== X-Received: by 2002:a17:906:8506:: with SMTP id i6mr16024949ejx.446.1597684720237; Mon, 17 Aug 2020 10:18:40 -0700 (PDT) Received: from localhost.localdomain ([2001:1715:4e26:a7e0:116c:c27a:3e7f:5eaf]) by smtp.gmail.com with ESMTPSA id lc18sm14672502ejb.29.2020.08.17.10.18.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 10:18:39 -0700 (PDT) From: Jean-Philippe Brucker To: iommu@lists.linux-foundation.org, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org Cc: joro@8bytes.org, catalin.marinas@arm.com, will@kernel.org, robin.murphy@arm.com, baolu.lu@linux.intel.com, Jonathan.Cameron@huawei.com, jacob.jun.pan@linux.intel.com, zhangfei.gao@linaro.org, xuzaibo@huawei.com, zhengxiang9@huawei.com, fenghua.yu@intel.com, Jean-Philippe Brucker , Suzuki K Poulose Subject: [PATCH RESEND v9 10/13] iommu/arm-smmu-v3: Check for SVA features Date: Mon, 17 Aug 2020 19:15:56 +0200 Message-Id: <20200817171558.325917-11-jean-philippe@linaro.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200817171558.325917-1-jean-philippe@linaro.org> References: <20200817171558.325917-1-jean-philippe@linaro.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: BA3371819E76F X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam03 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Aggregate all sanity-checks for sharing CPU page tables with the SMMU under a single ARM_SMMU_FEAT_SVA bit. For PCIe SVA, users also need to check FEAT_ATS and FEAT_PRI. For platform SVA, they will have to check FEAT_STALLS. Introduce ARM_SMMU_FEAT_BTM (Broadcast TLB Maintenance), but don't enable it at the moment. Since the entire VMID space is shared with the CPU, enabling DVM (by clearing SMMU_CR2.PTM) could result in over-invalidation and affect performance of stage-2 mappings. Cc: Suzuki K Poulose Signed-off-by: Jean-Philippe Brucker --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 10 +++++ .../iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c | 43 +++++++++++++++++++ drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 3 ++ 3 files changed, 56 insertions(+) diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h b/drivers/iommu/= arm/arm-smmu-v3/arm-smmu-v3.h index 90c08f156b43..7b14b48a26c7 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h @@ -602,6 +602,8 @@ struct arm_smmu_device { #define ARM_SMMU_FEAT_STALL_FORCE (1 << 13) #define ARM_SMMU_FEAT_VAX (1 << 14) #define ARM_SMMU_FEAT_RANGE_INV (1 << 15) +#define ARM_SMMU_FEAT_BTM (1 << 16) +#define ARM_SMMU_FEAT_SVA (1 << 17) u32 features; =20 #define ARM_SMMU_OPT_SKIP_PREFETCH (1 << 0) @@ -683,4 +685,12 @@ int arm_smmu_write_ctx_desc(struct arm_smmu_domain *= smmu_domain, int ssid, void arm_smmu_tlb_inv_asid(struct arm_smmu_device *smmu, u16 asid); bool arm_smmu_free_asid(struct arm_smmu_ctx_desc *cd); =20 +#ifdef CONFIG_ARM_SMMU_V3_SVA +bool arm_smmu_sva_supported(struct arm_smmu_device *smmu); +#else /* CONFIG_ARM_SMMU_V3_SVA */ +static inline bool arm_smmu_sva_supported(struct arm_smmu_device *smmu) +{ + return false; +} +#endif /* CONFIG_ARM_SMMU_V3_SVA */ #endif /* _ARM_SMMU_V3_H */ diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c b/drivers/io= mmu/arm/arm-smmu-v3/arm-smmu-v3-sva.c index e919ce894dd1..bf81d91ce71e 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c @@ -153,3 +153,46 @@ static void arm_smmu_free_shared_cd(struct arm_smmu_= ctx_desc *cd) kfree(cd); } } + +bool arm_smmu_sva_supported(struct arm_smmu_device *smmu) +{ + unsigned long reg, fld; + unsigned long oas; + unsigned long asid_bits; + + u32 feat_mask =3D ARM_SMMU_FEAT_BTM | ARM_SMMU_FEAT_COHERENCY; + + if ((smmu->features & feat_mask) !=3D feat_mask) + return false; + + if (!(smmu->pgsize_bitmap & PAGE_SIZE)) + return false; + + /* + * Get the smallest PA size of all CPUs (sanitized by cpufeature). We'r= e + * not even pretending to support AArch32 here. Abort if the MMU output= s + * addresses larger than what we support. + */ + reg =3D read_sanitised_ftr_reg(SYS_ID_AA64MMFR0_EL1); + fld =3D cpuid_feature_extract_unsigned_field(reg, ID_AA64MMFR0_PARANGE_= SHIFT); + oas =3D id_aa64mmfr0_parange_to_phys_shift(fld); + if (smmu->oas < oas) + return false; + + /* We can support bigger ASIDs than the CPU, but not smaller */ + fld =3D cpuid_feature_extract_unsigned_field(reg, ID_AA64MMFR0_ASID_SHI= FT); + asid_bits =3D fld ? 16 : 8; + if (smmu->asid_bits < asid_bits) + return false; + + /* + * See max_pinned_asids in arch/arm64/mm/context.c. The following is + * generally the maximum number of bindable processes. + */ + if (IS_ENABLED(CONFIG_UNMAP_KERNEL_AT_EL0)) + asid_bits--; + dev_dbg(smmu->dev, "%d shared contexts\n", (1 << asid_bits) - + num_possible_cpus() - 2); + + return true; +} 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 9e755caea525..15cb3d9c1a5d 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -3258,6 +3258,9 @@ static int arm_smmu_device_hw_probe(struct arm_smmu= _device *smmu) =20 smmu->ias =3D max(smmu->ias, smmu->oas); =20 + if (arm_smmu_sva_supported(smmu)) + smmu->features |=3D ARM_SMMU_FEAT_SVA; + dev_info(smmu->dev, "ias %lu-bit, oas %lu-bit (features 0x%08x)\n", smmu->ias, smmu->oas, smmu->features); return 0; --=20 2.28.0