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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CE045C43334 for ; Tue, 14 Jun 2022 23:06:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1357845AbiFNXGD (ORCPT ); Tue, 14 Jun 2022 19:06:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59852 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357981AbiFNXF5 (ORCPT ); Tue, 14 Jun 2022 19:05:57 -0400 Received: from mail-pj1-x1049.google.com (mail-pj1-x1049.google.com [IPv6:2607:f8b0:4864:20::1049]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 72AD8532F8 for ; Tue, 14 Jun 2022 16:05:56 -0700 (PDT) Received: by mail-pj1-x1049.google.com with SMTP id t11-20020a17090a2f8b00b001ea6a226d21so150637pjd.8 for ; Tue, 14 Jun 2022 16:05:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=reply-to:date:in-reply-to:message-id:mime-version:references :subject:from:to:cc; bh=x+rg0+A6Uvzv4O8bM/KpC5UOBIeWkz1gC/gNgA/d0ks=; b=XFTfkEarEGnyykkOT0u0agNc/6QpqWNtnqb9/RKSiEtwGP8BKrXAsWy+hU/1yehVXR oRtT3j15BCcJBCZ3E9ZvxtyMZ9nx1piGZ72rlxNY3o1llI8eC07PMpkX7IWLYduAxS6i 9vqGCNOQaM0MXcyIBc+2s1VoJBK/syksHErOrNe1hMnNWilr1qaEMX1bxiQwuOTn129H wPXbeKnSJlv+QkPh/vBICpkgIARmLgr7itKtSSTm+7HZvDM6UUxbzYaqQPGt78Z33Olk +BAhgpVdLzQG6DBzmMNxPrX/wKOivd0SWleDRfi0MOitmJjxn8my1BMMZlhgRggGufSs 89Xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:reply-to:date:in-reply-to:message-id :mime-version:references:subject:from:to:cc; bh=x+rg0+A6Uvzv4O8bM/KpC5UOBIeWkz1gC/gNgA/d0ks=; b=1hKjrHqKherxUACOUUNmZQzyDEa+XckZFG4WbyN69kwqFRtxzfrsgzqfQw5JFxKaAQ fyrFuEQEuH1nZ4UxIYsm/V8/zVAjLMZ0TGGguUItlkwk9GeZoFSufJ+JSx0nwpW6PvgZ t/07TmzfKuIJUIdG8ceZ7en0ym5CPPR+EOj67vZ/uTIgx+Y2eptdkcHhbQpLNWGxyrGw v5BNJ6Mb6zywIAEjK73xytZzGCVGcTSF2iJW/Mll8LPNxhCALn+BitWgWDwUcLQbgabK Zf0uaNIgw4mL0wKrAmtl9lpAXgjZNyqa4cJvHH5O1sd56fwVRdbI//qG78yP1iImgElM TQiA== X-Gm-Message-State: AOAM5336G0Ffxs5FGb0Fd4mXq4Ra76DxAnm7v3Kiv3z8kL22zeqSgp4J L3YU2pwdp7oZsJvSY+8x8CbjDEAlYFk= X-Google-Smtp-Source: ABdhPJy5VbrZHfaAAh6R1wY2dPzoNT6FYr+2b31ONeNPOhZXZdZVHBF4dat+mSDiL0l51ntrw462jxpVsTo= X-Received: from seanjc.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:3e5]) (user=seanjc job=sendgmr) by 2002:a62:be14:0:b0:505:a43b:cf6e with SMTP id l20-20020a62be14000000b00505a43bcf6emr7006035pff.33.1655247955887; Tue, 14 Jun 2022 16:05:55 -0700 (PDT) Reply-To: Sean Christopherson Date: Tue, 14 Jun 2022 23:05:46 +0000 In-Reply-To: <20220614230548.3852141-1-seanjc@google.com> Message-Id: <20220614230548.3852141-4-seanjc@google.com> Mime-Version: 1.0 References: <20220614230548.3852141-1-seanjc@google.com> X-Mailer: git-send-email 2.36.1.476.g0c4daa206d-goog Subject: [PATCH 3/5] KVM: x86: Check for in-kernel xAPIC when querying APICv for directed yield From: Sean Christopherson To: Paolo Bonzini Cc: Sean Christopherson , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel , kvm@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use kvm_vcpu_apicv_active() to check if APICv is active when seeing if a vCPU is a candidate for directed yield due to a pending ACPIv interrupt. This will allow moving apicv_active into kvm_lapic without introducing a potential NULL pointer deref (kvm_vcpu_apicv_active() effectively adds a pre-check on the vCPU having an in-kernel APIC). No functional change intended. Signed-off-by: Sean Christopherson --- arch/x86/kvm/x86.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 2318a99139fa..cd554a62eb0f 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -12375,7 +12375,8 @@ int kvm_arch_vcpu_runnable(struct kvm_vcpu *vcpu) bool kvm_arch_dy_has_pending_interrupt(struct kvm_vcpu *vcpu) { - if (vcpu->arch.apicv_active && static_call(kvm_x86_dy_apicv_has_pending_interrupt)(vcpu)) + if (kvm_vcpu_apicv_active(vcpu) && + static_call(kvm_x86_dy_apicv_has_pending_interrupt)(vcpu)) return true; return false; -- 2.36.1.476.g0c4daa206d-goog