From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.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 2AC1B39EF1D for ; Fri, 1 May 2026 11:20:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777634417; cv=none; b=u2aynsMchb86txf0+rCbmYwx1xR+von2tMheduThzQaeaFnRgt4BZ6LJCfC9CRoP4WFmTN8ujW2guUAy38U5TrjvXeyoL+85YvFgsLAJNPWxCxjc0sIr5IyIa2F66B9rPlbgw//TKO1E6xYi54pcCaYlkRinne7XYASMrD6UH3w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777634417; c=relaxed/simple; bh=La4+9+sPCS/4eXA8ja7XO9KK/olvOoUWDQbSdswhUu0=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=gxknYi1xUA4tflblvXX1fplrbliXSL3xIX2GFi8Bi7mxZ9ceITZ0uRU3yqAP40oxecxixp9ZrehbEW8JLfOIcKhgPlFSTVbwld9YOa8JjJhgis+3k4a+TftcnoEUY07ZKiofiqczuuOTCY8fpbeJIIE2DHngl8oXgOxtGIVoRtY= 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=tf0jtpQ3; arc=none smtp.client-ip=209.85.128.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="tf0jtpQ3" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-488bd1ee9e7so20148785e9.1 for ; Fri, 01 May 2026 04:20:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1777634412; x=1778239212; 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=9kXrhx388xhTRL3MvJdHy6WWnE8EmOsHEooLjon0268=; b=tf0jtpQ38Br8MVdG6EKNIYHLr4d3nznvLq8Oz0C9AmC9cnC4UgVUPJXVY/kkmKmguj 9I1plYKplanL3hxIzzBTMcNTk2SK2dAXSkWStVRtSYi0wzdCqK3sPBTbFcPwZHBIzeTa YS2UqkjSVfAXHeehIJIq0xKa5aLQ6AIWMZzbmx+cWnn+bCGIU+vnDRzfPg5soPU5zIts Dp7aOejhx+nbtBsJWirFE2pA4aEcRRIZ6DrkAwb6e30TZcVhjgvtPngVrlg5DzGYnxlM BKvZ51wvJazy5PiE0LH9WKPuKFvGN41Fc+RdmTQy/IJ7htNkpemwrafMtXiG4ACoh5D2 sWgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777634412; x=1778239212; 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=9kXrhx388xhTRL3MvJdHy6WWnE8EmOsHEooLjon0268=; b=Wm5v23hgSnPnBl0Neo7mfIgE4O907a/wCi7o2Z+pVTFjVA0nHm/o2YbOKShrdYyf7G l7zybF9U41I+u3EeCRyqoYlcWzWB96Nje52KRynVrvR8wNxi9/JCEdn8gZ44xvYOmFK6 Mk9byzktim+jKY/JT+3BKr2yeXH9uVaOIvlkGmhTzD/09hiWyeLo9KKz8V4/pVMMFbQf 1PrT4rmYG1OPXLwY7d44fnvHwhTAv1zLnEOckAWihCNJXsUz0muqT4CE0hrsokXeRKrL oRd5vdJDiIZAdrijbmDMO6VbaLAUFFN6uLo26csIjHUtqakKr0iiR5fONvyhw+MEd6Jn lUQA== X-Forwarded-Encrypted: i=1; AFNElJ+JbF8G0oQdbhdRQUYqI6t5zsDRX0xdIft6ZG64EOrnidCAMeQPYllKHBbjbDTzfnUHHIrQlDKUPDMG4mA=@vger.kernel.org X-Gm-Message-State: AOJu0YwknfrvPE4o5q5Q372Ip/VUJgSBFIdetgajj3KUQi5iekI4aNll M9PKymUfDWU6uAas8P4h9N1HCh2KTJZ295exwu+/gaiZ93Q1JCBKeAFzEFcR7UVjGk2rqwSoCgt oiZVdFcrQxeJWFQ== X-Received: from wmat2.prod.google.com ([2002:a05:600c:6d02:b0:485:33e8:92af]) (user=smostafa job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:c108:b0:485:40db:d40c with SMTP id 5b1f17b1804b1-48a8eb61ddfmr29338485e9.3.1777634412089; Fri, 01 May 2026 04:20:12 -0700 (PDT) Date: Fri, 1 May 2026 11:19:12 +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-11-smostafa@google.com> Subject: [PATCH v6 10/25] 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, 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" The pKVM SMMUv3 driver needs to trap and emulate access to the MMIO space of the SMMUv3 to provide emulation for the kernel driver. Add a handler for DABTs for IOMMU drivers to be able to do so. In case the host causes a data abort, check if it's part of IOMMU emulation first. Signed-off-by: Mostafa Saleh --- 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 | 15 +++++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kvm/hyp/include/nvhe/iommu.h b/arch/arm64/kvm/hyp/include/nvhe/iommu.h index eba94b4f6050..e1b6f16391cc 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); int (*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); }; int kvm_iommu_init(void *pool_base, unsigned int nr_pages); @@ -18,5 +19,5 @@ int kvm_iommu_host_stage2_idmap(phys_addr_t start, phys_addr_t end, /* Returns zeroed memory. */ 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 addr); #endif /* __ARM64_KVM_NVHE_IOMMU_H__ */ diff --git a/arch/arm64/kvm/hyp/nvhe/iommu/iommu.c b/arch/arm64/kvm/hyp/nvhe/iommu/iommu.c index 53cb5e4b0aac..b1474db016e5 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 #include @@ -139,3 +143,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 addr) +{ + 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/nvhe/mem_protect.c index b54cb72ed88c..5c64007dba4d 100644 --- a/arch/arm64/kvm/hyp/nvhe/mem_protect.c +++ b/arch/arm64/kvm/hyp/nvhe/mem_protect.c @@ -788,6 +788,12 @@ static void host_inject_mem_abort(struct kvm_cpu_context *host_ctxt) inject_host_exception(esr); } +static bool is_mmio_dabt(u64 esr) +{ + return (ESR_ELx_EC(esr) == ESR_ELx_EC_DABT_LOW) && + (esr & ESR_ELx_ISV); +} + void handle_host_mem_abort(struct kvm_cpu_context *host_ctxt) { struct kvm_vcpu_fault_info fault; @@ -810,6 +816,15 @@ void handle_host_mem_abort(struct kvm_cpu_context *host_ctxt) BUG_ON(!(fault.hpfar_el2 & HPFAR_EL2_NS)); addr = FIELD_GET(HPFAR_EL2_FIPA, fault.hpfar_el2) << 12; + /* + * Emulate data aborts for IOMMU drivers, other access will be denied + * by host_stage2_adjust_range() + */ + if (is_mmio_dabt(esr) && !addr_is_memory(addr) && + kvm_iommu_host_dabt_handler(&host_ctxt->regs, + esr, addr | FAR_TO_FIPA_OFFSET(fault.far_el2))) + return; + switch (host_stage2_idmap(addr)) { case -EPERM: host_inject_mem_abort(host_ctxt); -- 2.54.0.545.g6539524ca2-goog