From patchwork Wed Nov 27 14:18:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tonghao Zhang X-Patchwork-Id: 63351 X-Patchwork-Delegate: rasland@nvidia.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 05FFBA04E0; Wed, 27 Nov 2019 15:18:55 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C7DB22B8E; Wed, 27 Nov 2019 15:18:54 +0100 (CET) Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by dpdk.org (Postfix) with ESMTP id 6028528EE for ; Wed, 27 Nov 2019 15:18:53 +0100 (CET) Received: by mail-pl1-f193.google.com with SMTP id g6so1453382plp.7 for ; Wed, 27 Nov 2019 06:18:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=WulthsjOX44zzy++AyqQ2ff8a7siow33/rPOQoMVJ9k=; b=rcaF/s87mWgVd1//Am/1vzG9BTD2hKWaa9OVHLsbMVqh3gK0b7b4MXXo1qxtoSDzU7 xLEkgAlhBAsWR9yb654Up+ZqK0FgshQ4BaQtgO3TlkBOgFihXlsB+xbmpnDb/FnpCSAm JBAIk9QYOdXGgWI6C1F9xXsHFM5Tc3OS/xMgyfKr0qeDK/B+dpx/ew5fzMosFsu+DMPO 6ooGJFjN4uStfOF91+o0tgT3iY9BO5Bj/kmwzxrAKpWmVvepM+2xgYwlVcqukSx51+hJ aL717kcAq3/f9IwSBUyDG6BLlI3JI/Y34xtEY10DWgb6uDdFkT0d64EeeR6uVKcz+NKD JJ9Q== 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; bh=WulthsjOX44zzy++AyqQ2ff8a7siow33/rPOQoMVJ9k=; b=EX8z9I58LkdvCEmQ5K/fYSzDrexHW0QEd6W3GCyC2eL2uhxE8xbmtSBweTv+U39j4A toF8493Mhi9XIfP3/l8Y8UDXrb53c3aNoXHEiALAnNsg4nwLoZj2sSRfTfqhN6iTZdiq 8XWuEEcMWkR3ogVE/hUcwnj/1POv8WkcnF0XxRxlb8tQYzcbXxATMEb9eo3vSuFw84Yw Pu70yyo0oBuDV8yWWxuvR8+px9qO1x2ff+v/2K/2bctjX9ZvW+h2SkkVgZQPZFQHACIq Kw5HxItr6d76zQo1QrC8wJMiv8Tr84uVcwoLO/nkNmjXydjpI5pQrJqaatlwBacGrkMG wZjw== X-Gm-Message-State: APjAAAWf8kZh1WOZquvP/OtENwaHL42ifJ/gmK2SfV+SxuWfnSOoQJZz Vc/oYjhITeJ8QHryQDF1zZie/AxA X-Google-Smtp-Source: APXvYqybx9C+lpA3XXotnIHOhCp9mFaY5ljPJar2bgVf5rOEuNUQcJH4nt7awXVAIDs9D4l2+d/f/g== X-Received: by 2002:a17:902:9b8f:: with SMTP id y15mr4139735plp.54.1574864332419; Wed, 27 Nov 2019 06:18:52 -0800 (PST) Received: from local.opencloud.tech.localdomain ([203.100.54.194]) by smtp.gmail.com with ESMTPSA id i3sm16612951pfd.154.2019.11.27.06.18.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Nov 2019 06:18:51 -0800 (PST) From: xiangxia.m.yue@gmail.com To: dev@dpdk.org Cc: Tonghao Zhang , Ori Kam Date: Wed, 27 Nov 2019 22:18:41 +0800 Message-Id: <1574864323-85580-1-git-send-email-xiangxia.m.yue@gmail.com> X-Mailer: git-send-email 1.8.3.1 Subject: [dpdk-dev] [PATCH dpdk-dev 1/3] net/mlx5: avoid crash when setting hairpin queues X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Tonghao Zhang If configuring the number of tx/rx queue with rte_eth_dev_configure to nr_queues + hairpin_nr_queues, and setting tx/rx queues to nr_queues with rte_eth_tx/rx_queue_setup. But not configuring the hairpin queues via rte_eth_tx/rx_hairpin_queue_setup. When starting the netdev, there is a crash because of NULL accessing. Fixes: cf5516696d77 ("ethdev: add hairpin queue") Cc: Ori Kam Signed-off-by: Tonghao Zhang Acked-by: Ori Kam --- drivers/net/mlx5/mlx5_ethdev.c | 2 +- drivers/net/mlx5/mlx5_trigger.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c index 1d6c084119ec..0076d05b00cc 100644 --- a/drivers/net/mlx5/mlx5_ethdev.c +++ b/drivers/net/mlx5/mlx5_ethdev.c @@ -476,7 +476,7 @@ mlx5_dev_configure_rss_reta(struct rte_eth_dev *dev) rxq_data = (*priv->rxqs)[i]; rxq_ctrl = container_of(rxq_data, struct mlx5_rxq_ctrl, rxq); - if (rxq_ctrl->type == MLX5_RXQ_TYPE_STANDARD) + if (rxq_ctrl && rxq_ctrl->type == MLX5_RXQ_TYPE_STANDARD) rss_queue_arr[j++] = i; } rss_queue_n = j; diff --git a/drivers/net/mlx5/mlx5_trigger.c b/drivers/net/mlx5/mlx5_trigger.c index cafab25c67e7..ab6937ab10d1 100644 --- a/drivers/net/mlx5/mlx5_trigger.c +++ b/drivers/net/mlx5/mlx5_trigger.c @@ -106,9 +106,12 @@ mlx5_rxq_start(struct rte_eth_dev *dev) unsigned int i; int ret = 0; enum mlx5_rxq_obj_type obj_type = MLX5_RXQ_OBJ_TYPE_IBV; + struct mlx5_rxq_data *rxq = NULL; for (i = 0; i < priv->rxqs_n; ++i) { - if ((*priv->rxqs)[i]->lro) { + rxq = (*priv->rxqs)[i]; + + if (rxq && rxq->lro) { obj_type = MLX5_RXQ_OBJ_TYPE_DEVX_RQ; break; } From patchwork Wed Nov 27 14:18:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tonghao Zhang X-Patchwork-Id: 63352 X-Patchwork-Delegate: rasland@nvidia.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9BA9FA04E0; Wed, 27 Nov 2019 15:19:03 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 865A41B948; Wed, 27 Nov 2019 15:18:58 +0100 (CET) Received: from mail-pj1-f67.google.com (mail-pj1-f67.google.com [209.85.216.67]) by dpdk.org (Postfix) with ESMTP id 490042C60 for ; Wed, 27 Nov 2019 15:18:55 +0100 (CET) Received: by mail-pj1-f67.google.com with SMTP id w8so10009516pjh.11 for ; Wed, 27 Nov 2019 06:18:55 -0800 (PST) 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=VfhIp9iKQd/cV+IRQDhRpBJ0TD/QHpBY5ZgGlV6bvas=; b=YpGzyNVnzZwyKiWuNzZhiOScJJpquLJ4CdkSs9Ghs1Wmr2/s/fmFqm38IZHJ9K2Ajz 8L5fea1G9gPbLTdEPvIDdesJcw3yIlPnj0IKPaCY+DYLvK1s8FKHxNmLGmw56620aOjI lnXB338Bfo3Wh0debFI8LwjbNd9dG+/XR7O7c81g+NvTIyHRQ0+uozMyZC8JfW8AJREU ocViti7gctyk4FgNeAhSqd/xzOLytTtmmfzDjGwHknhxA5294blBx15423fiiHoV1CfN flu7yASsXe5Y5iCCQOHHX/vWjtYJwUX0i7ydhul4502V9g6WSXS3QGU9u6VZ0y0jinMX 3fZQ== 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=VfhIp9iKQd/cV+IRQDhRpBJ0TD/QHpBY5ZgGlV6bvas=; b=G0Gyq4x0uo6eu+CKUQhUNVbHUdKaM5SsG6usOLttCCoxG2uQpHQX7zrgklczNh6LyT R2qvti3o7+BN+YGxDafQegi83exvamoKPSWiB7qndqaPLNjVy1IFkPjLH13SAGt6M4Mu uXe5yqp8HMKm92gn9SkZvz+TwlVI1Vtu4kswYl1+s64dBoa9hVga0CV0hOU4ogxPqe91 TPjaCMybcBF+/HidVnf8IJXanJEWNgUSIXSzSfjm3qWQwSZ0lIKUSEwUFMUiQfHiB0id GOpxiEcrYdw/5eRIA0bdzWYedxaUHvFMClhz7wtQ9QropYGv6gdpIJVJ6wJWXh/ocUPT +Hmg== X-Gm-Message-State: APjAAAXSuBvQSACQekKOAErXcSRNIeGvnl3cCTnGsMwTCh1uFT9IVofx qeqt0I/zdUgnepIzqQ2RvrkoNBdf X-Google-Smtp-Source: APXvYqxynES7EENQkjmvmxUuZCqyx7jLrI2fbJcL10ywjwp8zcNoHtj+vQZQiGmd7LhOQIk7ZGGfHw== X-Received: by 2002:a17:902:ac88:: with SMTP id h8mr4328832plr.131.1574864334137; Wed, 27 Nov 2019 06:18:54 -0800 (PST) Received: from local.opencloud.tech.localdomain ([203.100.54.194]) by smtp.gmail.com with ESMTPSA id i3sm16612951pfd.154.2019.11.27.06.18.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Nov 2019 06:18:53 -0800 (PST) From: xiangxia.m.yue@gmail.com To: dev@dpdk.org Cc: Tonghao Zhang , Ori Kam Date: Wed, 27 Nov 2019 22:18:42 +0800 Message-Id: <1574864323-85580-2-git-send-email-xiangxia.m.yue@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1574864323-85580-1-git-send-email-xiangxia.m.yue@gmail.com> References: <1574864323-85580-1-git-send-email-xiangxia.m.yue@gmail.com> Subject: [dpdk-dev] [PATCH dpdk-dev 2/3] net/mlx5: clean up redundant assignment X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Tonghao Zhang The type of txq has been assigned in mlx5_txq_hairpin_new. Fixes: ae18a1ae9692 ("net/mlx5: support Tx hairpin queues") Cc: Ori Kam Signed-off-by: Tonghao Zhang Acked-by: Ori Kam --- drivers/net/mlx5/mlx5_txq.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_txq.c b/drivers/net/mlx5/mlx5_txq.c index a0d61644cb7f..e6a841c8d359 100644 --- a/drivers/net/mlx5/mlx5_txq.c +++ b/drivers/net/mlx5/mlx5_txq.c @@ -271,7 +271,6 @@ mlx5_tx_hairpin_queue_setup(struct rte_eth_dev *dev, uint16_t idx, DRV_LOG(DEBUG, "port %u adding Tx queue %u to list", dev->data->port_id, idx); (*priv->txqs)[idx] = &txq_ctrl->txq; - txq_ctrl->type = MLX5_TXQ_TYPE_HAIRPIN; return 0; } From patchwork Wed Nov 27 14:18:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tonghao Zhang X-Patchwork-Id: 63353 X-Patchwork-Delegate: rasland@nvidia.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1DABFA04E0; Wed, 27 Nov 2019 15:19:13 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id DC2F11BE96; Wed, 27 Nov 2019 15:19:02 +0100 (CET) Received: from mail-pj1-f65.google.com (mail-pj1-f65.google.com [209.85.216.65]) by dpdk.org (Postfix) with ESMTP id 7958D1B943 for ; Wed, 27 Nov 2019 15:18:57 +0100 (CET) Received: by mail-pj1-f65.google.com with SMTP id bb19so6475316pjb.4 for ; Wed, 27 Nov 2019 06:18:57 -0800 (PST) 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=ooy5NU1Ec3SgQ8Jkt7jERkg6pJgoKlcGi5u+CANtaSM=; b=tsQXkplWyOa3UyRaBMGAQG2Pb2f100EX8CsNmJ+tV6J5KwtNlgau8Nz7YKIM1ARTEU u2dx+bAufiQAu7TPKFKmdphs1TeibqqYa57UQzd4XnEzoXOLXNa9M7b2ir/t7XiIM1dN IHb4kv5Js3TA84dKxM6yKvpmxusv11Z0C5dwUlzCHiW8hY3bOe3UKGFBhktVNPw09sRN QGrYOUFipYFjzJh0iRfOF7xo7DPrRsuqZMzPqTUUmb6Pj4mooGP1BVx159BGGwGkz9Dt JaJhAByt9uVvYzvOVK/8XMi3RvYdMewPys2w6d65cgCdpgFwUQvHUC2oB1DCd8HZLlSV xWGw== 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=ooy5NU1Ec3SgQ8Jkt7jERkg6pJgoKlcGi5u+CANtaSM=; b=W/WhsE7B5tMv1sXWDf4G8PnuaNLIV/ro1SomOxacpdBR23fWkWrUYTH/c0lcyGtsrT 73b2uhbfOu30WmZNA+E7/Kiv09OS3vfKjnhxm649hKaqW2pL78g9sDLT5Z6L//XYE2Lm qUHmp5lno5PfHT7fIB6vJ9phB2g/65SQtPUxsJSAztc46wL72e5K+pCBDo0c1wLlxrJi ZG0EZUN2X+PjGB0l5AXI/RpXtdqJdMQZmf5OgWQYZ64k99UXL2V2u/3FVkkU2juMI9xL ehXm5JGd5JTFNI9LUPON3zjV9Qz3srJHbmmzZCkaOTJERWijInmkMVx6lymJPWie5S0N +B1A== X-Gm-Message-State: APjAAAUlQ9G1h6wW1dYUNszHoca/0ZUHAax1C23s+5wqVHuf/SUfKLfz qQFGvIw0r9uuEjpjaxrRapr5a/pR X-Google-Smtp-Source: APXvYqyZs4IeysF0gQ/h4bonarV1UkA8tXseyRPLJPQn84n/RS1Ym8Oz1zGSAONBFaoGKVZ/hJ/VEg== X-Received: by 2002:a17:902:ab98:: with SMTP id f24mr4373416plr.257.1574864336606; Wed, 27 Nov 2019 06:18:56 -0800 (PST) Received: from local.opencloud.tech.localdomain ([203.100.54.194]) by smtp.gmail.com with ESMTPSA id i3sm16612951pfd.154.2019.11.27.06.18.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Nov 2019 06:18:55 -0800 (PST) From: xiangxia.m.yue@gmail.com To: dev@dpdk.org Cc: Tonghao Zhang , Ori Kam Date: Wed, 27 Nov 2019 22:18:43 +0800 Message-Id: <1574864323-85580-3-git-send-email-xiangxia.m.yue@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1574864323-85580-1-git-send-email-xiangxia.m.yue@gmail.com> References: <1574864323-85580-1-git-send-email-xiangxia.m.yue@gmail.com> Subject: [dpdk-dev] [PATCH dpdk-dev 3/3] net/mlx5: remove the assert for rxq cq X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Tonghao Zhang The mlx5_rxq_obj_hairpin_new doesn't alloc the cq anymore. When releasing it, don't check it. Fixes: e79c9be91515 ("net/mlx5: support Rx hairpin queues") Cc: Ori Kam Signed-off-by: Tonghao Zhang --- drivers/net/mlx5/mlx5_rxq.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c index 2a12d5fa3436..582a2330e575 100644 --- a/drivers/net/mlx5/mlx5_rxq.c +++ b/drivers/net/mlx5/mlx5_rxq.c @@ -673,7 +673,6 @@ mlx5_rxq_obj_release(struct mlx5_rxq_obj *rxq_obj) assert(rxq_obj); if (rxq_obj->type == MLX5_RXQ_OBJ_TYPE_IBV) assert(rxq_obj->wq); - assert(rxq_obj->cq); if (rte_atomic32_dec_and_test(&rxq_obj->refcnt)) { switch (rxq_obj->type) { case MLX5_RXQ_OBJ_TYPE_IBV: