From patchwork Wed Apr 1 00:19:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wanpeng Li X-Patchwork-Id: 11468495 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4411A159A for ; Wed, 1 Apr 2020 00:19:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 166B920772 for ; Wed, 1 Apr 2020 00:19:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="qV7Egt69" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731508AbgDAATd (ORCPT ); Tue, 31 Mar 2020 20:19:33 -0400 Received: from mail-pg1-f193.google.com ([209.85.215.193]:34194 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731470AbgDAATd (ORCPT ); Tue, 31 Mar 2020 20:19:33 -0400 Received: by mail-pg1-f193.google.com with SMTP id l14so4060986pgb.1; Tue, 31 Mar 2020 17:19:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=8Z8cYPNA1Nnx+ynlfYUK6Uh1qA4I2RWYXKrKRt2N0YE=; b=qV7Egt69AFSYm63oan9OEeaDZCWNVhxRplH9ijcJinhqTPrM/ZGkiqPbKmU8fTx2Yn sdAno83KlgvyAT7AxdzAGOzk1JBDZFky9/yTNV6jYBfe2iUy+eODWvlMPOVSNnjBr8PC LMsn5q0GBsIUWIEM3ZiQxfcS0Jy/9SNx2hizD27ai+aVMAX4HjQ2NEm7GFMmcoP39JC1 Wz8pU4/8gRyBREb7ZdQolpMu9mNcr5xZBu1Qq7S5FNNRnops2NqT5ZPGwJFqNDUq7At+ AbXqAqsdSyfWZmRrzP7bpo/12+Kw7jw+BHEhPeqQBFUeZqzqQiTYh7Eg4z4O06E92eZ5 xEfw== 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:date:message-id; bh=8Z8cYPNA1Nnx+ynlfYUK6Uh1qA4I2RWYXKrKRt2N0YE=; b=iJ6eHLI3V7OEzQZFNvPelCJ41HLIKaSlP0BWjRgikvVEQ9GyiSRlcb1JFsAwGzMCHW GBS5DLpJzRw3P3HpiTm/IhXqR/ffdtx7ahkressPzUsTTCr2+ZC/xHa7oTlcTXJVyDVS 52+QKJCBK9CLj0yD2xF1w82UguvoOgSbIptm3taQLM2Y76Hnxb8UXb2FIKyv+yNzjbO/ wMQRkTWMK40klL42k0oy0TK/vdpJ06+cg7+TWz7DaX9cpwmlECEJyy8FzZtp1K/IZ93N vvuk5483GiA8dxEq2sh4lfANPnCCvIMWi1MwWLlKbsMQDif3MjrSoaQ9ekKIOljRvjSz xbxg== X-Gm-Message-State: ANhLgQ3wXLmIEVVv+Z1aONHd3WtjRn0ZNbgoD2mmS+RrM0cH+o6/U1Yt 6MVnP62AgQcuvuNkhmnXW+b/zX/r X-Google-Smtp-Source: ADFU+vuyLauhhsGiDnxRt45W7U5JB4YVBUGUkpBSElEOAwA/hE43H+Hki5xQrb+Z9SntSrnZUNFKRA== X-Received: by 2002:aa7:9844:: with SMTP id n4mr19644750pfq.98.1585700371738; Tue, 31 Mar 2020 17:19:31 -0700 (PDT) Received: from localhost.localdomain ([103.7.29.6]) by smtp.googlemail.com with ESMTPSA id ci18sm206978pjb.23.2020.03.31.17.19.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 31 Mar 2020 17:19:31 -0700 (PDT) From: Wanpeng Li X-Google-Original-From: Wanpeng Li To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: Paolo Bonzini , Sean Christopherson , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel Subject: [PATCH v2 1/2] KVM: X86: Filter out the broadcast dest for IPI fastpath Date: Wed, 1 Apr 2020 08:19:21 +0800 Message-Id: <1585700362-11892-1-git-send-email-wanpengli@tencent.com> X-Mailer: git-send-email 2.7.4 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Wanpeng Li Except destination shorthand, a destination value 0xffffffff is used to broadcast interrupts, let's also filter out this for single target IPI fastpath. Reviewed-by: Vitaly Kuznetsov Signed-off-by: Wanpeng Li --- v1 -> v2: * update subject and patch description arch/x86/kvm/lapic.c | 3 --- arch/x86/kvm/lapic.h | 3 +++ arch/x86/kvm/x86.c | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index e24d405..d528bed 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -59,9 +59,6 @@ #define MAX_APIC_VECTOR 256 #define APIC_VECTORS_PER_REG 32 -#define APIC_BROADCAST 0xFF -#define X2APIC_BROADCAST 0xFFFFFFFFul - static bool lapic_timer_advance_dynamic __read_mostly; #define LAPIC_TIMER_ADVANCE_ADJUST_MIN 100 /* clock cycles */ #define LAPIC_TIMER_ADVANCE_ADJUST_MAX 10000 /* clock cycles */ diff --git a/arch/x86/kvm/lapic.h b/arch/x86/kvm/lapic.h index bc76860..25b77a6 100644 --- a/arch/x86/kvm/lapic.h +++ b/arch/x86/kvm/lapic.h @@ -17,6 +17,9 @@ #define APIC_BUS_CYCLE_NS 1 #define APIC_BUS_FREQUENCY (1000000000ULL / APIC_BUS_CYCLE_NS) +#define APIC_BROADCAST 0xFF +#define X2APIC_BROADCAST 0xFFFFFFFFul + enum lapic_mode { LAPIC_MODE_DISABLED = 0, LAPIC_MODE_INVALID = X2APIC_ENABLE, diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 5e95950..5a645df 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -1559,7 +1559,8 @@ static int handle_fastpath_set_x2apic_icr_irqoff(struct kvm_vcpu *vcpu, u64 data if (((data & APIC_SHORT_MASK) == APIC_DEST_NOSHORT) && ((data & APIC_DEST_MASK) == APIC_DEST_PHYSICAL) && - ((data & APIC_MODE_MASK) == APIC_DM_FIXED)) { + ((data & APIC_MODE_MASK) == APIC_DM_FIXED) && + ((u32)(data >> 32) != X2APIC_BROADCAST)) { data &= ~(1 << 12); kvm_apic_send_ipi(vcpu->arch.apic, (u32)data, (u32)(data >> 32)); From patchwork Wed Apr 1 00:19:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wanpeng Li X-Patchwork-Id: 11468497 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6311B17EF for ; Wed, 1 Apr 2020 00:19:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 41B7820787 for ; Wed, 1 Apr 2020 00:19:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="lQ27s71B" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731588AbgDAATg (ORCPT ); Tue, 31 Mar 2020 20:19:36 -0400 Received: from mail-pj1-f68.google.com ([209.85.216.68]:54991 "EHLO mail-pj1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731470AbgDAATg (ORCPT ); Tue, 31 Mar 2020 20:19:36 -0400 Received: by mail-pj1-f68.google.com with SMTP id np9so1849979pjb.4; Tue, 31 Mar 2020 17:19:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=eoc4WcS+IpjrNztXfxLlfAJ87gSgdKjixSKutVJJ1CE=; b=lQ27s71BVXH2TyOl0LMvsm2rIgRan8KHkwCGQNNBZtfR1LsaCe59INT0mUuhs9OWSI PBVylMM+8z0psmpclM9UVnxX+Jwz7lOxis+GuF4U+6/WTl0W1UE6Emhd4YgOYWxGt+xB XKuWPEUGiN6miTIQQV93x+fangjGyVGr93RNiO6Z4y7HKEymHMfvWyHYkuy76gW+Ympz XgFsmtyMWMWgNEOFXr7H1G0YS0TsvFdPmX9known1Cg7z7UIAGxBUF3ZvDfVNoNPgVq5 VioXGco9zfLcnY0cZQGbzDanOUaoRpFSn0Io9VZVfNRXZy54vKBjucAIjsRhq9JFCsps NQGw== 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:date:message-id:in-reply-to :references; bh=eoc4WcS+IpjrNztXfxLlfAJ87gSgdKjixSKutVJJ1CE=; b=P76JkP3PXzHeOXZEhAAk2D5kyZTUBesin8djj9/Ex/1uqyCCk5hah8isqMQhGfbMMz 5PUuLgv2HLl173Hw2SOeImT7OWYMj5cx00aUCUfdR9pMXlEdG7xJAGiKux78U8GICAg2 i2TFYkEGDIEr6gKMpe9GASSxIc0sAZyDc5A/ODazAX1UkL5JD6YLMN5qM8gp5z19hwsk 71O05rWJDvaxqr2Gz8GUUYarVym8nXPQC/Q83xY09Jzj/zMtofQ6kcLu7h5TY+APTklQ YoTRf4+Y0EAjEdczegQSfVIchp1eoVYvScqWXy3qqjwQb7TOAF9tJtPpSP9fiFqs6zRd mSSA== X-Gm-Message-State: AGi0PuZCNiP6Qf8XE8Yk5EVN+ARxrYhajr/HDOLGIF9zLTQHnR/MDhtA XmDFMIYPkQkt4kdZpKXkusD3uneX X-Google-Smtp-Source: APiQypIClxoZOUUOKzzeaZHB+fxWtTwD06ya6pluh9+gP06Sgnivhgve6qRVZJRwNwaXfn5kct5O4Q== X-Received: by 2002:a17:902:b187:: with SMTP id s7mr6822588plr.84.1585700374464; Tue, 31 Mar 2020 17:19:34 -0700 (PDT) Received: from localhost.localdomain ([103.7.29.6]) by smtp.googlemail.com with ESMTPSA id ci18sm206978pjb.23.2020.03.31.17.19.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 31 Mar 2020 17:19:34 -0700 (PDT) From: Wanpeng Li X-Google-Original-From: Wanpeng Li To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: Paolo Bonzini , Sean Christopherson , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel Subject: [PATCH v2 2/2] KVM: LAPIC: Don't need to clear IPI delivery status in x2apic mode Date: Wed, 1 Apr 2020 08:19:22 +0800 Message-Id: <1585700362-11892-2-git-send-email-wanpengli@tencent.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1585700362-11892-1-git-send-email-wanpengli@tencent.com> References: <1585700362-11892-1-git-send-email-wanpengli@tencent.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Wanpeng Li IPI delivery status field is not present in x2apic mode, don't need to clear IPI delivery status in x2apic mode. Reviewed-by: Vitaly Kuznetsov Signed-off-by: Wanpeng Li --- v1 -> v2: * update code comments * update subject and patch description arch/x86/kvm/lapic.c | 5 +++-- arch/x86/kvm/x86.c | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index d528bed..5efca58 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -1941,8 +1941,9 @@ int kvm_lapic_reg_write(struct kvm_lapic *apic, u32 reg, u32 val) break; } case APIC_ICR: - /* No delay here, so we always clear the pending bit */ - val &= ~(1 << 12); + /* Immediately clear Delivery Status in xAPIC mode */ + if (!apic_x2apic_mode(apic)) + val &= ~(1 << 12); kvm_apic_send_ipi(apic, val, kvm_lapic_get_reg(apic, APIC_ICR2)); kvm_lapic_set_reg(apic, APIC_ICR, val); break; diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 5a645df..ececc09 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -1562,7 +1562,6 @@ static int handle_fastpath_set_x2apic_icr_irqoff(struct kvm_vcpu *vcpu, u64 data ((data & APIC_MODE_MASK) == APIC_DM_FIXED) && ((u32)(data >> 32) != X2APIC_BROADCAST)) { - data &= ~(1 << 12); kvm_apic_send_ipi(vcpu->arch.apic, (u32)data, (u32)(data >> 32)); kvm_lapic_set_reg(vcpu->arch.apic, APIC_ICR2, (u32)(data >> 32)); kvm_lapic_set_reg(vcpu->arch.apic, APIC_ICR, (u32)data);