Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp4721915pxv; Tue, 6 Jul 2021 07:40:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzccG8+12e13vEEDTZ9jsRuetkvZlv3KD/OYd+dQ7/rOmrQv0DOqB1jpAJB0FncRRzMPDRf X-Received: by 2002:aa7:c711:: with SMTP id i17mr23582365edq.386.1625582432963; Tue, 06 Jul 2021 07:40:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625582432; cv=none; d=google.com; s=arc-20160816; b=AVwSSHjqkUws6PYXc+gHx/NDxcFGOc+Ut41FGou6pwlWmvzVrkbo3six6T3poJhIE1 13pqYkmNevcdF+d/puLx7aEBxCQvDtpS6bvMrAOPpniS7Owk5Wv4zrLO440UCG7+6YLk 9D/X/wCmIasiL8xSbRxrG64INM9JLQDtnJIGATs6aCe/2wBLVw/g9lWRuwLPMgk1EBHH 9/sMito0YgYNQXcWS1oSy4FryJed6guPn5tv6Hz1i6XZ76oQMik6TsiHd0qD1LxRqJLM SFC0YB1QNHWOC5p0yajef/t8TLwuusNKQCYdZmGB8uVNTuScVNkxUs4I4tCCI8P7i71A 5WVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:content-language :in-reply-to:mime-version:user-agent:date:message-id:from:references :cc:to:subject:dkim-signature; bh=EKUrcUoZRPh3vlCTbwVSchVaWqNiyUJJrYB0Hptcx60=; b=bqkwzWnSVJT273UUteI2CP758NLuEa2rZofzsuEOtzUYLV+fjbO734Yp0s4gbwdAwU cyKeruSppQHRb237MfOEM8CmRYpFx+nmfs1585sJewPTBX3fTOcccBn5ybp6MliX16aW njh8gejBq3850ninCcl4Xwzlnz0XUK7ljHa0uLkSCFqJjUjB7ctYdFEIxgTMTAECgL7w iAXze5zecOX+wfA6b123O0qhb9BrYsEoL+Q5ehssEIk/OzcuX6ZtwMXQuljnDop5t0DI 0+5eyLJn1cNjXgpy8L1ti+8mLsUu9tYQB35L+1JJgmcNq9vNhs943SoHV5HJLNRxRbkz nWFw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=iLjVK9pg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id er22si14902399ejc.499.2021.07.06.07.40.09; Tue, 06 Jul 2021 07:40:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=iLjVK9pg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 S232096AbhGFOgH (ORCPT + 99 others); Tue, 6 Jul 2021 10:36:07 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:46302 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232321AbhGFOfr (ORCPT ); Tue, 6 Jul 2021 10:35:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1625581683; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EKUrcUoZRPh3vlCTbwVSchVaWqNiyUJJrYB0Hptcx60=; b=iLjVK9pg/pofYIDtYNLWFRGQH77l0jAh9Y6dHcMyQcGWQcLRxH4gI748oy3k+vvOU4X+IC fRLnuuM6YrifbXuJqk0r84xr5jYDrbApvUdhPjTq2ecEuaM+hloxt5xRCpj3AlVr6jUrg0 Xrawqf2Z0EXLIH8UiObnL8m0ZWD44qI= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-595-4-DZ0fhBNV2muJXKt-ZfXg-1; Tue, 06 Jul 2021 09:57:51 -0400 X-MC-Unique: 4-DZ0fhBNV2muJXKt-ZfXg-1 Received: by mail-ej1-f72.google.com with SMTP id f1-20020a1709064941b02903f6b5ef17bfso5827343ejt.20 for ; Tue, 06 Jul 2021 06:57:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=EKUrcUoZRPh3vlCTbwVSchVaWqNiyUJJrYB0Hptcx60=; b=grHqQ4mpqwG5d3jrkeqB3LC8JQEWTBLstwsWeNmhgf+BApvHM/to4Y+rKXoyzeVC2+ ScHW7AZ94oDvJ+LhMa/dEujbKtlC9BmHx61fdOkxNQJCoeVJXtM/bmbh9/uHeexF6Xun 0ujtD6zsk4voCvH6vJjTC1B6SiwwfkDL7lnWw8G5wXz9PlJsN9WecIdjVo20Hl02zEQF NRyLmX4EX3IDVlI3g7D5Ljs0Za4rO4UdGoq3i6UzocbQgk33TB7vg5qop5PbbEcqg2n4 LovaadLrPYYC/Te77HFnR0+ZY2xIKLiPWDBRYwvdsb9J5dHRJyErY20/D8OymOVukGp9 W99A== X-Gm-Message-State: AOAM532bX1+ZkfOc4W118FbkX1QRDQzB6/1fCZk8YwpAtmuXVGVlWIEd eg6CUIL/mhubQX+AiBgAYAehTDuED+2EWE2z6vhfTHDv+ilyMU1nRNJx3rarMSBye8gcpj0XNch fb70Tco+IKR0gRXWAU4h7szrd X-Received: by 2002:a05:6402:270e:: with SMTP id y14mr23712400edd.124.1625579869842; Tue, 06 Jul 2021 06:57:49 -0700 (PDT) X-Received: by 2002:a05:6402:270e:: with SMTP id y14mr23712370edd.124.1625579869708; Tue, 06 Jul 2021 06:57:49 -0700 (PDT) Received: from ?IPv6:2001:b07:6468:f312:c8dd:75d4:99ab:290a? ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id q23sm1720075edt.22.2021.07.06.06.57.46 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 06 Jul 2021 06:57:48 -0700 (PDT) Subject: Re: [RFC PATCH v2 23/69] KVM: x86: Hoist kvm_dirty_regs check out of sync_regs() To: isaku.yamahata@intel.com, Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H . Peter Anvin" , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel , erdemaktas@google.com, Connor Kuehl , Sean Christopherson , x86@kernel.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: isaku.yamahata@gmail.com, Sean Christopherson References: <889017a8d31cea46472e0c64b234ef5919278ed9.1625186503.git.isaku.yamahata@intel.com> From: Paolo Bonzini Message-ID: <98f9f005-67c5-39ba-0be8-8a752604fdd1@redhat.com> Date: Tue, 6 Jul 2021 15:57:46 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <889017a8d31cea46472e0c64b234ef5919278ed9.1625186503.git.isaku.yamahata@intel.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 03/07/21 00:04, isaku.yamahata@intel.com wrote: > From: Sean Christopherson > > Move the kvm_dirty_regs vs. KVM_SYNC_X86_VALID_FIELDS check out of > sync_regs() and into its sole caller, kvm_arch_vcpu_ioctl_run(). This > allows a future patch to allow synchronizing select state for protected > VMs. > > Signed-off-by: Sean Christopherson > Signed-off-by: Isaku Yamahata > --- > arch/x86/kvm/x86.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c > index d7110d48cbc1..271245ffc67c 100644 > --- a/arch/x86/kvm/x86.c > +++ b/arch/x86/kvm/x86.c > @@ -9729,7 +9729,8 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu) > goto out; > } > > - if (kvm_run->kvm_valid_regs & ~KVM_SYNC_X86_VALID_FIELDS) { > + if ((kvm_run->kvm_valid_regs & ~KVM_SYNC_X86_VALID_FIELDS) || > + (kvm_run->kvm_dirty_regs & ~KVM_SYNC_X86_VALID_FIELDS)) { > r = -EINVAL; > goto out; > } > @@ -10264,9 +10265,6 @@ static void store_regs(struct kvm_vcpu *vcpu) > > static int sync_regs(struct kvm_vcpu *vcpu) > { > - if (vcpu->run->kvm_dirty_regs & ~KVM_SYNC_X86_VALID_FIELDS) > - return -EINVAL; > - > if (vcpu->run->kvm_dirty_regs & KVM_SYNC_X86_REGS) { > __set_regs(vcpu, &vcpu->run->s.regs.regs); > vcpu->run->kvm_dirty_regs &= ~KVM_SYNC_X86_REGS; > Reviewed-by: Paolo Bonzini