Received: by 2002:a05:6359:c8b:b0:c7:702f:21d4 with SMTP id go11csp5589725rwb; Wed, 21 Sep 2022 09:42:04 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6/APPEHqZwQJM9EmzvaZTh9yZThgl1mEOIG6U2/57Bnm4BOtn5LtrZ3ZZlkYwUt+zRtsbk X-Received: by 2002:aa7:da51:0:b0:451:e316:31d with SMTP id w17-20020aa7da51000000b00451e316031dmr25467208eds.389.1663778524100; Wed, 21 Sep 2022 09:42:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663778524; cv=none; d=google.com; s=arc-20160816; b=e85YWMuluviTSobklPKsTx8TkYzQKxeqkCj94pITuQeQG8aEDO8nXB7TSqfqbd2rw6 SQ9bjo/0xGsFPU9+9g3GvwqerMhg1k8+hItyNMoUKn9JlRsBF3fMRNk0WCYy6EkGzmXg XrGXo5ai5IsRJTADq9nQf8lLfXHBHYqV9HWrtDYqvTiLZHBQ6n3tW/DVFvTqQQmwevs6 Nje6GxtMtxouP+p+4SdR8FOxlMZPpFKYHo4VVRgMUkeORIKmpxI3lAQvKMMb9pwHyoUu u77c1mK0360wPL7cE3Ps37up3BGYW7/4Hs9qWDJEzxCkBwZ/SU57CVcvaxjbjsY9tbOA ONXg== 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 :dkim-signature; bh=MFagy8v5syw6ehyVRqzdED+YcHjeWvTfUWu6P/xejD0=; b=Xail9T0/xL7xQhJDomVGsjZJ6ykdA7bYeKCkZtBOz+JIKo1rt+DrACC12RemQAURUV tNTQAMDUyQ9U3LbAy1kFI5NNNqkgu0INFAHPuVIMoM8QyVbrXhS/MZolSI9GWRt46iP8 9RButDvUO0nbwo5P1sP17Rbu9XRIC0zrTFQPhOqh89v/T+ez7/EmzQZwW3l2ph361UUz sHOUnKGqoWPLEBsd2qMFLBzMyJnPZLjrRU+I2HAtEVkTASiKuWnPs4oUlaMy1eiXYN1w YhzY3lqZvMraI2TmEJ+ap8aKVA8xDzMWMfwavHK4/NopUWOW6qV18324OHoG3JEoDbHh hpRw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=bbIUGdct; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id jj3-20020a170907984300b007788260dfdbsi2139062ejc.862.2022.09.21.09.41.37; Wed, 21 Sep 2022 09:42:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=bbIUGdct; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 S231276AbiIUP0a (ORCPT + 99 others); Wed, 21 Sep 2022 11:26:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60518 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229930AbiIUPZq (ORCPT ); Wed, 21 Sep 2022 11:25:46 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CC7C252475 for ; Wed, 21 Sep 2022 08:25:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1663773919; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MFagy8v5syw6ehyVRqzdED+YcHjeWvTfUWu6P/xejD0=; b=bbIUGdctpRayf0Vm/DHiMWP4HzYFBwsDcehN/FB86Ys+Q8WIOJFpvPi/bqA4LWNobZ6Ma/ J4H/2rzDPrLhuF8adQ9JJjIixFwEfO3/D12jdp25qUDhj3ZFe7VxR4zSICxsVoxXQycjI6 BLM/LVDHrY3n/FB9P4z+yqRhoDUD1w4= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-380-q9MFv65nNuKsM5ikhEGogQ-1; Wed, 21 Sep 2022 11:25:14 -0400 X-MC-Unique: q9MFv65nNuKsM5ikhEGogQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 995141019C89; Wed, 21 Sep 2022 15:25:13 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.40.194.159]) by smtp.corp.redhat.com (Postfix) with ESMTP id B1F102166B26; Wed, 21 Sep 2022 15:25:11 +0000 (UTC) From: Vitaly Kuznetsov To: kvm@vger.kernel.org, Paolo Bonzini Cc: Sean Christopherson , Wanpeng Li , Jim Mattson , Michael Kelley , Siddharth Chandrasekaran , Yuan Yao , Maxim Levitsky , linux-hyperv@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v10 12/39] KVM: x86: hyper-v: Use preallocated buffer in 'struct kvm_vcpu_hv' instead of on-stack 'sparse_banks' Date: Wed, 21 Sep 2022 17:24:09 +0200 Message-Id: <20220921152436.3673454-13-vkuznets@redhat.com> In-Reply-To: <20220921152436.3673454-1-vkuznets@redhat.com> References: <20220921152436.3673454-1-vkuznets@redhat.com> MIME-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW, SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org To make kvm_hv_flush_tlb() ready to handle L2 TLB flush requests, KVM needs to allow for all 64 sparse vCPU banks regardless of KVM_MAX_VCPUs as L1 may use vCPU overcommit for L2. To avoid growing on-stack allocation, make 'sparse_banks' part of per-vCPU 'struct kvm_vcpu_hv' which is allocated dynamically. Note: sparse_set_to_vcpu_mask() can't currently be used to handle L2 requests as KVM does not keep L2 VM_ID -> L2 VCPU_ID -> L1 vCPU mappings, i.e. its vp_bitmap array is still bounded by the number of L1 vCPUs and so can remain an on-stack allocation. Reviewed-by: Maxim Levitsky Signed-off-by: Vitaly Kuznetsov --- arch/x86/include/asm/kvm_host.h | 3 +++ arch/x86/kvm/hyperv.c | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index add0718798c1..025c0d6cda69 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -646,6 +646,9 @@ struct kvm_vcpu_hv { } cpuid_cache; struct kvm_vcpu_hv_tlb_flush_fifo tlb_flush_fifo[HV_NR_TLB_FLUSH_FIFOS]; + + /* Preallocated buffer for handling hypercalls passing sparse vCPU set */ + u64 sparse_banks[HV_MAX_SPARSE_VCPU_BANKS]; }; /* Xen HVM per vcpu emulation context */ diff --git a/arch/x86/kvm/hyperv.c b/arch/x86/kvm/hyperv.c index 23eb139b2936..0f3d04223d60 100644 --- a/arch/x86/kvm/hyperv.c +++ b/arch/x86/kvm/hyperv.c @@ -1904,6 +1904,8 @@ void kvm_hv_vcpu_flush_tlb(struct kvm_vcpu *vcpu) static u64 kvm_hv_flush_tlb(struct kvm_vcpu *vcpu, struct kvm_hv_hcall *hc) { + struct kvm_vcpu_hv *hv_vcpu = to_hv_vcpu(vcpu); + u64 *sparse_banks = hv_vcpu->sparse_banks; struct kvm *kvm = vcpu->kvm; struct hv_tlb_flush_ex flush_ex; struct hv_tlb_flush flush; @@ -1917,7 +1919,6 @@ static u64 kvm_hv_flush_tlb(struct kvm_vcpu *vcpu, struct kvm_hv_hcall *hc) u64 __tlb_flush_entries[KVM_HV_TLB_FLUSH_FIFO_SIZE - 1]; u64 *tlb_flush_entries; u64 valid_bank_mask; - u64 sparse_banks[KVM_HV_MAX_SPARSE_VCPU_SET_BITS]; struct kvm_vcpu *v; unsigned long i; bool all_cpus; @@ -2069,11 +2070,12 @@ static void kvm_hv_send_ipi_to_many(struct kvm *kvm, u32 vector, static u64 kvm_hv_send_ipi(struct kvm_vcpu *vcpu, struct kvm_hv_hcall *hc) { + struct kvm_vcpu_hv *hv_vcpu = to_hv_vcpu(vcpu); + u64 *sparse_banks = hv_vcpu->sparse_banks; struct kvm *kvm = vcpu->kvm; struct hv_send_ipi_ex send_ipi_ex; struct hv_send_ipi send_ipi; u64 valid_bank_mask; - u64 sparse_banks[KVM_HV_MAX_SPARSE_VCPU_SET_BITS]; u32 vector; bool all_cpus; -- 2.37.3