From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 78772D53E for ; Fri, 5 Jul 2024 01:02:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720141362; cv=none; b=KcrfJDj6s9K9PRkq4ghfbZ+7DoYIpVTu9sBbwUV+1p43vJQMMvT1YrYjGfx5yiVxfkDS9wiOQePQk4R5OoN7JYUPzySdA3ae8BrSAkIYvqP6meo8PG0NoItAr6fDIUTCg4jMPd1eU1HriXktRQKjS+FbcJQSBxuTIs6c6zRzd7Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720141362; c=relaxed/simple; bh=d28O/O1NNXtFdZSLqWx/Hw/P4g98RXkmjaWVisB5hUE=; h=Message-ID:Subject:From:To:Cc:Date:In-Reply-To:References: Content-Type:MIME-Version; b=tflokjzA8jxGYiwoQJ+HL3EgjP5EyN+qtt02xGKCq/KnAqDEYkHGbk3oyAGPtiXy9pq2fLXppxEVSG5//OERWPVFblBPtGpjfB8Qj+fNMEG2Tdmo1V4MVniQYRO5DvHhMSIriRWE6uRmbzfPFM+0HPiN61zYAXGFILXcYNbbj7s= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=PDYy0i4I; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="PDYy0i4I" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1720141359; 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=gwVWVVn2PQAhE34Slz2JjSzwHzwSSlv06I+ZV3jhpoM=; b=PDYy0i4IWcqJ26nWc762sWBZ7ZWTXdB4gwNZ85JV6VJqm9GzyjazM8PWkS+jmjKojBkJ3J xx38Umk7NlEkKmJsmBHL3r92ubFWBBSpH46TruaNrW5NSi0tUdFduB8jg8+7tKjBWiS4m8 kNEeC8HAQDX9rKVZftHHgRIZxVNeotw= Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-21-1gVp8RRsP3O8tPF9OUkcLw-1; Thu, 04 Jul 2024 21:02:37 -0400 X-MC-Unique: 1gVp8RRsP3O8tPF9OUkcLw-1 Received: by mail-qv1-f70.google.com with SMTP id 6a1803df08f44-6b5e0b5c9eeso13440156d6.3 for ; Thu, 04 Jul 2024 18:02:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720141357; x=1720746157; h=content-transfer-encoding:mime-version:user-agent:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=gwVWVVn2PQAhE34Slz2JjSzwHzwSSlv06I+ZV3jhpoM=; b=XSYisyk69CN9uxPfJSQFLtEUHQm5ngXaPsp4WZTgAtDQohwyyOQwaEDfnbNTHBadRR MS+DcpTdOULmq0lhMF8VRzh9pY+j/QTUZaJbEu5CH8MDfF4w+K6/hx4TPCC0mvsKDRT5 cfS0euyQSoz7jjEJQDe+PTGGoeW90MzGdfbPkouOQS3d+KNSLoq/Wzomz5REeOtwrmy3 Jd8wpl83tFz/5Dimma+dDZiZD5og5Bx5pihb7Fdj4xYIfLnuD+22FL0OWuFtDWcsYOwv tjARiCzOI+2PpHL1y3fxOBFEndyOTcRmCDr039Q1jnQ2cbWLmLMxawT++KUb9G22erdv QeRQ== X-Forwarded-Encrypted: i=1; AJvYcCW6i/od1oxMPZNYicLKwva1rjyWBhVMIBkXlGFUqJf3kyI5MHa4rfL4Fpu+xYcOxnhK7CmuqEG7uxkuQM1Mo9A4e0S9Awt4fyjYCzT7 X-Gm-Message-State: AOJu0YyTNORWQmKSmUs/lQ3ab99d9a9yC2NYV52HZkJdAsqkbPXL/X0/ yBkO7OuSssxvFnshRdLI4uGhIo9Qjw1NqnRwDzwh2bfH8ArRDZ6X0jrWe2EI8Q+dbyOetGXkD3g DcWs6fAp7uOQEf1DmWOmPjRLHboln9SIiMgW2K32LGIH9alwVFgjaF98vFwsx+g== X-Received: by 2002:ad4:5c69:0:b0:6b2:b510:8b79 with SMTP id 6a1803df08f44-6b5ed00d3e6mr34076086d6.36.1720141357190; Thu, 04 Jul 2024 18:02:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEgHHFK2aM2VfXFAkWbXWdsT/fbJGrY/e1g1UXJUmVTtQqviU3TXnQiExxFUPuOPNaxwjmNeg== X-Received: by 2002:ad4:5c69:0:b0:6b2:b510:8b79 with SMTP id 6a1803df08f44-6b5ed00d3e6mr34075926d6.36.1720141356874; Thu, 04 Jul 2024 18:02:36 -0700 (PDT) Received: from starship ([2607:fea8:fc01:7b7f:6adb:55ff:feaa:b156]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6b59e737d61sm68437506d6.136.2024.07.04.18.02.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jul 2024 18:02:36 -0700 (PDT) Message-ID: Subject: Re: [PATCH v2 08/49] KVM: x86: Move __kvm_is_valid_cr4() definition to x86.h From: Maxim Levitsky To: Sean Christopherson , Paolo Bonzini , Vitaly Kuznetsov Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Hou Wenlong , Kechen Lu , Oliver Upton , Binbin Wu , Yang Weijiang , Robert Hoo Date: Thu, 04 Jul 2024 21:02:35 -0400 In-Reply-To: <20240517173926.965351-9-seanjc@google.com> References: <20240517173926.965351-1-seanjc@google.com> <20240517173926.965351-9-seanjc@google.com> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.36.5 (3.36.5-2.fc32) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 7bit On Fri, 2024-05-17 at 10:38 -0700, Sean Christopherson wrote: > Let vendor code inline __kvm_is_valid_cr4() now x86.c's cr4_reserved_bits > no longer exists, as keeping cr4_reserved_bits local to x86.c was the only > reason for "hiding" the definition of __kvm_is_valid_cr4(). > > No functional change intended. > > Signed-off-by: Sean Christopherson > --- > arch/x86/kvm/x86.c | 9 --------- > arch/x86/kvm/x86.h | 6 +++++- > 2 files changed, 5 insertions(+), 10 deletions(-) > > diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c > index 3f20de4368a6..2f6dda723005 100644 > --- a/arch/x86/kvm/x86.c > +++ b/arch/x86/kvm/x86.c > @@ -1130,15 +1130,6 @@ int kvm_emulate_xsetbv(struct kvm_vcpu *vcpu) > } > EXPORT_SYMBOL_GPL(kvm_emulate_xsetbv); > > -bool __kvm_is_valid_cr4(struct kvm_vcpu *vcpu, unsigned long cr4) > -{ > - if (cr4 & vcpu->arch.cr4_guest_rsvd_bits) > - return false; > - > - return true; > -} > -EXPORT_SYMBOL_GPL(__kvm_is_valid_cr4); > - > static bool kvm_is_valid_cr4(struct kvm_vcpu *vcpu, unsigned long cr4) > { > return __kvm_is_valid_cr4(vcpu, cr4) && > diff --git a/arch/x86/kvm/x86.h b/arch/x86/kvm/x86.h > index d80a4c6b5a38..4a723705a139 100644 > --- a/arch/x86/kvm/x86.h > +++ b/arch/x86/kvm/x86.h > @@ -491,7 +491,6 @@ static inline void kvm_machine_check(void) > void kvm_load_guest_xsave_state(struct kvm_vcpu *vcpu); > void kvm_load_host_xsave_state(struct kvm_vcpu *vcpu); > int kvm_spec_ctrl_test_value(u64 value); > -bool __kvm_is_valid_cr4(struct kvm_vcpu *vcpu, unsigned long cr4); > int kvm_handle_memory_failure(struct kvm_vcpu *vcpu, int r, > struct x86_exception *e); > int kvm_handle_invpcid(struct kvm_vcpu *vcpu, unsigned long type, gva_t gva); > @@ -505,6 +504,11 @@ bool kvm_msr_allowed(struct kvm_vcpu *vcpu, u32 index, u32 type); > #define KVM_MSR_RET_INVALID 2 /* in-kernel MSR emulation #GP condition */ > #define KVM_MSR_RET_FILTERED 3 /* #GP due to userspace MSR filter */ > > +static inline bool __kvm_is_valid_cr4(struct kvm_vcpu *vcpu, unsigned long cr4) > +{ > + return !(cr4 & vcpu->arch.cr4_guest_rsvd_bits); > +} > + > #define __cr4_reserved_bits(__cpu_has, __c) \ > ({ \ > u64 __reserved_bits = CR4_RESERVED_BITS; \ Reviewed-by: Maxim Levitsky Best regards, Maxim Levitsky