From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f74.google.com (mail-ej1-f74.google.com [209.85.218.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 910DC39FCB3 for ; Fri, 1 May 2026 11:20:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777634423; cv=none; b=kqRVJC+6ZT8Oz65Sxqk+GxRX2Ojj9W8sZ+J1vgjqN53Jkbnt8uBCSD3reRVnbjQUOhpxxW9Wvkfvp+Nz7mkSS+T6PNGaKhB10Q/6atdbpNMmEZhKwt1+0HnDl83ZON2rSgoNVYNgkW6HtPsr6V9opvTmcRGfxUSdCpNtCblrZWc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777634423; c=relaxed/simple; bh=o14JzmXYNahFrdFmiylYn3Zxk6zxXvzNvdkjVQ1daIo=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=H545lCN56aV5VXCdNttN6Mi6LLCBVNSk2ybhIm6/FTAhYL/G6laos3Qj0zzZVRNpsw3GICYjeK9rteUmpnARJaBFF0aOIrQ9T1cvPs0h6ZHHC+VfZ6EvGDCRAmNBM5t7jKg9B5NG+kJyAJSF3s2z705NXFdq+QJJabvBZB9n2oM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--smostafa.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=G0cTfDgZ; arc=none smtp.client-ip=209.85.218.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--smostafa.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="G0cTfDgZ" Received: by mail-ej1-f74.google.com with SMTP id a640c23a62f3a-b8704795d25so137295966b.2 for ; Fri, 01 May 2026 04:20:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1777634418; x=1778239218; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=TWp0aeThUsgvfFBxJWuWRQdGQ3dxhvfuaZARmJjLR/k=; b=G0cTfDgZ+lBJXxRJIkThyAHGAQ5PJebTy+MWuq5c3nbQ9R31QA5ClcCAyAHRmW5TPc MnhQf9xp3OG6Av7UVhvvbWA8QuiRDx1aF4ByzdpvlkOkgoasjHINdERoYos4xPx/uGBD v6OB2Y3TMxaa7/y5w8ncTWFn2zXHJwxlFulelxaAYhhhKc3kCgS0V1GQV7T+42zCza2H m+PrFf7mmQWXhJiz6/xspT2ylUbf6jPsMcKh8s7mG17qRRgk5wdViDeuUXzxQgBAJkiw 58hGuiSEg657zuywXYsL5K2GsqIO/YvYzRp/4scUPcnIiY7slFYQNu1sXn15BENXjO0b 6lGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777634418; x=1778239218; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=TWp0aeThUsgvfFBxJWuWRQdGQ3dxhvfuaZARmJjLR/k=; b=dfRksC9VpLAFRtV+LwuxWcmoJ+pDK6Kfob6+IkrdNaaSl5SX/31nbI+0m+225ii/TU TiB7SMhW7jDRlfXQVDWJYXtQO4/yu1Gjc7B6cesfMn2C/7aztHngHj28JZYKKb5dGcCC D94MBr/9CbZaLn3R50hE2EFkXk9lTEX+4NMtMGWkc8qS+bLA2ZBsdTeqwR9n7icd19x3 lCdnSPFIKRBF1Qy9Ak8nI1/0ihJfn81TJtUkPGBbmx05CpQx/8x5cqDnCWYJjzs4w40g 1gkZk/Fs7WfIIU5+aI/mVKh1aXVW0et0uExPYukwwIuZJ46BZQiV/aAyEoE906w5kkT9 7elg== X-Forwarded-Encrypted: i=1; AFNElJ8Lya8AXvDMB9oe5/8G2GStsh/gcuN+UNz99SOetYflCkNte42uW9mJqDK2IWxnTAB3bpeAbNcxK1DLaKk=@vger.kernel.org X-Gm-Message-State: AOJu0YyU2Y6lg01YBFmyIDDTkpLBcxE96/9eFOhoslCrVNy07G0N54li DT2ENgpU3THijwa1hL+94+6QbwY2GCtvVKryFNCbTMKQNeGpPc39GfPyTJYTXVnCwT0MzHwgBgC jmlLv3iRKlcF6jQ== X-Received: from ejcjs18.prod.google.com ([2002:a17:907:97d2:b0:b97:b7aa:b4]) (user=smostafa job=prod-delivery.src-stubby-dispatcher) by 2002:a17:907:72d1:b0:ba5:2f0a:2f40 with SMTP id a640c23a62f3a-bbac4bd9fa1mr416440366b.4.1777634417769; Fri, 01 May 2026 04:20:17 -0700 (PDT) Date: Fri, 1 May 2026 11:19:16 +0000 In-Reply-To: <20260501111928.259252-1-smostafa@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260501111928.259252-1-smostafa@google.com> X-Mailer: git-send-email 2.54.0.545.g6539524ca2-goog Message-ID: <20260501111928.259252-15-smostafa@google.com> Subject: [PATCH v6 14/25] iommu/arm-smmu-v3-kvm: Add MMIO emulation From: Mostafa Saleh To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kvmarm@lists.linux.dev, iommu@lists.linux.dev Cc: catalin.marinas@arm.com, will@kernel.org, maz@kernel.org, oliver.upton@linux.dev, joey.gouly@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com, joro@8bytes.org, jean-philippe@linaro.org, jgg@ziepe.ca, mark.rutland@arm.com, qperret@google.com, tabba@google.com, vdonnefort@google.com, sebastianene@google.com, keirf@google.com, Mostafa Saleh Content-Type: text/plain; charset="UTF-8" Add data abort handler for the SMMUs, at the moment most registers are just passthrough. In the next patches CMDQ/STE emulation will be added which inserts logic to some register access. Signed-off-by: Mostafa Saleh --- .../iommu/arm/arm-smmu-v3/pkvm/arm-smmu-v3.c | 143 ++++++++++++++++++ .../iommu/arm/arm-smmu-v3/pkvm/arm_smmu_v3.h | 10 ++ 2 files changed, 153 insertions(+) diff --git a/drivers/iommu/arm/arm-smmu-v3/pkvm/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/pkvm/arm-smmu-v3.c index d9945db9e102..cce5a51b4656 100644 --- a/drivers/iommu/arm/arm-smmu-v3/pkvm/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/pkvm/arm-smmu-v3.c @@ -8,6 +8,7 @@ #include #include +#include #include "arm_smmu_v3.h" #include "../arm-smmu-v3.h" @@ -106,6 +107,7 @@ static int smmu_init_device(struct hyp_arm_smmu_v3_device *smmu) if (!PAGE_ALIGNED(smmu->mmio_addr | smmu->mmio_size)) return -EINVAL; + hyp_spin_lock_init(&smmu->lock); ret = __pkvm_host_donate_hyp_mmio(smmu->mmio_addr, smmu->mmio_size, &haddr); if (ret) return ret; @@ -144,6 +146,8 @@ static int smmu_init(void) goto out_reclaim_smmu; } + BUILD_BUG_ON(sizeof(hyp_spinlock_t) != sizeof(u32)); + return 0; out_reclaim_smmu: @@ -153,6 +157,144 @@ static int smmu_init(void) return ret; } +static bool smmu_dabt_device(struct hyp_arm_smmu_v3_device *smmu, + struct user_pt_regs *regs, + u64 esr, u32 off) +{ + bool is_write = esr & ESR_ELx_WNR; + unsigned int len = BIT((esr & ESR_ELx_SAS) >> ESR_ELx_SAS_SHIFT); + int rd = (esr & ESR_ELx_SRT_MASK) >> ESR_ELx_SRT_SHIFT; + const u64 read_write = -1ULL; + const u64 no_access = 0; + u64 mask = no_access; + const u64 read_only = is_write ? no_access : read_write; + bool is_xzr = (rd == 31); + u64 val = is_xzr ? 0 : regs->regs[rd]; + + switch (off) { + case ARM_SMMU_IDR0: + if (len != sizeof(u32)) + break; + /* Clear stage-2 support, hide MSI to avoid write back to cmdq */ + mask = read_only & ~(IDR0_S2P | IDR0_VMID16 | IDR0_MSI | IDR0_HYP); + break; + /* Passthrough the register access for bisectiblity, handled later */ + case ARM_SMMU_CMDQ_BASE: + case ARM_SMMU_CMDQ_PROD: + case ARM_SMMU_CMDQ_CONS: + case ARM_SMMU_STRTAB_BASE: + case ARM_SMMU_STRTAB_BASE_CFG: + case ARM_SMMU_GBPA: + mask = read_write; + break; + case ARM_SMMU_CR0: + if (len != sizeof(u32)) + break; + mask = read_write; + break; + case ARM_SMMU_CR1: { + /* Based on Linux implementation */ + u64 cr1_template = FIELD_PREP(CR1_TABLE_SH, ARM_SMMU_SH_ISH) | + FIELD_PREP(CR1_TABLE_OC, CR1_CACHE_WB) | + FIELD_PREP(CR1_TABLE_IC, CR1_CACHE_WB) | + FIELD_PREP(CR1_QUEUE_SH, ARM_SMMU_SH_ISH) | + FIELD_PREP(CR1_QUEUE_OC, CR1_CACHE_WB) | + FIELD_PREP(CR1_QUEUE_IC, CR1_CACHE_WB); + if (len != sizeof(u32)) + break; + /* Don't mess with shareability/cacheability. */ + if (is_write) { + WARN_ON(val != cr1_template); + val = cr1_template; + } + mask = read_write; + break; + } + + /* Allowed 32 bit registers. */ + case ARM_SMMU_EVTQ_PROD + SZ_64K: + case ARM_SMMU_EVTQ_CONS + SZ_64K: + case ARM_SMMU_EVTQ_IRQ_CFG1: + case ARM_SMMU_EVTQ_IRQ_CFG2: + case ARM_SMMU_PRIQ_PROD + SZ_64K: + case ARM_SMMU_PRIQ_CONS + SZ_64K: + case ARM_SMMU_PRIQ_IRQ_CFG1: + case ARM_SMMU_PRIQ_IRQ_CFG2: + case ARM_SMMU_GERRORN: + case ARM_SMMU_GERROR_IRQ_CFG1: + case ARM_SMMU_GERROR_IRQ_CFG2: + case ARM_SMMU_IRQ_CTRLACK: + case ARM_SMMU_IRQ_CTRL: + case ARM_SMMU_CR0ACK: + case ARM_SMMU_CR2: + if (len != sizeof(u32)) + break; + mask = read_write; + break; + /* Allowed 64 bit registers. */ + case ARM_SMMU_EVTQ_BASE: + case ARM_SMMU_EVTQ_IRQ_CFG0: + case ARM_SMMU_PRIQ_BASE: + case ARM_SMMU_PRIQ_IRQ_CFG0: + case ARM_SMMU_GERROR_IRQ_CFG0: + if (len != sizeof(u64)) + break; + mask = read_write; + break; + /* Allowed RO 32 bit registers. */ + case ARM_SMMU_IIDR: + case ARM_SMMU_IDR5: + case ARM_SMMU_IDR3: + case ARM_SMMU_IDR1: + case ARM_SMMU_GERROR: + if (len != sizeof(u32)) + break; + mask = read_only; + }; + + if (WARN_ON(!mask)) + goto out_ret; + + if (is_write) { + if (len == sizeof(u64)) + writeq_relaxed(val & mask, smmu->base + off); + else + writel_relaxed(val & mask, smmu->base + off); + + return true; + } + + if (len == sizeof(u64)) + val = readq_relaxed(smmu->base + off) & mask; + else + val = readl_relaxed(smmu->base + off) & mask; + /* + * Device might be read senstive, so do it but ignore writing + * back for xzr. + */ + if (!is_xzr) + regs->regs[rd] = val; + +out_ret: + return true; +} + +static bool smmu_dabt_handler(struct user_pt_regs *regs, u64 esr, u64 addr) +{ + struct hyp_arm_smmu_v3_device *smmu; + bool ret; + + for_each_smmu(smmu) { + if (addr < smmu->mmio_addr || addr >= smmu->mmio_addr + smmu->mmio_size) + continue; + hyp_spin_lock(&smmu->lock); + ret = smmu_dabt_device(smmu, regs, esr, addr - smmu->mmio_addr); + hyp_spin_unlock(&smmu->lock); + return ret; + } + return false; +} + static int smmu_host_stage2_idmap(phys_addr_t start, phys_addr_t end, int prot) { return 0; @@ -162,4 +304,5 @@ static int smmu_host_stage2_idmap(phys_addr_t start, phys_addr_t end, int prot) struct kvm_iommu_ops smmu_ops = { .init = smmu_init, .host_stage2_idmap = smmu_host_stage2_idmap, + .dabt_handler = smmu_dabt_handler, }; diff --git a/drivers/iommu/arm/arm-smmu-v3/pkvm/arm_smmu_v3.h b/drivers/iommu/arm/arm-smmu-v3/pkvm/arm_smmu_v3.h index 82b84673e85b..263b0fef262d 100644 --- a/drivers/iommu/arm/arm-smmu-v3/pkvm/arm_smmu_v3.h +++ b/drivers/iommu/arm/arm-smmu-v3/pkvm/arm_smmu_v3.h @@ -4,6 +4,10 @@ #include +#ifdef __KVM_NVHE_HYPERVISOR__ +#include +#endif + /* * Parameters from the trusted host: * @mmio_addr base address of the SMMU registers @@ -15,6 +19,7 @@ * @oas PA size * @pgsize_bitmap Supported page sizes * @sid_bits Max number of SID bits supported + * @lock Lock to protect SMMU */ struct hyp_arm_smmu_v3_device { phys_addr_t mmio_addr; @@ -24,6 +29,11 @@ struct hyp_arm_smmu_v3_device { unsigned long oas; unsigned long pgsize_bitmap; unsigned int sid_bits; +#ifdef __KVM_NVHE_HYPERVISOR__ + hyp_spinlock_t lock; +#else + u32 lock; +#endif }; extern size_t kvm_nvhe_sym(kvm_hyp_arm_smmu_v3_count); -- 2.54.0.545.g6539524ca2-goog