* [PATCH v2] KVM: x86: get rid of odd out jump label in pdptrs_changed
@ 2019-10-25 10:54 Miaohe Lin
2019-10-25 11:46 ` Paolo Bonzini
0 siblings, 1 reply; 3+ messages in thread
From: Miaohe Lin @ 2019-10-25 10:54 UTC (permalink / raw)
To: pbonzini, rkrcmar, sean.j.christopherson, vkuznets, wanpengli,
jmattson, joro, tglx, mingo, bp, hpa
Cc: x86, kvm, linux-kernel, linmiaohe
The odd out jump label is really not needed. Get rid of
it by return true directly while r < 0 as suggested by
Paolo. This further lead to var changed being unused.
Remove it too.
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
---
arch/x86/kvm/x86.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index ff395f812719..8b0d594a3b90 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -721,7 +721,6 @@ EXPORT_SYMBOL_GPL(load_pdptrs);
bool pdptrs_changed(struct kvm_vcpu *vcpu)
{
u64 pdpte[ARRAY_SIZE(vcpu->arch.walk_mmu->pdptrs)];
- bool changed = true;
int offset;
gfn_t gfn;
int r;
@@ -738,11 +737,9 @@ bool pdptrs_changed(struct kvm_vcpu *vcpu)
r = kvm_read_nested_guest_page(vcpu, gfn, pdpte, offset, sizeof(pdpte),
PFERR_USER_MASK | PFERR_WRITE_MASK);
if (r < 0)
- goto out;
- changed = memcmp(pdpte, vcpu->arch.walk_mmu->pdptrs, sizeof(pdpte)) != 0;
-out:
+ return true;
- return changed;
+ return memcmp(pdpte, vcpu->arch.walk_mmu->pdptrs, sizeof(pdpte)) != 0;
}
EXPORT_SYMBOL_GPL(pdptrs_changed);
--
2.19.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] KVM: x86: get rid of odd out jump label in pdptrs_changed
2019-10-25 10:54 [PATCH v2] KVM: x86: get rid of odd out jump label in pdptrs_changed Miaohe Lin
@ 2019-10-25 11:46 ` Paolo Bonzini
0 siblings, 0 replies; 3+ messages in thread
From: Paolo Bonzini @ 2019-10-25 11:46 UTC (permalink / raw)
To: Miaohe Lin, rkrcmar, sean.j.christopherson, vkuznets, wanpengli,
jmattson, joro, tglx, mingo, bp, hpa
Cc: x86, kvm, linux-kernel
Queued, thanks (but it likely won't be on git.kernel.org until after the
end of KVM Forum, sorry about that).
Paolo
On 25/10/19 12:54, Miaohe Lin wrote:
> The odd out jump label is really not needed. Get rid of
> it by return true directly while r < 0 as suggested by
> Paolo. This further lead to var changed being unused.
> Remove it too.
>
> Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
> ---
> arch/x86/kvm/x86.c | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> index ff395f812719..8b0d594a3b90 100644
> --- a/arch/x86/kvm/x86.c
> +++ b/arch/x86/kvm/x86.c
> @@ -721,7 +721,6 @@ EXPORT_SYMBOL_GPL(load_pdptrs);
> bool pdptrs_changed(struct kvm_vcpu *vcpu)
> {
> u64 pdpte[ARRAY_SIZE(vcpu->arch.walk_mmu->pdptrs)];
> - bool changed = true;
> int offset;
> gfn_t gfn;
> int r;
> @@ -738,11 +737,9 @@ bool pdptrs_changed(struct kvm_vcpu *vcpu)
> r = kvm_read_nested_guest_page(vcpu, gfn, pdpte, offset, sizeof(pdpte),
> PFERR_USER_MASK | PFERR_WRITE_MASK);
> if (r < 0)
> - goto out;
> - changed = memcmp(pdpte, vcpu->arch.walk_mmu->pdptrs, sizeof(pdpte)) != 0;
> -out:
> + return true;
>
> - return changed;
> + return memcmp(pdpte, vcpu->arch.walk_mmu->pdptrs, sizeof(pdpte)) != 0;
> }
> EXPORT_SYMBOL_GPL(pdptrs_changed);
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] KVM: x86: get rid of odd out jump label in pdptrs_changed
@ 2019-10-26 1:29 linmiaohe
0 siblings, 0 replies; 3+ messages in thread
From: linmiaohe @ 2019-10-26 1:29 UTC (permalink / raw)
To: Paolo Bonzini
Cc: rkrcmar, sean.j.christopherson, vkuznets, wanpengli, jmattson,
joro, tglx, mingo, bp, hpa, x86, kvm, linux-kernel
On 26/10/19 , Paolo Bonzini wrote:
> Queued, thanks (but it likely won't be on git.kernel.org until after the end of KVM Forum, sorry about that).
Not at all. Many thanks for your contribution to make KVM more strong, statble and efficient.
Have a nice day.
> On 25/10/19 12:54, Miaohe Lin wrote:
>> The odd out jump label is really not needed. Get rid of it by return
>> true directly while r < 0 as suggested by Paolo. This further lead to
>> var changed being unused.
>> Remove it too.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-10-26 1:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-25 10:54 [PATCH v2] KVM: x86: get rid of odd out jump label in pdptrs_changed Miaohe Lin
2019-10-25 11:46 ` Paolo Bonzini
2019-10-26 1:29 linmiaohe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).