From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by dpdk.org (Postfix) with ESMTP id F292E1DBA for ; Mon, 30 Apr 2018 16:07:51 +0200 (CEST) Received: by mail-wm0-f65.google.com with SMTP id j4so13409381wme.1 for ; Mon, 30 Apr 2018 07:07:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=2aqiBWDu4NDwbqo4KPvonbq/x0X+oUfAx9LnUiirQo0=; b=J6fH1QYSuoe/ChEQtZ7SOFHwfGe+SLU0n7op34azYUtgcX9pnLRz5vyRJAcGY3bJJV BrIQ3k1WtpJ1O1wwg90w0fdsX1KxTjVzTvrCBBFMkzJ2K+u084N3h6aHFlZTIBDBTv7s KArfhLO79cAwA6DguASjNpTMzoodfQraaCSbH4L2JAPeWpb2AhuSBICttuL/Ng78rul1 at6hSwUfANOibe+xC6/4Kl41p7LA8VYAynI/WyowUDW0o5TP5gIUp+gRfml08427HZ0W QlW2/qfeov0+MKfp4yUqz1ps8lv2v4SF+tMwtw76Fv3ThECdkI2gyMvuE/aoM8n/s+l7 q0rQ== 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=2aqiBWDu4NDwbqo4KPvonbq/x0X+oUfAx9LnUiirQo0=; b=T/jGsr2LsNjomWyQYA3tNuhCYLqUOWAudp58LMynHvISP8NnTiLYTf1lJyn6PSO0g/ ALe75wbHfuLzGgj0u3xaMuUVdmddBtBD8bMRVlLYNC5ABztAsQqbdrHXstzFca47VwPh +7mkq/VW6uQtrrRDKZVXa1TrOlAtRxCIWcon+cxytGi8tpFRNVKytTu3A3K7+5iGckBP 5pGbEUT93Ko1vtSYOiI9Ssx6VtttU/8XZk2zkWAEjg3ir1wHpt0OYmnHdD9a0HPFCtuy CnsyMUuaK/vO+7+5TdrCS3zvbsxFY+eur/xaQZASUVSKeu9+YrjwRagYs/A0vebTNMzo egGw== X-Gm-Message-State: ALQs6tCxY2FrhzpFxINBR2jS9K+JNHJdz4vIETSU7qWXncqgnyDXs4vN trDmx5MphO0erYuFKK1JeGI= X-Google-Smtp-Source: AB8JxZoKiXMBt+6V3t7qtkUsFgEQfGTs+4AV7VX7VpKgQb6CTIiFfZonk9Yb1H59S81S8n/YL7L81A== X-Received: by 10.28.245.9 with SMTP id t9mr8636810wmh.13.1525097271607; Mon, 30 Apr 2018 07:07:51 -0700 (PDT) Received: from localhost ([2a00:23c5:be9a:5200:ce4c:82c0:d567:ecbb]) by smtp.gmail.com with ESMTPSA id y45-v6sm8962149wrd.97.2018.04.30.07.07.50 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 30 Apr 2018 07:07:50 -0700 (PDT) From: luca.boccassi@gmail.com To: Hyong Youb Kim Cc: John Daley , dpdk stable Date: Mon, 30 Apr 2018 15:03:33 +0100 Message-Id: <20180430140606.4615-55-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20180430140606.4615-1-luca.boccassi@gmail.com> References: <20180430140606.4615-1-luca.boccassi@gmail.com> Subject: [dpdk-stable] patch 'net/enic: allocate stats DMA buffer upfront during probe' has been queued to stable release 18.02.2 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Apr 2018 14:07:52 -0000 Hi, FYI, your patch has been queued to stable release 18.02.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/02/18. So please shout if anyone has objections. Thanks. Luca Boccassi --- >>From bff48febbdbeaa0875cde88868937a67e743ba73 Mon Sep 17 00:00:00 2001 From: Hyong Youb Kim Date: Wed, 7 Mar 2018 18:46:58 -0800 Subject: [PATCH] net/enic: allocate stats DMA buffer upfront during probe [ upstream commit 8d782f3f89e1dcd0c8af1c3c93501d7a06159d66 ] The driver provides a DMA buffer to the firmware when it requests port stats. The NIC then fills that buffer with latest stats. Currently, the driver allocates the DMA buffer the first time it requests stats and saves it for later use. This can lead to crashes when primary/secondary processes are involved. For example, the following sequence crashes the secondary process. 1. Start a primary app that does not call rte_eth_stats_get() 2. dpdk-procinfo -- --stats dpdk-procinfo crashes while trying to allocate the stats DMA buffer because the alloc function pointer (vdev.alloc_consistent) is valid only in the primary process, not in the secondary process. Overwriting the alloc function pointer in the secondary process is not an option, as it will simply make the pointer invalid in the primary process. Instead, allocate the DMA buffer during probe so that only the primary process does both allocate and free. This allows the secondary process to dump stats as well. Fixes: 9913fbb91df0 ("enic/base: common code") Signed-off-by: Hyong Youb Kim Reviewed-by: John Daley --- drivers/net/enic/base/vnic_dev.c | 24 ++++++++++++++---------- drivers/net/enic/base/vnic_dev.h | 1 + drivers/net/enic/enic_main.c | 9 +++++++++ 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/drivers/net/enic/base/vnic_dev.c b/drivers/net/enic/base/vnic_dev.c index 05b595eb8..1f8d222fc 100644 --- a/drivers/net/enic/base/vnic_dev.c +++ b/drivers/net/enic/base/vnic_dev.c @@ -587,17 +587,9 @@ int vnic_dev_stats_dump(struct vnic_dev *vdev, struct vnic_stats **stats) { u64 a0, a1; int wait = 1000; - static u32 instance; - char name[NAME_MAX]; - if (!vdev->stats) { - snprintf((char *)name, sizeof(name), - "vnic_stats-%u", instance++); - vdev->stats = vdev->alloc_consistent(vdev->priv, - sizeof(struct vnic_stats), &vdev->stats_pa, (u8 *)name); - if (!vdev->stats) - return -ENOMEM; - } + if (!vdev->stats) + return -ENOMEM; *stats = vdev->stats; a0 = vdev->stats_pa; @@ -922,6 +914,18 @@ u32 vnic_dev_get_intr_coal_timer_max(struct vnic_dev *vdev) return vdev->intr_coal_timer_info.max_usec; } +int vnic_dev_alloc_stats_mem(struct vnic_dev *vdev) +{ + char name[NAME_MAX]; + static u32 instance; + + snprintf((char *)name, sizeof(name), "vnic_stats-%u", instance++); + vdev->stats = vdev->alloc_consistent(vdev->priv, + sizeof(struct vnic_stats), + &vdev->stats_pa, (u8 *)name); + return vdev->stats == NULL ? -ENOMEM : 0; +} + void vnic_dev_unregister(struct vnic_dev *vdev) { if (vdev) { diff --git a/drivers/net/enic/base/vnic_dev.h b/drivers/net/enic/base/vnic_dev.h index 8c0992063..7e5736b4d 100644 --- a/drivers/net/enic/base/vnic_dev.h +++ b/drivers/net/enic/base/vnic_dev.h @@ -165,6 +165,7 @@ struct vnic_dev *vnic_dev_register(struct vnic_dev *vdev, void *priv, struct rte_pci_device *pdev, struct vnic_dev_bar *bar, unsigned int num_bars); struct rte_pci_device *vnic_dev_get_pdev(struct vnic_dev *vdev); +int vnic_dev_alloc_stats_mem(struct vnic_dev *vdev); int vnic_dev_cmd_init(struct vnic_dev *vdev, int fallback); int vnic_dev_get_size(void); int vnic_dev_int13(struct vnic_dev *vdev, u64 arg, u32 op); diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c index ec9d343fd..caccdafff 100644 --- a/drivers/net/enic/enic_main.c +++ b/drivers/net/enic/enic_main.c @@ -1351,6 +1351,15 @@ int enic_probe(struct enic *enic) enic_alloc_consistent, enic_free_consistent); + /* + * Allocate the consistent memory for stats upfront so both primary and + * secondary processes can dump stats. + */ + err = vnic_dev_alloc_stats_mem(enic->vdev); + if (err) { + dev_err(enic, "Failed to allocate cmd memory, aborting\n"); + goto err_out_unregister; + } /* Issue device open to get device in known state */ err = enic_dev_open(enic); if (err) { -- 2.14.2