From: Michael Ellerman <mpe@ellerman•id.au>
To: Petr Mladek <pmladek@suse•com>, linuxppc-dev@ozlabs•org
Cc: jeyu@redhat•com, jkosina@suse•cz, linux-kernel@vger•kernel.org,
rostedt@goodmis•org, kamalesh@linux•vnet.ibm.com, duwe@lst•de,
live-patching@vger•kernel.org, mbenes@suse•cz,
Torsten Duwe <duwe@suse•de>,
jikos@kernel•org, vojtech@suse•com, jpoimboe@redhat•com,
sjenning@redhat•com
Subject: How to merge? (was Re: [PATCH][v4] livepatch/ppc: Enable livepatching on powerpc)
Date: Fri, 04 Mar 2016 19:06:40 +1100 [thread overview]
Message-ID: <1457078800.20076.4.camel@ellerman.id.au> (raw)
In-Reply-To: <1457023921-2051-1-git-send-email-pmladek@suse.com>
Hi livepatch maintainers,
On Thu, 2016-03-03 at 17:52 +0100, Petr Mladek wrote:
> From: Balbir Singh <bsingharora@gmail•com>
>
> Changelog v4:
> 1. Renamed klp_matchaddr() to klp_get_ftrace_location()
> and used it just to convert the function address.
> 2. Synced klp_write_module_reloc() with s390(); made it
> inline, no error message, return -ENOSYS
> 3. Added an error message when including
> powerpc/include/asm/livepatch.h without HAVE_LIVEPATCH
> 4. Update some comments.
> Changelog v3:
> 1. Moved -ENOSYS to -EINVAL in klp_write_module_reloc
> 2. Moved klp_matchaddr to use ftrace_location_range
> Changelog v2:
> 1. Implement review comments by Michael
> 2. The previous version compared _NIP from the
> wrong location to check for whether we
> are going to a patched location
>
> This applies on top of the patches posted by Michael
> https://patchwork.ozlabs.org/patch/589791/
>
> It enables livepatching. This takes patch 6/8 and 7/8 of v8 as the base.
> (See the reference [1] below) and adds logic for checking offset ranges
> in livepatch with ftrace_location_range.
>
> I tested the sample in the livepatch
>
> Signed-off-by: Torsten Duwe <duwe@suse•de>
> Signed-off-by: Balbir Singh <bsingharora@gmail•com>
> Signed-off-by: Petr Mladek <pmladek@suse•com>
> ---
> arch/powerpc/Kconfig | 3 +++
> arch/powerpc/include/asm/livepatch.h | 47 +++++++++++++++++++++++++++++++++
> arch/powerpc/kernel/Makefile | 1 +
> arch/powerpc/kernel/entry_64.S | 50 ++++++++++++++++++++++++++++++++++++
> arch/powerpc/kernel/livepatch.c | 29 +++++++++++++++++++++
> include/linux/ftrace.h | 1 +
> include/linux/livepatch.h | 2 ++
> kernel/livepatch/core.c | 28 +++++++++++++++++---
> kernel/trace/ftrace.c | 14 +++++++++-
> 9 files changed, 171 insertions(+), 4 deletions(-)
> create mode 100644 arch/powerpc/include/asm/livepatch.h
> create mode 100644 arch/powerpc/kernel/livepatch.c
How should we go about merging this?
Obviously it depends heavily on the content of my series, which will go into
powerpc#next, so it would make sense if this went there too.
I don't see any changes in linux-next for livepatch, so merging it via powerpc
would probably work fine and not cause any conflicts, unless there's some
livepatch changes pending for 4.6 that aren't in linux-next yet?
The other option is that I put my ftrace changes and this in a topic branch
(based on v4.5-rc3), and then that can be merged into both powerpc#next and the
livepatch tree.
Also regardless of who takes it an Ack from Steve for the ftrace changes would
be good.
cheers
next prev parent reply other threads:[~2016-03-04 8:06 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-03 16:52 [PATCH][v4] livepatch/ppc: Enable livepatching on powerpc Petr Mladek
2016-03-03 20:43 ` Balbir Singh
2016-03-04 6:08 ` Kamalesh Babulal
2016-03-04 7:58 ` Michael Ellerman
2016-03-04 9:31 ` Miroslav Benes
2016-03-07 3:29 ` Michael Ellerman
2016-03-04 8:06 ` Michael Ellerman [this message]
2016-03-04 8:56 ` How to merge? (was Re: [PATCH][v4] livepatch/ppc: Enable livepatching on powerpc) Jiri Kosina
2016-03-07 10:06 ` Michael Ellerman
2016-03-07 22:52 ` Jiri Kosina
2016-03-07 23:20 ` Michael Ellerman
2016-03-08 1:53 ` Steven Rostedt
2016-03-07 23:22 ` Josh Poimboeuf
2016-03-04 12:42 ` [PATCH][v4] livepatch/ppc: Enable livepatching on powerpc Torsten Duwe
2016-03-04 13:01 ` Petr Mladek
2016-03-04 18:16 ` Torsten Duwe
2016-03-04 19:22 ` Torsten Duwe
2016-03-08 11:14 ` Torsten Duwe
2016-03-06 23:55 ` Balbir Singh
2016-03-04 21:56 ` Josh Poimboeuf
2016-03-08 21:42 ` Steven Rostedt
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=1457078800.20076.4.camel@ellerman.id.au \
--to=mpe@ellerman$(echo .)id.au \
--cc=duwe@lst$(echo .)de \
--cc=duwe@suse$(echo .)de \
--cc=jeyu@redhat$(echo .)com \
--cc=jikos@kernel$(echo .)org \
--cc=jkosina@suse$(echo .)cz \
--cc=jpoimboe@redhat$(echo .)com \
--cc=kamalesh@linux$(echo .)vnet.ibm.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linuxppc-dev@ozlabs$(echo .)org \
--cc=live-patching@vger$(echo .)kernel.org \
--cc=mbenes@suse$(echo .)cz \
--cc=pmladek@suse$(echo .)com \
--cc=rostedt@goodmis$(echo .)org \
--cc=sjenning@redhat$(echo .)com \
--cc=vojtech@suse$(echo .)com \
/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