From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759852AbcBYFwL (ORCPT ); Thu, 25 Feb 2016 00:52:11 -0500 Received: from torg.zytor.com ([198.137.202.12]:54122 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1759772AbcBYFwH (ORCPT ); Thu, 25 Feb 2016 00:52:07 -0500 Date: Wed, 24 Feb 2016 21:50:52 -0800 From: tip-bot for Josh Poimboeuf Message-ID: Cc: mmarek@suse.cz, chris.j.arges@canonical.com, namhyung@gmail.com, peterz@infradead.org, torvalds@linux-foundation.org, bp@alien8.de, ast@kernel.org, luto@amacapital.net, linux-kernel@vger.kernel.org, akpm@linux-foundation.org, brgerst@gmail.com, bernd@petrovitsch.priv.at, palves@redhat.com, jpoimboe@redhat.com, tglx@linutronix.de, dvlasenk@redhat.com, luto@kernel.org, hpa@zytor.com, mingo@kernel.org, jslaby@suse.cz, acme@kernel.org Reply-To: bernd@petrovitsch.priv.at, luto@amacapital.net, akpm@linux-foundation.org, linux-kernel@vger.kernel.org, brgerst@gmail.com, jpoimboe@redhat.com, palves@redhat.com, tglx@linutronix.de, dvlasenk@redhat.com, mingo@kernel.org, hpa@zytor.com, luto@kernel.org, jslaby@suse.cz, acme@kernel.org, namhyung@gmail.com, mmarek@suse.cz, chris.j.arges@canonical.com, torvalds@linux-foundation.org, peterz@infradead.org, bp@alien8.de, ast@kernel.org In-Reply-To: References: To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/debug] x86/asm/bpf: Annotate callable functions Git-Commit-ID: 2d8fe90a1b96d52c2a3f719c385b846b02f0bcd8 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 2d8fe90a1b96d52c2a3f719c385b846b02f0bcd8 Gitweb: http://git.kernel.org/tip/2d8fe90a1b96d52c2a3f719c385b846b02f0bcd8 Author: Josh Poimboeuf AuthorDate: Thu, 21 Jan 2016 16:49:26 -0600 Committer: Ingo Molnar CommitDate: Wed, 24 Feb 2016 08:35:43 +0100 x86/asm/bpf: Annotate callable functions bpf_jit.S has several functions which can be called from C code. Give them proper ELF annotations. 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/bbe1de0c299fecd4fc9a1766bae8be2647bedb01.1453405861.git.jpoimboe@redhat.com Signed-off-by: Ingo Molnar --- arch/x86/net/bpf_jit.S | 39 ++++++++++++++++----------------------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/arch/x86/net/bpf_jit.S b/arch/x86/net/bpf_jit.S index 4093216..eb4a3bd 100644 --- a/arch/x86/net/bpf_jit.S +++ b/arch/x86/net/bpf_jit.S @@ -22,15 +22,16 @@ 32 /* space for rbx,r13,r14,r15 */ + \ 8 /* space for skb_copy_bits */) -sk_load_word: - .globl sk_load_word +#define FUNC(name) \ + .globl name; \ + .type name, @function; \ + name: +FUNC(sk_load_word) test %esi,%esi js bpf_slow_path_word_neg -sk_load_word_positive_offset: - .globl sk_load_word_positive_offset - +FUNC(sk_load_word_positive_offset) mov %r9d,%eax # hlen sub %esi,%eax # hlen - offset cmp $3,%eax @@ -39,15 +40,11 @@ sk_load_word_positive_offset: bswap %eax /* ntohl() */ ret -sk_load_half: - .globl sk_load_half - +FUNC(sk_load_half) test %esi,%esi js bpf_slow_path_half_neg -sk_load_half_positive_offset: - .globl sk_load_half_positive_offset - +FUNC(sk_load_half_positive_offset) mov %r9d,%eax sub %esi,%eax # hlen - offset cmp $1,%eax @@ -56,15 +53,11 @@ sk_load_half_positive_offset: rol $8,%ax # ntohs() ret -sk_load_byte: - .globl sk_load_byte - +FUNC(sk_load_byte) test %esi,%esi js bpf_slow_path_byte_neg -sk_load_byte_positive_offset: - .globl sk_load_byte_positive_offset - +FUNC(sk_load_byte_positive_offset) cmp %esi,%r9d /* if (offset >= hlen) goto bpf_slow_path_byte */ jle bpf_slow_path_byte movzbl (SKBDATA,%rsi),%eax @@ -120,8 +113,8 @@ bpf_slow_path_byte: bpf_slow_path_word_neg: cmp SKF_MAX_NEG_OFF, %esi /* test range */ jl bpf_error /* offset lower -> error */ -sk_load_word_negative_offset: - .globl sk_load_word_negative_offset + +FUNC(sk_load_word_negative_offset) sk_negative_common(4) mov (%rax), %eax bswap %eax @@ -130,8 +123,8 @@ sk_load_word_negative_offset: bpf_slow_path_half_neg: cmp SKF_MAX_NEG_OFF, %esi jl bpf_error -sk_load_half_negative_offset: - .globl sk_load_half_negative_offset + +FUNC(sk_load_half_negative_offset) sk_negative_common(2) mov (%rax),%ax rol $8,%ax @@ -141,8 +134,8 @@ sk_load_half_negative_offset: bpf_slow_path_byte_neg: cmp SKF_MAX_NEG_OFF, %esi jl bpf_error -sk_load_byte_negative_offset: - .globl sk_load_byte_negative_offset + +FUNC(sk_load_byte_negative_offset) sk_negative_common(1) movzbl (%rax), %eax ret