From patchwork Fri May 22 22:42:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexei Starovoitov X-Patchwork-Id: 475826 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 DB2B1140E45 for ; Sat, 23 May 2015 08:43:08 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1422847AbbEVWnE (ORCPT ); Fri, 22 May 2015 18:43:04 -0400 Received: from mail-pa0-f50.google.com ([209.85.220.50]:36031 "EHLO mail-pa0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1422679AbbEVWnD (ORCPT ); Fri, 22 May 2015 18:43:03 -0400 Received: by paza2 with SMTP id a2so20691747paz.3 for ; Fri, 22 May 2015 15:43:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=4Kgi5NLqWtUhi7Spo7GWMfxnyQ90164mosTHJ2oMLes=; b=YdMPlGxFMZEa7V0iJoGUGvpuQs8e3wFvCccm5MRsVsFLtN+jX1BiK2ErPkdAi4pNJ+ 7QI1pZ9aWe4WC9Fi8KRPqeS1MMAXJ9re1MmC75a8mfE7ARP7eAmMGzmwgd07FVvGEd7B EOGXczZXSswA7aE09I3M7Sv/mD/LlrnOtfjPJ6/oNdG03M5WOIwMuAl01/0Zz98Ig9OI gDTYeODyu+A/Si0WY6WWqJUVv9EJCKCnY7omua1Yem/qdgEFCl2baDEC/GD753TtYgbw whuqy3shxgDBGggF66lSUzyB3UuB2FofNRB5OybBsLtUstiR/tOycV7dGAzDg9AJVE9C TZag== X-Gm-Message-State: ALoCoQlx+9IB/3q5BWC+w7rNacxHyCAqdV/vHwNG0pbmu7x0oNWJr/Z8NmHckVulHt/yC/6D63Mo X-Received: by 10.70.98.145 with SMTP id ei17mr19711416pdb.92.1432334582677; Fri, 22 May 2015 15:43:02 -0700 (PDT) Received: from localhost.localdomain ([12.229.56.227]) by mx.google.com with ESMTPSA id da2sm3084848pbb.57.2015.05.22.15.43.01 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 22 May 2015 15:43:02 -0700 (PDT) From: Alexei Starovoitov To: "David S. Miller" Cc: Daniel Borkmann , Eric Dumazet , netdev@vger.kernel.org Subject: [PATCH net] x86: bpf_jit: fix compilation of large bpf programs Date: Fri, 22 May 2015 15:42:55 -0700 Message-Id: <1432334575-16959-1-git-send-email-ast@plumgrid.com> X-Mailer: git-send-email 1.7.9.5 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org x86 has variable length encoding. x86 JIT compiler is trying to pick the shortest encoding for given bpf instruction. While doing so the jump targets are changing, so JIT is doing multiple passes over the program. Typical program needs 3 passes. Some very short programs converge with 2 passes. Large programs may need 4 or 5. But specially crafted bpf programs may hit the pass limit and if the program converges on the last iteration the JIT compiler will be producing an image full of 'int 3' insns. Fix this corner case by doing final iteration over bpf program. Fixes: 0a14842f5a3c ("net: filter: Just In Time compiler for x86-64") Reported-by: Daniel Borkmann Signed-off-by: Alexei Starovoitov Tested-by: Daniel Borkmann Acked-by: Daniel Borkmann --- Daniel wrote the 'Edge hopping nuthouse' test case with 4k jump instructions that managed to trigger this bug. The test case is nuts and the bug is real. It's an old bug, but I think worth backporting all the way. Though this fix will apply cleanly only till commit: f3c2af7ba17a ("net: filter: x86: split bpf_jit_compile()") The older kernels should be similar. They have 'for (pass = 0; pass < 10; pass++) {' at the line 153 or so. and all have similar problem as far as I can see. arch/x86/net/bpf_jit_comp.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c index 99f76103c6b7..ddeff4844a10 100644 --- a/arch/x86/net/bpf_jit_comp.c +++ b/arch/x86/net/bpf_jit_comp.c @@ -966,7 +966,12 @@ void bpf_int_jit_compile(struct bpf_prog *prog) } ctx.cleanup_addr = proglen; - for (pass = 0; pass < 10; pass++) { + /* JITed image shrinks with every pass and the loop iterates + * until the image stops shrinking. Very large bpf programs + * may converge on the last pass. In such case do one more + * pass to emit the final image + */ + for (pass = 0; pass < 10 || image; pass++) { proglen = do_jit(prog, addrs, image, oldproglen, &ctx); if (proglen <= 0) { image = NULL;