From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f44.google.com (mail-wm0-f44.google.com [74.125.82.44]) by dpdk.org (Postfix) with ESMTP id BD64B9E7 for ; Wed, 9 Nov 2016 10:58:26 +0100 (CET) Received: by mail-wm0-f44.google.com with SMTP id a197so296326964wmd.0 for ; Wed, 09 Nov 2016 01:58:26 -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=ZdSsql/S3xvh43SN+zcZ31OOTCth8zhtjT1qI/8gEn8=; b=M7ckTC1YxqxF+WwIgsbgFcqmSHYf13ZyCVeLg0x8/CTi93c1WSDgPTaV8perbeWbEg Vpom4Q4Big+9ORJXDmmwReZXItYcVaTywdKdugWqFUqhrt/jbuYvbi/tDiC6ab98tYJc sN0ha3WGX++AWHiVtBcxaAFRuBTAyjpLezdr8njrwwxaep+An0qYHlZx85HepUNjpfN4 38YDDbMiimWROyz87JqjUbLV/0n/SBYuOfX4FeTpcKrdVpYab3j9kKPmiPGAx/0WYFCd 5Y3HYugXVR3G24/gjJLZ4rhciEERwzO4dcmNfz2cwCVfDzOlqj0L6kK9BOexagPKVPTj WzjA== 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=ZdSsql/S3xvh43SN+zcZ31OOTCth8zhtjT1qI/8gEn8=; b=NleKS1MP1ZoKiIolyc+O1J75Wfg7DS027nBgn/FuGhMIsAOO8P6JlqCEflAMT9Q++I r3FFT9iPEQ9BlQRa7JWKh6x/FB7+tXsILLwUtnXf6LzmWfoiueb6fE1XvNEsBfdGlxYF TtduT//mC00tgex8Uh5nhPtxX4TVnIa8dxuHoGCERInxn4oGsJbizEmCJwCOYr8aIVTF PkGIYGmTd8qyjn44Qj/Vj0resnkkeubrwS2B6dRT6WgBv7kbFgU/gDWI8ObDfZZWW0IJ 52hrBVDA3s27Cbs4xtUK/SDMqrfayl9NKYVQ5U/aHH/n2FmWcbbDoxgWwcnFQNOPNCXj NWSA== X-Gm-Message-State: ABUngvcnWwCUn/pOszyjAXGFnMieq17xOJEcydTBqjcLIMJCWL88epvE30i9904Da90M3Kfj X-Received: by 10.28.24.1 with SMTP id 1mr18595659wmy.107.1478685506424; Wed, 09 Nov 2016 01:58:26 -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 c133sm13926057wme.12.2016.11.09.01.58.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 09 Nov 2016 01:58:26 -0800 (PST) From: Nelio Laranjeiro To: stable@dpdk.org, Yuanhan Liu Cc: Olivier Gournet , Adrien Mazarguil Date: Wed, 9 Nov 2016 10:57:49 +0100 Message-Id: X-Mailer: git-send-email 2.1.4 In-Reply-To: References: In-Reply-To: References: Subject: [dpdk-stable] [PATCH v2 10/12] 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: Wed, 09 Nov 2016 09:58:27 -0000 From: Olivier Gournet [ backported from upstream commit 69491883cb3c10be73b55316b813909dcc61d8c5 ] 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 a3e8427..90ad467 100644 --- a/drivers/net/mlx5/mlx5_ethdev.c +++ b/drivers/net/mlx5/mlx5_ethdev.c @@ -1312,11 +1312,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