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=-14.6 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=unavailable 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 CB093C433E1 for ; Tue, 23 Jun 2020 18:20:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A194B207E8 for ; Tue, 23 Jun 2020 18:20:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="pNUPDEbs" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733126AbgFWSUn (ORCPT ); Tue, 23 Jun 2020 14:20:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33818 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732988AbgFWSUn (ORCPT ); Tue, 23 Jun 2020 14:20:43 -0400 Received: from mail-io1-xd44.google.com (mail-io1-xd44.google.com [IPv6:2607:f8b0:4864:20::d44]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CD877C061755 for ; Tue, 23 Jun 2020 11:20:42 -0700 (PDT) Received: by mail-io1-xd44.google.com with SMTP id f23so19565692iof.6 for ; Tue, 23 Jun 2020 11:20:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=e21GOxkW1jWzhvdZJoi4FLyBWJfKpI2RdakLYHhUv8g=; b=pNUPDEbsj3LXnapU8PbQOKn+BfClHZhKeHLGL9QLze3xrrlEu2kgFyDy5J3Zjxqg6f DhUN2qvUGcfVVUmfb+u/XQ9K7BBECK3mON0OvGtZhph9IvrdGZ1GRwEmpB5Js3bXcy3w oRYCC/9tx/oT5j3cgMxa/rgvpPvr23esA7MrXUPKUfqkdgZxsnf88yn+2mKsXsBcgvWy Fu+vnJ43vP45Cr/yWOlMqfBNEQvSPRxVxBTasneabIc+FDck/NduuOpEP8V+c8W7Jlug 1LvSJQPGrMlvwPGNnDjB99j/x/oYPxkKv+RTMxIeaPdMPkPiFUSg9t4K4f3SGS74gfSN 74/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=e21GOxkW1jWzhvdZJoi4FLyBWJfKpI2RdakLYHhUv8g=; b=jx22UjKXBchh4Sn+VPdxmJL9SvzcW/UVGq783nKy88oHsxNJJvO3N12YSRcQRDHgk6 cvTnzBKQRzEV/A4sEozty6NtZ8ck15crjLpgduSg3qznFjHwia+nDJMHDT1bCMIxYzr5 beUVdnLUXSN67eJEV5fP/XTZteMzUS4cRiRjmRwb6PLOpwhImM81+O3C+EuHIqyxT86Z NHrP1OgHtND7JJOqq59P6PTYCRurwu/t0HVF0Cz3ciVQYAiNPyn+q6A4va+hbeq1PWW1 ALHl+VzfBcW4hYOMCo9CNEnUA8adtFoMVx1y8n8GE/V89wVlc2hJby8I/rf1WpTi53lx IX2A== X-Gm-Message-State: AOAM532OjnTrM/0UXtViU/9Vf9knCRoAJe8EwMvJvmpmhlfr3FyNvrs6 6eixD+6Wuh7DN79aQlGzUYheEld4hXMT2mr6ZEVxog== X-Google-Smtp-Source: ABdhPJxaGzjfNh6BQfLb1ueNVoQADHqkOg76L4JYuELLLcDhVXfOvWRjzxEf7j/9HaI/FWHPs8UFADNvMWhpXPQgEJ8= X-Received: by 2002:a02:c785:: with SMTP id n5mr7612695jao.75.1592936441902; Tue, 23 Jun 2020 11:20:41 -0700 (PDT) MIME-Version: 1.0 References: <20200623115816.24132-1-xiaoyao.li@intel.com> <20200623115816.24132-2-xiaoyao.li@intel.com> In-Reply-To: <20200623115816.24132-2-xiaoyao.li@intel.com> From: Jim Mattson Date: Tue, 23 Jun 2020 11:20:31 -0700 Message-ID: Subject: Re: [PATCH v2 1/7] KVM: X86: Reset vcpu->arch.cpuid_nent to 0 if SET_CPUID fails To: Xiaoyao Li Cc: Paolo Bonzini , Sean Christopherson , Vitaly Kuznetsov , Wanpeng Li , Joerg Roedel , kvm list , LKML Content-Type: text/plain; charset="UTF-8" Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On Tue, Jun 23, 2020 at 4:58 AM Xiaoyao Li wrote: > > It needs to invalidate CPUID configruations if usersapce provides Nits: configurations, userspace > illegal input. > > Signed-off-by: Xiaoyao Li > --- > arch/x86/kvm/cpuid.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c > index 8a294f9747aa..1d13bad42bf9 100644 > --- a/arch/x86/kvm/cpuid.c > +++ b/arch/x86/kvm/cpuid.c > @@ -207,6 +207,8 @@ int kvm_vcpu_ioctl_set_cpuid(struct kvm_vcpu *vcpu, > kvm_apic_set_version(vcpu); > kvm_x86_ops.cpuid_update(vcpu); > r = kvm_update_cpuid(vcpu); > + if (r) > + vcpu->arch.cpuid_nent = 0; > > kvfree(cpuid_entries); > out: > @@ -230,6 +232,8 @@ int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu, > kvm_apic_set_version(vcpu); > kvm_x86_ops.cpuid_update(vcpu); > r = kvm_update_cpuid(vcpu); > + if (r) > + vcpu->arch.cpuid_nent = 0; > out: > return r; > } > -- > 2.18.2 What if vcpu->arch.cpuid_nent was greater than 0 before the ioctl in question?