From patchwork Thu Jan 14 07:33:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zi Shen Lim X-Patchwork-Id: 567280 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 6165A14029E for ; Thu, 14 Jan 2016 18:34:19 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=OaUm6TPW; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752727AbcANHeM (ORCPT ); Thu, 14 Jan 2016 02:34:12 -0500 Received: from mail-pf0-f193.google.com ([209.85.192.193]:36089 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750808AbcANHd5 (ORCPT ); Thu, 14 Jan 2016 02:33:57 -0500 Received: by mail-pf0-f193.google.com with SMTP id n128so7023922pfn.3 for ; Wed, 13 Jan 2016 23:33:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=NUlP0DTOjhVrGayNE5XjUZXEc820odv4aphVrQ73qzo=; b=OaUm6TPWDDWVD9lqnUu1jLKLkGvQv70q6GkxfVC6LZH1dxdp9Souwme3Zf3NaWZDO6 A56y8wG28M+uVilj/YjgRRAO3DOnGYl1U97ci+V3+pLhPyrG3ApU/cxU6/ikck60PVjF Fu+f17lC8FuDUTBscgpNrkTl0VgISE1Z0eE7U7JGSPInYECvVVldPuBMN7ywJaAejT/T DtJU4kwyKO5UR1U3+s3w/u1TVLah8kVqN2qDMhRynL7TyfVP+In7IzQi4qLU9oM91nwY mOYFq4/Z+fsZqQm1Ygjo2ApibceUehlUz7yBJb9tUMzkOmZpkk6P1K+OAPqC+YbGFKMD /C4g== 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:in-reply-to :references; bh=NUlP0DTOjhVrGayNE5XjUZXEc820odv4aphVrQ73qzo=; b=HAsR/0b8rPYTNxyWLha/S68QIBhxkxTFRcO1V13UI0zxEw3bRlVY+t1cGMUBbQQAjc 0nSFKPuNeYKDBxNe71G082OsTxg3i3TiRv0W+i64m7bRg1+Jv6BDgCYiwP1XOA4YzR0X 1DUH9QruVtlQLh4kCtMUcy7KqoWp2ixqgotSBDWizUwvQ1dUK9ZLlhiL8BKvxUIwIVS/ Oo/AxVNplVi8ZB3a8YaxiM/SxwT6rcqTpow0kTBkhhzultsTnVnP7C226KX4fe4Nmyh+ 89PFxK0acPry+foA5EaC5Ql9n2+JKSFfiJIlqXovkXz2Fo4X1f9fcqjsyWLCpeCyaT/G aMvQ== X-Gm-Message-State: ALoCoQkVWQ2MD9ii7l7oXHPq4pnGweloS+xafn8e2gzFZYW11D8WoAcGantA2HM4tw1+kn9B1rXpulQBfX21FgvcowHBDJONRw== X-Received: by 10.98.15.207 with SMTP id 76mr3870718pfp.60.1452756837333; Wed, 13 Jan 2016 23:33:57 -0800 (PST) Received: from localhost.localdomain (c-73-223-118-172.hsd1.ca.comcast.net. [73.223.118.172]) by smtp.gmail.com with ESMTPSA id q27sm7021578pfi.80.2016.01.13.23.33.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 13 Jan 2016 23:33:56 -0800 (PST) From: Zi Shen Lim To: Alexei Starovoitov , Will Deacon , "David S. Miller" , Catalin Marinas Cc: Zi Shen Lim , Rabin Vincent , netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/2] arm64: bpf: add extra pass to handle faulty codegen Date: Wed, 13 Jan 2016 23:33:22 -0800 Message-Id: <1452756802-16511-2-git-send-email-zlim.lnx@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1452756802-16511-1-git-send-email-zlim.lnx@gmail.com> References: <1452756802-16511-1-git-send-email-zlim.lnx@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Code generation functions in arch/arm64/kernel/insn.c previously BUG_ON invalid parameters. Following change of that behavior, now we need to handle the error case where AARCH64_BREAK_FAULT is returned. Instead of error-handling on every emit() in JIT, we add a new validation pass at the end of JIT compilation. There's no point in running JITed code at run-time only to trap due to AARCH64_BREAK_FAULT. Instead, we drop this failed JIT compilation and allow the system to gracefully fallback on the BPF interpreter. Signed-off-by: Zi Shen Lim Suggested-by: Alexei Starovoitov Acked-by: Alexei Starovoitov --- Per discussion here: http://www.spinics.net/lists/arm-kernel/msg474179.html arch/arm64/net/bpf_jit_comp.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/arch/arm64/net/bpf_jit_comp.c b/arch/arm64/net/bpf_jit_comp.c index d6a53ef..d66bc1f 100644 --- a/arch/arm64/net/bpf_jit_comp.c +++ b/arch/arm64/net/bpf_jit_comp.c @@ -1,7 +1,7 @@ /* * BPF JIT compiler for ARM64 * - * Copyright (C) 2014-2015 Zi Shen Lim + * Copyright (C) 2014-2016 Zi Shen Lim * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -726,6 +726,20 @@ static int build_body(struct jit_ctx *ctx) return 0; } +static int validate_code(struct jit_ctx *ctx) +{ + int i; + + for (i = 0; i < ctx->idx; i++) { + u32 a64_insn = le32_to_cpu(ctx->image[i]); + + if (a64_insn == AARCH64_BREAK_FAULT) + return -1; + } + + return 0; +} + static inline void bpf_flush_icache(void *start, void *end) { flush_icache_range((unsigned long)start, (unsigned long)end); @@ -788,6 +802,12 @@ void bpf_int_jit_compile(struct bpf_prog *prog) build_epilogue(&ctx); + /* 3. Extra pass to validate JITed code. */ + if (validate_code(&ctx)) { + bpf_jit_binary_free(header); + goto out; + } + /* And we're done. */ if (bpf_jit_enable > 1) bpf_jit_dump(prog->len, image_size, 2, ctx.image);