From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 047DDC433F5 for ; Thu, 7 Oct 2021 13:55:09 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B9C23603E9 for ; Thu, 7 Oct 2021 13:55:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org B9C23603E9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ACcGwpH4fAwvR/H1AwR8kLzwh4QL7zm9RflQS/sLIqU=; b=WsFa2Q5oJred2g OkrS0R9By25DlVZZBzhByAgjuyJZIDhSJrSpNmH3sJhRW1N9pnHi9HsGCyADPsRN0wMFsQr80V8GQ w6KFRNCEWfxZ5KLsrwYlPk050urTD5F4+HLss/hHLywJ9thJrJJqu8CMaTKvxXacqtDZgeqzsT8Hc vFrxU953woi1/uFi0l62FwNgKgql/TO4AA2xhvlqUsBV3ytK1jyMuAPVvcs20yV8VKD0ZZf5Lh7sD 7F27bO+rMi3elyem1naX7HLRQ2TgIJHrkNbFaKXo7hQmRtuyDqtkfZdak+XW39e+WMH+Z70R5MIYq qYWRiKdZY5Dr/obgrLmw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mYTpk-00HX3R-W7; Thu, 07 Oct 2021 13:53:17 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mYTpg-00HX30-PB for linux-arm-kernel@lists.infradead.org; Thu, 07 Oct 2021 13:53:14 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633614791; 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=OCnUFCDFWcoWZv9I+WDnAKonvZ48CTfwyEqTI4QgXnI=; b=XRGFsxOUlL9+2m8iry7bnQ62d5LM6CsyYuF+gd6srphqY1EIQ3M5Yf/74OQz/Z9tLFc59M n5Oqi7+It6SO3rHCgxWyL6UQYt4iyJwuDk4ZBrCREvbLbo/R9WgznvnZodFD5AmfHvqCkc x9aiJX57YMdrKDTgwarq28MLCKdscgk= Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-584-yH-kEEGaPgyWJQ9izYVvgA-1; Thu, 07 Oct 2021 09:53:08 -0400 X-MC-Unique: yH-kEEGaPgyWJQ9izYVvgA-1 Received: by mail-qv1-f70.google.com with SMTP id ey7-20020a0562140b6700b00382cf3eb480so5703881qvb.22 for ; Thu, 07 Oct 2021 06:53:08 -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=OCnUFCDFWcoWZv9I+WDnAKonvZ48CTfwyEqTI4QgXnI=; b=lArUOMYOXsreo5mUm9hjdo/la6si6LqT1X75gU4PayUoPkTpZKuuoXjlUhAhYTeiUO PYExMnBJx1fc7dfP2KTENsB6t735bQw2pVB+gTh08mirCi7eZBGsPxDf8eHLxLFdPp+c /76JTxPOnke3bSxCsTDaW86TOk51NVWQ6kRFfNwPsTVi22XWuiJKd+w0rUvW+IkOnNH7 iXlR52P613JMZi/Am9pJm8bZWN9e9x8hnSziVQUb3FgD2a1dBeAJqEPkE1GU4Tl+H3GM oJHuxJjmc0g6rJxj48hEv4RWZDfWjrOZPXYgkRkPWj1uivlnkAwrEftmMaPaNR91o3rD L2TA== X-Gm-Message-State: AOAM531kYk46kKBoZaFMY/7bj6LIAmVwwYOt1AUQ0WjBhn0wdx51+5UB 2uNY/Vl1N3GPGqV5O9rU7hFqYyXLTXrKImJZLUfJzGD5FUf9Q+j9q9NmWRwvZ6FvK3tOYMOTS6d tXygWR2n82rGalthbt0rYkSgjXNVDdJvrus4= X-Received: by 2002:ac8:404f:: with SMTP id j15mr5067199qtl.361.1633614788529; Thu, 07 Oct 2021 06:53:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwQr9CRm+JNFfKdbw14ykOPjUDm4MfkE8BuAkCsB288O/A4ZkxEiEofqmPBzACzDam2GSnZUg== X-Received: by 2002:ac8:404f:: with SMTP id j15mr5067165qtl.361.1633614788323; Thu, 07 Oct 2021 06:53:08 -0700 (PDT) Received: from gator (nat-pool-brq-u.redhat.com. [213.175.37.12]) by smtp.gmail.com with ESMTPSA id x79sm13881345qkb.65.2021.10.07.06.53.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Oct 2021 06:53:07 -0700 (PDT) Date: Thu, 7 Oct 2021 15:53:03 +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 07/16] KVM: arm64: Wire MMIO guard hypercalls Message-ID: <20211007135303.rbyvltetm3h4sqyy@gator> References: <20211004174849.2831548-1-maz@kernel.org> <20211004174849.2831548-8-maz@kernel.org> MIME-Version: 1.0 In-Reply-To: <20211004174849.2831548-8-maz@kernel.org> Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=drjones@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211007_065312_919884_35E301F8 X-CRM114-Status: GOOD ( 20.05 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, Oct 04, 2021 at 06:48:40PM +0100, Marc Zyngier wrote: > Plumb in the hypercall interface to allow a guest to discover, > enroll, map and unmap MMIO regions. > > Signed-off-by: Marc Zyngier > --- > arch/arm64/kvm/hypercalls.c | 28 ++++++++++++++++++++++++++++ > include/linux/arm-smccc.h | 28 ++++++++++++++++++++++++++++ > 2 files changed, 56 insertions(+) > > diff --git a/arch/arm64/kvm/hypercalls.c b/arch/arm64/kvm/hypercalls.c > index 30da78f72b3b..c39aab55ecae 100644 > --- a/arch/arm64/kvm/hypercalls.c > +++ b/arch/arm64/kvm/hypercalls.c > @@ -5,6 +5,7 @@ > #include > > #include > +#include > > #include > #include > @@ -129,10 +130,37 @@ int kvm_hvc_call_handler(struct kvm_vcpu *vcpu) > case ARM_SMCCC_VENDOR_HYP_KVM_FEATURES_FUNC_ID: > val[0] = BIT(ARM_SMCCC_KVM_FUNC_FEATURES); > val[0] |= BIT(ARM_SMCCC_KVM_FUNC_PTP); > + /* Only advertise MMIO guard to 64bit guests */ > + if (!vcpu_mode_is_32bit(vcpu)) { > + val[0] |= BIT(ARM_SMCCC_KVM_FUNC_MMIO_GUARD_INFO); > + val[0] |= BIT(ARM_SMCCC_KVM_FUNC_MMIO_GUARD_ENROLL); > + val[0] |= BIT(ARM_SMCCC_KVM_FUNC_MMIO_GUARD_MAP); > + val[0] |= BIT(ARM_SMCCC_KVM_FUNC_MMIO_GUARD_UNMAP); > + } > break; > case ARM_SMCCC_VENDOR_HYP_KVM_PTP_FUNC_ID: > kvm_ptp_get_time(vcpu, val); > break; > + case ARM_SMCCC_VENDOR_HYP_KVM_MMIO_GUARD_INFO_FUNC_ID: > + if (!vcpu_mode_is_32bit(vcpu)) > + val[0] = PAGE_SIZE; > + break; > + case ARM_SMCCC_VENDOR_HYP_KVM_MMIO_GUARD_ENROLL_FUNC_ID: > + if (!vcpu_mode_is_32bit(vcpu)) { > + set_bit(KVM_ARCH_FLAG_MMIO_GUARD, &vcpu->kvm->arch.flags); > + val[0] = SMCCC_RET_SUCCESS; > + } > + break; > + case ARM_SMCCC_VENDOR_HYP_KVM_MMIO_GUARD_MAP_FUNC_ID: > + if (!vcpu_mode_is_32bit(vcpu) && > + kvm_install_ioguard_page(vcpu, vcpu_get_reg(vcpu, 1))) > + val[0] = SMCCC_RET_SUCCESS; > + break; > + case ARM_SMCCC_VENDOR_HYP_KVM_MMIO_GUARD_UNMAP_FUNC_ID: > + if (!vcpu_mode_is_32bit(vcpu) && > + kvm_remove_ioguard_page(vcpu, vcpu_get_reg(vcpu, 1))) > + val[0] = SMCCC_RET_SUCCESS; > + break; Since these are all ARM_SMCCC_SMC_64 calls, can we do some sort of refactoring first, similar to Oliver's "KVM: arm64: Clean up SMC64 PSCI filtering for AArch32 guests", which would avoid the need for all the !vcpu_mode_is_32bit's? > case ARM_SMCCC_TRNG_VERSION: > case ARM_SMCCC_TRNG_FEATURES: > case ARM_SMCCC_TRNG_GET_UUID: > diff --git a/include/linux/arm-smccc.h b/include/linux/arm-smccc.h > index 7d1cabe15262..4aab2078d8d3 100644 > --- a/include/linux/arm-smccc.h > +++ b/include/linux/arm-smccc.h > @@ -107,6 +107,10 @@ > /* KVM "vendor specific" services */ > #define ARM_SMCCC_KVM_FUNC_FEATURES 0 > #define ARM_SMCCC_KVM_FUNC_PTP 1 > +#define ARM_SMCCC_KVM_FUNC_MMIO_GUARD_INFO 2 > +#define ARM_SMCCC_KVM_FUNC_MMIO_GUARD_ENROLL 3 > +#define ARM_SMCCC_KVM_FUNC_MMIO_GUARD_MAP 4 > +#define ARM_SMCCC_KVM_FUNC_MMIO_GUARD_UNMAP 5 > #define ARM_SMCCC_KVM_FUNC_FEATURES_2 127 > #define ARM_SMCCC_KVM_NUM_FUNCS 128 > > @@ -133,6 +137,30 @@ > #define KVM_PTP_VIRT_COUNTER 0 > #define KVM_PTP_PHYS_COUNTER 1 > > +#define ARM_SMCCC_VENDOR_HYP_KVM_MMIO_GUARD_INFO_FUNC_ID \ > + ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL, \ > + ARM_SMCCC_SMC_64, \ > + ARM_SMCCC_OWNER_VENDOR_HYP, \ > + ARM_SMCCC_KVM_FUNC_MMIO_GUARD_INFO) > + > +#define ARM_SMCCC_VENDOR_HYP_KVM_MMIO_GUARD_ENROLL_FUNC_ID \ > + ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL, \ > + ARM_SMCCC_SMC_64, \ > + ARM_SMCCC_OWNER_VENDOR_HYP, \ > + ARM_SMCCC_KVM_FUNC_MMIO_GUARD_ENROLL) > + > +#define ARM_SMCCC_VENDOR_HYP_KVM_MMIO_GUARD_MAP_FUNC_ID \ > + ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL, \ > + ARM_SMCCC_SMC_64, \ > + ARM_SMCCC_OWNER_VENDOR_HYP, \ > + ARM_SMCCC_KVM_FUNC_MMIO_GUARD_MAP) > + > +#define ARM_SMCCC_VENDOR_HYP_KVM_MMIO_GUARD_UNMAP_FUNC_ID \ > + ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL, \ > + ARM_SMCCC_SMC_64, \ > + ARM_SMCCC_OWNER_VENDOR_HYP, \ > + ARM_SMCCC_KVM_FUNC_MMIO_GUARD_UNMAP) > + > /* Paravirtualised time calls (defined by ARM DEN0057A) */ > #define ARM_SMCCC_HV_PV_TIME_FEATURES \ > ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL, \ > -- > 2.30.2 > Besides the refactoring suggestion, Reviewed-by: Andrew Jones Thanks, drew _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel