diff for duplicates of <1558605115220151@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 070a8b8..958f6f6 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -11,7 +11,7 @@ greg k-h ------------------ original commit in Linus's tree ------------------ >From 9e298e8604088a600d8100a111a532a9d342af09 Mon Sep 17 00:00:00 2001 -From: Peter Zijlstra <peterz at infradead.org> +From: Peter Zijlstra <peterz@infradead.org> Date: Wed, 1 May 2019 15:11:17 +0200 Subject: [PATCH] ftrace/x86_64: Emulate call function while updating in breakpoint handler diff --git a/a/content_digest b/N1/content_digest index 2949d0d..9cb0424 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,4 +1,4 @@ - "From\0gregkh at linuxfoundation.org (gregkh at linuxfoundation.org)\0" + "From\0gregkh@linuxfoundation.org (gregkh@linuxfoundation.org)\0" "Subject\0FAILED: patch \"[PATCH] ftrace/x86_64: Emulate call function while updating in\" failed to apply to 4.9-stable tree\0" "Date\0Thu, 23 May 2019 11:51:55 +0200\0" "\00:1\0" @@ -16,7 +16,7 @@ "------------------ original commit in Linus's tree ------------------\n" "\n" ">From 9e298e8604088a600d8100a111a532a9d342af09 Mon Sep 17 00:00:00 2001\n" - "From: Peter Zijlstra <peterz at infradead.org>\n" + "From: Peter Zijlstra <peterz@infradead.org>\n" "Date: Wed, 1 May 2019 15:11:17 +0200\n" "Subject: [PATCH] ftrace/x86_64: Emulate call function while updating in\n" " breakpoint handler\n" @@ -162,4 +162,4 @@ " \n" " \treturn update_ftrace_func(ip, new);" -711b9ee2e03297764e72bac7a13fd6ff30f08d5a26f7bbc21a8c1ff540c71516 +1183f669cbf2a38d4c9fef7e82a2c5a95ef45767c3da439a3e80e9153bbdd841
diff --git a/a/1.txt b/N2/1.txt index 070a8b8..c4c1321 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -2,7 +2,7 @@ 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 at vger.kernel.org>. +id to <stable@vger.kernel.org>. thanks, @@ -10,8 +10,8 @@ greg k-h ------------------ original commit in Linus's tree ------------------ ->From 9e298e8604088a600d8100a111a532a9d342af09 Mon Sep 17 00:00:00 2001 -From: Peter Zijlstra <peterz at infradead.org> +From 9e298e8604088a600d8100a111a532a9d342af09 Mon Sep 17 00:00:00 2001 +From: Peter Zijlstra <peterz@infradead.org> Date: Wed, 1 May 2019 15:11:17 +0200 Subject: [PATCH] ftrace/x86_64: Emulate call function while updating in breakpoint handler @@ -33,48 +33,48 @@ But after some debate[4][5] adding a gap in the stack when entering the breakpoint handler allows for pushing the return address onto the stack to easily emulate a call. -[1] http://lkml.kernel.org/r/20180726104029.7736-1-nstange at suse.de -[2] http://lkml.kernel.org/r/20190427100639.15074-1-nstange at suse.de -[3] http://lkml.kernel.org/r/3cf04e113d71c9f8e4be95fb84a510f085aa4afa.1541711457.git.jpoimboe at redhat.com -[4] http://lkml.kernel.org/r/CAHk-=wh5OpheSU8Em_Q3Hg8qw_JtoijxOdPtHru6d+5K8TWM=A at mail.gmail.com -[5] http://lkml.kernel.org/r/CAHk-=wjvQxY4DvPrJ6haPgAa6b906h=MwZXO6G8OtiTGe=N7_w at mail.gmail.com +[1] http://lkml.kernel.org/r/20180726104029.7736-1-nstange@suse.de +[2] http://lkml.kernel.org/r/20190427100639.15074-1-nstange@suse.de +[3] http://lkml.kernel.org/r/3cf04e113d71c9f8e4be95fb84a510f085aa4afa.1541711457.git.jpoimboe@redhat.com +[4] http://lkml.kernel.org/r/CAHk-=wh5OpheSU8Em_Q3Hg8qw_JtoijxOdPtHru6d+5K8TWM=A@mail.gmail.com +[5] http://lkml.kernel.org/r/CAHk-=wjvQxY4DvPrJ6haPgAa6b906h=MwZXO6G8OtiTGe=N7_w@mail.gmail.com [ Live kernel patching is not implemented on x86_32, thus the emulate calls are only for x86_64. ] -Cc: Andy Lutomirski <luto at kernel.org> -Cc: Nicolai Stange <nstange at suse.de> -Cc: Thomas Gleixner <tglx at linutronix.de> -Cc: Ingo Molnar <mingo at redhat.com> -Cc: Borislav Petkov <bp at alien8.de> -Cc: "H. Peter Anvin" <hpa at zytor.com> -Cc: the arch/x86 maintainers <x86 at kernel.org> -Cc: Josh Poimboeuf <jpoimboe at redhat.com> -Cc: Jiri Kosina <jikos at kernel.org> -Cc: Miroslav Benes <mbenes at suse.cz> -Cc: Petr Mladek <pmladek at suse.com> -Cc: Joe Lawrence <joe.lawrence at redhat.com> -Cc: Shuah Khan <shuah at kernel.org> -Cc: Konrad Rzeszutek Wilk <konrad.wilk at oracle.com> -Cc: Tim Chen <tim.c.chen at linux.intel.com> -Cc: Sebastian Andrzej Siewior <bigeasy at linutronix.de> -Cc: Mimi Zohar <zohar at linux.ibm.com> -Cc: Juergen Gross <jgross at suse.com> -Cc: Nick Desaulniers <ndesaulniers at google.com> -Cc: Nayna Jain <nayna at linux.ibm.com> -Cc: Masahiro Yamada <yamada.masahiro at socionext.com> -Cc: Joerg Roedel <jroedel at suse.de> -Cc: "open list:KERNEL SELFTEST FRAMEWORK" <linux-kselftest at vger.kernel.org> -Cc: stable at vger.kernel.org +Cc: Andy Lutomirski <luto@kernel.org> +Cc: Nicolai Stange <nstange@suse.de> +Cc: Thomas Gleixner <tglx@linutronix.de> +Cc: Ingo Molnar <mingo@redhat.com> +Cc: Borislav Petkov <bp@alien8.de> +Cc: "H. Peter Anvin" <hpa@zytor.com> +Cc: the arch/x86 maintainers <x86@kernel.org> +Cc: Josh Poimboeuf <jpoimboe@redhat.com> +Cc: Jiri Kosina <jikos@kernel.org> +Cc: Miroslav Benes <mbenes@suse.cz> +Cc: Petr Mladek <pmladek@suse.com> +Cc: Joe Lawrence <joe.lawrence@redhat.com> +Cc: Shuah Khan <shuah@kernel.org> +Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> +Cc: Tim Chen <tim.c.chen@linux.intel.com> +Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de> +Cc: Mimi Zohar <zohar@linux.ibm.com> +Cc: Juergen Gross <jgross@suse.com> +Cc: Nick Desaulniers <ndesaulniers@google.com> +Cc: Nayna Jain <nayna@linux.ibm.com> +Cc: Masahiro Yamada <yamada.masahiro@socionext.com> +Cc: Joerg Roedel <jroedel@suse.de> +Cc: "open list:KERNEL SELFTEST FRAMEWORK" <linux-kselftest@vger.kernel.org> +Cc: stable@vger.kernel.org Fixes: b700e7f03df5 ("livepatch: kernel: add support for live patching") -Tested-by: Nicolai Stange <nstange at suse.de> -Reviewed-by: Nicolai Stange <nstange at suse.de> -Reviewed-by: Masami Hiramatsu <mhiramat at kernel.org> -Signed-off-by: Peter Zijlstra (Intel) <peterz at infradead.org> +Tested-by: Nicolai Stange <nstange@suse.de> +Reviewed-by: Nicolai Stange <nstange@suse.de> +Reviewed-by: Masami Hiramatsu <mhiramat@kernel.org> +Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> [ Changed to only implement emulated calls for x86_64 ] -Signed-off-by: Steven Rostedt (VMware) <rostedt at goodmis.org> +Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org> diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c index ef49517f6bb2..bd553b3af22e 100644 diff --git a/a/content_digest b/N2/content_digest index 2949d0d..0daf579 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,13 +1,40 @@ - "From\0gregkh at linuxfoundation.org (gregkh at linuxfoundation.org)\0" + "From\0<gregkh@linuxfoundation.org>\0" "Subject\0FAILED: patch \"[PATCH] ftrace/x86_64: Emulate call function while updating in\" failed to apply to 4.9-stable tree\0" "Date\0Thu, 23 May 2019 11:51:55 +0200\0" + "To\0peterz@infradead.org" + bigeasy@linutronix.de + bp@alien8.de + hpa@zytor.com + jgross@suse.com + jikos@kernel.org + joe.lawrence@redhat.com + jpoimboe@redhat.com + jroedel@suse.de + konrad.wilk@oracle.com + linux-kselftest@vger.kernel.org + luto@kernel.org + mbenes@suse.cz + mhiramat@kernel.org + mingo@redhat.com + nayna@linux.ibm.com + ndesaulniers@google.com + nstange@suse.de + pmladek@suse.com + rostedt@goodmis.org + shuah@kernel.org + tglx@linutronix.de + tim.c.chen@linux.intel.com + x86@kernel.org + yamada.masahiro@socionext.com + " zohar@linux.ibm.com\0" + "Cc\0<stable@vger.kernel.org>\0" "\00:1\0" "b\0" "\n" "The patch below does not apply to the 4.9-stable tree.\n" "If someone wants it applied there, or to any other stable or longterm\n" "tree, then please email the backport, including the original git commit\n" - "id to <stable at vger.kernel.org>.\n" + "id to <stable@vger.kernel.org>.\n" "\n" "thanks,\n" "\n" @@ -15,8 +42,8 @@ "\n" "------------------ original commit in Linus's tree ------------------\n" "\n" - ">From 9e298e8604088a600d8100a111a532a9d342af09 Mon Sep 17 00:00:00 2001\n" - "From: Peter Zijlstra <peterz at infradead.org>\n" + "From 9e298e8604088a600d8100a111a532a9d342af09 Mon Sep 17 00:00:00 2001\n" + "From: Peter Zijlstra <peterz@infradead.org>\n" "Date: Wed, 1 May 2019 15:11:17 +0200\n" "Subject: [PATCH] ftrace/x86_64: Emulate call function while updating in\n" " breakpoint handler\n" @@ -38,48 +65,48 @@ "breakpoint handler allows for pushing the return address onto the stack to\n" "easily emulate a call.\n" "\n" - "[1] http://lkml.kernel.org/r/20180726104029.7736-1-nstange at suse.de\n" - "[2] http://lkml.kernel.org/r/20190427100639.15074-1-nstange at suse.de\n" - "[3] http://lkml.kernel.org/r/3cf04e113d71c9f8e4be95fb84a510f085aa4afa.1541711457.git.jpoimboe at redhat.com\n" - "[4] http://lkml.kernel.org/r/CAHk-=wh5OpheSU8Em_Q3Hg8qw_JtoijxOdPtHru6d+5K8TWM=A at mail.gmail.com\n" - "[5] http://lkml.kernel.org/r/CAHk-=wjvQxY4DvPrJ6haPgAa6b906h=MwZXO6G8OtiTGe=N7_w at mail.gmail.com\n" + "[1] http://lkml.kernel.org/r/20180726104029.7736-1-nstange@suse.de\n" + "[2] http://lkml.kernel.org/r/20190427100639.15074-1-nstange@suse.de\n" + "[3] http://lkml.kernel.org/r/3cf04e113d71c9f8e4be95fb84a510f085aa4afa.1541711457.git.jpoimboe@redhat.com\n" + "[4] http://lkml.kernel.org/r/CAHk-=wh5OpheSU8Em_Q3Hg8qw_JtoijxOdPtHru6d+5K8TWM=A@mail.gmail.com\n" + "[5] http://lkml.kernel.org/r/CAHk-=wjvQxY4DvPrJ6haPgAa6b906h=MwZXO6G8OtiTGe=N7_w@mail.gmail.com\n" "\n" "[\n" " Live kernel patching is not implemented on x86_32, thus the emulate\n" " calls are only for x86_64.\n" "]\n" "\n" - "Cc: Andy Lutomirski <luto at kernel.org>\n" - "Cc: Nicolai Stange <nstange at suse.de>\n" - "Cc: Thomas Gleixner <tglx at linutronix.de>\n" - "Cc: Ingo Molnar <mingo at redhat.com>\n" - "Cc: Borislav Petkov <bp at alien8.de>\n" - "Cc: \"H. Peter Anvin\" <hpa at zytor.com>\n" - "Cc: the arch/x86 maintainers <x86 at kernel.org>\n" - "Cc: Josh Poimboeuf <jpoimboe at redhat.com>\n" - "Cc: Jiri Kosina <jikos at kernel.org>\n" - "Cc: Miroslav Benes <mbenes at suse.cz>\n" - "Cc: Petr Mladek <pmladek at suse.com>\n" - "Cc: Joe Lawrence <joe.lawrence at redhat.com>\n" - "Cc: Shuah Khan <shuah at kernel.org>\n" - "Cc: Konrad Rzeszutek Wilk <konrad.wilk at oracle.com>\n" - "Cc: Tim Chen <tim.c.chen at linux.intel.com>\n" - "Cc: Sebastian Andrzej Siewior <bigeasy at linutronix.de>\n" - "Cc: Mimi Zohar <zohar at linux.ibm.com>\n" - "Cc: Juergen Gross <jgross at suse.com>\n" - "Cc: Nick Desaulniers <ndesaulniers at google.com>\n" - "Cc: Nayna Jain <nayna at linux.ibm.com>\n" - "Cc: Masahiro Yamada <yamada.masahiro at socionext.com>\n" - "Cc: Joerg Roedel <jroedel at suse.de>\n" - "Cc: \"open list:KERNEL SELFTEST FRAMEWORK\" <linux-kselftest at vger.kernel.org>\n" - "Cc: stable at vger.kernel.org\n" + "Cc: Andy Lutomirski <luto@kernel.org>\n" + "Cc: Nicolai Stange <nstange@suse.de>\n" + "Cc: Thomas Gleixner <tglx@linutronix.de>\n" + "Cc: Ingo Molnar <mingo@redhat.com>\n" + "Cc: Borislav Petkov <bp@alien8.de>\n" + "Cc: \"H. Peter Anvin\" <hpa@zytor.com>\n" + "Cc: the arch/x86 maintainers <x86@kernel.org>\n" + "Cc: Josh Poimboeuf <jpoimboe@redhat.com>\n" + "Cc: Jiri Kosina <jikos@kernel.org>\n" + "Cc: Miroslav Benes <mbenes@suse.cz>\n" + "Cc: Petr Mladek <pmladek@suse.com>\n" + "Cc: Joe Lawrence <joe.lawrence@redhat.com>\n" + "Cc: Shuah Khan <shuah@kernel.org>\n" + "Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>\n" + "Cc: Tim Chen <tim.c.chen@linux.intel.com>\n" + "Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>\n" + "Cc: Mimi Zohar <zohar@linux.ibm.com>\n" + "Cc: Juergen Gross <jgross@suse.com>\n" + "Cc: Nick Desaulniers <ndesaulniers@google.com>\n" + "Cc: Nayna Jain <nayna@linux.ibm.com>\n" + "Cc: Masahiro Yamada <yamada.masahiro@socionext.com>\n" + "Cc: Joerg Roedel <jroedel@suse.de>\n" + "Cc: \"open list:KERNEL SELFTEST FRAMEWORK\" <linux-kselftest@vger.kernel.org>\n" + "Cc: stable@vger.kernel.org\n" "Fixes: b700e7f03df5 (\"livepatch: kernel: add support for live patching\")\n" - "Tested-by: Nicolai Stange <nstange at suse.de>\n" - "Reviewed-by: Nicolai Stange <nstange at suse.de>\n" - "Reviewed-by: Masami Hiramatsu <mhiramat at kernel.org>\n" - "Signed-off-by: Peter Zijlstra (Intel) <peterz at infradead.org>\n" + "Tested-by: Nicolai Stange <nstange@suse.de>\n" + "Reviewed-by: Nicolai Stange <nstange@suse.de>\n" + "Reviewed-by: Masami Hiramatsu <mhiramat@kernel.org>\n" + "Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>\n" "[ Changed to only implement emulated calls for x86_64 ]\n" - "Signed-off-by: Steven Rostedt (VMware) <rostedt at goodmis.org>\n" + "Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>\n" "\n" "diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c\n" "index ef49517f6bb2..bd553b3af22e 100644\n" @@ -162,4 +189,4 @@ " \n" " \treturn update_ftrace_func(ip, new);" -711b9ee2e03297764e72bac7a13fd6ff30f08d5a26f7bbc21a8c1ff540c71516 +caec56af1171f379a587ff76d3218be1308c1b011171c461d02d6c96c4b6baee
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.