From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935662AbbGHP5K (ORCPT ); Wed, 8 Jul 2015 11:57:10 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:47798 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758834AbbGHPkz (ORCPT ); Wed, 8 Jul 2015 11:40:55 -0400 From: Kamal Mostafa To: linux-kernel@vger.kernel.org, stable@vger.kernel.org, kernel-team@lists.ubuntu.com Cc: Brad Figg , Kamal Mostafa Subject: [PATCH 3.13.y-ckt 07/56] [3.13-stable only] Revert "ARM: net: delegate filter to kernel interpreter when imm_offset() return value can't fit into 12bits." Date: Wed, 8 Jul 2015 08:39:48 -0700 Message-Id: <1436370037-25874-8-git-send-email-kamal@canonical.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1436370037-25874-1-git-send-email-kamal@canonical.com> References: <1436370037-25874-1-git-send-email-kamal@canonical.com> X-Extended-Stable: 3.13 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.13.11-ckt23 -stable review patch. If anyone has any objections, please let me know. ------------------ From: Kamal Mostafa This reverts commit a39d787c6d2df9850559923ffb7516f1011cf54e. Not suitable for 3.13 (no bpf_jit_binary_free). Cc: Brad Figg Signed-off-by: Kamal Mostafa --- arch/arm/net/bpf_jit_32.c | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c index 5fad5e9..6adf591 100644 --- a/arch/arm/net/bpf_jit_32.c +++ b/arch/arm/net/bpf_jit_32.c @@ -54,7 +54,6 @@ #define SEEN_DATA (1 << (BPF_MEMWORDS + 3)) #define FLAG_NEED_X_RESET (1 << 0) -#define FLAG_IMM_OVERFLOW (1 << 1) struct jit_ctx { const struct sk_filter *skf; @@ -294,15 +293,6 @@ static u16 imm_offset(u32 k, struct jit_ctx *ctx) /* PC in ARM mode == address of the instruction + 8 */ imm = offset - (8 + ctx->idx * 4); - if (imm & ~0xfff) { - /* - * literal pool is too far, signal it into flags. we - * can only detect it on the second pass unfortunately. - */ - ctx->flags |= FLAG_IMM_OVERFLOW; - return 0; - } - return imm; } @@ -873,14 +863,6 @@ b_epilogue: default: return -1; } - - if (ctx->flags & FLAG_IMM_OVERFLOW) - /* - * this instruction generated an overflow when - * trying to access the literal pool, so - * delegate this filter to the kernel interpreter. - */ - return -1; } /* compute offsets only during the first pass */ @@ -939,14 +921,7 @@ void bpf_jit_compile(struct sk_filter *fp) ctx.idx = 0; build_prologue(&ctx); - if (build_body(&ctx) < 0) { -#if __LINUX_ARM_ARCH__ < 7 - if (ctx.imm_count) - kfree(ctx.imms); -#endif - bpf_jit_binary_free(header); - goto out; - } + build_body(&ctx); build_epilogue(&ctx); flush_icache_range((u32)ctx.target, (u32)(ctx.target + ctx.idx)); -- 1.9.1