From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lf0-f67.google.com (mail-lf0-f67.google.com [209.85.215.67]) by dpdk.org (Postfix) with ESMTP id 9D3D51B703 for ; Tue, 15 May 2018 19:20:28 +0200 (CEST) Received: by mail-lf0-f67.google.com with SMTP id m17-v6so1376498lfj.8 for ; Tue, 15 May 2018 10:20:28 -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=laY0I8ZOSk1gadZ1pykUYd1Cp0P2MiZBCUGnkHRz+pc=; b=PKbnMC4LqlFRarYxcAzdQtL6efnZF+yoNa8xmQTU5x1Mhjzq7si3XGEWGIFjfwCKKI lPFS9szgFOP9Q5f0dQUsexLQ0Ja62dRtoS7T8DpwLVeO+qZZgy8xw9FEyG20EiR3dxMx k53HNSlfSwr5Pn8pLSk86+fbK8b992MwQojbevFU11IFrxBv2NE6Obsy8yglYaWharkO J6TZXEC0SVI+jS8YHaSn00sBlr8n/fCfps4ws0/YydiT4znwkYV8cSFmfXHtlA+Q+yqr gZ7ZolMrVr58+8y3CQuTjHF2SrLf3NbAA6s1bJH5/ul8/kRedGKH+jhBZSTJaETnIfM7 uwsg== 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=laY0I8ZOSk1gadZ1pykUYd1Cp0P2MiZBCUGnkHRz+pc=; b=Fkua+3Bs+4TdVMuKKc/k++gR4pjeleO1lax/4+mWih3acUjEFo/Ou38TQbJTiIGDHT GQH6ly8FhlF0OfLPCeMvfuNiOPYNOEvKvIYs6c5oO/0qiXR38JL2tHsT8ng2ZiX9Hn6N r0ztzkZHKwm6SQEkogVWLso7y/tLHQC88bZzh4IcS01X/T78B7fzxd20qccnpgjT9lgl US3gpMboVNwBEb22CQpYcjXl24jUGr2KA8unzb4RqXqkGvNtVjmSo9vjQ6fRwij2UVjp htnCZQYjCX3AyF2/KE0d9KIF87+EzmUU610Iv2B8Tv35YOY/rmBiFThE2SSLBZNqqnuI IwJQ== X-Gm-Message-State: ALKqPwdo1FcT0+KBg+8kJL6ymGJq+ckD/tgiLixsl+VA7CkPhgur4C4p dn97XJ+T7+GtknayTLyDihtlwvmanXA= X-Google-Smtp-Source: AB8JxZoOa1JHNYbY+DwV/GzWFwyIP7yUC2lktz5ei+v0VAZZveEmJok+4SftMbqkBjFifd52pJPCzQ== X-Received: by 2002:a19:5348:: with SMTP id h69-v6mr13066746lfb.26.1526404828207; Tue, 15 May 2018 10:20:28 -0700 (PDT) Received: from localhost ([2a00:23c5:be9a:5200:ce4c:82c0:d567:ecbb]) by smtp.gmail.com with ESMTPSA id y1-v6sm133600lfg.10.2018.05.15.10.20.27 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 15 May 2018 10:20:27 -0700 (PDT) From: luca.boccassi@gmail.com To: Xiaoxin Peng Cc: Jay Ding , Scott Branden , Ray Jui , Randy Schacher , Ajit Khaparde , dpdk stable Date: Tue, 15 May 2018 18:19:27 +0100 Message-Id: <20180515171933.12882-26-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20180515171933.12882-1-luca.boccassi@gmail.com> References: <20180501104509.17238-46-luca.boccassi@gmail.com> <20180515171933.12882-1-luca.boccassi@gmail.com> Subject: [dpdk-stable] patch 'net/bnxt: fix Rx mbuf and agg ring leak in dev stop' has been queued to LTS release 16.11.7 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: Tue, 15 May 2018 17:20:28 -0000 Hi, FYI, your patch has been queued to LTS release 16.11.7 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/16/18. So please shout if anyone has objections. Thanks. Luca Boccassi --- >>From 9f26a0e5471682d8f1dbe0ceae5d7cac1dd18ca6 Mon Sep 17 00:00:00 2001 From: Xiaoxin Peng Date: Mon, 30 Apr 2018 18:06:14 -0700 Subject: [PATCH] net/bnxt: fix Rx mbuf and agg ring leak in dev stop [ upstream commit 3f07f2da6ca91febb67816ce8818cbdec4976413 ] In the start/stop_op operation, mbufs allocated for rings were not freed 1) add bnxt_free_tx_mbuf/bnxt_free_rx_mbuf in bnxt_dev_stop_op to free MBUF before freeing the rings. 2) MBUF allocation and free routines were not in sync. Allocation uses the ring->ring_size including any rounded up and multiple factors while the free routine uses the requested queue size. Fixes: c09f57b49c13 ("net/bnxt: add start/stop/link update operations") Signed-off-by: Jay Ding Signed-off-by: Scott Branden Reviewed-by: Ray Jui Reviewed-by: Randy Schacher Signed-off-by: Xiaoxin Peng Signed-off-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_ethdev.c | 4 ++-- drivers/net/bnxt/bnxt_rxq.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index 962e3468e..3a0b1ce44 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -553,6 +553,8 @@ static void bnxt_dev_stop_op(struct rte_eth_dev *eth_dev) bnxt_set_hwrm_link_config(bp, false); bnxt_disable_int(bp); bnxt_free_int(bp); + bnxt_free_tx_mbufs(bp); + bnxt_free_rx_mbufs(bp); bnxt_shutdown_nic(bp); bp->dev_stopped = 1; } @@ -564,8 +566,6 @@ static void bnxt_dev_close_op(struct rte_eth_dev *eth_dev) if (bp->dev_stopped == 0) bnxt_dev_stop_op(eth_dev); - bnxt_free_tx_mbufs(bp); - bnxt_free_rx_mbufs(bp); bnxt_free_mem(bp); if (eth_dev->data->mac_addrs != NULL) { rte_free(eth_dev->data->mac_addrs); diff --git a/drivers/net/bnxt/bnxt_rxq.c b/drivers/net/bnxt/bnxt_rxq.c index 5bdb55bfc..b7b170be5 100644 --- a/drivers/net/bnxt/bnxt_rxq.c +++ b/drivers/net/bnxt/bnxt_rxq.c @@ -221,7 +221,8 @@ static void bnxt_rx_queue_release_mbufs(struct bnxt_rx_queue *rxq __rte_unused) if (rxq) { sw_ring = rxq->rx_ring->rx_buf_ring; if (sw_ring) { - for (i = 0; i < rxq->nb_rx_desc; i++) { + for (i = 0; + i < rxq->rx_ring->rx_ring_struct->ring_size; i++) { if (sw_ring[i].mbuf) { rte_pktmbuf_free_seg(sw_ring[i].mbuf); sw_ring[i].mbuf = NULL; -- 2.14.2