From patchwork Thu Nov 12 21:57:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Shi X-Patchwork-Id: 7605571 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 583549F1D3 for ; Thu, 12 Nov 2015 22:18:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6BA79207D0 for ; Thu, 12 Nov 2015 22:18:33 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 84305207A2 for ; Thu, 12 Nov 2015 22:18:32 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Zx0AW-0002du-Ba; Thu, 12 Nov 2015 22:16:36 +0000 Received: from mail-pa0-x230.google.com ([2607:f8b0:400e:c03::230]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Zx0A8-0002QE-73 for linux-arm-kernel@lists.infradead.org; Thu, 12 Nov 2015 22:16:14 +0000 Received: by pabfh17 with SMTP id fh17so77764601pab.0 for ; Thu, 12 Nov 2015 14:15:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro_org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=BzsLm5vPKjj9W+dp+n2jxOQuw2hzfzwd/YyvwzUHoAA=; b=B+ItVZrseumKdvr8p+vDJWR1TrOj/5f/DbgBLD7TclPDlVkw07CPL+8Au/Xr7FRbRF HB6lQCSbjohD0DV10lfUW50N75gjyS/CCrcvnjHdCgd/mN1J5tAh/43SKE+ZWAxOisF5 l3QuQWwwzZ6UAUCgfygFlqD8yjXzUqR0nF+mQKwtA8ZYY1wewvb7Q/vAkB6N7loT4Qnd A+94i0uPpstYPaFAaYcgTAOVY4NTsj8l5oSL39vJQ5IxOTufoSgNnqDyosbXqPA2XwSk HV5LtWmdNqOI9OH/uRpR/4e11nscWjv3G/nICDriXw2Jf+Bvg0WBrTnFwBuHxAqFrbqi 6sFg== 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=BzsLm5vPKjj9W+dp+n2jxOQuw2hzfzwd/YyvwzUHoAA=; b=bP/9yONkHTUtr+clc5/DfsYMEKjo7nxcEgx9PKQLDRCm8A3MuWtVDNkSzicpcXTazz McfiiOrtsx+M3rUZgLnH4rKYQ5UtnisEJ3FTJoWHw3xxRfNvDlDcIHDL74km/TKux5Ik +BeZhiPQpRM/O5mrZG7w9KXnW+l8xwuCKQZNXVY36KiEzela0bLlOOiMSI0tLHZL7zap NbQhEcpBydUp64fsvs1WNgCdRq96iAGm+eq1ERDutCNnHoZGVEHJo3oSXX0Phl0pnkp4 7eLWa/0/IlZ7x4F/+ruoXzng9bTTR5eZ4Q5kTP2BMvaqwuwW6slLG6DediVNNNDUrOIq ieaA== X-Gm-Message-State: ALoCoQmk54u+vQ+3NYUOVfXhBqZH87y2YRwdnimALt/aYEpWiGl+ic/VQXqHJe9UmzqNMZbUjk+X X-Received: by 10.66.228.137 with SMTP id si9mr26274736pac.63.1447366551093; Thu, 12 Nov 2015 14:15:51 -0800 (PST) Received: from yshi-Precision-T5600.corp.ad.wrs.com (unknown-216-82.windriver.com. [147.11.216.82]) by smtp.gmail.com with ESMTPSA id ur1sm829267pbc.44.2015.11.12.14.15.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Nov 2015 14:15:50 -0800 (PST) From: Yang Shi To: ast@kernel.org, daniel@iogearbox.net, catalin.marinas@arm.com, will.deacon@arm.com Subject: [PATCH 2/2] arm64: bpf: make BPF prologue and epilogue align with ARM64 AAPCS Date: Thu, 12 Nov 2015 13:57:01 -0800 Message-Id: <1447365421-1309-3-git-send-email-yang.shi@linaro.org> X-Mailer: git-send-email 2.0.2 In-Reply-To: <1447365421-1309-1-git-send-email-yang.shi@linaro.org> References: <1447365421-1309-1-git-send-email-yang.shi@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151112_141612_461218_35FBC8E4 X-CRM114-Status: GOOD ( 15.56 ) X-Spam-Score: -2.6 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.shi@linaro.org, linaro-kernel@lists.linaro.org, zlim.lnx@gmail.com, linux-kernel@vger.kernel.org, xi.wang@gmail.com, netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Save and restore FP/LR in BPF prog prologue and epilogue, save SP to FP in prologue in order to get the correct stack backtrace. However, ARM64 JIT used FP (x29) as eBPF fp register, FP is subjected to change during function call so it may cause the BPF prog stack base address change too. Use x25 to replace FP as BPF stack base register (fp). Since x25 is callee saved register, so it will keep intact during function call. It is initialized in BPF prog prologue when BPF prog is started to run everytime. When BPF prog exits, it could be just tossed. So, the BPF stack layout looks like: high original A64_SP => 0:+-----+ BPF prologue | | FP/LR and callee saved registers BPF fp register => -64:+-----+ | | | ... | BPF prog stack | | | | current A64_SP/FP => +-----+ | | | ... | Function call stack | | +-----+ low CC: Zi Shen Lim CC: Xi Wang Signed-off-by: Yang Shi --- arch/arm64/net/bpf_jit_comp.c | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/arch/arm64/net/bpf_jit_comp.c b/arch/arm64/net/bpf_jit_comp.c index ac8b548..8753bb7 100644 --- a/arch/arm64/net/bpf_jit_comp.c +++ b/arch/arm64/net/bpf_jit_comp.c @@ -50,7 +50,7 @@ static const int bpf2a64[] = { [BPF_REG_8] = A64_R(21), [BPF_REG_9] = A64_R(22), /* read-only frame pointer to access stack */ - [BPF_REG_FP] = A64_FP, + [BPF_REG_FP] = A64_R(25), /* temporary register for internal BPF JIT */ [TMP_REG_1] = A64_R(23), [TMP_REG_2] = A64_R(24), @@ -155,17 +155,41 @@ static void build_prologue(struct jit_ctx *ctx) stack_size += 4; /* extra for skb_copy_bits buffer */ stack_size = STACK_ALIGN(stack_size); + /* + * BPF prog stack layout + * + * high + * original A64_SP => 0:+-----+ BPF prologue + * | | FP/LR and callee saved registers + * BPF fp register => -64:+-----+ + * | | + * | ... | BPF prog stack + * | | + * | | + * current A64_SP/FP => +-----+ + * | | + * | ... | Function call stack + * | | + * +-----+ + * low + * + */ + + /* Save FP and LR registers to stay align with ARM64 AAPCS */ + emit(A64_PUSH(A64_FP, A64_LR, A64_SP), ctx); + /* Save callee-saved register */ emit(A64_PUSH(r6, r7, A64_SP), ctx); emit(A64_PUSH(r8, r9, A64_SP), ctx); if (ctx->tmp_used) emit(A64_PUSH(tmp1, tmp2, A64_SP), ctx); - /* Set up frame pointer */ + /* Set up BPF prog stack base register (x25) */ emit(A64_MOV(1, fp, A64_SP), ctx); - /* Set up BPF stack */ + /* Set up function call stack */ emit(A64_SUB_I(1, A64_SP, A64_SP, stack_size), ctx); + emit(A64_MOV(1, A64_FP, A64_SP), ctx); /* Clear registers A and X */ emit_a64_mov_i64(ra, 0, ctx); @@ -196,8 +220,8 @@ static void build_epilogue(struct jit_ctx *ctx) emit(A64_POP(r8, r9, A64_SP), ctx); emit(A64_POP(r6, r7, A64_SP), ctx); - /* Restore frame pointer */ - emit(A64_MOV(1, fp, A64_SP), ctx); + /* Restore FP/LR registers */ + emit(A64_POP(A64_FP, A64_LR, A64_SP), ctx); /* Set return value */ emit(A64_MOV(1, A64_R(0), r0), ctx);