From patchwork Fri Nov 13 18:09:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Shi X-Patchwork-Id: 544416 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 7A71D14141E for ; Sat, 14 Nov 2015 05:29:10 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro_org.20150623.gappssmtp.com header.i=@linaro_org.20150623.gappssmtp.com header.b=cbjIkFJo; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754727AbbKMS2w (ORCPT ); Fri, 13 Nov 2015 13:28:52 -0500 Received: from mail-pa0-f41.google.com ([209.85.220.41]:33951 "EHLO mail-pa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754594AbbKMS2u (ORCPT ); Fri, 13 Nov 2015 13:28:50 -0500 Received: by padhx2 with SMTP id hx2so107337056pad.1 for ; Fri, 13 Nov 2015 10:28:50 -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=knSfxB6iHibt2EXWCbZUCVckdJ8vpg4Zv2jnZwgMmmw=; b=cbjIkFJozSO5F7cNVbPSX3CYOh4Iu/g6Q+Gb7Hwar5cVQ/X9zA1yguSo/cSqsDiZHG 5QvRtSK+27xgx0XTGuW4iHPAldr6QM/i71u6oD3PMp38014dz+3hcrfhWvWQJb6U45nA RLFwLRkXI4LCZ9M921i2iw23QSclzaVvVkNWo9pIwRk9hWj0tVZHfAy8aoLh2B6kTObn a4P7CFy9zVcf5VrQO8rKmxmeWIWiO8C6zkj/R8/pIJ8WmeKyk8rJBr1GgrTcfln3INmF 5Q9nLYEI/6II2o3H+6ZCQi8bydp6Py5hyk/7Jry0Mow2kq13cQq7paazFGx6jI/ILems KQ5w== 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=knSfxB6iHibt2EXWCbZUCVckdJ8vpg4Zv2jnZwgMmmw=; b=SaI417ZW3jpib84CwdTHIjjFerbPvZMjlnNk/PB20hfoiOXfYV/lLJTU1U3MEVZ0+9 H9bNNxr7M9YrLmvQC0xjVV6ch/v+CrmP7CfCsvOD36UDU9df/kCzY0icagHus2Rp7NyG hC/sVzL89xS7knZ1UnKwtDZJ9h4HTQRDqyY8YoQRXfYvIy2xw39a06mkauUdVBxCKmA9 LA2gL3fGe11ye+BkbyLVnkf3QTbP8TecM80iUgbNU1sb+AEWhtqhVuoVmcZG8tgiPMJr aiV14WBQ+/viZZDe7WnAUo9GsM2mHdc6sMBpxNsWwK5XiCDJxrmUJ8egBRf55wO7LHMB 63Kw== X-Gm-Message-State: ALoCoQnkw/uP7T+sLTg1Yk7uGKdjVs9Ba45NF89ptsbJS42wRabnIFEggGSSI9nQe0xNw024pAVX X-Received: by 10.66.160.229 with SMTP id xn5mr33986345pab.0.1447439330104; Fri, 13 Nov 2015 10:28:50 -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 cs5sm21717254pbc.15.2015.11.13.10.28.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Nov 2015 10:28:49 -0800 (PST) From: Yang Shi To: ast@kernel.org, daniel@iogearbox.net, catalin.marinas@arm.com, will.deacon@arm.com Cc: zlim.lnx@gmail.com, xi.wang@gmail.com, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linaro-kernel@lists.linaro.org, yang.shi@linaro.org Subject: [PATCH V3 2/2] arm64: bpf: make BPF prologue and epilogue align with ARM64 AAPCS Date: Fri, 13 Nov 2015 10:09:57 -0800 Message-Id: <1447438197-31838-1-git-send-email-yang.shi@linaro.org> X-Mailer: git-send-email 2.0.2 In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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| current A64_FP => -16:+-----+ | ... | callee saved registers BPF fp register => -64:+-----+ | | | ... | BPF prog stack | | | | current A64_SP => +-----+ | | | ... | Function call stack | | +-----+ low CC: Zi Shen Lim CC: Xi Wang Signed-off-by: Yang Shi --- V3 --> V2: * Make FP point to FP' * Fix a compile warning arch/arm64/net/bpf_jit_comp.c | 37 +++++++++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/arch/arm64/net/bpf_jit_comp.c b/arch/arm64/net/bpf_jit_comp.c index ac8b548..c131e38 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,16 +155,42 @@ 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| + * current A64_FP => -16:+-----+ + * | ... | callee saved registers + * BPF fp register => -64:+-----+ + * | | + * | ... | BPF prog stack + * | | + * | | + * current A64_SP => +-----+ + * | | + * | ... | 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); + emit(A64_MOV(1, A64_FP, 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); /* Clear registers A and X */ @@ -179,7 +205,6 @@ static void build_epilogue(struct jit_ctx *ctx) const u8 r7 = bpf2a64[BPF_REG_7]; const u8 r8 = bpf2a64[BPF_REG_8]; const u8 r9 = bpf2a64[BPF_REG_9]; - const u8 fp = bpf2a64[BPF_REG_FP]; const u8 tmp1 = bpf2a64[TMP_REG_1]; const u8 tmp2 = bpf2a64[TMP_REG_2]; int stack_size = MAX_BPF_STACK; @@ -196,8 +221,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);