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 6F714C54EBD for ; Sat, 7 Jan 2023 01:10:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236815AbjAGBKk (ORCPT ); Fri, 6 Jan 2023 20:10:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59506 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229542AbjAGBKh (ORCPT ); Fri, 6 Jan 2023 20:10:37 -0500 Received: from mail-pj1-x104a.google.com (mail-pj1-x104a.google.com [IPv6:2607:f8b0:4864:20::104a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 87F71551C6 for ; Fri, 6 Jan 2023 17:10:32 -0800 (PST) Received: by mail-pj1-x104a.google.com with SMTP id o21-20020a17090aac1500b00226349b1e06so3837983pjq.4 for ; Fri, 06 Jan 2023 17:10:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=SUs8tClANttqi+Hnol8wJcTkjKVIAnbsM87bTemrCQY=; b=qWWqo91BVV3+ytqxD755nsAH10ni6r17FBuf3NIVJ2t+6M9OJ5GZ0EPcOGUpCSvhAz bR+QCshs/pBpsOE8ASAe4TOXSVX0DvK2Sh5JpxYGmZdBYsfk+UfsSmEqF8idhpiegdok SmYHW+Fx0sjU9GyW903xb6vpardDBVq8T1gXoO3O5/8ovMWLlExiF+m7rLHfmHEzzDPE cM8xFE+Rn4wMOsSAWW9vN4cm2aDnnUS8dcOJJGJuo7ZCW/kxbxvVaVa8HykjSkkw4YFn vy2UORCYy6kp1pZYyoXum0+320A12BaWQZlxT4Fei5X9uZiF8mSdexxhJX6oN57zdkou jHQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=SUs8tClANttqi+Hnol8wJcTkjKVIAnbsM87bTemrCQY=; b=N5mAVx6VXkSVI+oOyhZn9tjbeEm2ML2qXkNVCNLjiiYYmsaSIGC8daOuQ2NOyUe7pE RCnRHfYcpTen1eZDK0RmYgpv0UkrraaTsnGLxecGwrU5iQ43Ujx4SdVZHgESDlQB3WOz Wa07ehLUIHAhMAO8XPxT6eTE6uSjV8ZtaW+qbt0+e7j5eSheg2UipZaEpm5XkYjAmSx5 ZDK4msSs3jPQH1z/CL1310nZItxJzOe3mDVXqauS/x4H4QRVm8LWk6tJS7ZIwKOm8Twy 8rJocw+vCao1wV5wJ/HgsD1PRem5zy50uqZqMMFqNGQ40y5LZMZTjlmlXINa/xUlzB9n DHBw== X-Gm-Message-State: AFqh2koWaJZ9ctCN//X5jfvePq57IrIWplTFuoAwJAdDTR51zXsD3652 jKKd4rsXty5OMqkB58A3pyWItcjiTdc= X-Google-Smtp-Source: AMrXdXt3bMUn4GBz+6Q3Ao/qEuOA+If6p/VLctEyUd0CmvrocjSXdNvyLH1tnvT8nWhQYYf7l77/Vx7K63w= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:902:b611:b0:189:e687:b350 with SMTP id b17-20020a170902b61100b00189e687b350mr4637509pls.33.1673053832137; Fri, 06 Jan 2023 17:10:32 -0800 (PST) Reply-To: Sean Christopherson Date: Sat, 7 Jan 2023 01:10:21 +0000 In-Reply-To: <20230107011025.565472-1-seanjc@google.com> Mime-Version: 1.0 References: <20230107011025.565472-1-seanjc@google.com> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog Message-ID: <20230107011025.565472-3-seanjc@google.com> Subject: [PATCH 2/6] KVM: x86: Inject #GP on x2APIC WRMSR that sets reserved bits 63:32 From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Marc Orr , Ben Gardon , Venkatesh Srinivas Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Reject attempts to set bits 63:32 for 32-bit x2APIC registers, i.e. all x2APIC registers except ICR. Per Intel's SDM: Non-zero writes (by WRMSR instruction) to reserved bits to these registers will raise a general protection fault exception Opportunistically fix a typo in a nearby comment. Reported-by: Marc Orr Cc: stable@vger.kernel.org Signed-off-by: Sean Christopherson --- arch/x86/kvm/lapic.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index f77da92c6ea6..bf53e4752f30 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -3108,13 +3108,17 @@ static int kvm_lapic_msr_read(struct kvm_lapic *apic, u32 reg, u64 *data) static int kvm_lapic_msr_write(struct kvm_lapic *apic, u32 reg, u64 data) { /* - * ICR is a 64-bit register in x2APIC mode (and Hyper'v PV vAPIC) and + * ICR is a 64-bit register in x2APIC mode (and Hyper-V PV vAPIC) and * can be written as such, all other registers remain accessible only * through 32-bit reads/writes. */ if (reg == APIC_ICR) return kvm_x2apic_icr_write(apic, data); + /* Bits 63:32 are reserved in all other registers. */ + if (data >> 32) + return 1; + return kvm_lapic_reg_write(apic, reg, (u32)data); } -- 2.39.0.314.g84b9a713c41-goog