* [PATCH] x86: Hide the int3_emulate_call/jmp functions from UML
@ 2019-05-11 12:39 ` Steven Rostedt
0 siblings, 0 replies; 5+ messages in thread
From: Steven Rostedt @ 2019-05-11 12:39 UTC (permalink / raw)
To: LKML
Cc: Peter Zijlstra, Linus Torvalds, Jiri Kosina, Josh Poimboeuf,
Andy Lutomirski, Jeff Dike, Richard Weinberger, Anton Ivanov,
linux-um
From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
User Mode Linux does not have access to the ip or sp fields of the
pt_regs, and accessing them causes UML to fail to build. Hide the
int3_emulate_jmp() and int3_emulate_call() instructions from UML, as it
doesn't need them anyway.
Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
---
[ I added this to my queue to test too ]
arch/x86/include/asm/text-patching.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/arch/x86/include/asm/text-patching.h
b/arch/x86/include/asm/text-patching.h index 05861cc08787..0bbb07eaed6b
100644 --- a/arch/x86/include/asm/text-patching.h
+++ b/arch/x86/include/asm/text-patching.h
@@ -39,6 +39,7 @@ extern int poke_int3_handler(struct pt_regs *regs);
extern void *text_poke_bp(void *addr, const void *opcode, size_t len,
void *handler); extern int after_bootmem;
+#ifndef CONFIG_UML_X86
static inline void int3_emulate_jmp(struct pt_regs *regs, unsigned
long ip) {
regs->ip = ip;
@@ -65,6 +66,7 @@ static inline void int3_emulate_call(struct pt_regs
*regs, unsigned long func) int3_emulate_push(regs, regs->ip -
INT3_INSN_SIZE + CALL_INSN_SIZE); int3_emulate_jmp(regs, func);
}
-#endif
+#endif /* CONFIG_X86_64 */
+#endif /* !CONFIG_UML_X86 */
#endif /* _ASM_X86_TEXT_PATCHING_H */
--
2.20.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] x86: Hide the int3_emulate_call/jmp functions from UML
@ 2019-05-11 12:39 ` Steven Rostedt
0 siblings, 0 replies; 5+ messages in thread
From: Steven Rostedt @ 2019-05-11 12:39 UTC (permalink / raw)
To: LKML
Cc: Peter Zijlstra, Jiri Kosina, Jeff Dike, linux-um,
Andy Lutomirski, Richard Weinberger, Josh Poimboeuf,
Linus Torvalds, Anton Ivanov
From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
User Mode Linux does not have access to the ip or sp fields of the
pt_regs, and accessing them causes UML to fail to build. Hide the
int3_emulate_jmp() and int3_emulate_call() instructions from UML, as it
doesn't need them anyway.
Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
---
[ I added this to my queue to test too ]
arch/x86/include/asm/text-patching.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/arch/x86/include/asm/text-patching.h
b/arch/x86/include/asm/text-patching.h index 05861cc08787..0bbb07eaed6b
100644 --- a/arch/x86/include/asm/text-patching.h
+++ b/arch/x86/include/asm/text-patching.h
@@ -39,6 +39,7 @@ extern int poke_int3_handler(struct pt_regs *regs);
extern void *text_poke_bp(void *addr, const void *opcode, size_t len,
void *handler); extern int after_bootmem;
+#ifndef CONFIG_UML_X86
static inline void int3_emulate_jmp(struct pt_regs *regs, unsigned
long ip) {
regs->ip = ip;
@@ -65,6 +66,7 @@ static inline void int3_emulate_call(struct pt_regs
*regs, unsigned long func) int3_emulate_push(regs, regs->ip -
INT3_INSN_SIZE + CALL_INSN_SIZE); int3_emulate_jmp(regs, func);
}
-#endif
+#endif /* CONFIG_X86_64 */
+#endif /* !CONFIG_UML_X86 */
#endif /* _ASM_X86_TEXT_PATCHING_H */
--
2.20.1
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] x86: Hide the int3_emulate_call/jmp functions from UML
2019-05-11 12:39 ` Steven Rostedt
(?)
@ 2019-05-20 8:08 ` Anton Ivanov
2019-05-20 16:08 ` Steven Rostedt
-1 siblings, 1 reply; 5+ messages in thread
From: Anton Ivanov @ 2019-05-20 8:08 UTC (permalink / raw)
To: Steven Rostedt, LKML
Cc: Peter Zijlstra, Linus Torvalds, Jiri Kosina, Josh Poimboeuf,
Andy Lutomirski, Jeff Dike, Richard Weinberger, linux-um
On 11/05/2019 13:39, Steven Rostedt wrote:
>
> From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
>
> User Mode Linux does not have access to the ip or sp fields of the
> pt_regs, and accessing them causes UML to fail to build. Hide the
> int3_emulate_jmp() and int3_emulate_call() instructions from UML, as it
> doesn't need them anyway.
>
> Reported-by: kbuild test robot <lkp@intel.com>
> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
> ---
>
> [ I added this to my queue to test too ]
>
> arch/x86/include/asm/text-patching.h | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/arch/x86/include/asm/text-patching.h
> b/arch/x86/include/asm/text-patching.h index 05861cc08787..0bbb07eaed6b
> 100644 --- a/arch/x86/include/asm/text-patching.h
> +++ b/arch/x86/include/asm/text-patching.h
> @@ -39,6 +39,7 @@ extern int poke_int3_handler(struct pt_regs *regs);
> extern void *text_poke_bp(void *addr, const void *opcode, size_t len,
> void *handler); extern int after_bootmem;
>
> +#ifndef CONFIG_UML_X86
> static inline void int3_emulate_jmp(struct pt_regs *regs, unsigned
> long ip) {
> regs->ip = ip;
> @@ -65,6 +66,7 @@ static inline void int3_emulate_call(struct pt_regs
> *regs, unsigned long func) int3_emulate_push(regs, regs->ip -
> INT3_INSN_SIZE + CALL_INSN_SIZE); int3_emulate_jmp(regs, func);
> }
> -#endif
> +#endif /* CONFIG_X86_64 */
> +#endif /* !CONFIG_UML_X86 */
>
> #endif /* _ASM_X86_TEXT_PATCHING_H */
>
The patch has been garbled by an auto-wrap. Can you resend it please.
--
Anton R. Ivanov
Cambridgegreys Limited. Registered in England. Company Number 10273661
https://www.cambridgegreys.com/
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] x86: Hide the int3_emulate_call/jmp functions from UML
2019-05-20 8:08 ` Anton Ivanov
@ 2019-05-20 16:08 ` Steven Rostedt
0 siblings, 0 replies; 5+ messages in thread
From: Steven Rostedt @ 2019-05-20 16:08 UTC (permalink / raw)
To: Anton Ivanov
Cc: LKML, Peter Zijlstra, Linus Torvalds, Jiri Kosina,
Josh Poimboeuf, Andy Lutomirski, Jeff Dike, Richard Weinberger,
linux-um
On Mon, 20 May 2019 09:08:01 +0100
Anton Ivanov <anton.ivanov@cambridgegreys.com> wrote:
> On 11/05/2019 13:39, Steven Rostedt wrote:
> >
> > From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
> >
> > User Mode Linux does not have access to the ip or sp fields of the
> > pt_regs, and accessing them causes UML to fail to build. Hide the
> > int3_emulate_jmp() and int3_emulate_call() instructions from UML, as it
> > doesn't need them anyway.
> >
> > Reported-by: kbuild test robot <lkp@intel.com>
> > Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
> > ---
> >
> > [ I added this to my queue to test too ]
Looks like when I added this text, claws-mail, decided to line wrap the
patch :-p
> >
> > arch/x86/include/asm/text-patching.h | 4 +++-
> > 1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/arch/x86/include/asm/text-patching.h
> > b/arch/x86/include/asm/text-patching.h index 05861cc08787..0bbb07eaed6b
> > 100644 --- a/arch/x86/include/asm/text-patching.h
> > +++ b/arch/x86/include/asm/text-patching.h
> > @@ -39,6 +39,7 @@ extern int poke_int3_handler(struct pt_regs *regs);
> > extern void *text_poke_bp(void *addr, const void *opcode, size_t len,
> > void *handler); extern int after_bootmem;
> >
> > +#ifndef CONFIG_UML_X86
> > static inline void int3_emulate_jmp(struct pt_regs *regs, unsigned
> > long ip) {
> > regs->ip = ip;
> > @@ -65,6 +66,7 @@ static inline void int3_emulate_call(struct pt_regs
> > *regs, unsigned long func) int3_emulate_push(regs, regs->ip -
> > INT3_INSN_SIZE + CALL_INSN_SIZE); int3_emulate_jmp(regs, func);
> > }
> > -#endif
> > +#endif /* CONFIG_X86_64 */
> > +#endif /* !CONFIG_UML_X86 */
> >
> > #endif /* _ASM_X86_TEXT_PATCHING_H */
> >
> The patch has been garbled by an auto-wrap. Can you resend it please.
>
Anyway, it's already in Linus's tree. It was required to keep UML
compiling with other changes that needed to get into the merge window.
-- Steve
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] x86: Hide the int3_emulate_call/jmp functions from UML
@ 2019-05-20 16:08 ` Steven Rostedt
0 siblings, 0 replies; 5+ messages in thread
From: Steven Rostedt @ 2019-05-20 16:08 UTC (permalink / raw)
To: Anton Ivanov
Cc: Peter Zijlstra, Jiri Kosina, Jeff Dike, linux-um, LKML,
Andy Lutomirski, Richard Weinberger, Josh Poimboeuf,
Linus Torvalds
On Mon, 20 May 2019 09:08:01 +0100
Anton Ivanov <anton.ivanov@cambridgegreys.com> wrote:
> On 11/05/2019 13:39, Steven Rostedt wrote:
> >
> > From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
> >
> > User Mode Linux does not have access to the ip or sp fields of the
> > pt_regs, and accessing them causes UML to fail to build. Hide the
> > int3_emulate_jmp() and int3_emulate_call() instructions from UML, as it
> > doesn't need them anyway.
> >
> > Reported-by: kbuild test robot <lkp@intel.com>
> > Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
> > ---
> >
> > [ I added this to my queue to test too ]
Looks like when I added this text, claws-mail, decided to line wrap the
patch :-p
> >
> > arch/x86/include/asm/text-patching.h | 4 +++-
> > 1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/arch/x86/include/asm/text-patching.h
> > b/arch/x86/include/asm/text-patching.h index 05861cc08787..0bbb07eaed6b
> > 100644 --- a/arch/x86/include/asm/text-patching.h
> > +++ b/arch/x86/include/asm/text-patching.h
> > @@ -39,6 +39,7 @@ extern int poke_int3_handler(struct pt_regs *regs);
> > extern void *text_poke_bp(void *addr, const void *opcode, size_t len,
> > void *handler); extern int after_bootmem;
> >
> > +#ifndef CONFIG_UML_X86
> > static inline void int3_emulate_jmp(struct pt_regs *regs, unsigned
> > long ip) {
> > regs->ip = ip;
> > @@ -65,6 +66,7 @@ static inline void int3_emulate_call(struct pt_regs
> > *regs, unsigned long func) int3_emulate_push(regs, regs->ip -
> > INT3_INSN_SIZE + CALL_INSN_SIZE); int3_emulate_jmp(regs, func);
> > }
> > -#endif
> > +#endif /* CONFIG_X86_64 */
> > +#endif /* !CONFIG_UML_X86 */
> >
> > #endif /* _ASM_X86_TEXT_PATCHING_H */
> >
> The patch has been garbled by an auto-wrap. Can you resend it please.
>
Anyway, it's already in Linus's tree. It was required to keep UML
compiling with other changes that needed to get into the merge window.
-- Steve
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-05-20 16:08 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-11 12:39 [PATCH] x86: Hide the int3_emulate_call/jmp functions from UML Steven Rostedt
2019-05-11 12:39 ` Steven Rostedt
2019-05-20 8:08 ` Anton Ivanov
2019-05-20 16:08 ` Steven Rostedt
2019-05-20 16:08 ` Steven Rostedt
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.