From patchwork Mon Jan 21 13:15:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiong Wang X-Patchwork-Id: 1028645 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=netronome.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="AvFZgNsw"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43jsWV4rWGz9s7h for ; Tue, 22 Jan 2019 00:16:22 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728868AbfAUNQV (ORCPT ); Mon, 21 Jan 2019 08:16:21 -0500 Received: from mail-wm1-f66.google.com ([209.85.128.66]:55222 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728774AbfAUNQT (ORCPT ); Mon, 21 Jan 2019 08:16:19 -0500 Received: by mail-wm1-f66.google.com with SMTP id a62so10739219wmh.4 for ; Mon, 21 Jan 2019 05:16:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=s1cNqpfB7s4LP6oo3yUWzOKsGLPos0CJFVpZ0V++Ajk=; b=AvFZgNsw0yZld3TwyW3+8sbyiuEqzUqYev9bwURrzWibhcOLxBaoLkEhF7a4fChb2q 5tu9LoOxQsK9WqXwdswy4i8uwm0b6NJyxZO3Zpr/uX2MgOeGJ1uT50+JZQX4WCb4nhrt Qi8G51edp/02txZq4BUB6afXvFCglug5lepSk/zsL0pRkNH7fSVeav5ZEehyIWo7PfQp ISEGAdATHH6mDXILgQC9nxKo04ywAaa3xJomwMp6VrtZg5sMieZZJ7I2wQYqjLaXg73R v8UtvS2kDGp0OLN5lwgfekv3mO+pOBVBW7cdSwF5Ap+uoHGILeSgfoqjfBLjFkDHmuhR 02UA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=s1cNqpfB7s4LP6oo3yUWzOKsGLPos0CJFVpZ0V++Ajk=; b=Ydj7y6Ls+H0JfJlSoAve41YViZAowbbWAxv6EBMirx0MPKDTJrdglvedGjJkaYcl4J xfMtFqojp9VW/sj9RNaRMv3dWo/AxjBg2XAQ9M4ebXQwtC+4dOWLOlSAFl4YI/17IQII fn/sJZPs62Fk6Ai4u8GWfHV44nsRpafCz+zbxIu8Cs4PI5RTFc1CTpMDdF+zL+NBaAjD ySvMs/YhbwRtIdBe2Q5ym1c95ApIOkm9JrnGY8rUc8QMGYeRLn+LFdKv+isH+dayuLUs xCPQTObexgauFwQHfFnU3PbBiaPpWjil6T3y4WZWS7ACp5QJ0C8i85riexfce7CkPspC Pwrw== X-Gm-Message-State: AJcUukfBRiLgqXdMsWvxVO3uLSET2VJ8nubGQfdnfHOC6RnnSLzgCqTw viFps7GBv7aO2rNgtWrU6mpSlA== X-Google-Smtp-Source: ALg8bN4t73lymLaP0AyDcQney74ouEaARW0D7C7kYwxVVlMKBjnv3fMUkBk9qvziBXNRp/oMvYCpiA== X-Received: by 2002:a1c:888d:: with SMTP id k135mr25721181wmd.137.1548076576780; Mon, 21 Jan 2019 05:16:16 -0800 (PST) Received: from cbtest28.netronome.com ([217.38.71.146]) by smtp.gmail.com with ESMTPSA id a12sm100591936wro.18.2019.01.21.05.16.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 21 Jan 2019 05:16:16 -0800 (PST) From: Jiong Wang To: ast@kernel.org, daniel@iogearbox.net Cc: netdev@vger.kernel.org, oss-drivers@netronome.com, Jiong Wang Subject: [PATCH bpf-next v2 07/16] bpf: JIT blinds support JMP32 Date: Mon, 21 Jan 2019 08:15:44 -0500 Message-Id: <1548076553-31268-8-git-send-email-jiong.wang@netronome.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1548076553-31268-1-git-send-email-jiong.wang@netronome.com> References: <1548076553-31268-1-git-send-email-jiong.wang@netronome.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch adds JIT blinds support for JMP32. Reviewed-by: Jakub Kicinski Signed-off-by: Jiong Wang --- include/linux/filter.h | 20 ++++++++++++++++++++ kernel/bpf/core.c | 21 +++++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/include/linux/filter.h b/include/linux/filter.h index ad106d8..248dbc5 100644 --- a/include/linux/filter.h +++ b/include/linux/filter.h @@ -277,6 +277,26 @@ struct sock_reuseport; .off = OFF, \ .imm = IMM }) +/* Like BPF_JMP_REG, but with 32-bit wide operands for comparison. */ + +#define BPF_JMP32_REG(OP, DST, SRC, OFF) \ + ((struct bpf_insn) { \ + .code = BPF_JMP32 | BPF_OP(OP) | BPF_X, \ + .dst_reg = DST, \ + .src_reg = SRC, \ + .off = OFF, \ + .imm = 0 }) + +/* Like BPF_JMP_IMM, but with 32-bit wide operands for comparison. */ + +#define BPF_JMP32_IMM(OP, DST, IMM, OFF) \ + ((struct bpf_insn) { \ + .code = BPF_JMP32 | BPF_OP(OP) | BPF_K, \ + .dst_reg = DST, \ + .src_reg = 0, \ + .off = OFF, \ + .imm = IMM }) + /* Unconditional jumps, goto pc + off16 */ #define BPF_JMP_A(OFF) \ diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c index 199612e..84a8b25 100644 --- a/kernel/bpf/core.c +++ b/kernel/bpf/core.c @@ -935,6 +935,27 @@ static int bpf_jit_blind_insn(const struct bpf_insn *from, *to++ = BPF_JMP_REG(from->code, from->dst_reg, BPF_REG_AX, off); break; + case BPF_JMP32 | BPF_JEQ | BPF_K: + case BPF_JMP32 | BPF_JNE | BPF_K: + case BPF_JMP32 | BPF_JGT | BPF_K: + case BPF_JMP32 | BPF_JLT | BPF_K: + case BPF_JMP32 | BPF_JGE | BPF_K: + case BPF_JMP32 | BPF_JLE | BPF_K: + case BPF_JMP32 | BPF_JSGT | BPF_K: + case BPF_JMP32 | BPF_JSLT | BPF_K: + case BPF_JMP32 | BPF_JSGE | BPF_K: + case BPF_JMP32 | BPF_JSLE | BPF_K: + case BPF_JMP32 | BPF_JSET | BPF_K: + /* Accommodate for extra offset in case of a backjump. */ + off = from->off; + if (off < 0) + off -= 2; + *to++ = BPF_ALU32_IMM(BPF_MOV, BPF_REG_AX, imm_rnd ^ from->imm); + *to++ = BPF_ALU32_IMM(BPF_XOR, BPF_REG_AX, imm_rnd); + *to++ = BPF_JMP32_REG(from->code, from->dst_reg, BPF_REG_AX, + off); + break; + case BPF_LD | BPF_IMM | BPF_DW: *to++ = BPF_ALU64_IMM(BPF_MOV, BPF_REG_AX, imm_rnd ^ aux[1].imm); *to++ = BPF_ALU64_IMM(BPF_XOR, BPF_REG_AX, imm_rnd);