From patchwork Mon Jan 6 21:05:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Nelson X-Patchwork-Id: 1218465 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) 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=pensando.io Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=pensando.io header.i=@pensando.io header.b="Ox0dzOrp"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47s7M7629rz9sR8 for ; Tue, 7 Jan 2020 08:05:23 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727103AbgAFVFW (ORCPT ); Mon, 6 Jan 2020 16:05:22 -0500 Received: from mail-pg1-f194.google.com ([209.85.215.194]:32790 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727067AbgAFVFV (ORCPT ); Mon, 6 Jan 2020 16:05:21 -0500 Received: by mail-pg1-f194.google.com with SMTP id 6so27419411pgk.0 for ; Mon, 06 Jan 2020 13:05:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pensando.io; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=QRvRJ17yAgfqPGiRV0RGDzXVBVOSCZZmRgPS4VPHyZM=; b=Ox0dzOrp/RMLEy1cV7wN+t5WGHnvE92dBze//Kcmsifp7lVeT2aEcuzpNFbyYHbZ+G Q21o7JcBEe+wbJpOYALRZEfDKqpI01erR0bEBPusDseKkl6ecR2aNUCR7YN5ilNLw/6j Z7fN12cTlxSLMUJWLEkDMEz8ZCPBsFPEqw250dt7L825976MduyRNKq1Ldwq3TM8Krl8 Blu+q1ehnUSnwfjuCPvjI8dZFInvUE6lCh8Z/G51V3EU7en/DalxuI91WsrGNqfW9qUl FsMgktTn1npLC+Itit42FIcTuRUM3JTj5fNHnRggvU2BnE16BYLpcJaSqg1XLPvviQhj vobw== 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=QRvRJ17yAgfqPGiRV0RGDzXVBVOSCZZmRgPS4VPHyZM=; b=kpWaqmjEgaRWa7a6x/UkGC1Ku2RmiE7u2LcOCdijM5SUCGWWArfAR8IsCB41KaDyn7 exXCXp1Te7+4Bz00mpxCWRyBtV+4F+NSM90bfcusP9YVLfgkrb2SJTc1SsMRYNzFzYO7 gKhR5ABjLf7qVkHh7HgF6YIuyrotwNoogwZPkwo5V+c4qxLVHyidq30sg0AWP1PxmP0r IpQDoe/ap8s9ks4WvHkwQ78s+Q4slDGvcWFy7y5xVYHIGVF5DGfOIB0BauY+xo5bIzSc ipubjih4qwa2lRxl9kLM43CMQ9g7U+UDjt2z0JYrxw+Q+4xdmdNGTyIMzhwBhamxS1qD XHLA== X-Gm-Message-State: APjAAAVjFYAkL4AXH9lM9+X6vP0YRmzE8DbcWnMnFsayS43MDVpnbl3h gbRUJuiKWpo7QFxrLmlQc058xwZnzXo= X-Google-Smtp-Source: APXvYqyN1dn4Fsh4CrBo84YYcvNESUAwDAPwAsBOPPZTYG5PhSzCjeaqoYxOCZByyEIgSDDg52/Cbg== X-Received: by 2002:aa7:98d0:: with SMTP id e16mr107622520pfm.77.1578344720012; Mon, 06 Jan 2020 13:05:20 -0800 (PST) Received: from driver-dev1.pensando.io ([12.226.153.42]) by smtp.gmail.com with ESMTPSA id p16sm63183003pfq.184.2020.01.06.13.05.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Jan 2020 13:05:19 -0800 (PST) From: Shannon Nelson To: netdev@vger.kernel.org, davem@davemloft.net Cc: Shannon Nelson Subject: [PATCH net-next 1/4] ionic: drop use of subdevice tags Date: Mon, 6 Jan 2020 13:05:09 -0800 Message-Id: <20200106210512.34244-2-snelson@pensando.io> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200106210512.34244-1-snelson@pensando.io> References: <20200106210512.34244-1-snelson@pensando.io> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The subdevice concept is not being used in the driver, so drop the references to it. Signed-off-by: Shannon Nelson --- drivers/net/ethernet/pensando/ionic/ionic.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/net/ethernet/pensando/ionic/ionic.h b/drivers/net/ethernet/pensando/ionic/ionic.h index ca0b21911ad6..bb106a32f416 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic.h +++ b/drivers/net/ethernet/pensando/ionic/ionic.h @@ -19,10 +19,6 @@ struct ionic_lif; #define PCI_DEVICE_ID_PENSANDO_IONIC_ETH_PF 0x1002 #define PCI_DEVICE_ID_PENSANDO_IONIC_ETH_VF 0x1003 -#define IONIC_SUBDEV_ID_NAPLES_25 0x4000 -#define IONIC_SUBDEV_ID_NAPLES_100_4 0x4001 -#define IONIC_SUBDEV_ID_NAPLES_100_8 0x4002 - #define DEVCMD_TIMEOUT 10 struct ionic_vf { From patchwork Mon Jan 6 21:05:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Nelson X-Patchwork-Id: 1218469 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) 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=pensando.io Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=pensando.io header.i=@pensando.io header.b="H4orBqIT"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47s7MF5ZXyz9sR0 for ; Tue, 7 Jan 2020 08:05:29 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727146AbgAFVF2 (ORCPT ); Mon, 6 Jan 2020 16:05:28 -0500 Received: from mail-pg1-f194.google.com ([209.85.215.194]:42785 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727046AbgAFVFV (ORCPT ); Mon, 6 Jan 2020 16:05:21 -0500 Received: by mail-pg1-f194.google.com with SMTP id s64so27403074pgb.9 for ; Mon, 06 Jan 2020 13:05:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pensando.io; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=E8kuBhvQjVSYVziYAoWgqMCiuOOHXOD4BqBOGj3RIJ4=; b=H4orBqITU3ofRgPXado+xB09DYNvKgZZSY8pfmfAnLscB8dPr6VWLmKm2BmotU7Ado H3wEvGIewk92jVdf7lBjLPvOqdMtIWzagrFV0nSH7ZXF6SeqMum9K58Ztw4Dc8TQ7YsS 8hrPgWw6FC8bJVWIJKE8V1FSsEdDawUSlj9SVBAjt6nStX6dUT/mvvQgQhXpdK9cSzNG dUPLT08YnrTT2UXPHyHgipNOOUJEzA/EgzebDypMhg7X+esoZqoCFINs4ARkUm8mX/11 WYtnOduIrdO0+bGO1cVqEEVZCU0MC4P8leckGco04+LWBl3g2ivnEAiPd2MpVmEM3a8f JfsA== 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=E8kuBhvQjVSYVziYAoWgqMCiuOOHXOD4BqBOGj3RIJ4=; b=GelUnQ1N3W5Aq7YwhqObMyDhoBGj/LrRcY2bKPRcLyteqKspVH5XWGD+peSNYhn4xl d99mV6JDmIpYWpld6lqCoI4U6mXfofCnTprMKG2uvGAJmK2GzdcLXjfVkkUjWAjY4i/m pEKL9X5/eaBcxUx5oKpceKsNqkoKQpd799MHWEuK0TN3LIebgGwzh40Y/qC3Px/i94Np a44IqRBLamWRz8DeRDyxt0Lv3k2VbJ7HGE1647iaVXTKGp+hqn2wEReH0tnMP4Ks0+gp tAfsPkiFmrvoYaZeAk33SuxFXXfiVWhsBelv13w0jJTYORR9qPxW5Kf5pxs+oaWUH0A9 SlSg== X-Gm-Message-State: APjAAAX6uAVnDbt3JLaEKfaEZxh4rhFPYZPolumxj+JoR+eE7fKr4dMF 7ak9YD0D5rTPDQHgQp8eeVhg8tCm85U= X-Google-Smtp-Source: APXvYqyD5w84guC2W6wsijhZvmCuR0rE3T+KaGwEXt605MgO6DOu0lMpeieK5UCbkYHnjWC9cT21Tw== X-Received: by 2002:a62:258:: with SMTP id 85mr115837364pfc.254.1578344720838; Mon, 06 Jan 2020 13:05:20 -0800 (PST) Received: from driver-dev1.pensando.io ([12.226.153.42]) by smtp.gmail.com with ESMTPSA id p16sm63183003pfq.184.2020.01.06.13.05.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Jan 2020 13:05:20 -0800 (PST) From: Shannon Nelson To: netdev@vger.kernel.org, davem@davemloft.net Cc: Shannon Nelson Subject: [PATCH net-next 2/4] ionic: fix for ppc msix layout Date: Mon, 6 Jan 2020 13:05:10 -0800 Message-Id: <20200106210512.34244-3-snelson@pensando.io> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200106210512.34244-1-snelson@pensando.io> References: <20200106210512.34244-1-snelson@pensando.io> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The IBM Power9 ppc64 seems to have a problem with not wanting to limit the address space used by a PCI device. The Naples internal HW can only address up to 52 bits, but the ppc does not play well with that limitation. This patch tells the system how to work with Naples successfully. Signed-off-by: Shannon Nelson --- drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c b/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c index 448d7b23b2f7..9fd3862dee0d 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c +++ b/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c @@ -222,6 +222,9 @@ static int ionic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) mutex_init(&ionic->dev_cmd_lock); /* Query system for DMA addressing limitation for the device. */ +#ifdef CONFIG_PPC64 + ionic->pdev->no_64bit_msi = 1; +#endif err = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(IONIC_ADDR_LEN)); if (err) { dev_err(dev, "Unable to obtain 64-bit DMA for consistent allocations, aborting. err=%d\n", From patchwork Mon Jan 6 21:05:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Nelson X-Patchwork-Id: 1218466 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) 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=pensando.io Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=pensando.io header.i=@pensando.io header.b="guivR/P+"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47s7M968tpz9sR4 for ; Tue, 7 Jan 2020 08:05:25 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727127AbgAFVFY (ORCPT ); Mon, 6 Jan 2020 16:05:24 -0500 Received: from mail-pg1-f195.google.com ([209.85.215.195]:45738 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727099AbgAFVFW (ORCPT ); Mon, 6 Jan 2020 16:05:22 -0500 Received: by mail-pg1-f195.google.com with SMTP id b9so27401879pgk.12 for ; Mon, 06 Jan 2020 13:05:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pensando.io; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=VRpcX5dljS7G2GoRPSUCuR98m4dO7SFJ1AshJLSpdeY=; b=guivR/P+q9s70eQRcwYqKbN4IMhrvC5DL1eCZr0BFrQ74Zog0wuF0S8OCASq3XyLQA HhppT4v0Xejl7+vVdkur1gydxfoJv/4MUrBLNvPDCK13xfnuFnIGxyjQ6Q73Pzt85G8M 9PVtmqxzXQ+2oXBJLdb/X7gXK+7d/uSdXuTdUqnrvLQtx61floX2Db+DeSUqaRb1M9/N 1x6idfYgZUgoItCTN8xINlG24utvG7gJvxs8UWDM2eH2vXr4v8JmBvJ0J2nYQO6kxI5m 35BQoyWAJIoNGHN+cIOjkB3SuRqgr9blfSBlFWmambCIOkqluo2AmSHsPSDqviNRNoCS 9yVg== 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=VRpcX5dljS7G2GoRPSUCuR98m4dO7SFJ1AshJLSpdeY=; b=lkaORkkKD3UY7kTf/W17SNASpjaEzpNSBEh11c4NQgAXP/fh84qgSpDcxCjhTS2osM sCVXtp5DVyVNiY42/uWtA39ZD/odbWR4W7DtPgqNqg/4Xbd8vCjQQ9o6Zcuw+7IxEf65 Ig5EQJQZxSXRAAKmJe1914CFDQ/NOKs22sOvnSv5ukJGEQmBA8A3BbGhYu4WSCmSe4p7 3HBC7TPLPTpAa3ufSflAcodlAvjA6+1FJO7TI9hDRjdpeyPj6SE+QBcZXdSMisZovNqR CpGPoVRUd9kHGBGZq3zZBwxyQLxEwvd7HPXj+EywcsEokrn6hSF9VUaDbsx2JWSf9FaH JAmA== X-Gm-Message-State: APjAAAVGWQSUUmJ6yvE4LvXKVhmIWibNvr+8+hPY8Lpojh753YIROd0/ U+hPg75NjcvY6K1QJf67LHmRrNWUJC4= X-Google-Smtp-Source: APXvYqwsVQY2ssMnU9IZXKNMSfGDr1XF/DADpCGqcUaZ6J3+e0Un3jTQCqbDRYaYSM+ZVBD3EoSDpA== X-Received: by 2002:a62:148a:: with SMTP id 132mr48588984pfu.158.1578344721619; Mon, 06 Jan 2020 13:05:21 -0800 (PST) Received: from driver-dev1.pensando.io ([12.226.153.42]) by smtp.gmail.com with ESMTPSA id p16sm63183003pfq.184.2020.01.06.13.05.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Jan 2020 13:05:21 -0800 (PST) From: Shannon Nelson To: netdev@vger.kernel.org, davem@davemloft.net Cc: Shannon Nelson Subject: [PATCH net-next 3/4] ionic: add Rx dropped packet counter Date: Mon, 6 Jan 2020 13:05:11 -0800 Message-Id: <20200106210512.34244-4-snelson@pensando.io> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200106210512.34244-1-snelson@pensando.io> References: <20200106210512.34244-1-snelson@pensando.io> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add a counter for packets dropped by the driver, typically for bad size or a receive error seen by the device. Signed-off-by: Shannon Nelson --- drivers/net/ethernet/pensando/ionic/ionic_lif.h | 1 + drivers/net/ethernet/pensando/ionic/ionic_stats.c | 1 + drivers/net/ethernet/pensando/ionic/ionic_txrx.c | 12 +++++++++--- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/pensando/ionic/ionic_lif.h b/drivers/net/ethernet/pensando/ionic/ionic_lif.h index a55fd1f8c31b..9c5a7dd45f9d 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_lif.h +++ b/drivers/net/ethernet/pensando/ionic/ionic_lif.h @@ -37,6 +37,7 @@ struct ionic_rx_stats { u64 csum_complete; u64 csum_error; u64 buffers_posted; + u64 dropped; }; #define IONIC_QCQ_F_INITED BIT(0) diff --git a/drivers/net/ethernet/pensando/ionic/ionic_stats.c b/drivers/net/ethernet/pensando/ionic/ionic_stats.c index 03916b6d47f2..a1e9796a660a 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_stats.c +++ b/drivers/net/ethernet/pensando/ionic/ionic_stats.c @@ -39,6 +39,7 @@ static const struct ionic_stat_desc ionic_rx_stats_desc[] = { IONIC_RX_STAT_DESC(csum_none), IONIC_RX_STAT_DESC(csum_complete), IONIC_RX_STAT_DESC(csum_error), + IONIC_RX_STAT_DESC(dropped), }; static const struct ionic_stat_desc ionic_txq_stats_desc[] = { diff --git a/drivers/net/ethernet/pensando/ionic/ionic_txrx.c b/drivers/net/ethernet/pensando/ionic/ionic_txrx.c index 97e79949b359..a009bbe9f9be 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_txrx.c +++ b/drivers/net/ethernet/pensando/ionic/ionic_txrx.c @@ -152,12 +152,16 @@ static void ionic_rx_clean(struct ionic_queue *q, struct ionic_desc_info *desc_i stats = q_to_rx_stats(q); netdev = q->lif->netdev; - if (comp->status) + if (comp->status) { + stats->dropped++; return; + } /* no packet processing while resetting */ - if (unlikely(test_bit(IONIC_LIF_QUEUE_RESET, q->lif->state))) + if (unlikely(test_bit(IONIC_LIF_QUEUE_RESET, q->lif->state))) { + stats->dropped++; return; + } stats->pkts++; stats->bytes += le16_to_cpu(comp->len); @@ -167,8 +171,10 @@ static void ionic_rx_clean(struct ionic_queue *q, struct ionic_desc_info *desc_i else skb = ionic_rx_frags(q, desc_info, cq_info); - if (unlikely(!skb)) + if (unlikely(!skb)) { + stats->dropped++; return; + } skb_record_rx_queue(skb, q->index); From patchwork Mon Jan 6 21:05:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Nelson X-Patchwork-Id: 1218467 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) 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=pensando.io Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=pensando.io header.i=@pensando.io header.b="nNpu6RRL"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47s7MC306Xz9sR0 for ; Tue, 7 Jan 2020 08:05:27 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727137AbgAFVF0 (ORCPT ); Mon, 6 Jan 2020 16:05:26 -0500 Received: from mail-pf1-f196.google.com ([209.85.210.196]:45328 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727105AbgAFVFX (ORCPT ); Mon, 6 Jan 2020 16:05:23 -0500 Received: by mail-pf1-f196.google.com with SMTP id 2so27488439pfg.12 for ; Mon, 06 Jan 2020 13:05:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pensando.io; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=2hIMHWRkoNrhFsVDHwx2o3lYku7ksdqRfvz4mH1P854=; b=nNpu6RRLSnTQ5onTUQV3gqp6y4tabZ8GyKSpGpA/OknI2PC87eC2PDZuY3V5UNhwPq uylcdYs42i+wgROjRft5361MNyT9BtTGZhKXUeJ77QTIzZxf1jenyRCYA7fQyGj2exW8 1VKXR/H7+QYUeYKWmcVY7HQfiXeQVTKCqS53zPzaWf/1bi8HRyDkicZuJ4fLEKhUGje/ HDWH4hvJbnqdTjn1nVPB0PgT72AnHhzuuOdFVlNCJzWj0h8iFYN6lifxY4MplxpGV2qA oqxOoPAwXGbE9c1s9DDZlZNIw9f4NLtxDa7S2RGeEAc1+J8glDOct6a9CXiv8GPFBjkZ iioA== 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=2hIMHWRkoNrhFsVDHwx2o3lYku7ksdqRfvz4mH1P854=; b=fmtWtQUA+W+0uF/vhvc6px0EcXmDPux7BFpMohfyJiwSBlmGGoLhitn8LYeuCxz4WO /bBevUlXh6yxmxwu/0IP0NjyvHIEOam/w4vgUwkDTCxdhidjazZbMXWpp8UnIa45/yH+ epPcKyWu4dmBXZxOUz0NnUgt4U+IrpFP1G3MvCoCRjwwKIpnxBCl4coDe7XK5l99BOUj JFA9OeTfh5v0ZbfoV+aRqTSZ4DTiPaoqX4sl0Y/ehCMVfCFG3xBupNYg6h9P98zNoIR3 g3Oa9+4o9wlvlEgnzu4wzPhd76S7sZUSYAGh7aQhYi3VcvdYJZJN/VJYUD5pLQ5483F0 RRLg== X-Gm-Message-State: APjAAAUBMmaGEyE3cJTY81G97oES5iGW4bzXvi0dHumnlehP7FdAChWi i8r5CNmw2K1ExciRbtSo3c0JlVlI2yw= X-Google-Smtp-Source: APXvYqz2d0xvMwB0sY/KsbVqjum1v5qu1DTdgfsvpMn489dM5Gn1YEU0bOQDSw8xZLzflyuSzfkt6g== X-Received: by 2002:a65:68ca:: with SMTP id k10mr115134625pgt.222.1578344722487; Mon, 06 Jan 2020 13:05:22 -0800 (PST) Received: from driver-dev1.pensando.io ([12.226.153.42]) by smtp.gmail.com with ESMTPSA id p16sm63183003pfq.184.2020.01.06.13.05.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Jan 2020 13:05:21 -0800 (PST) From: Shannon Nelson To: netdev@vger.kernel.org, davem@davemloft.net Cc: Shannon Nelson Subject: [PATCH net-next 4/4] ionic: restrict received packets to mtu size Date: Mon, 6 Jan 2020 13:05:12 -0800 Message-Id: <20200106210512.34244-5-snelson@pensando.io> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200106210512.34244-1-snelson@pensando.io> References: <20200106210512.34244-1-snelson@pensando.io> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Make sure the NIC drops packets that are larger than the specified MTU. The front end of the NIC will accept packets larger than MTU and will copy all the data it can to fill up the driver's posted buffers - if the buffers are not long enough the packet will then get dropped. With the Rx SG buffers allocagted as full pages, we are currently setting up more space than MTU size available and end up receiving some packets that are larger than MTU, up to the size of buffers posted. To be sure the NIC doesn't waste our time with oversized packets we need to lie a little in the SG descriptor about how long is the last SG element. At dealloc time, we know the allocation was a page, so the deallocation doesn't care about what length we put in the descriptor. Signed-off-by: Shannon Nelson --- drivers/net/ethernet/pensando/ionic/ionic_txrx.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/pensando/ionic/ionic_txrx.c b/drivers/net/ethernet/pensando/ionic/ionic_txrx.c index a009bbe9f9be..e452f4242ba0 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_txrx.c +++ b/drivers/net/ethernet/pensando/ionic/ionic_txrx.c @@ -343,6 +343,8 @@ void ionic_rx_fill(struct ionic_queue *q) struct ionic_rxq_sg_desc *sg_desc; struct ionic_rxq_sg_elem *sg_elem; struct ionic_rxq_desc *desc; + unsigned int remain_len; + unsigned int seg_len; unsigned int nfrags; bool ring_doorbell; unsigned int i, j; @@ -352,6 +354,7 @@ void ionic_rx_fill(struct ionic_queue *q) nfrags = round_up(len, PAGE_SIZE) / PAGE_SIZE; for (i = ionic_q_space_avail(q); i; i--) { + remain_len = len; desc_info = q->head; desc = desc_info->desc; sg_desc = desc_info->sg_desc; @@ -375,7 +378,9 @@ void ionic_rx_fill(struct ionic_queue *q) return; } desc->addr = cpu_to_le64(page_info->dma_addr); - desc->len = cpu_to_le16(PAGE_SIZE); + seg_len = min_t(unsigned int, PAGE_SIZE, len); + desc->len = cpu_to_le16(seg_len); + remain_len -= seg_len; page_info++; /* fill sg descriptors - pages[1..n] */ @@ -391,7 +396,9 @@ void ionic_rx_fill(struct ionic_queue *q) return; } sg_elem->addr = cpu_to_le64(page_info->dma_addr); - sg_elem->len = cpu_to_le16(PAGE_SIZE); + seg_len = min_t(unsigned int, PAGE_SIZE, remain_len); + sg_elem->len = cpu_to_le16(seg_len); + remain_len -= seg_len; page_info++; }