Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756446Ab3DZWBr (ORCPT ); Fri, 26 Apr 2013 18:01:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45280 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755939Ab3DZWBn (ORCPT ); Fri, 26 Apr 2013 18:01:43 -0400 Message-ID: <517AF926.3020302@redhat.com> Date: Sat, 27 Apr 2013 00:01:10 +0200 From: Daniel Borkmann User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/17.0 Thunderbird/17.0 MIME-Version: 1.0 To: Andrew Morton CC: Arnd Bergmann , Nicolas Schichan , Will Drewry , Mircea Gherzan , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Russell King , "David S. Miller" , Daniel Borkmann , netdev@vger.kernel.org, Xi Wang Subject: Re: [PATCH V3 2/3] ARM: net: bpf_jit: make code generation less dependent on struct sk_filter. References: <1366824429-26652-1-git-send-email-nschichan@freebox.fr> <1366824429-26652-3-git-send-email-nschichan@freebox.fr> <3592414.M8kQZLCXlW@wuerfel> <20130426122601.10ec05fcb4860df1b0a5b409@linux-foundation.org> <517AD9E2.2090704@redhat.com> <20130426130948.cbfd2f6256afc0e3ee7abeed@linux-foundation.org> In-Reply-To: <20130426130948.cbfd2f6256afc0e3ee7abeed@linux-foundation.org> Content-Type: multipart/mixed; boundary="------------080108090705060902020509" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 5344 Lines: 137 This is a multi-part message in MIME format. --------------080108090705060902020509 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit On 04/26/2013 10:09 PM, Andrew Morton wrote: > On Fri, 26 Apr 2013 21:47:46 +0200 Daniel Borkmann wrote: >> On 04/26/2013 09:26 PM, Andrew Morton wrote: >>> On Fri, 26 Apr 2013 16:04:44 +0200 Arnd Bergmann wrote: >>>> On Wednesday 24 April 2013 19:27:08 Nicolas Schichan wrote: >>>>> @@ -858,7 +858,7 @@ b_epilogue: >>>>> } >>>>> >>>>> >>>>> -void bpf_jit_compile(struct sk_filter *fp) >>>>> +static void __bpf_jit_compile(struct jit_ctx *out_ctx) >>>>> { >>>>> struct jit_ctx ctx; >>>>> unsigned tmp_idx; >>>>> @@ -867,11 +867,10 @@ void bpf_jit_compile(struct sk_filter *fp) >>>>> if (!bpf_jit_enable) >>>>> return; >>>>> >>>>> - memset(&ctx, 0, sizeof(ctx)); >>>>> - ctx.skf = fp; >>>>> + ctx = *out_ctx; >>>>> ctx.ret0_fp_idx = -1; >>>>> >>>>> - ctx.offsets = kzalloc(4 * (ctx.skf->len + 1), GFP_KERNEL); >>>>> + ctx.offsets = kzalloc(4 * (ctx.prog_len + 1), GFP_KERNEL); >>>>> if (ctx.offsets == NULL) >>>>> return; >>>>> >>>>> @@ -921,13 +920,26 @@ void bpf_jit_compile(struct sk_filter *fp) >>>>> print_hex_dump(KERN_INFO, "BPF JIT code: ", >>>>> DUMP_PREFIX_ADDRESS, 16, 4, ctx.target, >>>>> alloc_size, false); >>>>> - >>>>> - fp->bpf_func = (void *)ctx.target; >>>>> out: >>>>> kfree(ctx.offsets); >>>>> + >>>>> + *out_ctx = ctx; >>>>> return; >>>> >>>> This part of the patch, in combination with 79617801e "filter: bpf_jit_comp: >>>> refactor and unify BPF JIT image dump output" is now causing build errors >>>> in linux-next: >>>> >>>> arch/arm/net/bpf_jit_32.c: In function '__bpf_jit_compile': >>>> arch/arm/net/bpf_jit_32.c:930:16: error: 'fp' undeclared (first use in this function) >>>> bpf_jit_dump(fp->len, alloc_size, 2, ctx.target); >>> >>> Thanks, I did this. There may be a smarter way... >> >> I think also seccomp_jit_compile() would need this change then, otherwise the build >> with CONFIG_SECCOMP_FILTER_JIT might break. > > urgh, that tears it. > >> I can fix this up for you if not already applied. I presume it's against >> linux-next tree? > > Yup, please send something. Patch is attached. However, I currently don't have an ARM toolchain at hand, so uncompiled, untested. @Nicolas, Xi (cc, ref: http://thread.gmane.org/gmane.linux.kernel/1481464): If there is someday support for other archs as well, it would be nice if we do not have each time duplicated seccomp_jit_compile() etc functions in each JIT implementation, i.e. because they do basically the same. So follow-up {fix,clean}up is appreciated. Also, I find it a bit weird that seccomp_filter_get_len() and some other _one-line_ functions from kernel/seccomp.c are not placed into the corresponding header file as inlines. --------------080108090705060902020509 Content-Type: text/x-patch; name="0001-ARM-bpf_jit-seccomp-filtering-fixup-merge-conflict.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0001-ARM-bpf_jit-seccomp-filtering-fixup-merge-conflict.patc"; filename*1="h" >From 655f4aabee7ccb909345ccfce92a405e3d173de5 Mon Sep 17 00:00:00 2001 Message-Id: <655f4aabee7ccb909345ccfce92a405e3d173de5.1367012811.git.dborkman@redhat.com> In-Reply-To: References: From: Daniel Borkmann Date: Fri, 26 Apr 2013 23:41:06 +0200 Subject: [PATCH linux-next -mm] ARM: bpf_jit: seccomp filtering: fixup merge conflict Commit e4c67f4c0479d8e3cb0 (ARM: net: bpf_jit: make code generation less dependent on struct sk_filter.) caused a merge conflict with commit 79617801ea0c0e6 (filter: bpf_jit_comp: refactor and unify BPF JIT image dump output) resulting in a build failure: arch/arm/net/bpf_jit_32.c: In function '__bpf_jit_compile': arch/arm/net/bpf_jit_32.c:930:16: error: 'fp' undeclared (first use in this function) bpf_jit_dump(fp->len, alloc_size, 2, ctx.target); Fix this up by using ctx.prog_len that is being set before we enter __bpf_jit_compile(). Reported-by: Arnd Bergmann Cc: Nicolas Schichan Signed-off-by: Daniel Borkmann --- arch/arm/net/bpf_jit_32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c index c5ef845..eb4daba 100644 --- a/arch/arm/net/bpf_jit_32.c +++ b/arch/arm/net/bpf_jit_32.c @@ -927,7 +927,7 @@ static void __bpf_jit_compile(struct jit_ctx *out_ctx) if (bpf_jit_enable > 1) /* there are 2 passes here */ - bpf_jit_dump(fp->len, alloc_size, 2, ctx.target); + bpf_jit_dump(ctx.prog_len, alloc_size, 2, ctx.target); out: kfree(ctx.offsets); -- 1.7.11.7 --------------080108090705060902020509-- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/