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 X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2AC41C34037 for ; Tue, 18 Feb 2020 12:27:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 036E0207FD for ; Tue, 18 Feb 2020 12:27:21 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="BOtFE2ti" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726613AbgBRM1U (ORCPT ); Tue, 18 Feb 2020 07:27:20 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:28669 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726422AbgBRM1T (ORCPT ); Tue, 18 Feb 2020 07:27:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582028838; 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=IJoYrV36o0Jp2itIALA0xT10zJEIaPxDyqdHnxgNlsI=; b=BOtFE2ti4zsOkDdm4Qko+k0VjlSgbdS3gZ5vfgbNnaP4GE87mmy40caQM3hg9F/Td0iUi3 qJo8uGcQLzEFfz2Bi2Ebi86oauA+gElIuFij9tKmPwqk8lZwIlWV9V7rMKxp6cairjHxBm YM+yoHdOaGj3T4pOheFK/+ANDpXk+Hc= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-103-7VyYlDBEM9az-bePlO0GEA-1; Tue, 18 Feb 2020 07:27:14 -0500 X-MC-Unique: 7VyYlDBEM9az-bePlO0GEA-1 Received: by mail-wr1-f70.google.com with SMTP id s13so10728523wrb.21 for ; Tue, 18 Feb 2020 04:27:14 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references:date :message-id:mime-version; bh=IJoYrV36o0Jp2itIALA0xT10zJEIaPxDyqdHnxgNlsI=; b=He5HszYvr2nMjeKOymuVrrSoKXLMFD6ss7+RwM5i6/J4TVCF9rVDOo38hUzv7kk5p6 kwRbIDaOD446DRm4MgA8KGUUtsqLfbPiOywGq/+ooEXm+hfESV0rujkiTePsI4ttt/+n kXCEtlSjk/O3Hs+t9j2q/Uy7ysY8idEFiOWqIay/RiRpRL8mUB07aC+zCsYaZvLADGFI NXXwYgpKyFA34yhOrEkBqj5Rfe0dh7S18timkRPty2T/HF+6W6Pa8B0OiPjoC8HObp09 68BJLoewLFXn1mRT7Qn+kQHrhmxC0jQxRi9MjUcjKS78fcJvXHYa9o1IATeaMw6zX3AE sLcg== X-Gm-Message-State: APjAAAXMcI9X2pQ28fJLnz8jvmLIlERPhHkGZG61Gt2Dol5lSIw9MDTt iYRr22uS8wibwPITSJHW3nRQnE7xR0IGSczD9rjNujqAfwalaCOl7srGMcVcSSrW+kYnf7SAXji iA63G3SnwJkomwZ+cRd35Gl1K X-Received: by 2002:a05:600c:3d1:: with SMTP id z17mr3076983wmd.90.1582028833190; Tue, 18 Feb 2020 04:27:13 -0800 (PST) X-Google-Smtp-Source: APXvYqxvdlcchraOkrSBJTxKY095h9HvMXtDI0WHiTHKtLH8hgQpaECMShQ1zGl1NVLObBHJBUIQjA== X-Received: by 2002:a05:600c:3d1:: with SMTP id z17mr3076948wmd.90.1582028832898; Tue, 18 Feb 2020 04:27:12 -0800 (PST) Received: from vitty.brq.redhat.com (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id b67sm3315284wmc.38.2020.02.18.04.27.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Feb 2020 04:27:12 -0800 (PST) From: Vitaly Kuznetsov To: linmiaohe Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, x86@kernel.org, pbonzini@redhat.com, sean.j.christopherson@intel.com, wanpengli@tencent.com, jmattson@google.com, joro@8bytes.org, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, hpa@zytor.com Subject: Re: [PATCH] KVM: apic: rename apic_lvt_vector and apic_lvt_enabled In-Reply-To: <1581995825-11239-1-git-send-email-linmiaohe@huawei.com> References: <1581995825-11239-1-git-send-email-linmiaohe@huawei.com> Date: Tue, 18 Feb 2020 13:27:11 +0100 Message-ID: <87tv3o84io.fsf@vitty.brq.redhat.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org linmiaohe writes: > From: Miaohe Lin > > As the func apic_lvt_enabled() is only used once with APIC_LVTT as the > second argument, we can eliminate the argument and hardcode lvt_type as > APIC_LVTT. And also rename apic_lvt_enabled() to apic_lvtt_enabled() to > indicates it's used for APIC_LVTT only. Similar as apic_lvt_vector(). > > Suggested-by: Krish Sadhukhan > Suggested-by: Vitaly Kuznetsov > Signed-off-by: Miaohe Lin > --- > arch/x86/kvm/lapic.c | 13 ++++++------- > 1 file changed, 6 insertions(+), 7 deletions(-) > > diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c > index eafc631d305c..4f14ec7525f6 100644 > --- a/arch/x86/kvm/lapic.c > +++ b/arch/x86/kvm/lapic.c > @@ -289,14 +289,14 @@ static inline void kvm_apic_set_x2apic_id(struct kvm_lapic *apic, u32 id) > recalculate_apic_map(apic->vcpu->kvm); > } > > -static inline int apic_lvt_enabled(struct kvm_lapic *apic, int lvt_type) > +static inline int apic_lvtt_enabled(struct kvm_lapic *apic) > { > - return !(kvm_lapic_get_reg(apic, lvt_type) & APIC_LVT_MASKED); > + return !(kvm_lapic_get_reg(apic, APIC_LVTT) & APIC_LVT_MASKED); > } > > -static inline int apic_lvt_vector(struct kvm_lapic *apic, int lvt_type) > +static inline int apic_lvtt_vector(struct kvm_lapic *apic) > { > - return kvm_lapic_get_reg(apic, lvt_type) & APIC_VECTOR_MASK; > + return kvm_lapic_get_reg(apic, APIC_LVTT) & APIC_VECTOR_MASK; > } > > static inline int apic_lvtt_oneshot(struct kvm_lapic *apic) > @@ -1475,10 +1475,9 @@ static void apic_update_lvtt(struct kvm_lapic *apic) > static bool lapic_timer_int_injected(struct kvm_vcpu *vcpu) > { > struct kvm_lapic *apic = vcpu->arch.apic; > - u32 reg = kvm_lapic_get_reg(apic, APIC_LVTT); > > if (kvm_apic_hw_enabled(apic)) { > - int vec = reg & APIC_VECTOR_MASK; > + int vec = apic_lvtt_vector(apic); > void *bitmap = apic->regs + APIC_ISR; > > if (vcpu->arch.apicv_active) > @@ -2278,7 +2277,7 @@ int apic_has_pending_timer(struct kvm_vcpu *vcpu) > { > struct kvm_lapic *apic = vcpu->arch.apic; > > - if (apic_enabled(apic) && apic_lvt_enabled(apic, APIC_LVTT)) > + if (apic_enabled(apic) && apic_lvtt_enabled(apic)) > return atomic_read(&apic->lapic_timer.pending); > > return 0; Reviewed-by: Vitaly Kuznetsov Thanks! -- Vitaly