From patchwork Fri Apr 26 22:01:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Borkmann X-Patchwork-Id: 2496071 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork1.kernel.org (Postfix) with ESMTP id 4DECD3FC64 for ; Fri, 26 Apr 2013 22:01:50 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UVqi8-0003NU-Si; Fri, 26 Apr 2013 22:01:45 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UVqi6-000638-Gl; Fri, 26 Apr 2013 22:01:42 +0000 Received: from mx1.redhat.com ([209.132.183.28]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UVqi3-00062k-6O for linux-arm-kernel@lists.infradead.org; Fri, 26 Apr 2013 22:01:40 +0000 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r3QM1Ifo005257 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 26 Apr 2013 18:01:18 -0400 Received: from [10.36.7.36] (vpn1-7-36.ams2.redhat.com [10.36.7.36]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r3QM1A6V025419 (version=TLSv1/SSLv3 cipher=DHE-RSA-CAMELLIA256-SHA bits=256 verify=NO); Fri, 26 Apr 2013 18:01:13 -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 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> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130426_180139_392565_C423F6A2 X-CRM114-Status: GOOD ( 29.12 ) X-Spam-Score: -6.9 (------) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-6.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [209.132.183.28 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Will Drewry , Arnd Bergmann , Nicolas Schichan , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Daniel Borkmann , Mircea Gherzan , Xi Wang , Russell King , "David S. Miller" , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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. 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