From: Paul Mackerras <paulus@ozlabs•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Alexander Graf <agraf@suse•de>,
Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Konstantin Khlebnikov <khlebnikov@yandex-team•ru>
Subject: Re: linux-next: manual merge of the kvm-ppc tree with the tip tree
Date: Wed, 26 Aug 2015 11:21:00 -0700 [thread overview]
Message-ID: <20150826182100.GA2662@fergus.ozlabs.ibm.com> (raw)
In-Reply-To: <20150824155954.0cb8a6a8@canb.auug.org.au>
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@canb•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.
next prev parent reply other threads:[~2015-08-26 18:21 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-24 5:59 linux-next: manual merge of the kvm-ppc tree with the tip tree Stephen Rothwell
2015-08-26 18:21 ` Paul Mackerras [this message]
2015-08-26 21:30 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150826182100.GA2662@fergus.ozlabs.ibm.com \
--to=paulus@ozlabs$(echo .)org \
--cc=agraf@suse$(echo .)de \
--cc=hpa@zytor$(echo .)com \
--cc=khlebnikov@yandex-team$(echo .)ru \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=peterz@infradead$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tglx@linutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox