stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: gregkh@linuxfoundation.org
Cc: mhiramat@kernel.org, anders.roxell@linaro.org,
	anil.s.keshavamurthy@intel.com, davem@davemloft.net,
	gustavoars@kernel.org, mingo@elte.hu, mingo@kernel.org,
	naveen.n.rao@linux.ibm.com, peterz@infradead.org,
	rostedt@goodmis.org, zsun@redhat.com, stable@vger.kernel.org
Subject: Re: FAILED: patch "[PATCH] kprobes: Fix to protect kick_kprobe_optimizer() by" failed to apply to 4.9-stable tree
Date: Tue, 23 Jun 2020 09:26:28 -0400	[thread overview]
Message-ID: <20200623132628.GX1931@sasha-vm> (raw)
In-Reply-To: <159291344624382@kroah.com>

On Tue, Jun 23, 2020 at 01:57:26PM +0200, gregkh@linuxfoundation.org wrote:
>
>The patch below does not apply to the 4.9-stable tree.
>If someone wants it applied there, or to any other stable or longterm
>tree, then please email the backport, including the original git commit
>id to <stable@vger.kernel.org>.
>
>thanks,
>
>greg k-h
>
>------------------ original commit in Linus's tree ------------------
>
>From 1a0aa991a6274161c95a844c58cfb801d681eb59 Mon Sep 17 00:00:00 2001
>From: Masami Hiramatsu <mhiramat@kernel.org>
>Date: Tue, 12 May 2020 17:02:56 +0900
>Subject: [PATCH] kprobes: Fix to protect kick_kprobe_optimizer() by
> kprobe_mutex
>
>In kprobe_optimizer() kick_kprobe_optimizer() is called
>without kprobe_mutex, but this can race with other caller
>which is protected by kprobe_mutex.
>
>To fix that, expand kprobe_mutex protected area to protect
>kick_kprobe_optimizer() call.
>
>Link: http://lkml.kernel.org/r/158927057586.27680.5036330063955940456.stgit@devnote2
>
>Fixes: cd7ebe2298ff ("kprobes: Use text_poke_smp_batch for optimizing")
>Cc: Ingo Molnar <mingo@kernel.org>
>Cc: "Gustavo A . R . Silva" <gustavoars@kernel.org>
>Cc: Anders Roxell <anders.roxell@linaro.org>
>Cc: "Naveen N . Rao" <naveen.n.rao@linux.ibm.com>
>Cc: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
>Cc: David Miller <davem@davemloft.net>
>Cc: Ingo Molnar <mingo@elte.hu>
>Cc: Peter Zijlstra <peterz@infradead.org>
>Cc: Ziqian SUN <zsun@redhat.com>
>Cc: stable@vger.kernel.org
>Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
>Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

The conflict happened because we don't have 2d1e38f56622 ("kprobes: Cure
hotplug lock ordering issues") on 4.9 and 4.4. I've fixed it up and
queued for both branches.

-- 
Thanks,
Sasha

  reply	other threads:[~2020-06-23 13:26 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-23 11:57 FAILED: patch "[PATCH] kprobes: Fix to protect kick_kprobe_optimizer() by" failed to apply to 4.9-stable tree gregkh
2020-06-23 13:26 ` Sasha Levin [this message]
2020-06-23 13:30   ` Steven Rostedt
2020-06-23 16:09   ` Greg KH

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=20200623132628.GX1931@sasha-vm \
    --to=sashal@kernel.org \
    --cc=anders.roxell@linaro.org \
    --cc=anil.s.keshavamurthy@intel.com \
    --cc=davem@davemloft.net \
    --cc=gregkh@linuxfoundation.org \
    --cc=gustavoars@kernel.org \
    --cc=mhiramat@kernel.org \
    --cc=mingo@elte.hu \
    --cc=mingo@kernel.org \
    --cc=naveen.n.rao@linux.ibm.com \
    --cc=peterz@infradead.org \
    --cc=rostedt@goodmis.org \
    --cc=stable@vger.kernel.org \
    --cc=zsun@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).