From patchwork Thu Nov 17 10:00:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xing, Beilei" X-Patchwork-Id: 119930 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 86478A0544; Thu, 17 Nov 2022 11:01:09 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6809F40DDC; Thu, 17 Nov 2022 11:01:09 +0100 (CET) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mails.dpdk.org (Postfix) with ESMTP id 8FE0B40DDA for ; Thu, 17 Nov 2022 11:01:07 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1668679267; x=1700215267; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=D6VVoZ7Thi/xTlTSBRQ8FyXCEsGX5NT0ZSsZW1ulRrE=; b=Pwdqrci7kIFKRud7w0NV+nNQzT/n4o7CpCcFyO+9stm2V/6xrHjJ/lEW ehI3Vg+RaaOVIJ2Gt4EqsxqnO8wSg2pXrI5Jz9ltmJSze/7cuSzQOiEwO mjq8naIob8GIJh5Xaw5hgjibQEG2og7bvivWgIKG+qJ6P6Wrl03N1WyeA YZpjWMw5I/piLGpnHB7SUDX2pb3GQ1BM+pAL9bWUkrzEGL9NydKoYgvGL 9T3z8Fc1p9FZLAnrSFebNUBOCsWXecpSZL5L/GtCUzxTneRJo7QG5mfjO W1dcMkJq2oeeTHq5GStTuUdtB6W1IpCBy5PJyTfh0qpQx5M7xza2NA6JV Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10533"; a="314627025" X-IronPort-AV: E=Sophos;i="5.96,171,1665471600"; d="scan'208";a="314627025" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Nov 2022 02:01:06 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10533"; a="782165677" X-IronPort-AV: E=Sophos;i="5.96,171,1665471600"; d="scan'208";a="782165677" Received: from dpdk-beileix-3.sh.intel.com ([10.67.110.253]) by fmsmga001.fm.intel.com with ESMTP; 17 Nov 2022 02:01:04 -0800 From: beilei.xing@intel.com To: jingjing.wu@intel.com Cc: dev@dpdk.org, yuan.peng@intel.com, Beilei Xing Subject: [PATCH] net/idpf: fix crash when launching l3fwd Date: Thu, 17 Nov 2022 10:00:54 +0000 Message-Id: <20221117100054.13836-1-beilei.xing@intel.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: Beilei Xing There's core dump when launching l3fwd with 1 queue 1 core. It's because NULL pointer is used if fail to configure device. This patch removes incorrect check during device configuration, and checks NULL pointer when excuting VIRTCHNL2_OP_DEALLOC_VECTORS. Fixes: 549343c25db8 ("net/idpf: support device initialization") Fixes: 70675bcc3a57 ("net/idpf: support RSS") Fixes: 37291a68fd78 ("net/idpf: support write back based on ITR expire") Signed-off-by: Beilei Xing --- drivers/net/idpf/idpf_ethdev.c | 7 ------- drivers/net/idpf/idpf_vchnl.c | 3 +++ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/net/idpf/idpf_ethdev.c b/drivers/net/idpf/idpf_ethdev.c index 20f088eb80..51fc97bf7b 100644 --- a/drivers/net/idpf/idpf_ethdev.c +++ b/drivers/net/idpf/idpf_ethdev.c @@ -372,13 +372,6 @@ idpf_dev_configure(struct rte_eth_dev *dev) return -ENOTSUP; } - if ((dev->data->nb_rx_queues == 1 && conf->rxmode.mq_mode != RTE_ETH_MQ_RX_NONE) || - (dev->data->nb_rx_queues > 1 && conf->rxmode.mq_mode != RTE_ETH_MQ_RX_RSS)) { - PMD_INIT_LOG(ERR, "Multi-queue packet distribution mode %d is not supported", - conf->rxmode.mq_mode); - return -ENOTSUP; - } - if (conf->txmode.mq_mode != RTE_ETH_MQ_TX_NONE) { PMD_INIT_LOG(ERR, "Multi-queue TX mode %d is not supported", conf->txmode.mq_mode); diff --git a/drivers/net/idpf/idpf_vchnl.c b/drivers/net/idpf/idpf_vchnl.c index ac6486d4ef..88770447f8 100644 --- a/drivers/net/idpf/idpf_vchnl.c +++ b/drivers/net/idpf/idpf_vchnl.c @@ -1197,6 +1197,9 @@ idpf_vc_dealloc_vectors(struct idpf_vport *vport) int err, len; alloc_vec = vport->recv_vectors; + if (alloc_vec == NULL) + return -EINVAL; + vcs = &alloc_vec->vchunks; len = sizeof(struct virtchnl2_vector_chunks) +