From patchwork Thu Oct 12 17:34:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 824993 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="0p+eq877"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yCdKC3kGBz9t2r for ; Fri, 13 Oct 2017 04:35:11 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752962AbdJLRfA (ORCPT ); Thu, 12 Oct 2017 13:35:00 -0400 Received: from mail-pf0-f173.google.com ([209.85.192.173]:45112 "EHLO mail-pf0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752836AbdJLRez (ORCPT ); Thu, 12 Oct 2017 13:34:55 -0400 Received: by mail-pf0-f173.google.com with SMTP id d28so5857816pfe.2 for ; Thu, 12 Oct 2017 10:34:55 -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=RfhdWePuFAsU/eOtmjl0iGh+0j8z+yeu9iWepC6GdQM=; b=0p+eq877sC7JE0047Cuw1P5Vg5j/N4kmaD1c3LUuExUNO7juInNqvr+jPptTWeytJf BDih/+AEKsxXQ6/0Gy3ZV7jyk3kRZLSiTGx2WMsW8QDymFgvMeN1/x8Hyoyxb3rnk2uo 6m7kDLlOTUg1pIDMbfkkmSz2fO8oKxvQfuYrvrbZtWR+qmX83+AmgWj3FnHjZRmfGHp+ RDjyfJc3B+xLOHaB8g7t9HBlN7FTFxKcfaB9IOmItWzz+47IForf41jNm7pP7ojtUGyS D3383qP9faL1ycWsh+wMRPwICmt2qWZBD3vJHE/ghzs9cs58AqKljji/T/Oyfv2TE5kE raow== 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=RfhdWePuFAsU/eOtmjl0iGh+0j8z+yeu9iWepC6GdQM=; b=MwLjU6GCbKSTvzXGpyjwUcwCp2OzBOv1rFkrQbII6wbe/zefUlW9TpDj+Bh2Dz881G 3qifIIMarALnXevx4NDW6iqUelT7U+c8KRpMgvW+pFWnAe+KHI1pJBSfLt4TEHzdqPZn AfuWXd6mpDb7Y4zl+cX8Mn+aaYienNQw+24pi0vJj1Z40PZi9OqXY2G0F1rC2eXBCcsk urk8wNpfuekLp+vqpxDmI2oxDwoo/4y+ndib6NjFNbDreeKStsmC3msugs8zsbl03wXK JUBqLwBogcsKlHndB9UFaFsLWpw/m0xu0zIPVpsXLmec6KeC/xYlVNWcn28NZNK55cDs Hymw== X-Gm-Message-State: AMCzsaXiCY+/nJi1hrHagmGwTPFdg7y35SuybE1j0aAlPRfWVidlgF+9 7OpogxTH6t7FCeSeXNn5JfSpwA5R X-Google-Smtp-Source: AOwi7QBm8M0l3IQLLKxRDQ6DQahDtA5iB9PX/tzorlZxA9Iy1pIa/tlQmTe1n4o+HDCa5bnSw3fuiQ== X-Received: by 10.101.87.139 with SMTP id b11mr802202pgr.186.1507829695056; Thu, 12 Oct 2017 10:34:55 -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.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 12 Oct 2017 10:34:54 -0700 (PDT) From: Jakub Kicinski To: netdev@vger.kernel.org Cc: oss-drivers@netronome.com, Jakub Kicinski Subject: [PATCH net-next 08/12] nfp: bpf: fix context accesses Date: Thu, 12 Oct 2017 10:34:14 -0700 Message-Id: <20171012173418.4029-9-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 Sizes of fields in struct xdp_md/xdp_buff and some in sk_buff depend on target architecture. Take that into account and use struct xdp_buff, not struct xdp_md. Signed-off-by: Jakub Kicinski Reviewed-by: Simon Horman --- drivers/net/ethernet/netronome/nfp/bpf/jit.c | 49 ++++++++++++++++------------ 1 file changed, 29 insertions(+), 20 deletions(-) diff --git a/drivers/net/ethernet/netronome/nfp/bpf/jit.c b/drivers/net/ethernet/netronome/nfp/bpf/jit.c index 5e8a6b766790..4b62f5497728 100644 --- a/drivers/net/ethernet/netronome/nfp/bpf/jit.c +++ b/drivers/net/ethernet/netronome/nfp/bpf/jit.c @@ -1070,47 +1070,56 @@ static int data_ind_ld4(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta) meta->insn.src_reg * 2, true, 4); } -static int mem_ldx4_skb(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta) +static int mem_ldx_skb(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta, + u8 size) { - if (meta->insn.off == offsetof(struct sk_buff, len)) + switch (meta->insn.off) { + case offsetof(struct sk_buff, len): + if (size != FIELD_SIZEOF(struct sk_buff, len)) + return -EOPNOTSUPP; wrp_mov(nfp_prog, reg_both(meta->insn.dst_reg * 2), plen_reg(nfp_prog)); - else + break; + default: return -EOPNOTSUPP; + } + + wrp_immed(nfp_prog, reg_both(meta->insn.dst_reg * 2 + 1), 0); return 0; } -static int mem_ldx4_xdp(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta) +static int mem_ldx_xdp(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta, + u8 size) { swreg dst = reg_both(meta->insn.dst_reg * 2); - if (meta->insn.off != offsetof(struct xdp_md, data) && - meta->insn.off != offsetof(struct xdp_md, data_end)) - return -EOPNOTSUPP; - - wrp_mov(nfp_prog, dst, pptr_reg(nfp_prog)); + if (size != sizeof(void *)) + return -EINVAL; - if (meta->insn.off == offsetof(struct xdp_md, data)) - return 0; + switch (meta->insn.off) { + case offsetof(struct xdp_buff, data): + wrp_mov(nfp_prog, dst, pptr_reg(nfp_prog)); + break; + case offsetof(struct xdp_buff, data_end): + emit_alu(nfp_prog, dst, + plen_reg(nfp_prog), ALU_OP_ADD, pptr_reg(nfp_prog)); + break; + default: + return -EOPNOTSUPP; + } - emit_alu(nfp_prog, dst, dst, ALU_OP_ADD, plen_reg(nfp_prog)); + wrp_immed(nfp_prog, reg_both(meta->insn.dst_reg * 2 + 1), 0); return 0; } static int mem_ldx4(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta) { - int ret; - if (nfp_prog->act == NN_ACT_XDP) - ret = mem_ldx4_xdp(nfp_prog, meta); + return mem_ldx_xdp(nfp_prog, meta, 4); else - ret = mem_ldx4_skb(nfp_prog, meta); - - wrp_immed(nfp_prog, reg_both(meta->insn.dst_reg * 2 + 1), 0); - - return ret; + return mem_ldx_skb(nfp_prog, meta, 4); } static int mem_stx4_skb(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta)