Received: by 2002:a05:6a10:d5a5:0:0:0:0 with SMTP id gn37csp1501943pxb; Thu, 7 Oct 2021 09:00:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz/heqyWGVuZCPy2UryfO9PTrp5qW17yV+iZtkMJlI7GSU2dYM/VfZ6qumqT6TQWyRblKq1 X-Received: by 2002:a17:906:8893:: with SMTP id ak19mr4952072ejc.124.1633622422905; Thu, 07 Oct 2021 09:00:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633622422; cv=none; d=google.com; s=arc-20160816; b=GSBHL3Tmtv72jhV/G198TMfbh6PywWmU5JCbKdtjCzbm3/AMfz1e7XnCZ3sc8gLRzn EmBQ2z2EWItEuJukTADX/2t0pjgW15DzRB5EmqiK0ry4ZiMkIMkmdFb6AOAjvAjmtPZE G56ocYmf16FZji1OLTJptx9CFJNL2vlrLmGarMRDzM18BMFDyxbxtfy3nvLJCJwIftTZ GXV6R1/jjeogLz/G8c8mhtQRWI8+A9fBqlBRCsI/cc5s6g14sjHpF3UPPWB3yiOy9I6O fXag6QNxpJXWcdFNoiGzVlhrZZ7N2gIG5JCHDPYDS4ZgaT+0zXxdJ95rNhcC2NXPNSs4 PMDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=uAG2gSfGivkFqPdUcOcMoHWNK+3LPbOEp8js+1JX9D0=; b=Qw17LcyDBwT/e20+bGbRdtrphRhSMrjP+z0q35h4oXRaAZmj7yxw6Gj2gtC6qLDmC4 pkkvI0CR+WDJ1KrzrEomoJTdIftbiLa7x/aOXF247zHsqfbFDSkT/uBobImKvg2+xKJi A0wDujRWElJbg+x/KmcHqviJKpl+KhHH3Hh7CPTe0JdXEXMDu/1ukWyMnTjHUBlKGr02 yJlWPu+NWkfIz8RNBf+cZii3J7y5LlKHXHzHuwPCTDnIJ062LckLjj67pBwSF/GuAU1N WOSqNM8PFMnoTLytoJb0LiEe/pWPL6oMbgZhz6CpFnzjZP1lZ32ItCY0tQZjtLiWXEe8 BzHg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=I0fupxoR; 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=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id di18si3576622edb.289.2021.10.07.08.59.56; Thu, 07 Oct 2021 09:00:22 -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; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=I0fupxoR; 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=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241641AbhJGPiF (ORCPT + 99 others); Thu, 7 Oct 2021 11:38:05 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:57980 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230060AbhJGPiE (ORCPT ); Thu, 7 Oct 2021 11:38:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633620970; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=uAG2gSfGivkFqPdUcOcMoHWNK+3LPbOEp8js+1JX9D0=; b=I0fupxoRBtmZpK+4mbolu8M7Y5WTs/pI9A+3Ok20YQScJQcq6Dz7Dhdw8rzGpnYrby4Arj sUSXKzm+e3cKs7FBfV+IwOh9C8i4j1x3xKnAPP0Jse0Yv6FzwrYf+hivK3/Itkh1h0UNrz U/8CmFK2O9Qh9R/CDdNismpdQRb0oUg= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-547-si8SsmTJO3uT-tHM3DdKag-1; Thu, 07 Oct 2021 11:36:06 -0400 X-MC-Unique: si8SsmTJO3uT-tHM3DdKag-1 Received: by mail-wr1-f72.google.com with SMTP id 41-20020adf812c000000b00160dfbfe1a2so1355138wrm.3 for ; Thu, 07 Oct 2021 08:36:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=uAG2gSfGivkFqPdUcOcMoHWNK+3LPbOEp8js+1JX9D0=; b=mreSQ79EGPlV2UZSKK95Lie9bC0/+JRgK6b0IhnJKOqRNVMOZ7Ymx9RMno1gYKzjGz mrTyVedS6TRzAtRyXZ4WIYbEZV5nlxkH0RHd7IJRt5/3KCVbe4ObKLywfDeTS1ZqiMAu shQ420J17Itn7FQZXxQnk2g8DYQQIh1u8y5kYY7dUrxYSM7TpbnZYnElwQnMKcr5IBX/ iU/OrA3CjcgGNM/eJEki0GHsft9GZDQ7xtazkeG5zSm3NM3XB+pox/VLkaMmUui1Bhqd uqbRa72h6DH/7dvy2kEHj9T4I9eOKwb/ISkv0YYsytvxoMiXMOLkyL5M6Kte6zLGzYmx EuXQ== X-Gm-Message-State: AOAM532XDS46Bj36pVp+a4bVOZz8FQJQCfHATKF8JLODO7Ybxyr+UlgO 9sWk9zzUexMPiZvWpZYT1Ak+LNDBVYSNzB9gIfAGi1WwcWvigd9fAlD7xFQ4RvBkOlcoFwRp0Uj ZHVor9scYu78rYep3N/y0StvZ X-Received: by 2002:a5d:6b03:: with SMTP id v3mr6309709wrw.226.1633620964987; Thu, 07 Oct 2021 08:36:04 -0700 (PDT) X-Received: by 2002:a5d:6b03:: with SMTP id v3mr6309692wrw.226.1633620964837; Thu, 07 Oct 2021 08:36:04 -0700 (PDT) Received: from gator (nat-pool-brq-u.redhat.com. [213.175.37.12]) by smtp.gmail.com with ESMTPSA id z1sm20480911wrt.41.2021.10.07.08.36.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Oct 2021 08:36:04 -0700 (PDT) Date: Thu, 7 Oct 2021 17:36:02 +0200 From: Andrew Jones To: Marc Zyngier Cc: 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, Steven Price , Fuad Tabba , Srivatsa Vaddagiri , Shanker R Donthineni , James Morse , Suzuki K Poulose , Alexandru Elisei , kernel-team@android.com Subject: Re: [PATCH v2 13/16] arm64: Implement ioremap/iounmap hooks calling into KVM's MMIO guard Message-ID: <20211007153602.ty72qbglrwbphokj@gator> References: <20211004174849.2831548-1-maz@kernel.org> <20211004174849.2831548-14-maz@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20211004174849.2831548-14-maz@kernel.org> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Oct 04, 2021 at 06:48:46PM +0100, Marc Zyngier wrote: > 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 | 112 ++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 112 insertions(+) > > diff --git a/arch/arm64/mm/ioremap.c b/arch/arm64/mm/ioremap.c > index b7c81dacabf0..5334cbdc9f64 100644 > --- a/arch/arm64/mm/ioremap.c > +++ b/arch/arm64/mm/ioremap.c > @@ -9,13 +9,125 @@ > * Copyright (C) 2012 ARM Ltd. > */ > > +#define pr_fmt(fmt) "ioremap: " fmt > + > #include > #include > #include > +#include > #include > +#include > > #include > #include > +#include > + > +struct ioremap_guard_ref { > + refcount_t count; > +}; > + > +static DEFINE_STATIC_KEY_FALSE(ioremap_guard_key); > +static DEFINE_XARRAY(ioremap_guard_array); > +static DEFINE_MUTEX(ioremap_guard_lock); > + > +void ioremap_phys_range_hook(phys_addr_t phys_addr, size_t size, pgprot_t prot) > +{ > + if (!static_branch_unlikely(&ioremap_guard_key)) > + return; > + > + if (pfn_valid(__phys_to_pfn(phys_addr))) > + return; > + > + mutex_lock(&ioremap_guard_lock); > + > + while (size) { > + u64 pfn = phys_addr >> PAGE_SHIFT; > + struct ioremap_guard_ref *ref; > + struct arm_smccc_res res; > + > + ref = xa_load(&ioremap_guard_array, pfn); > + if (ref) { > + refcount_inc(&ref->count); > + goto next; > + } > + > + /* > + * It is acceptable for the allocation to fail, specially > + * if trying to ioremap something very early on, like with > + * earlycon, which happens long before kmem_cache_init. > + * This page will be permanently accessible, similar to a > + * saturated refcount. > + */ > + ref = kzalloc(sizeof(*ref), GFP_KERNEL); > + if (ref) { > + refcount_set(&ref->count, 1); > + if (xa_err(xa_store(&ioremap_guard_array, pfn, ref, > + GFP_KERNEL))) { > + kfree(ref); > + ref = NULL; > + } > + } > + > + arm_smccc_1_1_hvc(ARM_SMCCC_VENDOR_HYP_KVM_MMIO_GUARD_MAP_FUNC_ID, > + phys_addr, prot, &res); OK, I see this follows the document and passes prot in x2, even though the hypercall implementation doesn't look at it [yet]. > + if (res.a0 != SMCCC_RET_SUCCESS) { > + pr_warn_ratelimited("Failed to register %llx\n", > + phys_addr); > + xa_erase(&ioremap_guard_array, pfn); > + kfree(ref); > + goto out; > + } > + > + next: > + size -= PAGE_SIZE; > + phys_addr += PAGE_SIZE; Looks like we're assuming the guard granule to be PAGE_SIZE here. Looking ahead at the next patch, I see it must be PAGE_SIZE, because if the info hypercall doesn't have a matching value, then mmio guarding doesn't happen at all. Maybe it should be documented that for this feature the host and guest must have matching page sizes. > + } > +out: > + mutex_unlock(&ioremap_guard_lock); > +} > + > +void iounmap_phys_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); > + > + mutex_lock(&ioremap_guard_lock); > + > + while (size) { > + u64 pfn = phys_addr >> PAGE_SHIFT; > + struct ioremap_guard_ref *ref; > + struct arm_smccc_res res; > + > + ref = xa_load(&ioremap_guard_array, pfn); > + if (!ref) { > + pr_warn_ratelimited("%llx not tracked, left mapped\n", > + phys_addr); > + goto next; > + } > + > + if (!refcount_dec_and_test(&ref->count)) > + goto next; > + > + xa_erase(&ioremap_guard_array, pfn); > + kfree(ref); > + > + 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); > + goto out; > + } > + > + next: > + size -= PAGE_SIZE; > + phys_addr += PAGE_SIZE; > + } > +out: > + mutex_unlock(&ioremap_guard_lock); > +} > > static void __iomem *__ioremap_caller(phys_addr_t phys_addr, size_t size, > pgprot_t prot, void *caller) > -- > 2.30.2 > Thanks, drew