From patchwork Fri Oct 23 16:05:39 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laszlo Ersek X-Patchwork-Id: 535064 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 7793D141326 for ; Sat, 24 Oct 2015 03:06:14 +1100 (AEDT) Received: from localhost ([::1]:39676 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zper6-0006zT-Ik for incoming@patchwork.ozlabs.org; Fri, 23 Oct 2015 12:06:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38413) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zpeqr-0006ir-Aw for qemu-devel@nongnu.org; Fri, 23 Oct 2015 12:05:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zpeqn-0004Vm-Ty for qemu-devel@nongnu.org; Fri, 23 Oct 2015 12:05:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34689) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zpeqn-0004Vc-MF for qemu-devel@nongnu.org; Fri, 23 Oct 2015 12:05:53 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 07452C075D96; Fri, 23 Oct 2015 16:05:52 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-113-156.phx2.redhat.com [10.3.113.156]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t9NG5mMk032358; Fri, 23 Oct 2015 12:05:49 -0400 From: Laszlo Ersek To: qemu-devel@nongnu.org Date: Fri, 23 Oct 2015 18:05:39 +0200 Message-Id: <1445616339-28414-1-git-send-email-lersek@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: "Michael S. Tsirkin" , Jordan Justen , Kevin O'Connor , Gerd Hoffmann , Michael Kinney , Paolo Bonzini Subject: [Qemu-devel] [PATCH] hw/isa/lpc_ich9: inject SMI on all VCPUs if APM_STS == 'Q' X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The generic edk2 SMM infrastructure prefers EFI_SMM_CONTROL2_PROTOCOL.Trigger() to inject an SMI on each processor. If Trigger() only brings the current processor into SMM, then edk2 handles it in the following ways: (1) If Trigger() is executed by the BSP (which is guaranteed before ExitBootServices(), but is not necessarily true at runtime), then: (a) If edk2 has been configured for "traditional" SMM synchronization, then the BSP sends directed SMIs to the APs with APIC delivery, bringing them into SMM individually. Then the BSP runs the SMI handler / dispatcher. (b) If edk2 has been configured for "relaxed" SMM synchronization, then the APs that are not already in SMM are not brought in, and the BSP runs the SMI handler / dispatcher. (2) If Trigger() is executed by an AP (which is possible after ExitBootServices(), and can be forced e.g. by "taskset -c 1 efibootmgr"), then the AP in question brings in the BSP with a directed SMI, and the BSP runs the SMI handler / dispatcher. The problem with (1a) and (2) is that the BSP and AP synchronization is slow. The above taskset + efibootmgr command takes more than 30 seconds to complete on TCG, for example, because efibootmgr accesses non-volatile UEFI variables intensively. Therefore introduce a special APM_STS value (0x51) that causes QEMU to inject the SMI on all VCPUs. OVMF's EFI_SMM_CONTROL2_PROTOCOL.Trigger() can utilize this to accommodate edk2's preference about "broadcast" SMI. SeaBIOS uses values 0x00 and 0x01 for APM_STS (called PORT_SMI_STATUS in the SeaBIOS code), so this change should be transparent to it. While commit 3c23402d4032 targeted correctness, this one aims at better performance only. Cc: Paolo Bonzini Cc: Gerd Hoffmann Cc: Jordan Justen Cc: Michael Kinney Cc: "Kevin O'Connor" Cc: "Michael S. Tsirkin" Signed-off-by: Laszlo Ersek --- hw/isa/lpc_ich9.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c index 1ffc803..117baff 100644 --- a/hw/isa/lpc_ich9.c +++ b/hw/isa/lpc_ich9.c @@ -380,6 +380,8 @@ void ich9_lpc_pm_init(PCIDevice *lpc_pci, bool smm_enabled, bool enable_tco) /* APM */ +#define QEMU_ICH9_APM_STS_BROADCAST_SMI 'Q' + static void ich9_apm_ctrl_changed(uint32_t val, void *arg) { ICH9LPCState *lpc = arg; @@ -394,7 +396,15 @@ static void ich9_apm_ctrl_changed(uint32_t val, void *arg) /* SMI_EN = PMBASE + 30. SMI control and enable register */ if (lpc->pm.smi_en & ICH9_PMIO_SMI_EN_APMC_EN) { - cpu_interrupt(current_cpu, CPU_INTERRUPT_SMI); + if (lpc->apm.apms == QEMU_ICH9_APM_STS_BROADCAST_SMI) { + CPUState *cs; + + CPU_FOREACH(cs) { + cpu_interrupt(cs, CPU_INTERRUPT_SMI); + } + } else { + cpu_interrupt(current_cpu, CPU_INTERRUPT_SMI); + } } }