From patchwork Fri Feb 1 22:39:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiong Wang X-Patchwork-Id: 1035252 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="VgdKb0ef"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43rsVc6vKCz9s4Z for ; Sat, 2 Feb 2019 09:39:52 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727161AbfBAWjv (ORCPT ); Fri, 1 Feb 2019 17:39:51 -0500 Received: from mail-wr1-f67.google.com ([209.85.221.67]:45258 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726542AbfBAWjt (ORCPT ); Fri, 1 Feb 2019 17:39:49 -0500 Received: by mail-wr1-f67.google.com with SMTP id t6so8670818wrr.12 for ; Fri, 01 Feb 2019 14:39:47 -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=GP1nNOgjrfmxr+auQwyUTuH+nmqo4JNJ9uMpNR37fHc=; b=VgdKb0ef1Vig3QuxubtLJnk3vS/TyGRKRwYJ7N4ZBBHPgMttKX9BXnplzSTH42UMDP uP9AIjQTCUjBEc8gFPm1y5jTPx/jpYvznRFps2uirzzTjpOBkV1tqPPRVxQqrjqmVtom PBTGwzJghPwkU4hPo38cL0bDuJm7NQ2JYq6LrE0vbrCfXH9sRnFvX9uypSMeUkZsOy4/ i5+qAPKn/ggWRZXN6JGc6u+qtdm32AcF1gZFt0B/Hu+GBaqClWJBYI0X381x3GcIpJ8C WomGmlrGk5Y2WCIVWi/5AEKU4OPmDB+KvvhMfAutofWe8UOSNWKiORxNdHrm98ru1oTN jvPQ== 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=GP1nNOgjrfmxr+auQwyUTuH+nmqo4JNJ9uMpNR37fHc=; b=r9pfluD8uIoYqvPRe6iIbD2ShqAL528unPUIDFCtJuChsgTvvJnMCP6zD/GD6CKJHl dgsHK/n61Jxq7/e098aEtdPl3q0BMWlGDhMAtg0hBCp8YsvS2LVbg2J1pzb0kPJFAzOU og0Z7Vl3YYpvkOAAIfpjd3nyGosVTNLI6Et9QoZGiptposFPCjDJc093lXTZNp57I0HD X1tp5nF6EUHIyn1Fb8ILFoyzx1jpJjN/7jUXv83rzQ9jBNNpcC5ZM0E5x+qpeJRJEFri ysJq6KrfCbzkPBPeohREXqP32k6eRbHE9pVwNJ0bxRD2/5Gzq+iReMfsvq3b4uUzDiWl jfwg== X-Gm-Message-State: AJcUukdgDnxB/Y7cNSCJfhveTtNVWiBi9+dnD+8GYesy7xrBczMmI8zC MsdJLgKHFe9jOAcBG1juh128dw== X-Google-Smtp-Source: ALg8bN7GERymegEJVIMgbjzcNmec9E6Ikjzte0ivGcyU78TESfHrZGVAGwX3ye7YVZayJT5IJdB3XQ== X-Received: by 2002:adf:bb8d:: with SMTP id q13mr40111915wrg.183.1549060786997; Fri, 01 Feb 2019 14:39:46 -0800 (PST) Received: from cbtest28.netronome.com ([217.38.71.146]) by smtp.gmail.com with ESMTPSA id t12sm7217326wrr.65.2019.02.01.14.39.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 01 Feb 2019 14:39:45 -0800 (PST) From: Jiong Wang To: ast@kernel.org, daniel@iogearbox.net Cc: jakub.kicinski@netronome.com, netdev@vger.kernel.org, oss-drivers@netronome.com, Jiong Wang Subject: [PATCH bpf-next 2/2] nfp: bpf: complete ALU32 logic shift supports Date: Fri, 1 Feb 2019 22:39:29 +0000 Message-Id: <1549060769-20920-3-git-send-email-jiong.wang@netronome.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1549060769-20920-1-git-send-email-jiong.wang@netronome.com> References: <1549060769-20920-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 The following ALU32 logic shift supports are missing: BPF_ALU | BPF_LSH | BPF_X BPF_ALU | BPF_RSH | BPF_X BPF_ALU | BPF_RSH | BPF_K For BPF_RSH | BPF_K, it could be implemented using NFP direct shift instruction. For the other BPF_X shifts, NFP indirect shifts sequences need to be used. Separate code-gen hook is assigned to each instruction to make the implementation clear. Reviewed-by: Jakub Kicinski Signed-off-by: Jiong Wang --- drivers/net/ethernet/netronome/nfp/bpf/jit.c | 72 ++++++++++++++++++++++++++-- 1 file changed, 67 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/netronome/nfp/bpf/jit.c b/drivers/net/ethernet/netronome/nfp/bpf/jit.c index 093b8ff..4d9d380 100644 --- a/drivers/net/ethernet/netronome/nfp/bpf/jit.c +++ b/drivers/net/ethernet/netronome/nfp/bpf/jit.c @@ -2441,16 +2441,75 @@ static int ashr_imm(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta) return __ashr_imm(nfp_prog, dst, insn->imm); } +static int __shr_imm(struct nfp_prog *nfp_prog, u8 dst, u8 shift_amt) +{ + if (shift_amt) + emit_shf(nfp_prog, reg_both(dst), reg_none(), SHF_OP_NONE, + reg_b(dst), SHF_SC_R_SHF, shift_amt); + wrp_immed(nfp_prog, reg_both(dst + 1), 0); + return 0; +} + +static int shr_imm(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta) +{ + const struct bpf_insn *insn = &meta->insn; + u8 dst = insn->dst_reg * 2; + + return __shr_imm(nfp_prog, dst, insn->imm); +} + +static int shr_reg(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta) +{ + const struct bpf_insn *insn = &meta->insn; + u64 umin, umax; + u8 dst, src; + + dst = insn->dst_reg * 2; + umin = meta->umin_src; + umax = meta->umax_src; + if (umin == umax) + return __shr_imm(nfp_prog, dst, umin); + + src = insn->src_reg * 2; + emit_alu(nfp_prog, reg_none(), reg_a(src), ALU_OP_OR, reg_imm(0)); + emit_shf_indir(nfp_prog, reg_both(dst), reg_none(), SHF_OP_NONE, + reg_b(dst), SHF_SC_R_SHF); + wrp_immed(nfp_prog, reg_both(dst + 1), 0); + return 0; +} + +static int __shl_imm(struct nfp_prog *nfp_prog, u8 dst, u8 shift_amt) +{ + if (shift_amt) + emit_shf(nfp_prog, reg_both(dst), reg_none(), SHF_OP_NONE, + reg_b(dst), SHF_SC_L_SHF, shift_amt); + wrp_immed(nfp_prog, reg_both(dst + 1), 0); + return 0; +} + static int shl_imm(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta) { const struct bpf_insn *insn = &meta->insn; + u8 dst = insn->dst_reg * 2; - if (insn->imm) - emit_shf(nfp_prog, reg_both(insn->dst_reg * 2), - reg_none(), SHF_OP_NONE, reg_b(insn->dst_reg * 2), - SHF_SC_L_SHF, insn->imm); - wrp_immed(nfp_prog, reg_both(insn->dst_reg * 2 + 1), 0); + return __shl_imm(nfp_prog, dst, insn->imm); +} +static int shl_reg(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta) +{ + const struct bpf_insn *insn = &meta->insn; + u64 umin, umax; + u8 dst, src; + + dst = insn->dst_reg * 2; + umin = meta->umin_src; + umax = meta->umax_src; + if (umin == umax) + return __shl_imm(nfp_prog, dst, umin); + + src = insn->src_reg * 2; + shl_reg64_lt32_low(nfp_prog, dst, src); + wrp_immed(nfp_prog, reg_both(dst + 1), 0); return 0; } @@ -3360,7 +3419,10 @@ static const instr_cb_t instr_cb[256] = { [BPF_ALU | BPF_DIV | BPF_X] = div_reg, [BPF_ALU | BPF_DIV | BPF_K] = div_imm, [BPF_ALU | BPF_NEG] = neg_reg, + [BPF_ALU | BPF_LSH | BPF_X] = shl_reg, [BPF_ALU | BPF_LSH | BPF_K] = shl_imm, + [BPF_ALU | BPF_RSH | BPF_X] = shr_reg, + [BPF_ALU | BPF_RSH | BPF_K] = shr_imm, [BPF_ALU | BPF_ARSH | BPF_X] = ashr_reg, [BPF_ALU | BPF_ARSH | BPF_K] = ashr_imm, [BPF_ALU | BPF_END | BPF_X] = end_reg32,