From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932765AbcBWJKN (ORCPT ); Tue, 23 Feb 2016 04:10:13 -0500 Received: from terminus.zytor.com ([198.137.202.10]:58188 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932591AbcBWJKG (ORCPT ); Tue, 23 Feb 2016 04:10:06 -0500 Date: Tue, 23 Feb 2016 01:03:02 -0800 From: =?UTF-8?B?dGlwLWJvdCBmb3IgSm9zaCBQb2ltYm9ldWYgPHRpcGJvdEB6eXRvci5jb20+?=@zytor.com Message-ID: Cc: luto@kernel.org, dvlasenk@redhat.com, bp@alien8.de, hpa@zytor.com, palves@redhat.com, luto@amacapital.net, jslaby@suse.cz, ast@kernel.org, tglx@linutronix.de, acme@kernel.org, torvalds@linux-foundation.org, mmarek@suse.cz, brgerst@gmail.com, peterz@infradead.org, namhyung@gmail.com, bernd@petrovitsch.priv.at, jpoimboe@redhat.com, mingo@kernel.org, akpm@linux-foundation.org, linux-kernel@vger.kernel.org, chris.j.arges@canonical.com Reply-To: bernd@petrovitsch.priv.at, namhyung@gmail.com, jpoimboe@redhat.com, mingo@kernel.org, akpm@linux-foundation.org, linux-kernel@vger.kernel.org, chris.j.arges@canonical.com, luto@amacapital.net, jslaby@suse.cz, ast@kernel.org, tglx@linutronix.de, acme@kernel.org, mmarek@suse.cz, torvalds@linux-foundation.org, brgerst@gmail.com, peterz@infradead.org, hpa@zytor.com, palves@redhat.com, luto@kernel.org, dvlasenk@redhat.com, bp@alien8.de In-Reply-To: References: To: =?UTF-8?B?bGludXgtdGlwLWNvbW1pdHNAdmdlci5rZXJuZWwub3Jn?=@zytor.com Subject: =?UTF-8?B?W3RpcDp4ODYvZGVidWddIHg4Ni9hc20vYnBmOiBDcmVhdGUgc3RhY2sgZnJhbWU=?= =?UTF-8?B?cyBpbiBicGZfaml0LlM=?= Git-Commit-ID: =?UTF-8?B?NDU2NzBiZTA3NWNlOTY1NjZiYzZiNmNhMGI1NzlmMTdlZDZmOTRmMw==?= X-Mailer: =?UTF-8?B?dGlwLWdpdC1sb2ctZGFlbW9u?= Robot-ID: =?UTF-8?B?PHRpcC1ib3QuZ2l0Lmtlcm5lbC5vcmc+?= Robot-Unsubscribe: =?UTF-8?B?Q29udGFjdCA8bWFpbHRvOmhwYUBrZXJuZWwub3JnPiB0byBnZXQgYmxhY2tsaXM=?= =?UTF-8?B?dGVkIGZyb20gdGhlc2UgZW1haWxz?= MIME-Version: =?UTF-8?B?MS4w?= Content-Transfer-Encoding: =?UTF-8?B?OGJpdA==?= Content-Type: =?UTF-8?B?dGV4dC9wbGFpbjsgY2hhcnNldD1VVEYtOA==?= Content-Disposition: =?UTF-8?B?aW5saW5l?= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 45670be075ce96566bc6b6ca0b579f17ed6f94f3 Gitweb: http://git.kernel.org/tip/45670be075ce96566bc6b6ca0b579f17ed6f94f3 Author: Josh Poimboeuf AuthorDate: Thu, 21 Jan 2016 16:49:27 -0600 Committer: Ingo Molnar CommitDate: Tue, 23 Feb 2016 09:03:59 +0100 x86/asm/bpf: Create stack frames in bpf_jit.S bpf_jit.S has several callable non-leaf functions which don't honor CONFIG_FRAME_POINTER, which can result in bad stack traces. Create a stack frame before the call instructions when CONFIG_FRAME_POINTER is enabled. Signed-off-by: Josh Poimboeuf Acked-by: Alexei Starovoitov Cc: Andrew Morton Cc: Andy Lutomirski Cc: Andy Lutomirski Cc: Arnaldo Carvalho de Melo Cc: Bernd Petrovitsch Cc: Borislav Petkov Cc: Brian Gerst Cc: Chris J Arges Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Jiri Slaby Cc: Linus Torvalds Cc: Michal Marek Cc: Namhyung Kim Cc: Pedro Alves Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: live-patching@vger.kernel.org Cc: netdev@vger.kernel.org Link: http://lkml.kernel.org/r/fa4c41976b438b51954cb8021f06bceb1d1d66cc.1453405861.git.jpoimboe@redhat.com Signed-off-by: Ingo Molnar --- arch/x86/net/bpf_jit.S | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/arch/x86/net/bpf_jit.S b/arch/x86/net/bpf_jit.S index eb4a3bd..f2a7faf 100644 --- a/arch/x86/net/bpf_jit.S +++ b/arch/x86/net/bpf_jit.S @@ -8,6 +8,7 @@ * of the License. */ #include +#include /* * Calling convention : @@ -65,16 +66,18 @@ FUNC(sk_load_byte_positive_offset) /* rsi contains offset and can be scratched */ #define bpf_slow_path_common(LEN) \ + lea -MAX_BPF_STACK + 32(%rbp), %rdx;\ + FRAME_BEGIN; \ mov %rbx, %rdi; /* arg1 == skb */ \ push %r9; \ push SKBDATA; \ /* rsi already has offset */ \ mov $LEN,%ecx; /* len */ \ - lea - MAX_BPF_STACK + 32(%rbp),%rdx; \ call skb_copy_bits; \ test %eax,%eax; \ pop SKBDATA; \ - pop %r9; + pop %r9; \ + FRAME_END bpf_slow_path_word: @@ -99,6 +102,7 @@ bpf_slow_path_byte: ret #define sk_negative_common(SIZE) \ + FRAME_BEGIN; \ mov %rbx, %rdi; /* arg1 == skb */ \ push %r9; \ push SKBDATA; \ @@ -108,6 +112,7 @@ bpf_slow_path_byte: test %rax,%rax; \ pop SKBDATA; \ pop %r9; \ + FRAME_END; \ jz bpf_error bpf_slow_path_word_neg: