From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by dpdk.org (Postfix) with ESMTP id 73C85187 for ; Sun, 22 Apr 2018 17:12:20 +0200 (CEST) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 106D920EDC; Sun, 22 Apr 2018 11:12:20 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Sun, 22 Apr 2018 11:12:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fridaylinux.org; h=cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=IKKFhg9eZmWyXQ1Hu 5H4fFEbG7U2uwbdpzjsoa0n33U=; b=bYbEpTIgVEy1BLbsvwDK2vYjS1ftzic31 Mcear2+5LcSZKE+dZNqZKDMQxcawVNMeQXEHptmnze2qb0bnn77sCgen2zQrPE5c 6xdCACWtkLhZ+n5StqU+tGI4IJXcGaqU0HqmC4wu/VIRaItZ7j08nw7UKnCGtwml 53JCej8eucm9BiuNg4AC43UEjyOP8x3KvFzHS5nmyfKHdncmosHeoUCntX1dqnjN OOVLmEOKyJHH70GQvX4upqI2pOFalhAjbWVjBbfjDvAul1zHR49IpdJ52iL9G1ki 2xf6BMYy6FsDud0e8oYsuHvO6doLRDt0LYpE+rKs7OkG6H1kOjNLQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=IKKFhg9eZmWyXQ1Hu5H4fFEbG7U2uwbdpzjsoa0n33U=; b=S2nrc9EU Lm687C1qzkq0OCxDMGlDWu0WHEpsjKrutVy1GyxB9MonjIEd3AhmDK5U02C9aAdq zZdnOpeWhMcLUtC0gnRAZc66oe9R1vCoqPXEMuxNYlSUKr9H0eXo4xZIwgXil5/7 haRfVwrA/OYje0rHKAe5XJnh/DL+VNQpPuC+ikYddIMHQwXtKXdR+J2V/teuj1Jg s/+Lb0Xewf4o5pTC1icZ+tn6EBrpLkn8KfNrlS6VqsAIZL4mQ1SuDP9MNuNVuOHL /axylJgh3wnhI3LE12c/jEXQE2tEpTJg+scfpydJe1f+je2q1cQIuXsNyODWC4NN xQIDOPIaKX8GWQ== X-ME-Sender: Received: from yuanhanliu-NB0.tencent.com (unknown [223.74.148.66]) by mail.messagingengine.com (Postfix) with ESMTPA id 0ACE51025D; Sun, 22 Apr 2018 11:12:17 -0400 (EDT) From: Yuanhan Liu To: John Daley Cc: Hyong Youb Kim , dpdk stable Date: Sun, 22 Apr 2018 23:09:42 +0800 Message-Id: <20180422150949.17523-52-yliu@fridaylinux.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180422150949.17523-1-yliu@fridaylinux.org> References: <20180422150949.17523-1-yliu@fridaylinux.org> Subject: [dpdk-stable] patch 'net/enic: fix crash on MTU update with non-setup queues' has been queued to LTS release 17.11.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: Sun, 22 Apr 2018 15:12:20 -0000 Hi, FYI, your patch has been queued to LTS release 17.11.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 04/29/18. So please shout if anyone has objections. Thanks. --yliu --- >>From 60477676869d817b49c8a2e4a943182bae040904 Mon Sep 17 00:00:00 2001 From: John Daley Date: Wed, 4 Apr 2018 16:54:53 -0700 Subject: [PATCH] net/enic: fix crash on MTU update with non-setup queues [ upstream commit 33a2d6594945eb3278bfa441f79ae9a38ea538a0 ] The enic code called from rte_eth_dev_set_mtu() was assuming that the Rx queues are already set up via a call to rte_eth_tx_queue_setup(). OVS calls rte_eth_dev_set_mtu() before rte_eth_rx_queue_setup() and a null pointer was dereferenced. Fixes: c3e09182bcd6 ("net/enic: support scatter Rx in MTU update") Signed-off-by: John Daley Reviewed-by: Hyong Youb Kim --- drivers/net/enic/enic_main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c index 59e60aa76..6356c10cb 100644 --- a/drivers/net/enic/enic_main.c +++ b/drivers/net/enic/enic_main.c @@ -1252,6 +1252,8 @@ int enic_set_mtu(struct enic *enic, uint16_t new_mtu) /* free and reallocate RQs with the new MTU */ for (rq_idx = 0; rq_idx < enic->rq_count; rq_idx++) { rq = &enic->rq[enic_rte_rq_idx_to_sop_idx(rq_idx)]; + if (!rq->in_use) + continue; enic_free_rq(rq); rc = enic_alloc_rq(enic, rq_idx, rq->socket_id, rq->mp, -- 2.11.0