From mboxrd@z Thu Jan 1 00:00:00 1970 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.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 791E1C433DF for ; Wed, 27 May 2020 10:03:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 50FD72084C for ; Wed, 27 May 2020 10:03:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="MhmIJE6n" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728043AbgE0KDV (ORCPT ); Wed, 27 May 2020 06:03:21 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:48860 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725775AbgE0KDV (ORCPT ); Wed, 27 May 2020 06:03:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590573799; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=K5aoZD94Bdt8IQkQiaPPsorrKIIJCA0ECfpK+RBmwjU=; b=MhmIJE6ngQ9AZ6JE3zXQ1WEE5vEVC0oOVTCTcv82xvMs7U3vsywld1t8R6gQ4E6VfXay0y qg+Tf+/snjA1drgkd/pkhiC24XfcV0hflCutWeWG/dUoUb1H4No7S8AUimSuezh1R9RcQU WVdvj1ZiWPSa/MYbTJfUQHYRHgQUp20= Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-274-S0UZJbIWOs2ORrLQzaxBug-1; Wed, 27 May 2020 06:03:18 -0400 X-MC-Unique: S0UZJbIWOs2ORrLQzaxBug-1 Received: by mail-ej1-f69.google.com with SMTP id ng1so8622710ejb.22 for ; Wed, 27 May 2020 03:03:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references:date :message-id:mime-version; bh=K5aoZD94Bdt8IQkQiaPPsorrKIIJCA0ECfpK+RBmwjU=; b=dsDzTjM7kzLB7fp+0JsgxLINeC9tnx3du5IkLveYqkohxeYb382vcWd/f0DjvQ8jHv h4XDqRrsenATaL9EgScS+gE4kkzvgiLiK4VaDmzhPb8m5gHQlDXvyQPoXr21KYUQAg5P XyVNjeY0Yq6ba51hk3Os/J2rFUNHNwU8R79Cm4wzFt96bTyumRDPCYUbiDwmtwlKAJAQ HGg64KmUNZXPXyMs7NbjfLg8fPL90tB+s00JUzIHAbM+fuuISpxIB5kQ7pm+C/T0n+6k UnD5FviF1rXflXZy93UY+UERqXGKaZ+4KUvHYBwehzSRE8pZTOSFEeOfSBX1vGviGcsi 7Sww== X-Gm-Message-State: AOAM531Z5Cy0Sd7ZtcB4fc7Ld1wN+9qyHYQcaeW0f3CgF5BuUFzauVYY LaA0e4F0qSWXFskoSvI8J20GOdPZ8hA+MnGOZWvGdGmOrjoI6PRiecNS6M7Zv9C7GkPkO2qduIP liRRYZRdU1FlkAUspaAizcxvd X-Received: by 2002:a17:907:1189:: with SMTP id uz9mr5081182ejb.53.1590573796345; Wed, 27 May 2020 03:03:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwtGDTVME1kTme3ysc0tvVt/aSxxpA7Dx0TxZxwIBs/4vrOxvgxcS0wsLTR19Vf7/VXoKMP5A== X-Received: by 2002:a17:907:1189:: with SMTP id uz9mr5081127ejb.53.1590573795772; Wed, 27 May 2020 03:03:15 -0700 (PDT) Received: from vitty.brq.redhat.com (g-server-2.ign.cz. [91.219.240.2]) by smtp.gmail.com with ESMTPSA id m11sm2268523ejq.49.2020.05.27.03.03.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 May 2020 03:03:14 -0700 (PDT) From: Vitaly Kuznetsov To: Sean Christopherson Cc: Wanpeng Li , Jim Mattson , Joerg Roedel , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, syzbot+904752567107eefb728c@syzkaller.appspotmail.com, Paolo Bonzini Subject: Re: [PATCH] KVM: x86: Initialize tdp_level during vCPU creation In-Reply-To: <20200527085400.23759-1-sean.j.christopherson@intel.com> References: <20200527085400.23759-1-sean.j.christopherson@intel.com> Date: Wed, 27 May 2020 12:03:13 +0200 Message-ID: <875zch66fy.fsf@vitty.brq.redhat.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Sean Christopherson writes: > Initialize vcpu->arch.tdp_level during vCPU creation to avoid consuming > garbage if userspace calls KVM_RUN without first calling KVM_SET_CPUID. > > Fixes: e93fd3b3e89e9 ("KVM: x86/mmu: Capture TDP level when updating CPUID") > Reported-by: syzbot+904752567107eefb728c@syzkaller.appspotmail.com > Signed-off-by: Sean Christopherson > --- > arch/x86/kvm/x86.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c > index b226fb8abe41b..01a6304056197 100644 > --- a/arch/x86/kvm/x86.c > +++ b/arch/x86/kvm/x86.c > @@ -9414,6 +9414,7 @@ int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu) > fx_init(vcpu); > > vcpu->arch.maxphyaddr = cpuid_query_maxphyaddr(vcpu); > + vcpu->arch.tdp_level = kvm_x86_ops.get_tdp_level(vcpu); > > vcpu->arch.pat = MSR_IA32_CR_PAT_DEFAULT; Reviewed-by: Vitaly Kuznetsov Looking at kvm_update_cpuid() I was thinking if it would make sense to duplicate the "/* Note, maxphyaddr must be updated before tdp_level. */" comment here (it seems to be a vmx-only thing btw), drop it from kvm_update_cpuid() or move cpuid_query_maxphyaddr() to get_tdp_level() but didn't come to a conclusive answer. -- Vitaly