From patchwork Mon Jan 9 13:06:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emanuele Giuseppe Esposito X-Patchwork-Id: 40852 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp2145844wrt; Mon, 9 Jan 2023 05:09:57 -0800 (PST) X-Google-Smtp-Source: AMrXdXtyjL+C8Gu3wsFt5mrlI52vwqp1AJhHVP6dfbZDf28mzOsJrarD7IWs3f6hRRwmtAr6MTAY X-Received: by 2002:aa7:8752:0:b0:588:cb81:9274 with SMTP id g18-20020aa78752000000b00588cb819274mr3165450pfo.32.1673269797054; Mon, 09 Jan 2023 05:09:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673269797; cv=none; d=google.com; s=arc-20160816; b=N0et4Vl5TPr/VMeKgAx9BUVmNEwxva8fd4R8ZtAqD/pxeo21n3paPhl2hvFh+bUH/e z+x+4laD3yBh2CpIh12BJGdV2J44jYp0/VIBjVrzTPUZutHpzDV9kQQTYfuxgKpVg259 YiQUAFrEW8hHoGrsiVI2o8pkJYoEhDP8ArmsfU1Cc8+bWxQdMv0IQd6suTeA3a+yAmhv XRr89Rw+wopw+ccbmevANIaKRHP/BibyZRQKikYMqyopTUQWpcuP83MUv6vf0IyEZQRK zyp4WMiobPKiRLUcg7CHOuof+8/Z2iUkJfMQHfoW6d2Xn58tkXpLmQSgteUllKx2iXeB URqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=luPXsS+ks9CN356IQwEOn1IqYG8Q1VUr1O3bLDCB5Co=; b=Q/ecDhO+OjQLOMQzf3+1yMxKG5vrdj+xR6k9zPintcmt71C5xijh0gLY8dF8bOOOpL IkoUVnmf6h+cH0U1QEp+LGRdR+v1yd5uRRskZUtvpgXySuoVvlwTk8fpEkW9r0k93SU0 vkgK6sqjXVdeDYS1LzDB150CTl5WINJmrPuKt5kZKyicS8reGl1wnbY0Xd5lj2Sf0A68 JjrKBgoz/K2xkgrOHq6plO2Bt0/k7uyW+3C8Q3yAA1w4PzK3lWJffb21kOOAbfKRbpi8 ytCn5YHLBo+VglGBz0ekyUAUaaakjNNopPDLyEUyqQa+yJ6iLZy37QNvuFw2AGEnvT3t f/1w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ail+zzeX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z10-20020aa7888a000000b0058783c3d567si4929534pfe.43.2023.01.09.05.09.44; Mon, 09 Jan 2023 05:09:57 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ail+zzeX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236494AbjAINJb (ORCPT + 99 others); Mon, 9 Jan 2023 08:09:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54114 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236276AbjAINJK (ORCPT ); Mon, 9 Jan 2023 08:09:10 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 821C2203F for ; Mon, 9 Jan 2023 05:06:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1673269576; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=luPXsS+ks9CN356IQwEOn1IqYG8Q1VUr1O3bLDCB5Co=; b=ail+zzeX55J6EERUpw5Og+yQqitxjo4YYKLUz6fvNFATyrvw1QsMIvDahqflHlrvliMC1v wIVXmKsQtiMvFdJb6AjNHK3NmqeblFeKS6cW3TkGIyFKbcwEIizwvxK6ktaF5vkOF3oErI M39HTwk2dba6s/jx0z0JpnKRAg2Db04= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-435-2oUJb9aVOYKsK2CZI1NtXQ-1; Mon, 09 Jan 2023 08:06:10 -0500 X-MC-Unique: 2oUJb9aVOYKsK2CZI1NtXQ-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 88BFB80D0EB; Mon, 9 Jan 2023 13:06:09 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 24BF9175AD; Mon, 9 Jan 2023 13:06:09 +0000 (UTC) From: Emanuele Giuseppe Esposito To: kvm@vger.kernel.org Cc: Sean Christopherson , Paolo Bonzini , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Shuah Khan , Gautam Menghani , Emanuele Giuseppe Esposito , Zeng Guang , Krish Sadhukhan , Jim Mattson , linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [RFC PATCH 1/2] KVM: x86: update APIC_ID also when disabling x2APIC in kvm_lapic_set_base Date: Mon, 9 Jan 2023 08:06:04 -0500 Message-Id: <20230109130605.2013555-2-eesposit@redhat.com> In-Reply-To: <20230109130605.2013555-1-eesposit@redhat.com> References: <20230109130605.2013555-1-eesposit@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754550550931151151?= X-GMAIL-MSGID: =?utf-8?q?1754550550931151151?= If KVM_SET_MSR firstly enables and then disables x2APIC, make sure APIC_ID is actually updated correctly, since bits and offset differ from xAPIC and x2APIC. Currently this is not handled correctly, as kvm_set_apic_base() will have msr_info->host_initiated, so switching from x2APIC to xAPIC won't fail, but kvm_lapic_set_base() does not handle the case. Fixes: 8d860bbeedef ("kvm: vmx: Basic APIC virtualization controls have three settings") Signed-off-by: Emanuele Giuseppe Esposito Reported-by: Emanuele Giuseppe Esposito Signed-off-by: Sean Christopherson --- arch/x86/kvm/lapic.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index 4efdb4a4d72c..df0a50099aa2 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -2394,8 +2394,12 @@ void kvm_lapic_set_base(struct kvm_vcpu *vcpu, u64 value) } } - if (((old_value ^ value) & X2APIC_ENABLE) && (value & X2APIC_ENABLE)) - kvm_apic_set_x2apic_id(apic, vcpu->vcpu_id); + if ((old_value ^ value) & X2APIC_ENABLE) { + if (value & X2APIC_ENABLE) + kvm_apic_set_x2apic_id(apic, vcpu->vcpu_id); + else + kvm_apic_set_xapic_id(apic, vcpu->vcpu_id); + } if ((old_value ^ value) & (MSR_IA32_APICBASE_ENABLE | X2APIC_ENABLE)) { kvm_vcpu_update_apicv(vcpu); From patchwork Mon Jan 9 13:06:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emanuele Giuseppe Esposito X-Patchwork-Id: 40853 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp2146491wrt; Mon, 9 Jan 2023 05:11:09 -0800 (PST) X-Google-Smtp-Source: AMrXdXvEQcFUBlS7Ig+gbwWEZRcUxjyOhGxBuv+LRQROR9sLs89NHHlfeCgM0VOWaz8lNJ+Kw27Q X-Received: by 2002:a17:906:8d0f:b0:7c1:7c38:f079 with SMTP id rv15-20020a1709068d0f00b007c17c38f079mr39881569ejc.71.1673269869186; Mon, 09 Jan 2023 05:11:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673269869; cv=none; d=google.com; s=arc-20160816; b=rKjXkkJCFlfXwgSfGCxMjmO8HLS1hQsaonoFPsXW1gxLbEvhl2o2sOd8AAMSqs9AwL qB2GZajSxIi+89s+4UyWle4aXkARCFUaOMEyO9HLF1x8Rk/rVOxY9Kjv8l890Ls8qf/w EmYqQyx3DiQfncnK9rDHZy1Hm4XfkmKHSMrtGubQnuF1XPLBhOaWTVmLM8UHg9ddzKph NA2+hArNhQm7wod4rYuz3sq9/o/OlDcJSvX+cRcu8+5I2bs6e9iOSjc8+JdiMZjhMwNt dcCM6ASXli0VuCp8FSaNK4oKckmDNFR9JyxWTGf5ytzREwQrr0q7h2G6Vxjv1AbW6A+k pOuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=yqnAszpgy0KJ191Ho69gF9UoikTfczETJLDKhGuW5zw=; b=JPjd9rROVwsjnXDzF49B/484eNSv2tFlOrcYIhs81jyPE3+Hi0WAgKIOOXgeBydzF0 o3dxW9KXJ5zQIPXdAR6AjsnPK/rbgkwkbW4QDHtiH3xi7HfItg2Z5DqDRKGsdZU89DMy ZFi7txPx+ZKPm8GSnTMNswTOeOlWqzv/mU7Em5vYayU7B9y2uOnvGqhRToJi61Z8ijDH HnjDeJMVo5HjKBkfPvgNPWR9YA63ocYxp0PKlOfz9o/m6QOsVvwvBqeRtrZ2rdhybnhP Bo7OVhIr/y80qx23TGXemn/Vazs2TRaJmDJwN7LeyJzjtVxV2xvUTonODr17w68HpJpL pf2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=B+FEY+m4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z19-20020a05640235d300b004865253bd29si10502693edc.468.2023.01.09.05.10.45; Mon, 09 Jan 2023 05:11:09 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=B+FEY+m4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234293AbjAINJp (ORCPT + 99 others); Mon, 9 Jan 2023 08:09:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52658 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233877AbjAINJM (ORCPT ); Mon, 9 Jan 2023 08:09:12 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1BF321EAC2 for ; Mon, 9 Jan 2023 05:06:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1673269577; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yqnAszpgy0KJ191Ho69gF9UoikTfczETJLDKhGuW5zw=; b=B+FEY+m47+2Ih6AAdPW7/dKGt7GXJytx8IHXlWixj/k5+0ANmwJRlE8T5I/gwLpI9cS9Zh EY69wvXbwEJBENTTzixhfrCeZq9SujJw3cik5IdIcqQEa2wLxssbZVQ2Aj8GVO3aX0YR4e HUQYI8IjTR1rEiNPVMqvQyF3xrobqhc= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-495-yTRL9aU4O3yaIXCTW92jXQ-1; Mon, 09 Jan 2023 08:06:11 -0500 X-MC-Unique: yTRL9aU4O3yaIXCTW92jXQ-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0144E183B3CA; Mon, 9 Jan 2023 13:06:10 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 91D53175AD; Mon, 9 Jan 2023 13:06:09 +0000 (UTC) From: Emanuele Giuseppe Esposito To: kvm@vger.kernel.org Cc: Sean Christopherson , Paolo Bonzini , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Shuah Khan , Gautam Menghani , Emanuele Giuseppe Esposito , Zeng Guang , Krish Sadhukhan , Jim Mattson , linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [RFC PATCH 2/2] KVM: selftests: APIC_ID must be correctly updated when disabling x2apic Date: Mon, 9 Jan 2023 08:06:05 -0500 Message-Id: <20230109130605.2013555-3-eesposit@redhat.com> In-Reply-To: <20230109130605.2013555-1-eesposit@redhat.com> References: <20230109130605.2013555-1-eesposit@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754550626382324506?= X-GMAIL-MSGID: =?utf-8?q?1754550626382324506?= Make sure the APIC_ID is correctly shifted in the right bit positions when disabling x2APIC via KVM_SET_MSRS. Signed-off-by: Emanuele Giuseppe Esposito --- .../selftests/kvm/x86_64/xapic_state_test.c | 64 +++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/tools/testing/selftests/kvm/x86_64/xapic_state_test.c b/tools/testing/selftests/kvm/x86_64/xapic_state_test.c index d7d37dae3eeb..6ebda7162a25 100644 --- a/tools/testing/selftests/kvm/x86_64/xapic_state_test.c +++ b/tools/testing/selftests/kvm/x86_64/xapic_state_test.c @@ -132,6 +132,62 @@ static void test_icr(struct xapic_vcpu *x) __test_icr(x, -1ull & ~APIC_DM_FIXED_MASK); } +static void _test_lapic_id(struct kvm_vcpu *vcpu, bool x2apic_enabled, + int expected_id) +{ + struct kvm_lapic_state xapic; + + vcpu_ioctl(vcpu, KVM_GET_LAPIC, &xapic); + if (x2apic_enabled) + ASSERT_EQ(xapic.regs[APIC_ID], expected_id); + else + ASSERT_EQ(xapic.regs[0x23], expected_id); + +} + +static void test_apic_id(struct kvm_vcpu *vcpu, int id) +{ + int ret; + struct { + struct kvm_msrs info; + struct kvm_msr_entry entries[1]; + } msr_data = { + .info.nmsrs = 1, + .entries[0].index = MSR_IA32_APICBASE, + }; + + /* vcpu is initialized with xAPIC enabled */ + ret = __vcpu_ioctl(vcpu, KVM_GET_MSRS, &msr_data.info); + TEST_ASSERT(ret == 1, __KVM_IOCTL_ERROR("__vcpu_ioctl", ret)); + ASSERT_EQ(msr_data.entries[0].data & MSR_IA32_APICBASE_ENABLE, + MSR_IA32_APICBASE_ENABLE); + ASSERT_EQ(msr_data.entries[0].data & X2APIC_ENABLE, 0); + _test_lapic_id(vcpu, false, id); + + /* enable x2APIC */ + msr_data.entries[0].data |= X2APIC_ENABLE; + ret = __vcpu_ioctl(vcpu, KVM_SET_MSRS, &msr_data.info); + TEST_ASSERT(ret == 1, __KVM_IOCTL_ERROR("__vcpu_ioctl", ret)); + ASSERT_EQ(msr_data.entries[0].data & MSR_IA32_APICBASE_ENABLE, + MSR_IA32_APICBASE_ENABLE); + ASSERT_EQ(msr_data.entries[0].data & X2APIC_ENABLE, X2APIC_ENABLE); + _test_lapic_id(vcpu, true, id); + + /* + * Check that disabling x2APIC correctly updates the APIC ID to the + * xAPIC format. + */ + msr_data.entries[0].data ^= X2APIC_ENABLE; + ret = __vcpu_ioctl(vcpu, KVM_SET_MSRS, &msr_data.info); + TEST_ASSERT(ret == 1, __KVM_IOCTL_ERROR("__vcpu_ioctl", ret)); + ASSERT_EQ(msr_data.entries[0].data & MSR_IA32_APICBASE_ENABLE, + MSR_IA32_APICBASE_ENABLE); + ASSERT_EQ(msr_data.entries[0].data & X2APIC_ENABLE, 0); + _test_lapic_id(vcpu, false, id); +} + +#define NCPUS 3 + int main(int argc, char *argv[]) { struct xapic_vcpu x = { @@ -139,6 +195,14 @@ int main(int argc, char *argv[]) .is_x2apic = true, }; struct kvm_vm *vm; + struct kvm_vcpu *vcpus[NCPUS] = { 0 }; + int i; + + vm = vm_create_with_vcpus(NCPUS, NULL, vcpus); + vm_enable_cap(vm, KVM_CAP_X2APIC_API, KVM_X2APIC_API_USE_32BIT_IDS); + for (i = 0; i < NCPUS; i++) + test_apic_id(vcpus[i], i); + kvm_vm_free(vm); vm = vm_create_with_one_vcpu(&x.vcpu, x2apic_guest_code); test_icr(&x);