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.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED autolearn=ham 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 4DCCAC10F0E for ; Mon, 15 Apr 2019 19:16:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 183EC2075B for ; Mon, 15 Apr 2019 19:16:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="lUCsKunR" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730835AbfDOTQm (ORCPT ); Mon, 15 Apr 2019 15:16:42 -0400 Received: from mail-pl1-f195.google.com ([209.85.214.195]:42165 "EHLO mail-pl1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730294AbfDOTNB (ORCPT ); Mon, 15 Apr 2019 15:13:01 -0400 Received: by mail-pl1-f195.google.com with SMTP id cv12so9050694plb.9 for ; Mon, 15 Apr 2019 12:13:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=6gB/E4EQ63t9VzaA8YS/D+aM2FeFh/B7ZNHze3tsPvM=; b=lUCsKunR9tDbitzUe/qx2xjsKir5t4B5AotpN0Rz6qfYiRoZuIA54IcYeTFFEbTUJM iaEHk62wjVtXFXXACtfk/K4W2dG9MKmUR6WtSdjmYMnzVlQyYAQfnQJ6CKAuRAY9OzD6 PyeM5j++PuMNYZ7ibzbaqYrLtBg4Pn8czSsW0uB+Hk6m/vazA6VbLBkcTIgEnTU1J7mA lB2WGfHgGcjP694p4IdkEBr2LSwnHQX1+nW2fIPOszAPzR6EE778q8ujUFZ0YHUEkhlD lb26K3AAAAzJJoyUIoJHCrGEIV3D1VM2AFORPk6IMJZZizw3yeHIQYm+qzKrXBcxPlv8 g4iQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=6gB/E4EQ63t9VzaA8YS/D+aM2FeFh/B7ZNHze3tsPvM=; b=kszUwKEulCcwYXrT0IyAyArP+kloALLZp7MKS52ZtA4qnaoegdjSJxd0Ixy6z3Qj8U y1G4uNt+gsNH9dt6e9KBlLFqOFPCVjYY0eDzllekoM8q65E52hNR5xBe7R1AFsf+wn2/ vekEAinT4NUD+f5hXuQ7wto0Fp0ZLk8En6aWJykVPe7AAMs6wCKuRbnGd6SMCvjfVZbc Ol2xuQM0OwEq1Etoempq+xbj/uBrgd2bXCYtUdnddJCrc5vUJB9IQdV2pQjopbMYcMiR 6orH/jLjSRFqg4rrTNW2d4hJcikyWVljQAnayqOP+tsQ5hid5Xz+3msMVzlGTKoWd3js v3fw== X-Gm-Message-State: APjAAAWvaXGRyMPBwmW88KcWw8CE8axdRk1xz6k4e+YUzuRAZWTYsMsz jBAAZoFGcLoQ6OfKxYhSLtQ= X-Google-Smtp-Source: APXvYqxjrJwXa6qQ0bziN1uzc8PTx6rpMoIBu8owAZEsuc/aBhQmgBzWlAXskw+U3BlEWB6YTge/Hw== X-Received: by 2002:a17:902:9a85:: with SMTP id w5mr35152927plp.157.1555355580431; Mon, 15 Apr 2019 12:13:00 -0700 (PDT) Received: from [10.2.189.129] ([66.170.99.2]) by smtp.gmail.com with ESMTPSA id t12sm103911573pfl.59.2019.04.15.12.12.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Apr 2019 12:12:59 -0700 (PDT) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 12.2 \(3445.102.3\)) Subject: Re: [kvm-unit-tests PATCH] x86: Prevent APIC base address from changing in test_enable_x2apic() From: Nadav Amit In-Reply-To: <96C8EA7D-C1D3-40E2-95D0-E1F947742F9B@gmail.com> Date: Mon, 15 Apr 2019 12:12:58 -0700 Cc: Paolo Bonzini , kvm@vger.kernel.org Content-Transfer-Encoding: quoted-printable Message-Id: <04ECBA2D-C623-487B-89E2-FC6FD7062C19@gmail.com> References: <20190415183100.6827-1-nadav.amit@gmail.com> <20190415190027.GJ24010@linux.intel.com> <96C8EA7D-C1D3-40E2-95D0-E1F947742F9B@gmail.com> To: Sean Christopherson X-Mailer: Apple Mail (2.3445.102.3) Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org > On Apr 15, 2019, at 12:09 PM, Nadav Amit wrote: >=20 >> On Apr 15, 2019, at 12:00 PM, Sean Christopherson = wrote: >>=20 >> On Mon, Apr 15, 2019 at 11:31:00AM -0700, nadav.amit@gmail.com wrote: >>> From: Nadav Amit >>>=20 >>> test_enable_x2apic() unintentionally changes the APIC base address = to >>> zero and resets the BSP indication. This actually causes the local = APIC >>> to overlap the IDT area, which is wrong. Prevent it from happening = by >>> keeping the APIC base address and BSP-bit as it was before. >>>=20 >>> Signed-off-by: Nadav Amit >>> --- >>> x86/apic.c | 4 ++-- >>> 1 file changed, 2 insertions(+), 2 deletions(-) >>>=20 >>> diff --git a/x86/apic.c b/x86/apic.c >>> index 51744cf..0849f87 100644 >>> --- a/x86/apic.c >>> +++ b/x86/apic.c >>> @@ -90,11 +90,11 @@ static void test_enable_x2apic(void) >>> report("disabled to x2apic enabled", >>> test_write_apicbase_exception(APIC_EN | APIC_EXTD)); >>>=20 >>> - wrmsr(MSR_IA32_APICBASE, APIC_EN); >>> + wrmsr(MSR_IA32_APICBASE, APIC_EN | APIC_DEFAULT_PHYS_BASE | = APIC_BSP); >>> report("apic enabled to invalid state", >>> test_write_apicbase_exception(APIC_EXTD)); >>>=20 >>> - wrmsr(MSR_IA32_APICBASE, APIC_EN | APIC_EXTD); >>> + wrmsr(MSR_IA32_APICBASE, APIC_EN | APIC_EXTD | = APIC_DEFAULT_PHYS_BASE | APIC_BSP); >>=20 >> It probably doesn't matter since AFAIK kvm-unit-tests always uses the >> default base, but preserving the current base+BSP would be preferred. >> The #GP tests get away with using APIC_DEFAULT_PHYS_BASE because the >> WRMSR will never succeed, but even that is poor form. And the test >> should also reset to xAPIC when it's done. >>=20 >> I think the attached patch covers everything. >=20 > Thanks. The base is indeed the default, so it should not matter, but = your > change should make the code more robust. >=20 > One important comment regarding your patch: >=20 >> + if (!(orig_apicbase & APIC_EXTD)) >> + reset_apic(); >=20 > This is not needed, since enable_x2apic() will only return true if it > succeeded in enabling x2apic. In addition, this is wrong, since = reset_apic() > should (usually, and specifically in this case) be followed with: >=20 > apic_write(APIC_SPIV, 0x1ff); >=20 > And not the other way around (there are actually a couple of missing = writes > to software-enable the APIC after reset_apic(), which I=E2=80=99ll = send later). Correcting myself - I understand (now) that you want to reset back to = xapic, so that=E2=80=99s fine. Just keep "apic_write(APIC_SPIV, 0x1ff);=E2=80=9D = after the reset, please.