Received: by 2002:ac0:a5a6:0:0:0:0:0 with SMTP id m35-v6csp237263imm; Wed, 22 Aug 2018 03:20:24 -0700 (PDT) X-Google-Smtp-Source: AA+uWPyKdLBwKjbP82SZHNCCoKEl9MzwBU31PqYdFhAFeX1+kI6Uwod3MXiN0HBjpLLQQodU8cvI X-Received: by 2002:a62:8d16:: with SMTP id z22-v6mr57824761pfd.181.1534933224620; Wed, 22 Aug 2018 03:20:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534933224; cv=none; d=google.com; s=arc-20160816; b=nu+q+duihCzSJci3kgHOV+Uw6QwA04p6ZByo6Ks6EdleUHueM9neAPpGQFu3St64QA bJDmR0+AKq502/8SfBkW/XpUW+juNaprq50BkBTo1HsQRrkiPImlXlH9rZAhIVGlDTw/ Zs6urZ8JlEyuDeV2GOCUtuTgjIUBieYLoCa/smrHxNVCE/2Zv1GCTczQFSYFFIcZWiCM ZAvdHJWB4QUn3pz1odRS5b9FBDcusAEFvAZrGHVc59QhsAOCWstyqgIz2WxnlrAomzvl FcYRB/XfW7QSOtGApyIf9Ga4YaGuuC56PCNk1WrMNAaOAruvkuPCbTvVWxvtk7RVzpD8 jD+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=RoNY9VzFphguogn5xOGZDxohhzl7EwDhXTNsQl2VXUY=; b=XvZ9bFHNBG7B2A8PxeV3hL2aODr18qlP1OrlqsHOl7mWYdDbVsASehexKUxgkRy0pC yt2u73qmBRpYC47UF1wwVl8DVGr+hYMwgDjsx5NkK6H3aHBwiLjB0Iish0OLXZH7BRl6 aLHFNnkofT89iFc7PLwz/XcjQHrgsmFjXLuxdMBHlazFp9Bnz/GbMpVcGgd46IMGVSwq G9M+TUGtvXN+c1M94BdE1Tsd676RB0JCeOFXrYPJ78zjwbFqNCtbJoF9NqkWuybaZ9QZ 6IbHO91pLvRN0IiXfFhlCspTH1360ZFk6s1OYyn0MAnqjUZnEmfCC58InjhIgJy/l+4e yxKg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x1-v6si1325491plb.253.2018.08.22.03.20.09; Wed, 22 Aug 2018 03:20:24 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728729AbeHVNm7 (ORCPT + 99 others); Wed, 22 Aug 2018 09:42:59 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:49732 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727396AbeHVNm6 (ORCPT ); Wed, 22 Aug 2018 09:42:58 -0400 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 mx1.redhat.com (Postfix) with ESMTPS id 0D25A87A6D; Wed, 22 Aug 2018 10:18:41 +0000 (UTC) Received: from vitty.brq.redhat.com (unknown [10.43.2.155]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4FE9863F37; Wed, 22 Aug 2018 10:18:39 +0000 (UTC) From: Vitaly Kuznetsov To: kvm@vger.kernel.org Cc: Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= , Roman Kagan , "K. Y. Srinivasan" , Haiyang Zhang , Stephen Hemminger , "Michael Kelley (EOSG)" , Wanpeng Li , linux-kernel@vger.kernel.org Subject: [PATCH v4 RESEND 3/5] KVM: x86: hyperv: use get_vcpu_by_vpidx() in kvm_hv_flush_tlb() Date: Wed, 22 Aug 2018 12:18:30 +0200 Message-Id: <20180822101832.31763-4-vkuznets@redhat.com> In-Reply-To: <20180822101832.31763-1-vkuznets@redhat.com> References: <20180822101832.31763-1-vkuznets@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Wed, 22 Aug 2018 10:18:41 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Wed, 22 Aug 2018 10:18:41 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'vkuznets@redhat.com' RCPT:'' Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org VP_INDEX almost always matches VCPU id and get_vcpu_by_vpidx() is fast, use it instead of traversing full vCPU list every time. To support the change split off get_vcpu_idx_by_vpidx() from get_vcpu_by_vpidx(). Signed-off-by: Vitaly Kuznetsov Reviewed-by: Roman Kagan --- arch/x86/kvm/hyperv.c | 78 ++++++++++++++++++++------------------------------- 1 file changed, 31 insertions(+), 47 deletions(-) diff --git a/arch/x86/kvm/hyperv.c b/arch/x86/kvm/hyperv.c index b45ce136be2f..d1a911132b59 100644 --- a/arch/x86/kvm/hyperv.c +++ b/arch/x86/kvm/hyperv.c @@ -127,20 +127,31 @@ static int synic_set_sint(struct kvm_vcpu_hv_synic *synic, int sint, return 0; } -static struct kvm_vcpu *get_vcpu_by_vpidx(struct kvm *kvm, u32 vpidx) +static u32 get_vcpu_idx_by_vpidx(struct kvm *kvm, u32 vpidx) { struct kvm_vcpu *vcpu = NULL; int i; if (vpidx >= KVM_MAX_VCPUS) - return NULL; + return U32_MAX; vcpu = kvm_get_vcpu(kvm, vpidx); if (vcpu && vcpu_to_hv_vcpu(vcpu)->vp_index == vpidx) - return vcpu; + return vpidx; kvm_for_each_vcpu(i, vcpu, kvm) if (vcpu_to_hv_vcpu(vcpu)->vp_index == vpidx) - return vcpu; + return i; + return U32_MAX; +} + +static __always_inline struct kvm_vcpu *get_vcpu_by_vpidx(struct kvm *kvm, + u32 vpidx) +{ + u32 vcpu_idx = get_vcpu_idx_by_vpidx(kvm, vpidx); + + if (vcpu_idx < KVM_MAX_VCPUS) + return kvm_get_vcpu(kvm, vcpu_idx); + return NULL; } @@ -1257,20 +1268,6 @@ int kvm_hv_get_msr_common(struct kvm_vcpu *vcpu, u32 msr, u64 *pdata, bool host) return kvm_hv_get_msr(vcpu, msr, pdata, host); } -static __always_inline int get_sparse_bank_no(u64 valid_bank_mask, int bank_no) -{ - int i = 0, j; - - if (!(valid_bank_mask & BIT_ULL(bank_no))) - return -1; - - for (j = 0; j < bank_no; j++) - if (valid_bank_mask & BIT_ULL(j)) - i++; - - return i; -} - static u64 kvm_hv_flush_tlb(struct kvm_vcpu *current_vcpu, u64 ingpa, u16 rep_cnt, bool ex) { @@ -1278,11 +1275,10 @@ static u64 kvm_hv_flush_tlb(struct kvm_vcpu *current_vcpu, u64 ingpa, struct kvm_vcpu_hv *hv_current = ¤t_vcpu->arch.hyperv; struct hv_tlb_flush_ex flush_ex; struct hv_tlb_flush flush; - struct kvm_vcpu *vcpu; unsigned long vcpu_bitmap[BITS_TO_LONGS(KVM_MAX_VCPUS)] = {0}; - unsigned long valid_bank_mask = 0; + unsigned long valid_bank_mask; u64 sparse_banks[64]; - int sparse_banks_len, i; + int sparse_banks_len, bank, i; bool all_cpus; if (!ex) { @@ -1292,6 +1288,7 @@ static u64 kvm_hv_flush_tlb(struct kvm_vcpu *current_vcpu, u64 ingpa, trace_kvm_hv_flush_tlb(flush.processor_mask, flush.address_space, flush.flags); + valid_bank_mask = BIT_ULL(0); sparse_banks[0] = flush.processor_mask; all_cpus = flush.flags & HV_FLUSH_ALL_PROCESSORS; } else { @@ -1332,38 +1329,25 @@ static u64 kvm_hv_flush_tlb(struct kvm_vcpu *current_vcpu, u64 ingpa, goto ret_success; } - kvm_for_each_vcpu(i, vcpu, kvm) { - struct kvm_vcpu_hv *hv = &vcpu->arch.hyperv; - int bank = hv->vp_index / 64, sbank = 0; + for_each_set_bit(bank, (unsigned long *)&valid_bank_mask, + BITS_PER_LONG) { - /* Banks >64 can't be represented */ - if (bank >= 64) - continue; + for_each_set_bit(i, (unsigned long *)&sparse_banks[bank], + BITS_PER_LONG) { + u32 vp_index = bank * 64 + i; + u32 vcpu_idx = get_vcpu_idx_by_vpidx(kvm, vp_index); - /* Non-ex hypercalls can only address first 64 vCPUs */ - if (!ex && bank) - continue; + /* A non-existent vCPU was specified */ + if (vcpu_idx >= KVM_MAX_VCPUS) + return HV_STATUS_INVALID_HYPERCALL_INPUT; - if (ex) { /* - * Check is the bank of this vCPU is in sparse - * set and get the sparse bank number. + * vcpu->arch.cr3 may not be up-to-date for running + * vCPUs so we can't analyze it here, flush TLB + * regardless of the specified address space. */ - sbank = get_sparse_bank_no(valid_bank_mask, bank); - - if (sbank < 0) - continue; + __set_bit(vcpu_idx, vcpu_bitmap); } - - if (!(sparse_banks[sbank] & BIT_ULL(hv->vp_index % 64))) - continue; - - /* - * vcpu->arch.cr3 may not be up-to-date for running vCPUs so we - * can't analyze it here, flush TLB regardless of the specified - * address space. - */ - __set_bit(i, vcpu_bitmap); } kvm_make_vcpus_request_mask(kvm, -- 2.14.4