Received: by 2002:a05:6359:c8b:b0:c7:702f:21d4 with SMTP id go11csp413001rwb; Tue, 4 Oct 2022 05:57:25 -0700 (PDT) X-Google-Smtp-Source: AMsMyM60mIU893JweQi8eGQcBqe7nSVRsLh8kZ8wh5dlziYHi8OepvQfNm6IZQcOzZTqTvGDH8G1 X-Received: by 2002:a17:90b:2705:b0:20a:b25d:5d93 with SMTP id px5-20020a17090b270500b0020ab25d5d93mr8294568pjb.218.1664888245594; Tue, 04 Oct 2022 05:57:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664888245; cv=none; d=google.com; s=arc-20160816; b=jQ5g5VimvMnHzvnOjLFEbXplhn43XTabPCmh/MgnIUkazB4qPXIaX+gfmn1XEeK9Xq ODmEU2djEQf/YNC39RvctD/wkz43gee8B5AF9GNPDNA/ksBs335BbENuVYKQTdlBQM63 yegsHWlIt4cnSG8v6WzOrr0ebOFpOs4nfmi+8pnA9OiUD6vn9QAo4PDQgCuMN9XL2IzJ D3qiRCj1GNJiFSKcGH3yXXTiJpMK5+b9yPESUcQ7D92/Ty0ytgu/mGYBGap/1rQV7Mjc gwVigoNzMvHEeOYReqBlZGaLyuUoNej00+ZhuRh498v30yRUi5dZOmvptE77Uxu5OUdf d+/g== 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=9fi1DCEUj2CrG5Dr3Rl/nEqMY7CPsbZ71PEevcURzbw=; b=skuVgkju5lzM4IHBoFg4yZjdBiLy+00kWMJFPWMH1TqcJSL7TgOgAwa4d90DeqApbv 9ajHRfg//DLaDQKeAzRb9rjzw4AGjE8F9J/3ftrd/FZj2NWGYDG4v2cYhqkfs9WWVNPr y5/TiF1qLa8W2mzcOgHyIAv5k8DsnkgjrVAbZcT5a/NUCWzqilU3IXZDb1NJtTbHhPKt 46KlmapRELsti9jtSVwDGOgW6G5IEtjrsCEmtDmw9ggImKE1Sxk8aTNmghhnHVN6eR2s nZptIiSvERJe7Jskwche8KXnJ65bvqQP9huKq2NDohXOLfd7e/CS1scC2MyCWX/7qqDF gB5g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=a8SqqqXL; 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 c14-20020a170902d48e00b00178b7f3b89esi15603852plg.352.2022.10.04.05.57.12; Tue, 04 Oct 2022 05:57:25 -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=a8SqqqXL; 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 S230054AbiJDMmx (ORCPT + 99 others); Tue, 4 Oct 2022 08:42:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56344 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230047AbiJDMmY (ORCPT ); Tue, 4 Oct 2022 08:42:24 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 47A215D10C for ; Tue, 4 Oct 2022 05:41:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1664887248; 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=9fi1DCEUj2CrG5Dr3Rl/nEqMY7CPsbZ71PEevcURzbw=; b=a8SqqqXLr7C8s6Opla9L1hZHanPBNSr8tLnsY2EAwvSerVQ+1L+qhLL8htKQYs+27Lhwi2 xi12WXkp2fI4tSzbd/NW95kMzYSKl4keTpei3piGgMvDu65jEiaSEykV1+RSCgXYW2umxA EXvX2JAtnCODhoKkIAjea40ILh04ii4= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-587-mKtvXbYPNsWTx_jxloV_ow-1; Tue, 04 Oct 2022 08:40:45 -0400 X-MC-Unique: mKtvXbYPNsWTx_jxloV_ow-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 69EAE3810788; Tue, 4 Oct 2022 12:40:44 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.40.192.255]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5DCD07AE5; Tue, 4 Oct 2022 12:40:42 +0000 (UTC) From: Vitaly Kuznetsov To: kvm@vger.kernel.org, Paolo Bonzini , Sean Christopherson Cc: Wanpeng Li , Jim Mattson , Michael Kelley , Siddharth Chandrasekaran , Yuan Yao , Maxim Levitsky , linux-hyperv@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v11 18/46] KVM: x86: hyper-v: Use preallocated buffer in 'struct kvm_vcpu_hv' instead of on-stack 'sparse_banks' Date: Tue, 4 Oct 2022 14:39:28 +0200 Message-Id: <20221004123956.188909-19-vkuznets@redhat.com> In-Reply-To: <20221004123956.188909-1-vkuznets@redhat.com> References: <20221004123956.188909-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.5 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=ham 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 1486dc58754e..12088bf06676 100644 --- a/arch/x86/kvm/hyperv.c +++ b/arch/x86/kvm/hyperv.c @@ -1907,6 +1907,8 @@ int 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; @@ -1920,7 +1922,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; @@ -2072,11 +2073,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