From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CF7D9C3A5A6 for ; Mon, 26 Aug 2019 21:34:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A2CF221881 for ; Mon, 26 Aug 2019 21:34:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=pensando.io header.i=@pensando.io header.b="CAVr65Pl" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729235AbfHZVeG (ORCPT ); Mon, 26 Aug 2019 17:34:06 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:46640 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729204AbfHZVeE (ORCPT ); Mon, 26 Aug 2019 17:34:04 -0400 Received: by mail-pf1-f193.google.com with SMTP id q139so12608766pfc.13 for ; Mon, 26 Aug 2019 14:34:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pensando.io; s=google; h=from:to:subject:date:message-id:in-reply-to:references; bh=DyCo1NMnHq3vgBPr6beW9sksazqYRU3ddLHVNkPneLs=; b=CAVr65Pl66Y7Oop0G/UZUShsvPrAa78enNNnvgGh/WNOZ1bpqSgilq21IftPHvYUIO SKKaVvJF0eq+QkJYMxXC0h2rltYdBnt2zx1CVuke4ZJMDknSYEqqtFA++SpzycXRiVoX i7MTFp0hcU7xbrikQJkHGDrhRwNmQsXfpjdFAE+A/NbpjutYSkGiRv138DBegj46jBI/ 6BZp4FyCGS65ZQ5a0sEl7WbtPu8/Mx3wg3JsqWfBdAc3LOFsdgzCUjRI5QA5uzDm9ppd YJQH8lKpTsPRIqTHRekjN6D8X7C2RpK9zWEHyisVqBLkpaIuG5SIQgmhSO6I5PZaI3sp gJrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=DyCo1NMnHq3vgBPr6beW9sksazqYRU3ddLHVNkPneLs=; b=NtaAPaATVrlhikL9wlAYJR12TtF3pxAjLK99oLOiY8OZ/FUl+zod8YoPiMpBj6GoDh TwUdojNlBEmrWV0avmbpJC7IjbI46mh7Y1VOrDlHYeFDRI2Y85iZ090lH7pPXJIGmG8W xGDNPH3m+KhNT1waBk1V/yotBL7T8/TDX/zxNGPK9dJ0wSeMz2L7hw1kcBCen623Trxy jnQHYoPMA4l3GFJxWhg9wcZ/EgA+Evj9FlGVOCHgG8gdxZ6t5/fhzrpgP/2BvNULbXbO AnPrDouIDsbETuTyvf4jIBLvWkya9TGHOXCDXnnEkhH17I5xXDzAIs1UrNxVBZq5+ERn OyTg== X-Gm-Message-State: APjAAAXhNGg+pywqGd3Z/eKqlwRfzBeDg+NXBGo2PP0dAQPoxloXaigo rz5nIYyy+Sb9eid8faj9IQyWyA== X-Google-Smtp-Source: APXvYqxXFYhrNNERmkVpvsfvAcazX+SmbGZM40GnncNXi3Qh0TdF6opRMwpYJaOnmI0Vi/JbhI/hRA== X-Received: by 2002:a17:90a:240e:: with SMTP id h14mr23081549pje.9.1566855242696; Mon, 26 Aug 2019 14:34:02 -0700 (PDT) Received: from driver-dev1.pensando.io ([12.1.37.26]) by smtp.gmail.com with ESMTPSA id j9sm5876905pfi.128.2019.08.26.14.34.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Aug 2019 14:34:02 -0700 (PDT) From: Shannon Nelson To: snelson@pensando.io, netdev@vger.kernel.org, davem@davemloft.net Subject: [PATCH v5 net-next 12/18] ionic: Add async link status check and basic stats Date: Mon, 26 Aug 2019 14:33:33 -0700 Message-Id: <20190826213339.56909-13-snelson@pensando.io> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190826213339.56909-1-snelson@pensando.io> References: <20190826213339.56909-1-snelson@pensando.io> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add code to handle the link status event, and wire up the basic netdev hardware stats. Signed-off-by: Shannon Nelson --- .../net/ethernet/pensando/ionic/ionic_lif.c | 116 +++++++++++++++++- .../net/ethernet/pensando/ionic/ionic_lif.h | 1 + 2 files changed, 111 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/pensando/ionic/ionic_lif.c b/drivers/net/ethernet/pensando/ionic/ionic_lif.c index 0fcb26b8608e..5105ce281983 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_lif.c +++ b/drivers/net/ethernet/pensando/ionic/ionic_lif.c @@ -15,6 +15,7 @@ static void ionic_lif_rx_mode(struct ionic_lif *lif, unsigned int rx_mode); static int ionic_lif_addr_add(struct ionic_lif *lif, const u8 *addr); static int ionic_lif_addr_del(struct ionic_lif *lif, const u8 *addr); +static void ionic_link_status_check(struct ionic_lif *lif); static void ionic_lif_deferred_work(struct work_struct *work) { @@ -41,6 +42,9 @@ static void ionic_lif_deferred_work(struct work_struct *work) case IONIC_DW_TYPE_RX_ADDR_DEL: ionic_lif_addr_del(lif, w->addr); break; + case IONIC_DW_TYPE_LINK_STATUS: + ionic_link_status_check(lif); + break; default: break; } @@ -58,6 +62,54 @@ static void ionic_lif_deferred_enqueue(struct ionic_deferred *def, schedule_work(&def->work); } +static void ionic_link_status_check(struct ionic_lif *lif) +{ + struct net_device *netdev = lif->netdev; + u16 link_status; + bool link_up; + + link_status = le16_to_cpu(lif->info->status.link_status); + link_up = link_status == IONIC_PORT_OPER_STATUS_UP; + + /* filter out the no-change cases */ + if (link_up == netif_carrier_ok(netdev)) + goto link_out; + + if (link_up) { + netdev_info(netdev, "Link up - %d Gbps\n", + le32_to_cpu(lif->info->status.link_speed) / 1000); + + } else { + netdev_info(netdev, "Link down\n"); + + /* carrier off first to avoid watchdog timeout */ + netif_carrier_off(netdev); + } + +link_out: + clear_bit(IONIC_LIF_LINK_CHECK_REQUESTED, lif->state); +} + +static void ionic_link_status_check_request(struct ionic_lif *lif) +{ + struct ionic_deferred_work *work; + + /* we only need one request outstanding at a time */ + if (test_and_set_bit(IONIC_LIF_LINK_CHECK_REQUESTED, lif->state)) + return; + + if (in_interrupt()) { + work = kzalloc(sizeof(*work), GFP_ATOMIC); + if (!work) + return; + + work->type = IONIC_DW_TYPE_LINK_STATUS; + ionic_lif_deferred_enqueue(&lif->deferred, work); + } else { + ionic_link_status_check(lif); + } +} + static irqreturn_t ionic_isr(int irq, void *data) { struct napi_struct *napi = data; @@ -382,12 +434,7 @@ static bool ionic_notifyq_service(struct ionic_cq *cq, switch (le16_to_cpu(comp->event.ecode)) { case IONIC_EVENT_LINK_CHANGE: - netdev_info(netdev, "Notifyq IONIC_EVENT_LINK_CHANGE eid=%lld\n", - eid); - netdev_info(netdev, - " link_status=%d link_speed=%d\n", - le16_to_cpu(comp->link_change.link_status), - le32_to_cpu(comp->link_change.link_speed)); + ionic_link_status_check_request(lif); break; case IONIC_EVENT_RESET: netdev_info(netdev, "Notifyq IONIC_EVENT_RESET eid=%lld\n", @@ -446,6 +493,59 @@ static int ionic_adminq_napi(struct napi_struct *napi, int budget) return max(n_work, a_work); } +static void ionic_get_stats64(struct net_device *netdev, + struct rtnl_link_stats64 *ns) +{ + struct ionic_lif *lif = netdev_priv(netdev); + struct ionic_lif_stats *ls; + + memset(ns, 0, sizeof(*ns)); + ls = &lif->info->stats; + + ns->rx_packets = le64_to_cpu(ls->rx_ucast_packets) + + le64_to_cpu(ls->rx_mcast_packets) + + le64_to_cpu(ls->rx_bcast_packets); + + ns->tx_packets = le64_to_cpu(ls->tx_ucast_packets) + + le64_to_cpu(ls->tx_mcast_packets) + + le64_to_cpu(ls->tx_bcast_packets); + + ns->rx_bytes = le64_to_cpu(ls->rx_ucast_bytes) + + le64_to_cpu(ls->rx_mcast_bytes) + + le64_to_cpu(ls->rx_bcast_bytes); + + ns->tx_bytes = le64_to_cpu(ls->tx_ucast_bytes) + + le64_to_cpu(ls->tx_mcast_bytes) + + le64_to_cpu(ls->tx_bcast_bytes); + + ns->rx_dropped = le64_to_cpu(ls->rx_ucast_drop_packets) + + le64_to_cpu(ls->rx_mcast_drop_packets) + + le64_to_cpu(ls->rx_bcast_drop_packets); + + ns->tx_dropped = le64_to_cpu(ls->tx_ucast_drop_packets) + + le64_to_cpu(ls->tx_mcast_drop_packets) + + le64_to_cpu(ls->tx_bcast_drop_packets); + + ns->multicast = le64_to_cpu(ls->rx_mcast_packets); + + ns->rx_over_errors = le64_to_cpu(ls->rx_queue_empty); + + ns->rx_missed_errors = le64_to_cpu(ls->rx_dma_error) + + le64_to_cpu(ls->rx_queue_disabled) + + le64_to_cpu(ls->rx_desc_fetch_error) + + le64_to_cpu(ls->rx_desc_data_error); + + ns->tx_aborted_errors = le64_to_cpu(ls->tx_dma_error) + + le64_to_cpu(ls->tx_queue_disabled) + + le64_to_cpu(ls->tx_desc_fetch_error) + + le64_to_cpu(ls->tx_desc_data_error); + + ns->rx_errors = ns->rx_over_errors + + ns->rx_missed_errors; + + ns->tx_errors = ns->tx_aborted_errors; +} + static int ionic_lif_addr_add(struct ionic_lif *lif, const u8 *addr) { struct ionic_admin_ctx ctx = { @@ -981,6 +1081,8 @@ int ionic_open(struct net_device *netdev) set_bit(IONIC_LIF_UP, lif->state); + ionic_link_status_check_request(lif); + return 0; } @@ -1006,6 +1108,7 @@ int ionic_stop(struct net_device *netdev) static const struct net_device_ops ionic_netdev_ops = { .ndo_open = ionic_open, .ndo_stop = ionic_stop, + .ndo_get_stats64 = ionic_get_stats64, .ndo_set_rx_mode = ionic_set_rx_mode, .ndo_set_features = ionic_set_features, .ndo_set_mac_address = ionic_set_mac_address, @@ -1439,6 +1542,7 @@ int ionic_lifs_register(struct ionic *ionic) return err; } + ionic_link_status_check_request(ionic->master_lif); ionic->master_lif->registered = true; return 0; diff --git a/drivers/net/ethernet/pensando/ionic/ionic_lif.h b/drivers/net/ethernet/pensando/ionic/ionic_lif.h index a7dcb7865b89..db6dda42e8bd 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_lif.h +++ b/drivers/net/ethernet/pensando/ionic/ionic_lif.h @@ -84,6 +84,7 @@ struct ionic_deferred { enum ionic_lif_state_flags { IONIC_LIF_INITED, IONIC_LIF_UP, + IONIC_LIF_LINK_CHECK_REQUESTED, IONIC_LIF_QUEUE_RESET, /* leave this as last */ -- 2.17.1