From nobody Tue Dec 2 02:59:06 2025 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) (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 62A4933710A for ; Mon, 17 Nov 2025 18:48:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763405323; cv=none; b=sseRw2epwEqL/iSeb+6JI7ZbLpeDo96PVuw5nxN3mVFU9CK7o5ONtOu2oSJ52+mV00IynHWcOL+NnxkikPNm1CC+BOVj+LvR37v3AmXniuIPAGNJIkX/ezoQY/yWV0u3caQKXdX/nWmFbWn3GlwIYz2zonTlDRKiQjzvyPKgxvc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763405323; c=relaxed/simple; bh=6nFSpBu3ZwObAoKoHCayRp3PVnE6EITEZuEZzaiIGGQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=OXnYziWxs2xEmcuffCfXYtUIQR4aV8Hh9M1tgLQXTGxFxxwBJe9iUlH48hy1LN4NMTmVB6YSkNvNdkNSNpxd34bCfqypa99NRCjKyK5u0E75ATH51d98kysRUlW2887zm5iDZcgMFaQg4gSBKqr+QCDrDdqfmmV0oIOYxOdIEhE= 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=ry8QedJ4; arc=none smtp.client-ip=209.85.128.73 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="ry8QedJ4" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-477a11d9f89so1924275e9.3 for ; Mon, 17 Nov 2025 10:48:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1763405317; x=1764010117; 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=UGnO/Bwz/Bdpjz8RxXVYUEJKHIK5XJgWwQocmBNRacI=; b=ry8QedJ4P5bt7XXIOvkBr6SRNXPsrOIHgMwsGqnP+NNQ9Fl1NDxi0YuW+yrHR16sO8 CksCZqJhk9BGBiXSbJMRZC9+J7DIyvgDGu8PVjVitQnwfaBsheByzs/sLCypMMPvO0Dj JuebT3z09opMROvmpFTk9V6uuYhoqEkRx7sDLISR3wLiluc5fso2F3G3ONnmCyUJGMIV qy+WZLL2TPnj/LV3qFDxYO5aKGZIMLqnigKPyqhp1ciSBaO5pTLfoVK1QvBULuoCR/W8 zNvf5E9ux+oITq462qLlMYtVEft4KpYBbUTE+K3c9hN53gp2qfaah58EactLdpelwWIH XI2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763405317; x=1764010117; 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=UGnO/Bwz/Bdpjz8RxXVYUEJKHIK5XJgWwQocmBNRacI=; b=Fdse4//EumV//xEQNJ36uBa1WF1AvF4dkIbD2IijP362ZslZerKAkHA3sr8+Hw5wSp 25XHBgr7Mojv5D6ktJekkXyuBS18iciur8d1w9C6fcWMo1gmF0HyeXbQ/e8QfxLfeJlt 6iiksgFSa3MwLLBh3+KnmgHbkVFujUgMXqV5riQA/fsTB9ij80m33o6xiVVRZ8xlk1bP HITfvR8hx98Tt6TIs2DUW9DqEtAYHedY1zfOTogw86yRNd1g0jmvnrO+0QamjpR8yq2c PCu+04vk9rkCEGhbBUb1qvhcGXXFyORkeWo7JsZA+auNe2WhkzSKosRn2O1iEAbi+TU5 7lGQ== X-Forwarded-Encrypted: i=1; AJvYcCWYT+Ok0vz4CJ0hqbdTfUqSp/3JOIvZKR9tINRM/KhjDu5wcYcuzEqqeIGZI3Ai88MmECOCQaBhHMmLu0o=@vger.kernel.org X-Gm-Message-State: AOJu0YzH3vCNLtp7gd8AycN+WVeZN27vS3DZIOJrCwGmIb7LaL430MDi ckpRobwQaqb7u52ZkeGhhlBDXXeBOVjrOFxw80/zonFTaRJNSHyMR5ErJgg0Rhf06EwZFhFsiHd 5HtkEiajpw0EUVA== X-Google-Smtp-Source: AGHT+IFrvnE51rjqhZgZikSAId4eBRwM0rBdtcUofGQG56OV6eJr8JyqvovBQ6X7CtmMQHN+xu1fxfhfh3qxIg== X-Received: from wmbgz10.prod.google.com ([2002:a05:600c:888a:b0:477:afa:d217]) (user=smostafa job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:8b23:b0:477:7bd2:693f with SMTP id 5b1f17b1804b1-4778fe60615mr126251305e9.6.1763405317263; Mon, 17 Nov 2025 10:48:37 -0800 (PST) Date: Mon, 17 Nov 2025 18:47:58 +0000 In-Reply-To: <20251117184815.1027271-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: <20251117184815.1027271-1-smostafa@google.com> X-Mailer: git-send-email 2.52.0.rc1.455.g30608eb744-goog Message-ID: <20251117184815.1027271-12-smostafa@google.com> Subject: [PATCH v5 11/27] KVM: arm64: iommu: Support DABT for IOMMU 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, praan@google.com, danielmentz@google.com, mark.rutland@arm.com, qperret@google.com, tabba@google.com, Mostafa Saleh Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" SMMUv3 driver need to trap and emulate access to the MMIO space to provide emulation for the kernel. Add a handler for DABTs for IOMMU drivers to be able to do so, in case the host fault in page, check if it's part of IOMMU emulation first. Signed-off-by: Mostafa Saleh --- arch/arm64/include/asm/kvm_arm.h | 2 ++ arch/arm64/kvm/hyp/include/nvhe/iommu.h | 3 ++- arch/arm64/kvm/hyp/nvhe/iommu/iommu.c | 15 +++++++++++++++ arch/arm64/kvm/hyp/nvhe/mem_protect.c | 10 ++++++++++ 4 files changed, 29 insertions(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/kvm_arm.h b/arch/arm64/include/asm/kvm_= arm.h index 1da290aeedce..8d63308ccd5c 100644 --- a/arch/arm64/include/asm/kvm_arm.h +++ b/arch/arm64/include/asm/kvm_arm.h @@ -331,6 +331,8 @@ =20 /* Hyp Prefetch Fault Address Register (HPFAR/HDFAR) */ #define HPFAR_MASK (~UL(0xf)) + +#define FAR_MASK GENMASK_ULL(11, 0) /* * We have * PAR [PA_Shift - 1 : 12] =3D PA [PA_Shift - 1 : 12] diff --git a/arch/arm64/kvm/hyp/include/nvhe/iommu.h b/arch/arm64/kvm/hyp/i= nclude/nvhe/iommu.h index 9f4906c6dcc9..10fe4fbf7424 100644 --- a/arch/arm64/kvm/hyp/include/nvhe/iommu.h +++ b/arch/arm64/kvm/hyp/include/nvhe/iommu.h @@ -8,6 +8,7 @@ struct kvm_iommu_ops { int (*init)(void); void (*host_stage2_idmap)(phys_addr_t start, phys_addr_t end, int prot); + bool (*dabt_handler)(struct user_pt_regs *regs, u64 esr, u64 addr); }; =20 int kvm_iommu_init(void *pool_base, size_t nr_pages); @@ -16,5 +17,5 @@ void kvm_iommu_host_stage2_idmap(phys_addr_t start, phys_= addr_t end, enum kvm_pgtable_prot prot); void *kvm_iommu_donate_pages(u8 order); void kvm_iommu_reclaim_pages(void *ptr); - +bool kvm_iommu_host_dabt_handler(struct user_pt_regs *regs, u64 esr, u64 a= ddr); #endif /* __ARM64_KVM_NVHE_IOMMU_H__ */ diff --git a/arch/arm64/kvm/hyp/nvhe/iommu/iommu.c b/arch/arm64/kvm/hyp/nvh= e/iommu/iommu.c index a0df34ecf6b0..c9f2103a25fe 100644 --- a/arch/arm64/kvm/hyp/nvhe/iommu/iommu.c +++ b/arch/arm64/kvm/hyp/nvhe/iommu/iommu.c @@ -4,6 +4,10 @@ * * Copyright (C) 2022 Linaro Ltd. */ +#include + +#include + #include =20 #include @@ -113,3 +117,14 @@ void kvm_iommu_reclaim_pages(void *ptr) { hyp_put_page(&iommu_pages_pool, ptr); } + +bool kvm_iommu_host_dabt_handler(struct user_pt_regs *regs, u64 esr, u64 a= ddr) +{ + if (kvm_iommu_ops && kvm_iommu_ops->dabt_handler && + kvm_iommu_ops->dabt_handler(regs, esr, addr)) { + /* DABT handled by the driver, skip to next instruction. */ + kvm_skip_host_instr(); + return true; + } + return false; +} diff --git a/arch/arm64/kvm/hyp/nvhe/mem_protect.c b/arch/arm64/kvm/hyp/nvh= e/mem_protect.c index f60acfb868d0..4c47df895579 100644 --- a/arch/arm64/kvm/hyp/nvhe/mem_protect.c +++ b/arch/arm64/kvm/hyp/nvhe/mem_protect.c @@ -595,6 +595,11 @@ static int host_stage2_idmap(u64 addr) return ret; } =20 +static bool is_dabt(u64 esr) +{ + return ESR_ELx_EC(esr) =3D=3D ESR_ELx_EC_DABT_LOW; +} + void handle_host_mem_abort(struct kvm_cpu_context *host_ctxt) { struct kvm_vcpu_fault_info fault; @@ -617,6 +622,11 @@ void handle_host_mem_abort(struct kvm_cpu_context *hos= t_ctxt) */ BUG_ON(!(fault.hpfar_el2 & HPFAR_EL2_NS)); addr =3D FIELD_GET(HPFAR_EL2_FIPA, fault.hpfar_el2) << 12; + addr |=3D fault.far_el2 & FAR_MASK; + + if (is_dabt(esr) && !addr_is_memory(addr) && + kvm_iommu_host_dabt_handler(&host_ctxt->regs, esr, addr)) + return; =20 ret =3D host_stage2_idmap(addr); BUG_ON(ret && ret !=3D -EAGAIN); --=20 2.52.0.rc1.455.g30608eb744-goog