Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.2/patches/808943/?format=api
{ "id": 808943, "url": "http://patchwork.ozlabs.org/api/1.2/patches/808943/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/patch/20170901185301.17978-1-sandipan@linux.vnet.ibm.com/", "project": { "id": 7, "url": "http://patchwork.ozlabs.org/api/1.2/projects/7/?format=api", "name": "Linux network development", "link_name": "netdev", "list_id": "netdev.vger.kernel.org", "list_email": "netdev@vger.kernel.org", "web_url": null, "scm_url": null, "webscm_url": null, "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20170901185301.17978-1-sandipan@linux.vnet.ibm.com>", "list_archive_url": null, "date": "2017-09-01T18:53:01", "name": "[1/1] bpf: take advantage of stack_depth tracking in powerpc JIT", "commit_ref": null, "pull_url": null, "state": "not-applicable", "archived": true, "hash": "f20673aab46a62494e74e1f43435e8b053dfcf3f", "submitter": { "id": 72280, "url": "http://patchwork.ozlabs.org/api/1.2/people/72280/?format=api", "name": "Sandipan Das", "email": "sandipan@linux.vnet.ibm.com" }, "delegate": { "id": 34, "url": "http://patchwork.ozlabs.org/api/1.2/users/34/?format=api", "username": "davem", "first_name": "David", "last_name": "Miller", "email": "davem@davemloft.net" }, "mbox": "http://patchwork.ozlabs.org/project/netdev/patch/20170901185301.17978-1-sandipan@linux.vnet.ibm.com/mbox/", "series": [ { "id": 1096, "url": "http://patchwork.ozlabs.org/api/1.2/series/1096/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/list/?series=1096", "date": "2017-09-01T18:53:01", "name": "[1/1] bpf: take advantage of stack_depth tracking in powerpc JIT", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/1096/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/808943/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/808943/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<netdev-owner@vger.kernel.org>", "X-Original-To": "patchwork-incoming@ozlabs.org", "Delivered-To": "patchwork-incoming@ozlabs.org", "Authentication-Results": "ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=<UNKNOWN>)", "Received": [ "from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xkT0H4pg3z9sPt\n\tfor <patchwork-incoming@ozlabs.org>;\n\tSat, 2 Sep 2017 04:53:19 +1000 (AEST)", "(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1752392AbdIASxR (ORCPT <rfc822;patchwork-incoming@ozlabs.org>);\n\tFri, 1 Sep 2017 14:53:17 -0400", "from mx0b-001b2d01.pphosted.com ([148.163.158.5]:41320 \"EHLO\n\tmx0a-001b2d01.pphosted.com\" rhost-flags-OK-OK-OK-FAIL)\n\tby vger.kernel.org with ESMTP id S1752355AbdIASxQ (ORCPT\n\t<rfc822;netdev@vger.kernel.org>); Fri, 1 Sep 2017 14:53:16 -0400", "from pps.filterd (m0098419.ppops.net [127.0.0.1])\n\tby mx0b-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id\n\tv81IoGef126929\n\tfor <netdev@vger.kernel.org>; Fri, 1 Sep 2017 14:53:15 -0400", "from e23smtp03.au.ibm.com (e23smtp03.au.ibm.com [202.81.31.145])\n\tby mx0b-001b2d01.pphosted.com with ESMTP id 2cq9gb5yeh-1\n\t(version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT)\n\tfor <netdev@vger.kernel.org>; Fri, 01 Sep 2017 14:53:15 -0400", "from localhost\n\tby e23smtp03.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use\n\tOnly! Violators will be prosecuted\n\tfor <netdev@vger.kernel.org> from <sandipan@linux.vnet.ibm.com>;\n\tSat, 2 Sep 2017 04:53:12 +1000", "from d23relay07.au.ibm.com (202.81.31.226)\n\tby e23smtp03.au.ibm.com (202.81.31.209) with IBM ESMTP SMTP Gateway:\n\tAuthorized Use Only! Violators will be prosecuted; \n\tSat, 2 Sep 2017 04:53:09 +1000", "from d23av03.au.ibm.com (d23av03.au.ibm.com [9.190.234.97])\n\tby d23relay07.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id\n\tv81Ir8if24183026\n\tfor <netdev@vger.kernel.org>; Sat, 2 Sep 2017 04:53:08 +1000", "from d23av03.au.ibm.com (localhost [127.0.0.1])\n\tby d23av03.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id\n\tv81Ir0ID029405\n\tfor <netdev@vger.kernel.org>; Sat, 2 Sep 2017 04:53:00 +1000", "from tpad450.in.ibm.com ([9.77.199.93])\n\tby d23av03.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id\n\tv81Iqsmg029286; Sat, 2 Sep 2017 04:52:56 +1000" ], "From": "Sandipan Das <sandipan@linux.vnet.ibm.com>", "To": "mpe@ellerman.id.au", "Cc": "naveen.n.rao@linux.vnet.ibm.com, daniel@iogearbox.net, ast@fb.com,\n\tnetdev@vger.kernel.org, linuxppc-dev@lists.ozlabs.org", "Subject": "[PATCH 1/1] bpf: take advantage of stack_depth tracking in powerpc\n\tJIT", "Date": "Sat, 2 Sep 2017 00:23:01 +0530", "X-Mailer": "git-send-email 2.13.5", "X-TM-AS-MML": "disable", "x-cbid": "17090118-0008-0000-0000-00000154DDF7", "X-IBM-AV-DETECTION": "SAVI=unused REMOTE=unused XFE=unused", "x-cbparentid": "17090118-0009-0000-0000-00000987EE59", "Message-Id": "<20170901185301.17978-1-sandipan@linux.vnet.ibm.com>", "X-Proofpoint-Virus-Version": "vendor=fsecure engine=2.50.10432:, ,\n\tdefinitions=2017-09-01_05:, , signatures=0", "X-Proofpoint-Spam-Details": "rule=outbound_notspam policy=outbound score=0\n\tspamscore=0 suspectscore=1\n\tmalwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam\n\tadjust=0 reason=mlx scancount=1 engine=8.0.1-1707230000\n\tdefinitions=main-1709010270", "Sender": "netdev-owner@vger.kernel.org", "Precedence": "bulk", "List-ID": "<netdev.vger.kernel.org>", "X-Mailing-List": "netdev@vger.kernel.org" }, "content": "Take advantage of stack_depth tracking, originally introduced for\nx64, in powerpc JIT as well. Round up allocated stack by 16 bytes\nto make sure it stays aligned for functions called from JITed bpf\nprogram.\n\nSigned-off-by: Sandipan Das <sandipan@linux.vnet.ibm.com>\n---\n arch/powerpc/net/bpf_jit64.h | 7 ++++---\n arch/powerpc/net/bpf_jit_comp64.c | 16 ++++++++++------\n 2 files changed, 14 insertions(+), 9 deletions(-)", "diff": "diff --git a/arch/powerpc/net/bpf_jit64.h b/arch/powerpc/net/bpf_jit64.h\nindex 62fa7589db2b..8bdef7ed28a8 100644\n--- a/arch/powerpc/net/bpf_jit64.h\n+++ b/arch/powerpc/net/bpf_jit64.h\n@@ -23,7 +23,7 @@\n *\t\t[ nv gpr save area\t] 8*8\t\t|\n *\t\t[ tail_call_cnt\t] 8\t\t|\n *\t\t[ local_tmp_var\t] 8\t\t|\n- * fp (r31) -->\t[ ebpf stack space\t] 512\t\t|\n+ * fp (r31) -->\t[ ebpf stack space\t] upto 512\t|\n *\t\t[ frame header\t] 32/112\t|\n * sp (r1) --->\t[ stack pointer\t] --------------\n */\n@@ -32,8 +32,8 @@\n #define BPF_PPC_STACK_SAVE\t(8*8)\n /* for bpf JIT code internal usage */\n #define BPF_PPC_STACK_LOCALS\t16\n-/* Ensure this is quadword aligned */\n-#define BPF_PPC_STACKFRAME\t(STACK_FRAME_MIN_SIZE + MAX_BPF_STACK + \\\n+/* stack frame excluding BPF stack, ensure this is quadword aligned */\n+#define BPF_PPC_STACKFRAME\t(STACK_FRAME_MIN_SIZE + \\\n \t\t\t\t BPF_PPC_STACK_LOCALS + BPF_PPC_STACK_SAVE)\n \n #ifndef __ASSEMBLY__\n@@ -103,6 +103,7 @@ struct codegen_context {\n \t */\n \tunsigned int seen;\n \tunsigned int idx;\n+\tunsigned int stack_size;\n };\n \n #endif /* !__ASSEMBLY__ */\ndiff --git a/arch/powerpc/net/bpf_jit_comp64.c b/arch/powerpc/net/bpf_jit_comp64.c\nindex 6ba5d253e857..a01362c88f6a 100644\n--- a/arch/powerpc/net/bpf_jit_comp64.c\n+++ b/arch/powerpc/net/bpf_jit_comp64.c\n@@ -69,7 +69,7 @@ static inline bool bpf_has_stack_frame(struct codegen_context *ctx)\n static int bpf_jit_stack_local(struct codegen_context *ctx)\n {\n \tif (bpf_has_stack_frame(ctx))\n-\t\treturn STACK_FRAME_MIN_SIZE + MAX_BPF_STACK;\n+\t\treturn STACK_FRAME_MIN_SIZE + ctx->stack_size;\n \telse\n \t\treturn -(BPF_PPC_STACK_SAVE + 16);\n }\n@@ -82,8 +82,9 @@ static int bpf_jit_stack_tailcallcnt(struct codegen_context *ctx)\n static int bpf_jit_stack_offsetof(struct codegen_context *ctx, int reg)\n {\n \tif (reg >= BPF_PPC_NVR_MIN && reg < 32)\n-\t\treturn (bpf_has_stack_frame(ctx) ? BPF_PPC_STACKFRAME : 0)\n-\t\t\t\t\t\t\t- (8 * (32 - reg));\n+\t\treturn (bpf_has_stack_frame(ctx) ?\n+\t\t\t(BPF_PPC_STACKFRAME + ctx->stack_size) : 0)\n+\t\t\t\t- (8 * (32 - reg));\n \n \tpr_err(\"BPF JIT is asking about unknown registers\");\n \tBUG();\n@@ -134,7 +135,7 @@ static void bpf_jit_build_prologue(u32 *image, struct codegen_context *ctx)\n \t\t\tPPC_BPF_STL(0, 1, PPC_LR_STKOFF);\n \t\t}\n \n-\t\tPPC_BPF_STLU(1, 1, -BPF_PPC_STACKFRAME);\n+\t\tPPC_BPF_STLU(1, 1, -(BPF_PPC_STACKFRAME + ctx->stack_size));\n \t}\n \n \t/*\n@@ -161,7 +162,7 @@ static void bpf_jit_build_prologue(u32 *image, struct codegen_context *ctx)\n \t/* Setup frame pointer to point to the bpf stack area */\n \tif (bpf_is_seen_register(ctx, BPF_REG_FP))\n \t\tPPC_ADDI(b2p[BPF_REG_FP], 1,\n-\t\t\t\tSTACK_FRAME_MIN_SIZE + MAX_BPF_STACK);\n+\t\t\t\tSTACK_FRAME_MIN_SIZE + ctx->stack_size);\n }\n \n static void bpf_jit_emit_common_epilogue(u32 *image, struct codegen_context *ctx)\n@@ -183,7 +184,7 @@ static void bpf_jit_emit_common_epilogue(u32 *image, struct codegen_context *ctx\n \n \t/* Tear down our stack frame */\n \tif (bpf_has_stack_frame(ctx)) {\n-\t\tPPC_ADDI(1, 1, BPF_PPC_STACKFRAME);\n+\t\tPPC_ADDI(1, 1, BPF_PPC_STACKFRAME + ctx->stack_size);\n \t\tif (ctx->seen & SEEN_FUNC) {\n \t\t\tPPC_BPF_LL(0, 1, PPC_LR_STKOFF);\n \t\t\tPPC_MTLR(0);\n@@ -993,6 +994,9 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *fp)\n \n \tmemset(&cgctx, 0, sizeof(struct codegen_context));\n \n+\t/* Make sure that the stack is quadword aligned. */\n+\tcgctx.stack_size = round_up(fp->aux->stack_depth, 16);\n+\n \t/* Scouting faux-generate pass 0 */\n \tif (bpf_jit_build_body(fp, 0, &cgctx, addrs)) {\n \t\t/* We hit something illegal or unsupported. */\n", "prefixes": [ "1/1" ] }