From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x224TPrDkImP4K4xnV7UHko4z1nng47CU1YTZZg/CUw5ur+kvLHqixCUBBfKg7aR9GKvg1RvR ARC-Seal: i=1; a=rsa-sha256; t=1517256390; cv=none; d=google.com; s=arc-20160816; b=0qxoGyC5XIxw1wYlsLAAWnRrLPL8EsujM1nUAfVDx9V/3bK+4Hwh9/bZvFPFwLI7h4 xlv9Uqn4kRahBvyS2ZNXKRkAZgN2WJNuCiHI9+YUW9lKnuLlIl1i0xyLmlbd4dW6nb8L CdEhqRUD30mJ+fF5eJD1zHVD0TF5uE0/fGCWhMvDcUJNByaaLFl+/yX0ZeqhsS8IgJFQ qIDp+VUZDLwiG4Chu3M3gFgVnVWPGoLs+73EpADKJXLklzCrgLh69agZlwhw7Hq+CZTk Xxst0ryeK8ah2hFBIZTXfOdfKspYIPNYbzgjSPMH8+Y5NpKunwBl8Q9lBpoNVU/EWpkP nkqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=Cv0aomkq+pIf3PplDuin5dxmtM0md+kSRvSrfQlLT+w=; b=gxYdKSGQitjYPmQ0Lv59oKboIRQ9LnisPGZeVO7U/9YjorJj5WoxielDMtWLhL69FL FYjyh8lybZlPOGjq9VT68xV8F53sVSo5t4/G43P/8ZbvdNM8aqRjeGrIvwzESvFULE+W C9Om9uPoWorXW4iD4NxvW5wHcxKWzz6xLuPOlopHNRAIbmV9U5SqfbyzbwQI4jPjkqMh Fo9tAeyjeKvfHU4bTVwGmdQjVAlUycZhO255ZldBnjdVtRHu/hqvm5EsdN/4/l5snFGT PYhICi/9IWZXUUXjIWvwoqzl/qbM7IWYQCdUa9jsdEKYlKENM1bo3he1ftx11Fqs/zN0 vNnQ== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Russell King Subject: [PATCH 4.14 17/71] ARM: net: bpf: move stack documentation Date: Mon, 29 Jan 2018 13:56:45 +0100 Message-Id: <20180129123828.442169161@linuxfoundation.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180129123827.271171825@linuxfoundation.org> References: <20180129123827.271171825@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1590958637248756049?= X-GMAIL-MSGID: =?utf-8?q?1590958637248756049?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Russell King commit 70ec3a6c2c11e4b0e107a65de943a082f9aff351 upstream. Move the stack documentation towards the top of the file, where it's relevant for things like the register layout. Signed-off-by: Russell King Signed-off-by: Greg Kroah-Hartman --- arch/arm/net/bpf_jit_32.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) --- a/arch/arm/net/bpf_jit_32.c +++ b/arch/arm/net/bpf_jit_32.c @@ -27,6 +27,27 @@ int bpf_jit_enable __read_mostly; +/* + * eBPF prog stack layout + * + * high + * original ARM_SP => +-----+ eBPF prologue + * |FP/LR| + * current ARM_FP => +-----+ + * | ... | callee saved registers + * eBPF fp register => +-----+ <= (BPF_FP) + * | ... | eBPF JIT scratch space + * | | eBPF prog stack + * +-----+ + * |RSVD | JIT scratchpad + * current ARM_SP => +-----+ <= (BPF_FP - STACK_SIZE) + * | | + * | ... | Function call stack + * | | + * +-----+ + * low + */ + #define STACK_OFFSET(k) (k) #define TMP_REG_1 (MAX_BPF_JIT_REG + 0) /* TEMP Register 1 */ #define TMP_REG_2 (MAX_BPF_JIT_REG + 1) /* TEMP Register 2 */ @@ -1091,27 +1112,6 @@ static void build_prologue(struct jit_ct u16 reg_set = 0; - /* - * eBPF prog stack layout - * - * high - * original ARM_SP => +-----+ eBPF prologue - * |FP/LR| - * current ARM_FP => +-----+ - * | ... | callee saved registers - * eBPF fp register => +-----+ <= (BPF_FP) - * | ... | eBPF JIT scratch space - * | | eBPF prog stack - * +-----+ - * |RSVD | JIT scratchpad - * current A64_SP => +-----+ <= (BPF_FP - STACK_SIZE) - * | | - * | ... | Function call stack - * | | - * +-----+ - * low - */ - /* Save callee saved registers. */ reg_set |= (1<