Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp569106pxv; Thu, 15 Jul 2021 10:25:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzR/ilhU41Po+/NZS3U18Tw+Wl+pEZjlhTUxtwNnbhZ0zgSkPaumCuUWlvi/UnMKWq6dkPJ X-Received: by 2002:a05:6e02:1a46:: with SMTP id u6mr3339422ilv.135.1626369947636; Thu, 15 Jul 2021 10:25:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626369947; cv=none; d=google.com; s=arc-20160816; b=mM43z0Yf/e8I//mxKVQbqKscnC9Gi/01twv88iLcOJsorpBXMATaZzkRC2aXjMIaly vzkR6ul6b3J/QETCRiavBrylDZODCgzwaMggxUHlhgeWVredKyRMobsQHJTKOp9wwMiq 2MKp5nEW6obmBMMA1IR307b5ab98Tah91RnyVz4I3rWivbdFa8Rn/ge1uYV+pHMTUtAI 8PFSfQsklBH5k+PmejWO1jcmc6EJhMCPEBbjikaveMRn7FWEUSLfBcMva8Kp4roLotTR kL+MF84CTe+pYvy5MtEnBI0J/sspJ8+2EvHKc4nfztgQbKQrG3DNgWYKHwEvJWDsGkcI X4aQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=gTFZscKPf+0fee/Gf97/08+iZ3DmimrqYeYsJOHEHAo=; b=iqWh3Z9UA3257uAyk5N2oxFtT+sx2DFXStH/GUtECeB9M9GXYLSESAfeDI5E1346kD JedP9PTCUE8L+lgs0XaetkZasNbmNpZRdQBcM6xALwN+44jkRE4S5WtTuio0gWtINNuc 71e855llxL8eB0I+6Hzas+OUcKtytsYP61x2G6BtwKmO5yRC1jdRsvgmRfGxEB0c3mlZ PwyVz16cPoPbg55ek+PMmHYCahldRz9QGYN1s2l05xC2yZwCrkJW7w5B7wb1Gne8zHHX 1MujaOzHE2ZNmKBVtnGJc3smNxDReo87q7ttczbxnJTboYdX7TuumRqzyMVpJAuAicwC iIHA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p18si7259328ios.10.2021.07.15.10.25.35; Thu, 15 Jul 2021 10:25:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236255AbhGOQ4w (ORCPT + 99 others); Thu, 15 Jul 2021 12:56:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:48400 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236183AbhGOQ4w (ORCPT ); Thu, 15 Jul 2021 12:56:52 -0400 Received: from disco-boy.misterjones.org (disco-boy.misterjones.org [51.254.78.96]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 84887613E9; Thu, 15 Jul 2021 16:53:58 +0000 (UTC) Received: from sofa.misterjones.org ([185.219.108.64] helo=why.lan) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1m44Hb-00DYjr-4J; Thu, 15 Jul 2021 17:32:19 +0100 From: Marc Zyngier To: linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: will@kernel.org, qperret@google.com, dbrazdil@google.com, Srivatsa Vaddagiri , Shanker R Donthineni , James Morse , Suzuki K Poulose , Alexandru Elisei , kernel-team@android.com Subject: [PATCH 13/16] arm64: Implement ioremap/iounmap hooks calling into KVM's MMIO guard Date: Thu, 15 Jul 2021 17:31:56 +0100 Message-Id: <20210715163159.1480168-14-maz@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210715163159.1480168-1-maz@kernel.org> References: <20210715163159.1480168-1-maz@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, will@kernel.org, qperret@google.com, dbrazdil@google.com, vatsa@codeaurora.org, sdonthineni@nvidia.com, james.morse@arm.com, suzuki.poulose@arm.com, alexandru.elisei@arm.com, kernel-team@android.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Implement the previously defined ioremap/iounmap hooks for arm64, calling into KVM's MMIO guard if available. Signed-off-by: Marc Zyngier --- arch/arm64/mm/ioremap.c | 56 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/arch/arm64/mm/ioremap.c b/arch/arm64/mm/ioremap.c index b7c81dacabf0..0801fd92f0e3 100644 --- a/arch/arm64/mm/ioremap.c +++ b/arch/arm64/mm/ioremap.c @@ -9,13 +9,69 @@ * Copyright (C) 2012 ARM Ltd. */ +#define pr_fmt(fmt) "ioremap: " fmt + #include #include #include #include +#include #include #include +#include + +static DEFINE_STATIC_KEY_FALSE(ioremap_guard_key); + +void ioremap_page_range_hook(unsigned long addr, unsigned long end, + phys_addr_t phys_addr, pgprot_t prot) +{ + size_t size = end - addr; + + if (!static_branch_unlikely(&ioremap_guard_key)) + return; + + if (pfn_valid(__phys_to_pfn(phys_addr))) + return; + + while (size) { + struct arm_smccc_res res; + + arm_smccc_1_1_hvc(ARM_SMCCC_VENDOR_HYP_KVM_MMIO_GUARD_MAP_FUNC_ID, + phys_addr, prot, &res); + if (res.a0 != SMCCC_RET_SUCCESS) { + pr_warn_ratelimited("Failed to register %llx\n", + phys_addr); + return; + } + + size -= PAGE_SIZE; + phys_addr += PAGE_SIZE; + } +} + +void iounmap_page_range_hook(phys_addr_t phys_addr, size_t size) +{ + if (!static_branch_unlikely(&ioremap_guard_key)) + return; + + VM_BUG_ON(phys_addr & ~PAGE_MASK || size & ~PAGE_MASK); + + while (size) { + struct arm_smccc_res res; + + arm_smccc_1_1_hvc(ARM_SMCCC_VENDOR_HYP_KVM_MMIO_GUARD_UNMAP_FUNC_ID, + phys_addr, &res); + if (res.a0 != SMCCC_RET_SUCCESS) { + pr_warn_ratelimited("Failed to unregister %llx\n", + phys_addr); + return; + } + + size -= PAGE_SIZE; + phys_addr += PAGE_SIZE; + } +} static void __iomem *__ioremap_caller(phys_addr_t phys_addr, size_t size, pgprot_t prot, void *caller) -- 2.30.2