From patchwork Thu Apr 2 00:16:10 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nadav Amit X-Patchwork-Id: 6143431 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 8AFE5BF4A6 for ; Thu, 2 Apr 2015 00:16:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7D3B220138 for ; Thu, 2 Apr 2015 00:16:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7832E2034F for ; Thu, 2 Apr 2015 00:16:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752655AbbDBAQ1 (ORCPT ); Wed, 1 Apr 2015 20:16:27 -0400 Received: from mailgw10.technion.ac.il ([132.68.225.10]:18394 "EHLO mailgw10.technion.ac.il" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752356AbbDBAQX (ORCPT ); Wed, 1 Apr 2015 20:16:23 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2C6AAAdiRxVlwEgRIRchDbLVgKBQjsRAQEBAQEBAREBAQEBAQgWB0KEHwEFeRBAEVcZiC/IUYR/AQEBBwIgkCIHhC0FixukAIIkHIFTbIJDAQEB X-IPAS-Result: A2C6AAAdiRxVlwEgRIRchDbLVgKBQjsRAQEBAQEBAREBAQEBAQgWB0KEHwEFeRBAEVcZiC/IUYR/AQEBBwIgkCIHhC0FixukAIIkHIFTbIJDAQEB X-IronPort-AV: E=Sophos;i="5.11,507,1422914400"; d="scan'208";a="18589126" Received: from csa.cs.technion.ac.il ([132.68.32.1]) by mailgw10.technion.ac.il with ESMTP; 02 Apr 2015 03:16:18 +0300 Received: from csn.cs.technion.ac.il (csn.cs.technion.ac.il [132.68.32.15]) by csa.cs.technion.ac.il (Postfix) with ESMTP id DEE68140041; Thu, 2 Apr 2015 03:16:17 +0300 (IDT) Received: from csl-tapuz20.cs.technion.ac.il (csl-tapuz20.cs.technion.ac.il [132.68.206.58]) by csn.cs.technion.ac.il (Postfix) with ESMTPSA id D2E93A042C; Thu, 2 Apr 2015 03:16:17 +0300 (IDT) From: Nadav Amit To: pbonzini@redhat.com Cc: kvm@vger.kernel.org, Nadav Amit Subject: [PATCH kvm-unit-tests 4/4] x86: Test BSP change Date: Thu, 2 Apr 2015 03:16:10 +0300 Message-Id: <1427933770-12948-5-git-send-email-namit@cs.technion.ac.il> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1427933770-12948-1-git-send-email-namit@cs.technion.ac.il> References: <1427933770-12948-1-git-send-email-namit@cs.technion.ac.il> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Testing whether changing the BSP, followed by INIT works correctly. The APIC ID is saved after resume and compared. For this test to pass, a fix of QEMU is needed in addition to a KVM fix. Signed-off-by: Nadav Amit --- x86/init.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++----- x86/unittests.cfg | 1 + 2 files changed, 71 insertions(+), 7 deletions(-) diff --git a/x86/init.c b/x86/init.c index 3694d67..2d7ea99 100644 --- a/x86/init.c +++ b/x86/init.c @@ -3,6 +3,7 @@ #include "io.h" #include "processor.h" #include "msr.h" +#include "smp.h" #define CHECK_HARD_RESET 0 @@ -36,18 +37,30 @@ static inline void rtc_out(u8 reg, u8 val) outb(val, 0x71); } +static inline void send_init(void) +{ + char *reset_vec = (void*)0xfffffff0; + + reset_vec[0] = 0xeb; + reset_vec[1] = 0xfe; + apic_icr_write(APIC_DEST_ALLINC | APIC_DEST_PHYSICAL + | APIC_DM_INIT, 0); +} + extern char resume_start, resume_end; struct expected_state { bool init; + unsigned int bsp; }; static struct expected_state expected[] = { - {.init = false}, - {.init = false}, - {.init = false}, - {.init = false}, - {.init = true}, + {.init = false, .bsp = 0}, + {.init = false, .bsp = 0}, + {.init = false, .bsp = 0}, + {.init = false, .bsp = 0}, + {.init = true, .bsp = 0}, + {.init = true, .bsp = 1}, }; #define state (*(volatile int *)0x2000) @@ -56,6 +69,7 @@ static struct expected_state expected[] = { #define dr0 (*(volatile int*)0x200c) #define cr2 (*(volatile int*)0x2010) #define sysenter_eip (*(volatile int*)0x2014) +#define boot_apic_id (*(volatile int *)0x2018) static void set_test_regs(void) { @@ -84,6 +98,39 @@ static bool check_test_regs(bool init) return error; } +static void change_bsp(bool bsp) +{ + unsigned long apicbase = rdmsr(MSR_IA32_APICBASE); + + if (bsp) + apicbase |= MSR_IA32_APICBASE_BSP; + else + apicbase &= ~MSR_IA32_APICBASE_BSP; + wrmsr(MSR_IA32_APICBASE, apicbase); +} + +static void set_bsp(void *data) +{ + set_test_regs(); + change_bsp(true); +} + +static bool change_bsp_test(void) +{ + int ncpus; + + smp_init(); + ncpus = cpu_count(); + if (ncpus != 2) { + printf("Skipping BSP test\n"); + return false; + } + on_cpu(1, set_bsp, NULL); + change_bsp(false); + return true; +} + + int main(int argc, char **argv) { volatile u16 *resume_vector_ptr = (u16 *)0x467L; @@ -110,6 +157,12 @@ int main(int argc, char **argv) if (check_test_regs(expected[state-1].init)) bad |= 4; + if (expected[state-1].bsp != boot_apic_id) { + printf("error: wrong BSP: %x expected: %x\n", + boot_apic_id, expected[state-1].bsp); + bad |= 8; + } + #if CHECK_HARD_RESET /* * Port 92 bit 0 is cleared on system reset. On a soft reset it @@ -151,11 +204,17 @@ int main(int argc, char **argv) case 4: printf("testing init to BSP... "); - apic_icr_write(APIC_DEST_SELF | APIC_DEST_PHYSICAL - | APIC_DM_INIT, 0); + send_init(); break; case 5: + printf("testing init to BSP (2nd core)... "); + if (change_bsp_test()) { + send_init(); + break; + } + state++; /* fall through */ + case 6: exit(bad); } @@ -177,6 +236,10 @@ asm ( "mov $0x176, %ecx\n" "rdmsr\n" "mov %eax, %cs:0x2014\n" // sysenter_eip + "mov $1, %eax\n" + "cpuid\n" + "shrl $24, %ebx\n" + "mov %ebx, %cs:0x2018\n" // apic_id "mov $0x0f, %al\n" // rtc_out(0x0f, 0x00); "out %al, $0x70\n" "mov $0x00, %al\n" diff --git a/x86/unittests.cfg b/x86/unittests.cfg index d7ddd9d..2d25801 100644 --- a/x86/unittests.cfg +++ b/x86/unittests.cfg @@ -85,6 +85,7 @@ arch = x86_64 [init] file = init.flat +smp = 2 [msr] file = msr.flat