From patchwork Sat Nov 7 05:36:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Shi X-Patchwork-Id: 541218 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 DBDBE140B0F for ; Sat, 7 Nov 2015 16:54:52 +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=oVJh/Iv7; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751473AbbKGFyk (ORCPT ); Sat, 7 Nov 2015 00:54:40 -0500 Received: from mail-pa0-f48.google.com ([209.85.220.48]:36439 "EHLO mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751213AbbKGFyj (ORCPT ); Sat, 7 Nov 2015 00:54:39 -0500 Received: by pacdm15 with SMTP id dm15so119317379pac.3 for ; Fri, 06 Nov 2015 21:54:38 -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; bh=m7oZ07+YjmqeUpNb/f4RYFzvAJUDpfK0KLPkxw0KSh4=; b=oVJh/Iv7/Ls1Z+4MukxSCdxo7olkoORPgYLlfwgKgoun3gkhYTBTXwaTEg6ayrWc2v /yESt1ecfaogfOZT2omvzHdG1ZH/KWlpwvMZM/6cnbWTwoJYX3F7esYLMABT0ssZwmkG 7jjgW98dEv1blSgyVf63LTvINcrXEF3CMc4dKC8wZp9MTwUsWes+c/S/mjbjCmMGyWxf z8Ucyp/iiu7g6E3urYD/hf7G2+NQbEFo97aEoKEiioB15E8/HqCucABDyumE+SxDMwiG AllnFppeyLRjvSyF4xXXEnYLRzPeRS8QPbxcRz55CDicOIpaS3OZWQLE4yYRBqNGlaE+ xhiQ== 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=m7oZ07+YjmqeUpNb/f4RYFzvAJUDpfK0KLPkxw0KSh4=; b=DAjPAuGXzPB1QAKSKmameK+HGyIflpWDOuMS+lGQ10F/yGwQRWYhTM4eC+OsL8xtpC ilcTASHkCizgrpAZy8Rb9a/9GkRfFt9PBseN1E4KPTQd0j/2xMD8VBGpsnVbAvUqJZeh d+RBro4gZe5BiVrkBpH7HGL8pHLMnT4y5wZbTecirTHU6/ITobhZ8B+P4wBXg0COSqeE 9pAHKsKcWFfFllniMRYG0IuwqmounpL2THdtFEjiKyaIGjKqY5UimVJg98E2kbDulK/L pi1ShmdEzPv6sY/JAMlOmKUMEKyvkC8HAKU3O54BFeDZ8w6JRon11vjHS5J/o5R3a6Bi RwXA== X-Gm-Message-State: ALoCoQmqrHEmc05CZPEyLdvowJevJ1rxPeFKPbEaU8b4a9EBrtqSH2SUc40A59gGET6m7ko0TwtN X-Received: by 10.66.141.42 with SMTP id rl10mr23070805pab.18.1446875678560; Fri, 06 Nov 2015 21:54:38 -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 ro7sm3377873pbb.30.2015.11.06.21.54.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 06 Nov 2015 21:54:38 -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] arm64: bpf: fix JIT stack setup Date: Fri, 6 Nov 2015 21:36:17 -0800 Message-Id: <1446874577-14539-1-git-send-email-yang.shi@linaro.org> X-Mailer: git-send-email 2.0.2 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org ARM64 JIT used FP (x29) as eBPF fp register, but FP is subjected to change during function call so it may cause the BPF prog stack base address change too. Whenever, it pointed to the bottom of BPF prog stack instead of the top. So, when copying data via bpf_probe_read, it will be copied to (SP - offset), then it may overwrite the saved FP/LR. 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. Other than this the BPf prog stack base need to be setup before function call stack. 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 => +-----+ | | | ... | Function call stack | | +-----+ low Signed-off-by: Yang Shi CC: Zi Shen Lim CC: Xi Wang --- arch/arm64/net/bpf_jit_comp.c | 38 +++++++++++++++++++++++++++++++------- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/arch/arm64/net/bpf_jit_comp.c b/arch/arm64/net/bpf_jit_comp.c index a44e529..6809647 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,18 +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 and 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); + /* 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 BPF stack */ - emit(A64_SUB_I(1, A64_SP, A64_SP, stack_size), ctx); - - /* Set up frame pointer */ + /* Set up BPF prog stack base register (x25) */ emit(A64_MOV(1, fp, A64_SP), ctx); + /* 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); emit_a64_mov_i64(rx, 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);