From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f41.google.com (mail-wm0-f41.google.com [74.125.82.41]) by dpdk.org (Postfix) with ESMTP id 2A8D5FFA for ; Tue, 8 Nov 2016 11:37:54 +0100 (CET) Received: by mail-wm0-f41.google.com with SMTP id a197so236358758wmd.0 for ; Tue, 08 Nov 2016 02:37:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=Ybbu+n7Wl1P97YD5TCfIfwy9F8sKQAUb1z1v5vS1QnE=; b=ItGMcckraNP+Z51R4kRUunIsjXnWgc5N0TALemtOEeomog0thiLMuY52svinBuEHFx Lg4GdMpSpvycfVvrt3U7btv3N/i83oZ8kLr5laGFo/IWmf8yojoQA7SRsdEegqLVWORE eSDHZkPKElen5C1Iuqa/uo/mpp7oBTx5xTizO9jzfG3ayJRa5gzm+Ml5iRgWjePeIjNA k804xnQSqdMWwjD3wafcV5MsSQW30QupNaYMDjlE+0mge5D45GRrvc7Ra+7W8Zatlzdw jEAyOXXB/lkhYVsHKq+zlR3mfzHNktJeojLhx2eGHvbtSGZdk4OoCl0Kt6baj1z6X0Nw C35w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=Ybbu+n7Wl1P97YD5TCfIfwy9F8sKQAUb1z1v5vS1QnE=; b=de3XXQVqq6Ot/WSneTfSBzRTOeWkl5tEFk0dNktXeu0tsSL8NJMyMHMk4ozqa0bLD4 VMMQia1EdUIJOBIpy5dubsSYC5gkyZiHb6/VcoYqGTuUrOIVVxWWryTYsL+2U+WJ7j5/ TIEPPjtCqnNYDFos94jPvQYhPr9ALIeGdHoPdgqjMhaMC+INjb3wUWbVKc1+thGS1+Gy HjvEvQuDOpiLRNhAFOg4/3odcRr/WCXl+vWi7Ua2KwMVFQl718cmxFgrMWggYjg63a5u BHn8AoqpyF11CMQhFix0pVUh2zg8JUS/y274c9ktZRLk7ILAX924BCUdQsz/9rgHCt87 8fYQ== X-Gm-Message-State: ABUngvcndTjLv+z8Z+axRbxqJyCbOtmORci3ParFTxUVPrKrpQuotOAA5sJDEgNq+xWZPFp1 X-Received: by 10.194.248.233 with SMTP id yp9mr9536324wjc.228.1478601473943; Tue, 08 Nov 2016 02:37:53 -0800 (PST) Received: from ping.vm.6wind.com (guy78-3-82-239-227-177.fbx.proxad.net. [82.239.227.177]) by smtp.gmail.com with ESMTPSA id k74sm18837414wmd.18.2016.11.08.02.37.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 08 Nov 2016 02:37:53 -0800 (PST) From: Nelio Laranjeiro To: stable@dpdk.org, Yuanhan Liu Cc: Olivier Gournet , Adrien Mazarguil Date: Tue, 8 Nov 2016 11:36:53 +0100 Message-Id: <4c79e47ffa65bf1a1e9e1f47c10c2878b2610e46.1478600855.git.nelio.laranjeiro@6wind.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: In-Reply-To: References: Subject: [dpdk-stable] [PATCH 12/14] net/mlx5: fix initialization in secondary process X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Nov 2016 10:37:54 -0000 From: Olivier Gournet The changes introduced by previous commits (ones in fixes lines) made secondaries attempt to reinitialize the Tx queue structures of the primary instead of their own, for which they also do not allocate enough memory, leading to crashes. Fixes: 1d88ba171942 ("net/mlx5: refactor Tx data path") Fixes: 21c8bb4928c9 ("net/mlx5: split Tx queue structure") Signed-off-by: Olivier Gournet Acked-by: Adrien Mazarguil --- drivers/net/mlx5/mlx5_ethdev.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c index 7edbcd9..29d2aec 100644 --- a/drivers/net/mlx5/mlx5_ethdev.c +++ b/drivers/net/mlx5/mlx5_ethdev.c @@ -1309,11 +1309,13 @@ mlx5_secondary_data_setup(struct priv *priv) continue; primary_txq_ctrl = container_of(primary_txq, struct txq_ctrl, txq); - txq_ctrl = rte_calloc_socket("TXQ", 1, sizeof(*txq_ctrl), 0, + txq_ctrl = rte_calloc_socket("TXQ", 1, sizeof(*txq_ctrl) + + (1 << primary_txq->elts_n) * + sizeof(struct rte_mbuf *), 0, primary_txq_ctrl->socket); if (txq_ctrl != NULL) { if (txq_ctrl_setup(priv->dev, - primary_txq_ctrl, + txq_ctrl, primary_txq->elts_n, primary_txq_ctrl->socket, NULL) == 0) { -- 2.1.4