From patchwork Fri Mar 10 18:38:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 737529 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3vfwzs53R1z9s06 for ; Sat, 11 Mar 2017 05:40:09 +1100 (AEDT) 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="kRCZ7bF6"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933136AbdCJSkH (ORCPT ); Fri, 10 Mar 2017 13:40:07 -0500 Received: from mail-pg0-f50.google.com ([74.125.83.50]:35572 "EHLO mail-pg0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932965AbdCJSjc (ORCPT ); Fri, 10 Mar 2017 13:39:32 -0500 Received: by mail-pg0-f50.google.com with SMTP id b129so41791932pgc.2 for ; Fri, 10 Mar 2017 10:39:32 -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=FCaAyK1+tIJt08SNOfb1/hg2lqWndd3B4j2l/2mZkL8=; b=kRCZ7bF6yc1CbIsascQ9q8zwcSFccCGPuedIoo/h7LHDRjGLXjy8SNuCFcvqATSGD4 A/Ca/FzZq1xt8aonUy36dGS/CjZ6DAIKvmnFq+i9JdPIhOdmm+DgSUot9ozIihMglSWN T1bkyMByQVSVnDdeRxVEeDscjevDXEPfPSLVRZjfsKWYMeELHkb/Nq54EpY4U1rfjJuA fYeZpxXXMeizczkHF+vHAjQZLZ9zicaZD3l1fSxb0AFakfILyQrQb8DHDW9309w981KV Mi1vNWBVoDl3rFKdYwD5LCdb07vrTEoBdHOLNKW32UrDHhKpe/dWbthtcJbtlKxLVCj+ r90Q== 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=FCaAyK1+tIJt08SNOfb1/hg2lqWndd3B4j2l/2mZkL8=; b=dFvT/7dInhlrxI6HtXBlbEk3vFI2ONqltu5c3Pwe2op62RHWwQFhXKagP9M20ETMId 5U9v3ni67RI9vHK3oNrqbGHU1jIB3ZzuhLUPwomotAqoukw+QT80NoXLiUV6r3LzhngR T/FujiDIx6Y0Q1u8LgBXp8dx3/tSQ3yBPB8WM5DeSjBrF0w6J24m2a9k9Olca5X/33HF +OIlycrr0tOZ7viIBXnrd9oEvYvDfxUML4dn+LQrDz/X+7ssWVSZ8yFHf8ESo53CwB6T d3709c5x5Namml4EQe4FiiCG7/liUCzfV2BXkFsfwvdAexB8HxjhIMbCbmFI3nR5NT9m coqA== X-Gm-Message-State: AMke39n7pHH/NUE5o+lKNMcpvXBOoxe1kUXVu1Vf6ySazapUksQNbOsB4Rq2NramPT+ZXRDL X-Received: by 10.84.231.201 with SMTP id g9mr27397558pln.91.1489171171623; Fri, 10 Mar 2017 10:39:31 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([75.53.12.129]) by smtp.gmail.com with ESMTPSA id d63sm19940335pfg.132.2017.03.10.10.39.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 10 Mar 2017 10:39:31 -0800 (PST) From: Jakub Kicinski To: netdev@vger.kernel.org Cc: oss-drivers@netronome.com, kubakici@wp.pl, Jakub Kicinski Subject: [PATCH net-next 10/13] nfp: validate rx offset from the BAR and size down it's field Date: Fri, 10 Mar 2017 10:38:36 -0800 Message-Id: <20170310183839.39568-11-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170310183839.39568-1-jakub.kicinski@netronome.com> References: <20170310183839.39568-1-jakub.kicinski@netronome.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org NFP_NET_CFG_RX_OFFSET is 32bit wide, make sure what we read from there is reasonable for packet headroom. This allows us to store the rx_offset in a 8bit variable. Signed-off-by: Jakub Kicinski --- drivers/net/ethernet/netronome/nfp/nfp_net.h | 6 +++--- drivers/net/ethernet/netronome/nfp/nfp_net_common.c | 14 +++++++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net.h b/drivers/net/ethernet/netronome/nfp/nfp_net.h index db92463da440..5f0547c6efb8 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net.h +++ b/drivers/net/ethernet/netronome/nfp/nfp_net.h @@ -439,9 +439,9 @@ struct nfp_stat_pair { * @bpf_offload_xdp: Offloaded BPF program is XDP * @chained_metadata_format: Firemware will use new metadata format * @rx_dma_dir: Mapping direction for RX buffers + * @rx_offset: Offset in the RX buffers where packet data starts * @ctrl: Local copy of the control register/word. * @fl_bufsz: Currently configured size of the freelist buffers - * @rx_offset: Offset in the RX buffers where packet data starts * @xdp_prog: Installed XDP program * @tx_rings: Array of pre-allocated TX ring structures * @rx_rings: Array of pre-allocated RX ring structures @@ -466,11 +466,11 @@ struct nfp_net_dp { u8 rx_dma_dir; + u8 rx_offset; + u32 ctrl; u32 fl_bufsz; - u32 rx_offset; - struct bpf_prog *xdp_prog; struct nfp_net_tx_ring *tx_rings; diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c index ab03f2f301cd..513f55dd746b 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c @@ -3124,10 +3124,18 @@ int nfp_net_netdev_init(struct net_device *netdev) nfp_net_write_mac_addr(nn); /* Determine RX packet/metadata boundary offset */ - if (nn->fw_ver.major >= 2) - nn->dp.rx_offset = nn_readl(nn, NFP_NET_CFG_RX_OFFSET); - else + if (nn->fw_ver.major >= 2) { + u32 reg; + + reg = nn_readl(nn, NFP_NET_CFG_RX_OFFSET); + if (reg > NFP_NET_MAX_PREPEND) { + nn_err(nn, "Invalid rx offset: %d\n", reg); + return -EINVAL; + } + nn->dp.rx_offset = reg; + } else { nn->dp.rx_offset = NFP_NET_RX_OFFSET; + } /* Set default MTU and Freelist buffer size */ if (nn->max_mtu < NFP_NET_DEFAULT_MTU)