From patchwork Thu Oct 12 17:34:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 824994 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@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; dkim=pass (2048-bit key; unprotected) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="z86gFr4c"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yCdKH5tYBz9t2r for ; Fri, 13 Oct 2017 04:35:15 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752907AbdJLRe6 (ORCPT ); Thu, 12 Oct 2017 13:34:58 -0400 Received: from mail-pf0-f174.google.com ([209.85.192.174]:43253 "EHLO mail-pf0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752786AbdJLRex (ORCPT ); Thu, 12 Oct 2017 13:34:53 -0400 Received: by mail-pf0-f174.google.com with SMTP id a8so5395387pfc.0 for ; Thu, 12 Oct 2017 10:34:53 -0700 (PDT) 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=PdrstdinAeFDyhP8s9LaLT30UAuLm6HgWg4K474Aq+k=; b=z86gFr4clVJBelaQJO46BvW2tWRzy2QsM2H2MkWU5R78rBOqloZlyfKd9uFZGXxHV4 JGmBFDDpTrPF5qy0VjEYzFHxwGzZZ+C7dwosjiCO+OPmiv6HfhttrPEwvDQdkt0CiSjb Ax9wF+tCQAegiow8pj0xvqdCm6TGuUm1YC65pRK0eBToXWyPX5fF6W9acCI/dZV/tG+w CySfbSwE4yS8hwLbVuV5WwC30JpAE1FRvAEXmR+n9Ca/WMscUUyCuIx9qdWY9LajJMLJ 8bZBucaIYZho+H1hqrQjRoZRB2kVTlWE6HvpavbKsMcBItSUyTWE2WS5fz0aIh2WFTuV 63iQ== 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=PdrstdinAeFDyhP8s9LaLT30UAuLm6HgWg4K474Aq+k=; b=culXLlek02sglhQxDzy1geurnkj7d/qC8ErlXrHog+PiA6NfC5mTMIf3iukMkcT4cF JgwQ3MjP6TX7/TCC919HKSV/QPjPBeN2oFiJQ24zbRIZWU3bF74ELcCVYGX4b+IACa34 PoORwRJ1lD7+EDH4ibTPfd1bhCUAd77DuN6W2g93/WWa0Zy/FLYCMG3B/OrD0NBnaWLR 8PcO1uItNHpSHVTdGSf6E9zi+D3bpkLNKVaoR+dv49iltzehJLXxKUxUKElKh22DlnDX 5+OacZnyvsjFJa4E+NxS1anWBG3KMRBoINRA1DNWOqjJOC0VE4OAVIhhKn0QwQxNzEfn r6cw== X-Gm-Message-State: AMCzsaUIDAC3lTe7qbiLK9Diy7Z02tlHbqebcyoZGQSeOV+oas/bzFbl /IIU2sRQolBJ9AAJmtpT6VCIVZoR X-Google-Smtp-Source: AOwi7QAbF1nVj3xd0J6FLlh5iUTOg80lIETwofCFIlzhzsmBAzlBJBSZA/hVG7feoYop5u589qZnxQ== X-Received: by 10.99.8.194 with SMTP id 185mr833778pgi.202.1507829693277; Thu, 12 Oct 2017 10:34:53 -0700 (PDT) Received: from jkicinski-Precision-T1700.netronome.com ([75.53.12.129]) by smtp.gmail.com with ESMTPSA id q8sm25037929pfk.100.2017.10.12.10.34.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 12 Oct 2017 10:34:52 -0700 (PDT) From: Jakub Kicinski To: netdev@vger.kernel.org Cc: oss-drivers@netronome.com, Jakub Kicinski Subject: [PATCH net-next 06/12] nfp: bpf: implement byte swap instruction Date: Thu, 12 Oct 2017 10:34:12 -0700 Message-Id: <20171012173418.4029-7-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171012173418.4029-1-jakub.kicinski@netronome.com> References: <20171012173418.4029-1-jakub.kicinski@netronome.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Implement byte swaps with rotations, shifts and byte loads. Remember to clear upper parts of the 64 bit registers. Signed-off-by: Jakub Kicinski Reviewed-by: Simon Horman --- drivers/net/ethernet/netronome/nfp/bpf/jit.c | 38 ++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/drivers/net/ethernet/netronome/nfp/bpf/jit.c b/drivers/net/ethernet/netronome/nfp/bpf/jit.c index 4f7cfa6adfc1..5e8a6b766790 100644 --- a/drivers/net/ethernet/netronome/nfp/bpf/jit.c +++ b/drivers/net/ethernet/netronome/nfp/bpf/jit.c @@ -746,6 +746,14 @@ wrp_cmp_reg(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta, return 0; } +static void wrp_end32(struct nfp_prog *nfp_prog, swreg reg_in, u8 gpr_out) +{ + emit_ld_field(nfp_prog, reg_both(gpr_out), 0xf, reg_in, + SHF_SC_R_ROT, 8); + emit_ld_field(nfp_prog, reg_both(gpr_out), 0x5, reg_a(gpr_out), + SHF_SC_R_ROT, 16); +} + /* --- Callbacks --- */ static int mov_reg64(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta) { @@ -982,6 +990,35 @@ static int shl_imm(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta) return 0; } +static int end_reg32(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta) +{ + const struct bpf_insn *insn = &meta->insn; + u8 gpr = insn->dst_reg * 2; + + switch (insn->imm) { + case 16: + emit_ld_field(nfp_prog, reg_both(gpr), 0x9, reg_b(gpr), + SHF_SC_R_ROT, 8); + emit_ld_field(nfp_prog, reg_both(gpr), 0xe, reg_a(gpr), + SHF_SC_R_SHF, 16); + + wrp_immed(nfp_prog, reg_both(gpr + 1), 0); + break; + case 32: + wrp_end32(nfp_prog, reg_a(gpr), gpr); + wrp_immed(nfp_prog, reg_both(gpr + 1), 0); + break; + case 64: + wrp_mov(nfp_prog, imm_a(nfp_prog), reg_b(gpr + 1)); + + wrp_end32(nfp_prog, reg_a(gpr), gpr + 1); + wrp_end32(nfp_prog, imm_a(nfp_prog), gpr); + break; + } + + return 0; +} + static int imm_ld8_part2(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta) { wrp_immed(nfp_prog, reg_both(nfp_meta_prev(meta)->insn.dst_reg * 2 + 1), @@ -1297,6 +1334,7 @@ static const instr_cb_t instr_cb[256] = { [BPF_ALU | BPF_SUB | BPF_X] = sub_reg, [BPF_ALU | BPF_SUB | BPF_K] = sub_imm, [BPF_ALU | BPF_LSH | BPF_K] = shl_imm, + [BPF_ALU | BPF_END | BPF_X] = end_reg32, [BPF_LD | BPF_IMM | BPF_DW] = imm_ld8, [BPF_LD | BPF_ABS | BPF_B] = data_ld1, [BPF_LD | BPF_ABS | BPF_H] = data_ld2,