From patchwork Sat Apr 22 03:16:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Miller X-Patchwork-Id: 753662 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3w8yT81nzbz9s65 for ; Sat, 22 Apr 2017 13:17:16 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161263AbdDVDRI (ORCPT ); Fri, 21 Apr 2017 23:17:08 -0400 Received: from shards.monkeyblade.net ([184.105.139.130]:42216 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1043566AbdDVDRC (ORCPT ); Fri, 21 Apr 2017 23:17:02 -0400 Received: from localhost (cpe-66-108-81-97.nyc.res.rr.com [66.108.81.97]) (Authenticated sender: davem-davemloft) by shards.monkeyblade.net (Postfix) with ESMTPSA id 4C1F01228418C; Fri, 21 Apr 2017 19:35:38 -0700 (PDT) Date: Fri, 21 Apr 2017 20:16:58 -0700 (PDT) Message-Id: <20170421.201658.403967091238148561.davem@davemloft.net> To: sparclinux@vger.kernel.org CC: netdev@vger.kernel.org, ast@kernel.org, daniel@iogearbox.net Subject: [PATCH 1/2] sparc: Split BPF JIT into 32-bit and 64-bit. From: David Miller X-Mailer: Mew version 6.7 on Emacs 25.1 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.5.12 (shards.monkeyblade.net [149.20.54.216]); Fri, 21 Apr 2017 19:35:38 -0700 (PDT) Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org This is in preparation for adding the 64-bit eBPF JIT. Signed-off-by: David S. Miller --- arch/sparc/net/Makefile | 2 +- arch/sparc/net/{bpf_jit.h => bpf_jit_32.h} | 0 arch/sparc/net/{bpf_jit_asm.S => bpf_jit_asm_32.S} | 2 +- arch/sparc/net/bpf_jit_asm_64.S | 1 + arch/sparc/net/{bpf_jit_comp.c => bpf_jit_comp_32.c} | 2 +- arch/sparc/net/bpf_jit_comp_64.c | 1 + 6 files changed, 5 insertions(+), 3 deletions(-) rename arch/sparc/net/{bpf_jit.h => bpf_jit_32.h} (100%) rename arch/sparc/net/{bpf_jit_asm.S => bpf_jit_asm_32.S} (99%) create mode 100644 arch/sparc/net/bpf_jit_asm_64.S rename arch/sparc/net/{bpf_jit_comp.c => bpf_jit_comp_32.c} (99%) create mode 100644 arch/sparc/net/bpf_jit_comp_64.c diff --git a/arch/sparc/net/Makefile b/arch/sparc/net/Makefile index 1306a58..76fa8e9 100644 --- a/arch/sparc/net/Makefile +++ b/arch/sparc/net/Makefile @@ -1,4 +1,4 @@ # # Arch-specific network modules # -obj-$(CONFIG_BPF_JIT) += bpf_jit_asm.o bpf_jit_comp.o +obj-$(CONFIG_BPF_JIT) += bpf_jit_asm_$(BITS).o bpf_jit_comp_$(BITS).o diff --git a/arch/sparc/net/bpf_jit.h b/arch/sparc/net/bpf_jit_32.h similarity index 100% rename from arch/sparc/net/bpf_jit.h rename to arch/sparc/net/bpf_jit_32.h diff --git a/arch/sparc/net/bpf_jit_asm.S b/arch/sparc/net/bpf_jit_asm_32.S similarity index 99% rename from arch/sparc/net/bpf_jit_asm.S rename to arch/sparc/net/bpf_jit_asm_32.S index 8c83f4b..5632cdc 100644 --- a/arch/sparc/net/bpf_jit_asm.S +++ b/arch/sparc/net/bpf_jit_asm_32.S @@ -1,6 +1,6 @@ #include -#include "bpf_jit.h" +#include "bpf_jit_32.h" #ifdef CONFIG_SPARC64 #define SAVE_SZ 176 diff --git a/arch/sparc/net/bpf_jit_asm_64.S b/arch/sparc/net/bpf_jit_asm_64.S new file mode 100644 index 0000000..6fb023f --- /dev/null +++ b/arch/sparc/net/bpf_jit_asm_64.S @@ -0,0 +1 @@ +#include "bpf_jit_asm_32.S" diff --git a/arch/sparc/net/bpf_jit_comp.c b/arch/sparc/net/bpf_jit_comp_32.c similarity index 99% rename from arch/sparc/net/bpf_jit_comp.c rename to arch/sparc/net/bpf_jit_comp_32.c index a6d9204..83fc41d 100644 --- a/arch/sparc/net/bpf_jit_comp.c +++ b/arch/sparc/net/bpf_jit_comp_32.c @@ -8,7 +8,7 @@ #include #include -#include "bpf_jit.h" +#include "bpf_jit_32.h" int bpf_jit_enable __read_mostly; diff --git a/arch/sparc/net/bpf_jit_comp_64.c b/arch/sparc/net/bpf_jit_comp_64.c new file mode 100644 index 0000000..49b5f65 --- /dev/null +++ b/arch/sparc/net/bpf_jit_comp_64.c @@ -0,0 +1 @@ +#include "bpf_jit_comp_32.c"