linux-kernel - Re: linux-next: manual merge of the kvm-ppc tree with the tip tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20150826182100.GA2662@fergus.ozlabs.ibm.com>
Date:	Wed, 26 Aug 2015 11:21:00 -0700
From:	Paul Mackerras <paulus@...abs.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Alexander Graf <agraf@...e.de>,
	Thomas Gleixner <tglx@...utronix.de>,
	Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Konstantin Khlebnikov <khlebnikov@...dex-team.ru>
Subject: Re: linux-next: manual merge of the kvm-ppc tree with the tip tree

Hi Stephen,

On Mon, Aug 24, 2015 at 03:59:54PM +1000, Stephen Rothwell wrote:
> Hi Alexander,
> 
> Today's linux-next merge of the kvm-ppc tree got a conflict in:
> 
>   arch/powerpc/kvm/book3s_hv.c
> 
> between commit:
> 
>   c56dadf39761 ("sched/preempt, powerpc, kvm: Use need_resched() instead of should_resched()")
> 
> from the tip tree and commit:
> 
>   ec2571650826 ("KVM: PPC: Book3S HV: Make use of unused threads when running guests")
> 
> from the kvm-ppc tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

The fix isn't quite correct (see below), but the error is benign.

> -- 
> Cheers,
> Stephen Rothwell                    sfr@...b.auug.org.au
> 
> diff --cc arch/powerpc/kvm/book3s_hv.c
> index a9f753fb73a8,fad52f226c12..000000000000
> --- a/arch/powerpc/kvm/book3s_hv.c
> +++ b/arch/powerpc/kvm/book3s_hv.c
> @@@ -2178,11 -2670,12 +2670,13 @@@ static int kvmppc_run_vcpu(struct kvm_r
>   		vc->runner = vcpu;
>   		if (n_ceded == vc->n_runnable) {
>   			kvmppc_vcore_blocked(vc);
>  -		} else if (should_resched()) {
>  +		} else if (need_resched()) {
>  +			vc->vcore_state = VCORE_PREEMPT;

This line is removed in the kvm-ppc tree because it is now in the new
kvmppc_vcore_preempt() function.  Thus we don't need this line in the
merge result.  However, having it here just means that we set
vc->vcore_state to VCORE_PREEMPT twice.

> + 			kvmppc_vcore_preempt(vc);
>   			/* Let something else run */
>   			cond_resched_lock(&vc->lock);
> - 			vc->vcore_state = VCORE_INACTIVE;
> + 			if (vc->vcore_state == VCORE_PREEMPT)
> + 				kvmppc_vcore_end_preempt(vc);
>   		} else {
>   			kvmppc_run_core(vc);
>   		}

Regards,
Paul.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/