From patchwork Wed Nov 6 19:01:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Traynor X-Patchwork-Id: 62601 X-Patchwork-Delegate: david.marchand@redhat.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 C3CFCA04AB; Wed, 6 Nov 2019 20:02:30 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 660411E864; Wed, 6 Nov 2019 20:02:29 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id DE2141C132 for ; Wed, 6 Nov 2019 20:02:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1573066947; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yEKdgmUoUl4BQhC+B/j5hHn9giIsWK98vcI2EftlhLE=; b=C3bC5LJalWrnoisFl88Ti9fHVmsOlhzA/v5NknK0rIxhsa34n5D7qwGyv2hJBk6+iNrW2n Rfz+F2I8EqGRWKbIDFLVhcKyjXiTYBVDksFGEIYgess5SLOF4xHQUAPhm5rR5fbUvolXf1 +q/PbfdLWgpOMlke11wK7wXRfPu90WQ= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-103-aGnCF9S4NXCaBiwklx07GQ-1; Wed, 06 Nov 2019 14:02:24 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0C3431800D6B; Wed, 6 Nov 2019 19:02:23 +0000 (UTC) Received: from rh.redhat.com (unknown [10.36.118.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9B4D11001B35; Wed, 6 Nov 2019 19:02:21 +0000 (UTC) From: Kevin Traynor To: dev@dpdk.org Cc: david.marchand@redhat.com, Kevin Traynor , stable@dpdk.org, Cian Ferriter Date: Wed, 6 Nov 2019 19:01:56 +0000 Message-Id: <20191106190203.10750-2-ktraynor@redhat.com> In-Reply-To: <20191106190203.10750-1-ktraynor@redhat.com> References: <20191001125315.6191-1-ktraynor@redhat.com> <20191106190203.10750-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: aGnCF9S4NXCaBiwklx07GQ-1 X-Mimecast-Spam-Score: 0 Subject: [dpdk-dev] [v2 PATCH 1/8] net/pcap: fix argument checks 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" Previously rx/tx_queues were passed into eth_from_pcaps_common() as ptrs and were checked for being NULL. In commit da6ba28f0540 ("net/pcap: use a struct to pass user options") that changed to pass in a ptr to a pmd_devargs_all which contains the rx/tx_queues. The parameter checking was not updated as part of that commit and coverity caught that there was still a check if rx/tx_queues were NULL, apparently after they had been dereferenced. In fact as they are a members of the devargs_all struct, they will not be NULL so remove those checks. 1231 struct pmd_devargs *rx_queues = &devargs_all->rx_queues; 1232 struct pmd_devargs *tx_queues = &devargs_all->tx_queues; 1233 const unsigned int nb_rx_queues = rx_queues->num_of_queue; deref_ptr: Directly dereferencing pointer tx_queues. 1234 const unsigned int nb_tx_queues = tx_queues->num_of_queue; 1235 unsigned int i; 1236 1237 /* do some parameter checking */ CID 345004: Dereference before null check (REVERSE_INULL) [select issue] 1238 if (rx_queues == NULL && nb_rx_queues > 0) 1239 return -1; CID 345029 (#1 of 1): Dereference before null check (REVERSE_INULL) check_after_deref: Null-checking tx_queues suggests that it may be null, but it has already been dereferenced on all paths leading to the check. 1240 if (tx_queues == NULL && nb_tx_queues > 0) 1241 return -1; Coverity issue: 345029 Coverity issue: 345044 Fixes: da6ba28f0540 ("net/pcap: use a struct to pass user options") Cc: stable@dpdk.org Signed-off-by: Kevin Traynor Acked-by: Cian Ferriter --- drivers/net/pcap/rte_eth_pcap.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/net/pcap/rte_eth_pcap.c b/drivers/net/pcap/rte_eth_pcap.c index 5186d8fe5..aa7ef6fdb 100644 --- a/drivers/net/pcap/rte_eth_pcap.c +++ b/drivers/net/pcap/rte_eth_pcap.c @@ -1241,10 +1241,4 @@ eth_from_pcaps_common(struct rte_vdev_device *vdev, unsigned int i; - /* do some parameter checking */ - if (rx_queues == NULL && nb_rx_queues > 0) - return -1; - if (tx_queues == NULL && nb_tx_queues > 0) - return -1; - if (pmd_init_internals(vdev, nb_rx_queues, nb_tx_queues, internals, eth_dev) < 0) From patchwork Wed Nov 6 19:01:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Traynor X-Patchwork-Id: 62602 X-Patchwork-Delegate: david.marchand@redhat.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 EFA6CA04AB; Wed, 6 Nov 2019 20:02:41 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C31441E881; Wed, 6 Nov 2019 20:02:32 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id 58DF01E56D for ; Wed, 6 Nov 2019 20:02:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1573066948; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bsrCM0ug/pCjMiM0vDZz75VjM1S3KqQaLQml0riDCh0=; b=f14AWoo9XqdORenuTc9ctCkWGVKVwTA8kP4H0hK3u4Tp5I7eVJrq5UK6wM2+jpA9n6oByl J/V80pv91vmwzB5QptgYRqqGMB1fqKLXXSR0xXEqpbUZuUE7Az6eJFg64XSTyE+/z+bGJM YrEsdkVceBGpQeTe7uru9y1QIc5Uwm4= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-214-s7PDk2WuNG2V6xLkxXtH0A-1; Wed, 06 Nov 2019 14:02:25 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id ABB5E1005500; Wed, 6 Nov 2019 19:02:24 +0000 (UTC) Received: from rh.redhat.com (unknown [10.36.118.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5A01B1001B35; Wed, 6 Nov 2019 19:02:23 +0000 (UTC) From: Kevin Traynor To: dev@dpdk.org Cc: david.marchand@redhat.com, Kevin Traynor , ndabilpuram@marvell.com, stable@dpdk.org Date: Wed, 6 Nov 2019 19:01:57 +0000 Message-Id: <20191106190203.10750-3-ktraynor@redhat.com> In-Reply-To: <20191106190203.10750-1-ktraynor@redhat.com> References: <20191001125315.6191-1-ktraynor@redhat.com> <20191106190203.10750-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: s7PDk2WuNG2V6xLkxXtH0A-1 X-Mimecast-Spam-Score: 0 Subject: [dpdk-dev] [v2 PATCH 2/8] common/cpt: fix possible NULL deference 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" Coverity complains that ctrl_flags is set to NULL at the start of the function and it may not have been set before there is a jump to fc_success and it is dereferenced. Check for NULL before dereference. 312fc_success: CID 344983 (#1 of 1): Explicit null dereferenced (FORWARD_NULL)7. var_deref_op: Dereferencing null pointer ctrl_flags. 313 *ctrl_flags = rte_cpu_to_be_64(*ctrl_flags); Coverity issue: 344983 Fixes: 6cc54096520d ("crypto/octeontx: add supported sessions") Cc: ndabilpuram@marvell.com Cc: stable@dpdk.org Signed-off-by: Kevin Traynor Reviewed-by: David Marchand --- There may be further rework needed to set it to the correct value, but for now at least prevent the NULL dereference. --- drivers/common/cpt/cpt_ucode.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/common/cpt/cpt_ucode.h b/drivers/common/cpt/cpt_ucode.h index 0dac12ee3..d5a0135d7 100644 --- a/drivers/common/cpt/cpt_ucode.h +++ b/drivers/common/cpt/cpt_ucode.h @@ -311,5 +311,6 @@ cpt_fc_ciph_set_key(void *ctx, cipher_type_t type, const uint8_t *key, fc_success: - *ctrl_flags = rte_cpu_to_be_64(*ctrl_flags); + if (ctrl_flags != NULL) + *ctrl_flags = rte_cpu_to_be_64(*ctrl_flags); success: From patchwork Wed Nov 6 19:01:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Traynor X-Patchwork-Id: 62603 X-Patchwork-Delegate: david.marchand@redhat.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 BE39FA04AB; Wed, 6 Nov 2019 20:02:52 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 675D41E8A5; Wed, 6 Nov 2019 20:02:35 +0100 (CET) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id ADE051E86A for ; Wed, 6 Nov 2019 20:02:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1573066951; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PodAppb9t0ih75//Q3LNZEsSmDpASGXw+Zdgt2BaX5k=; b=fZXYudlgXvUc7xJ0ySMj20efYmc4LTYkXhP+lIklmpWnB0S9WVR7P2ZmDdbWJvT1E2PGCI 3OsEIAaSQcAeCZ9wJBMYcxUCNIidD7/8AAss3e2BYOemoIgA3YmVwkxv8w/EMxrIunmEeZ MQ3H1I3lZscjVc0eQJrq2S7LO4qFB/U= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-164-z9mKmBsKNQix023nCUTBTg-1; Wed, 06 Nov 2019 14:02:27 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 58D868017DD; Wed, 6 Nov 2019 19:02:26 +0000 (UTC) Received: from rh.redhat.com (unknown [10.36.118.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0484B1001B35; Wed, 6 Nov 2019 19:02:24 +0000 (UTC) From: Kevin Traynor To: dev@dpdk.org Cc: david.marchand@redhat.com, Kevin Traynor , rosen.xu@intel.com, stable@dpdk.org Date: Wed, 6 Nov 2019 19:01:58 +0000 Message-Id: <20191106190203.10750-4-ktraynor@redhat.com> In-Reply-To: <20191106190203.10750-1-ktraynor@redhat.com> References: <20191001125315.6191-1-ktraynor@redhat.com> <20191106190203.10750-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: z9mKmBsKNQix023nCUTBTg-1 X-Mimecast-Spam-Score: 0 Subject: [dpdk-dev] [v2 PATCH 3/8] net/ipn3ke: fix incorrect commit check logic 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" Coverity is complaining about identical code regardless of which branch of the if else is taken. Functionally it means an error will always be returned if this if else is hit. Remove the else branch. CID 337928 (#1 of 1): Identical code for different branches (IDENTICAL_BRANCHES)identical_branches: The same code is executed regardless of whether n->level != IPN3KE_TM_NODE_LEVEL_COS || n->n_children != 0U is true, because the 'then' and 'else' branches are identical. Should one of the branches be modified, or the entire 'if' statement replaced? 1506 if (n->level != IPN3KE_TM_NODE_LEVEL_COS || 1507 n->n_children != 0) { 1508 return -rte_tm_error_set(error, 1509 EINVAL, 1510 RTE_TM_ERROR_TYPE_UNSPECIFIED, 1511 NULL, 1512 rte_strerror(EINVAL)); else_branch: The else branch, identical to the then branch. 1513 } else { 1514 return -rte_tm_error_set(error, 1515 EINVAL, 1516 RTE_TM_ERROR_TYPE_UNSPECIFIED, 1517 NULL, 1518 rte_strerror(EINVAL)); 1519 } Coverity issue: 337928 Fixes: c820468ac99c ("net/ipn3ke: support TM") Cc: rosen.xu@intel.com Cc: stable@dpdk.org Signed-off-by: Kevin Traynor Reviewed-by: Rosen Xu --- drivers/net/ipn3ke/ipn3ke_tm.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/net/ipn3ke/ipn3ke_tm.c b/drivers/net/ipn3ke/ipn3ke_tm.c index adf02c157..a93145d59 100644 --- a/drivers/net/ipn3ke/ipn3ke_tm.c +++ b/drivers/net/ipn3ke/ipn3ke_tm.c @@ -1511,10 +1511,4 @@ ipn3ke_tm_hierarchy_commit_check(struct rte_eth_dev *dev, NULL, rte_strerror(EINVAL)); - } else { - return -rte_tm_error_set(error, - EINVAL, - RTE_TM_ERROR_TYPE_UNSPECIFIED, - NULL, - rte_strerror(EINVAL)); } } From patchwork Wed Nov 6 19:01:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Traynor X-Patchwork-Id: 62604 X-Patchwork-Delegate: david.marchand@redhat.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 0860AA04AB; Wed, 6 Nov 2019 20:03:03 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 902BE1E8AA; Wed, 6 Nov 2019 20:02:38 +0100 (CET) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id C732E1E86E for ; Wed, 6 Nov 2019 20:02:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1573066951; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zBfVUDGnCJ2tftIAysnOIYHQX9OfOD11ZFjQ48qPmvU=; b=abvqY3T/qpEQPFbz1XIJmBKR7otZSWTUuGHjb+RrOIP/8EVaNwJoFOQsPBCeJydSMxlLIl 5p1e5nen/EkQVV86MlfZ+6hQl/qjf05aXcf8qR+OZ67jNSLz507i5isHrAwC8cfBZMJpSb rurdTE4pifgiYsjoi6qAzf3rFV/iQYw= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-338-UTdFlJfAODuM0gbS6rOPXg-1; Wed, 06 Nov 2019 14:02:29 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 15AAC8017E0; Wed, 6 Nov 2019 19:02:28 +0000 (UTC) Received: from rh.redhat.com (unknown [10.36.118.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id B357B1001B35; Wed, 6 Nov 2019 19:02:26 +0000 (UTC) From: Kevin Traynor To: dev@dpdk.org Cc: david.marchand@redhat.com, Kevin Traynor , rosen.xu@intel.com, stable@dpdk.org Date: Wed, 6 Nov 2019 19:01:59 +0000 Message-Id: <20191106190203.10750-5-ktraynor@redhat.com> In-Reply-To: <20191106190203.10750-1-ktraynor@redhat.com> References: <20191001125315.6191-1-ktraynor@redhat.com> <20191106190203.10750-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: UTdFlJfAODuM0gbS6rOPXg-1 X-Mimecast-Spam-Score: 0 Subject: [dpdk-dev] [v2 PATCH 4/8] net/ipn3ke: remove useless if statement 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" Coverity complains that this statement is not needed as the goto label is on the next line anyway. Remove the if statement. 653 ret = ipn3ke_cfg_parse_i40e_pf_ethdev(afu_name, pf_name); CID 337930 (#1 of 1): Identical code for different branches (IDENTICAL_BRANCHES)identical_branches: The same code is executed when the condition ret is true or false, because the code in the if-then branch and after the if statement is identical. Should the if statement be removed? 654 if (ret) 655 goto end; implicit_else: The code from the above if-then branch is identical to the code after the if statement. 656end: Coverity issue: 337930 Fixes: c01c748e4ae6 ("net/ipn3ke: add new driver") Cc: rosen.xu@intel.com Cc: stable@dpdk.org Signed-off-by: Kevin Traynor Reviewed-by: David Marchand Reviewed-by: Rosen Xu --- drivers/net/ipn3ke/ipn3ke_ethdev.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/ipn3ke/ipn3ke_ethdev.c b/drivers/net/ipn3ke/ipn3ke_ethdev.c index 28d8aaf2d..af87fda6b 100644 --- a/drivers/net/ipn3ke/ipn3ke_ethdev.c +++ b/drivers/net/ipn3ke/ipn3ke_ethdev.c @@ -738,6 +738,5 @@ ipn3ke_cfg_probe(struct rte_vdev_device *dev) ret = ipn3ke_cfg_parse_i40e_pf_ethdev(afu_name, pf_name); - if (ret) - goto end; + end: if (kvlist) From patchwork Wed Nov 6 19:02:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Traynor X-Patchwork-Id: 62605 X-Patchwork-Delegate: david.marchand@redhat.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 70C36A04AB; Wed, 6 Nov 2019 20:03:15 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 95B091E8C2; Wed, 6 Nov 2019 20:02:41 +0100 (CET) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id 7F3F71E88D for ; Wed, 6 Nov 2019 20:02:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1573066954; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Np/h6u6Cvkt7Pv5s/VbZOyBhLWnlNaTELmbCr2CtIIQ=; b=LjGBmoFdEmjpQeJ0mXuL1yBgPwH7W5hwaf57+OBXuegBou8HXi9MSI521ldGItEnS9gkBG RN9FHSCeBSMtPwQz3REleX/VHsAucdUDu3iskP/rnxA6qvjWYmbrEp+qeNAEajW5mlMbC/ m8jVkDceGdn/PjQcL/sL61aj3tN9OlE= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-412-ouEqhkIONba2SfMtndyuKQ-1; Wed, 06 Nov 2019 14:02:30 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B442F800C72; Wed, 6 Nov 2019 19:02:29 +0000 (UTC) Received: from rh.redhat.com (unknown [10.36.118.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 670821001B35; Wed, 6 Nov 2019 19:02:28 +0000 (UTC) From: Kevin Traynor To: dev@dpdk.org Cc: david.marchand@redhat.com, Kevin Traynor , rosen.xu@intel.com, stable@dpdk.org Date: Wed, 6 Nov 2019 19:02:00 +0000 Message-Id: <20191106190203.10750-6-ktraynor@redhat.com> In-Reply-To: <20191106190203.10750-1-ktraynor@redhat.com> References: <20191001125315.6191-1-ktraynor@redhat.com> <20191106190203.10750-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: ouEqhkIONba2SfMtndyuKQ-1 X-Mimecast-Spam-Score: 0 Subject: [dpdk-dev] [v2 PATCH 5/8] net/ipn3ke: remove commented out code 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" These struct members and variable were commented out. Remove them. Fixes: c01c748e4ae6 ("net/ipn3ke: add new driver") Fixes: c820468ac99c ("net/ipn3ke: support TM") Cc: rosen.xu@intel.com Cc: stable@dpdk.org Signed-off-by: Kevin Traynor Reviewed-by: David Marchand Reviewed-by: Rosen Xu --- drivers/net/ipn3ke/ipn3ke_ethdev.h | 7 ------- drivers/net/ipn3ke/ipn3ke_tm.c | 1 - 2 files changed, 8 deletions(-) diff --git a/drivers/net/ipn3ke/ipn3ke_ethdev.h b/drivers/net/ipn3ke/ipn3ke_ethdev.h index 985f20352..9b0cf309c 100644 --- a/drivers/net/ipn3ke/ipn3ke_ethdev.h +++ b/drivers/net/ipn3ke/ipn3ke_ethdev.h @@ -97,18 +97,11 @@ struct ipn3ke_tm_node { struct ipn3ke_tm_hierarchy { struct ipn3ke_tm_node *port_node; - /*struct ipn3ke_tm_node_list vt_node_list;*/ - /*struct ipn3ke_tm_node_list cos_node_list;*/ - uint32_t n_shaper_profiles; - /*uint32_t n_shared_shapers;*/ uint32_t n_tdrop_profiles; uint32_t n_vt_nodes; uint32_t n_cos_nodes; - struct ipn3ke_tm_node *port_commit_node; struct ipn3ke_tm_node_list vt_commit_node_list; struct ipn3ke_tm_node_list cos_commit_node_list; - - /*uint32_t n_tm_nodes[IPN3KE_TM_NODE_LEVEL_MAX];*/ }; diff --git a/drivers/net/ipn3ke/ipn3ke_tm.c b/drivers/net/ipn3ke/ipn3ke_tm.c index a93145d59..5a16c5f96 100644 --- a/drivers/net/ipn3ke/ipn3ke_tm.c +++ b/drivers/net/ipn3ke/ipn3ke_tm.c @@ -1088,5 +1088,4 @@ ipn3ke_tm_node_add_check_mount(uint32_t tm_id, struct rte_tm_error *error) { - /*struct ipn3ke_tm_internals *tm = IPN3KE_DEV_PRIVATE_TO_TM(dev);*/ uint32_t node_index; uint32_t parent_index; From patchwork Wed Nov 6 19:02:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Traynor X-Patchwork-Id: 62606 X-Patchwork-Delegate: david.marchand@redhat.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 38FDBA04AB; Wed, 6 Nov 2019 20:03:24 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E0DEC1E8E1; Wed, 6 Nov 2019 20:02:43 +0100 (CET) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id DCC3D1E895 for ; Wed, 6 Nov 2019 20:02:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1573066954; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9r7qfXMbobtBtIVGlgzdYQNTc30h04PwyeABaO5SF+s=; b=NW3fQ3+k8UezuO8DnKlkTJSgMBSEEV6w6I1aO5kG7m1V1qQfUE+m6vgcmB1vE4ZQFaxSU+ jXPvMHxIDwjFVsEgcvK6na7V5uMbeqV/3bIoxWtUuCub1IE0HqjpS7drQdmXUGgY574Exi hUqyFncrCKs/+cUan9wQbn0nHqHFs/A= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-148-kd--ZT7bOse1zN3GsD4w4Q-1; Wed, 06 Nov 2019 14:02:32 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 62AEB477; Wed, 6 Nov 2019 19:02:31 +0000 (UTC) Received: from rh.redhat.com (unknown [10.36.118.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 140561001B35; Wed, 6 Nov 2019 19:02:29 +0000 (UTC) From: Kevin Traynor To: dev@dpdk.org Cc: david.marchand@redhat.com, Kevin Traynor , ssahu@marvell.com, stable@dpdk.org Date: Wed, 6 Nov 2019 19:02:01 +0000 Message-Id: <20191106190203.10750-7-ktraynor@redhat.com> In-Reply-To: <20191106190203.10750-1-ktraynor@redhat.com> References: <20191001125315.6191-1-ktraynor@redhat.com> <20191106190203.10750-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: kd--ZT7bOse1zN3GsD4w4Q-1 X-Mimecast-Spam-Score: 0 Subject: [dpdk-dev] [v2 PATCH 6/8] compress/octeontx: remove commented out code 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" This code is commented out. Remove it. Fixes: 43e610bb8565 ("compress/octeontx: introduce octeontx zip PMD") Cc: ssahu@marvell.com Cc: stable@dpdk.org Signed-off-by: Kevin Traynor Reviewed-by: David Marchand --- drivers/compress/octeontx/include/zip_regs.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/drivers/compress/octeontx/include/zip_regs.h b/drivers/compress/octeontx/include/zip_regs.h index 04c3d75e9..96e538bb7 100644 --- a/drivers/compress/octeontx/include/zip_regs.h +++ b/drivers/compress/octeontx/include/zip_regs.h @@ -37,5 +37,4 @@ typedef union { #endif /* Word 0 - End */ } s; - /* struct zip_vqx_ena_s cn; */ } zip_vqx_ena_t; @@ -65,5 +64,4 @@ typedef union { #endif /* Word 0 - End */ } s; - /* struct zip_vqx_sbuf_addr_s cn; */ } zip_vqx_sbuf_addr_t; @@ -85,5 +83,4 @@ typedef union { #endif /* Word 0 - End */ } s; - /* struct zip_quex_doorbell_s cn; */ } zip_quex_doorbell_t; @@ -105,5 +102,4 @@ union zip_nptr_s { #endif /* Word 0 - End */ } s; - /* struct zip_nptr_s_s cn83xx; */ }; @@ -198,5 +194,4 @@ union zip_inst_s { /** Beginning of file */ uint64_t bf : 1; - // uint64_t reserved_3_4 : 2; /** Comp/decomp operation */ uint64_t op : 2; @@ -211,5 +206,4 @@ union zip_inst_s { uint64_t dg : 1; uint64_t ds : 1; - //uint64_t reserved_3_4 : 2; uint64_t op : 2; uint64_t bf : 1; @@ -616,6 +610,4 @@ union zip_zres_s { #endif /* Word 7 - End */ } /** ZIP Result Structure */s; - - /* struct zip_zres_s_s cn83xx; */ }; From patchwork Wed Nov 6 19:02:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Traynor X-Patchwork-Id: 62607 X-Patchwork-Delegate: david.marchand@redhat.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 EB15EA04AB; Wed, 6 Nov 2019 20:03:34 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 607FA1E8E7; Wed, 6 Nov 2019 20:02:46 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id D6B3F1E88F for ; Wed, 6 Nov 2019 20:02:37 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1573066957; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ucZ+VFvUm6I/nCFGc1O5idXdV//uY26x/3klSShN7ns=; b=VdF4UMGrj0ePf6y3PbQ4DXJJUsYWx26yGq6V7z2MpMv/2Duli2+jF1mQh1cLForpC35WFw VxxKqygFCK+uFzv1g/0JkRM9RrLAmfJ5MNknvHs+7kt7h/1PMnaoU5CfpvvMjgvqYbHfiK gbHBT8qDbGO+qLHJhTxb191t7qD1l58= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-167--D7E2GllMMWkoMPlVCBtsA-1; Wed, 06 Nov 2019 14:02:34 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1B692800C72; Wed, 6 Nov 2019 19:02:33 +0000 (UTC) Received: from rh.redhat.com (unknown [10.36.118.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id B0C6E1001B35; Wed, 6 Nov 2019 19:02:31 +0000 (UTC) From: Kevin Traynor To: dev@dpdk.org Cc: david.marchand@redhat.com, Kevin Traynor , stable@dpdk.org, Liang Ma Date: Wed, 6 Nov 2019 19:02:02 +0000 Message-Id: <20191106190203.10750-8-ktraynor@redhat.com> In-Reply-To: <20191106190203.10750-1-ktraynor@redhat.com> References: <20191001125315.6191-1-ktraynor@redhat.com> <20191106190203.10750-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: -D7E2GllMMWkoMPlVCBtsA-1 X-Mimecast-Spam-Score: 0 Subject: [dpdk-dev] [v2 PATCH 7/8] event/opdl: remove commented out code 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" Some variables are commented out. Remove them. Fixes: d548ef513cd7 ("event/opdl: add unit tests") Cc: stable@dpdk.org Signed-off-by: Kevin Traynor Acked-by: Liang Ma --- drivers/event/opdl/opdl_test.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/event/opdl/opdl_test.c b/drivers/event/opdl/opdl_test.c index 5868ec1be..e7a32fbd3 100644 --- a/drivers/event/opdl/opdl_test.c +++ b/drivers/event/opdl/opdl_test.c @@ -696,7 +696,4 @@ static int single_link(struct test *t) { - /* const uint8_t rx_port = 0; */ - /* const uint8_t w1_port = 1; */ - /* const uint8_t w3_port = 3; */ const uint8_t tx_port = 2; int err; From patchwork Wed Nov 6 19:02:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Traynor X-Patchwork-Id: 62608 X-Patchwork-Delegate: david.marchand@redhat.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 C19D5A04AB; Wed, 6 Nov 2019 20:03:42 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 660911E8F3; Wed, 6 Nov 2019 20:02:48 +0100 (CET) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id 7A5221E8CA for ; Wed, 6 Nov 2019 20:02:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1573066962; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CGjZlG8PhTosHrE24E65RdpooCyoXnM5mX89zFgkDXE=; b=SZiXbhpIppxRyRyRDGY6DDxoPrxMy6LIydZ6BjJvWZkVqOM9E22XSPBRYhLoX2fy4K7Awk V7LJGlpfCJ8kaC4Jz0XTj4FY/MEK42+kvNH1ID4AkR33hFfOqe1Rftw9PCrgeSRwyCGeQR FjmncX//V+Gp5D/2ioZw/lqYkK5T2p8= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-222-oYVkib7LPLWD6fMYMW9Oog-1; Wed, 06 Nov 2019 14:02:38 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 71BAB800C72; Wed, 6 Nov 2019 19:02:37 +0000 (UTC) Received: from rh.redhat.com (unknown [10.36.118.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 751ED1001B35; Wed, 6 Nov 2019 19:02:33 +0000 (UTC) From: Kevin Traynor To: dev@dpdk.org Cc: david.marchand@redhat.com, Kevin Traynor , stable@dpdk.org, Ajit Khaparde Date: Wed, 6 Nov 2019 19:02:03 +0000 Message-Id: <20191106190203.10750-9-ktraynor@redhat.com> In-Reply-To: <20191106190203.10750-1-ktraynor@redhat.com> References: <20191001125315.6191-1-ktraynor@redhat.com> <20191106190203.10750-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: oYVkib7LPLWD6fMYMW9Oog-1 X-Mimecast-Spam-Score: 0 Subject: [dpdk-dev] [v2 PATCH 8/8] net/bnxt: remove commented out code 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" This commented out todo and code is old. Remove it. Fixes: b7435d660a8c ("net/bnxt: add ntuple filtering support") Cc: stable@dpdk.org Signed-off-by: Kevin Traynor Acked-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_ethdev.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index 7d9459f0a..58a4f98c9 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -2617,7 +2617,4 @@ parse_ntuple_filter(struct bnxt *bp, } - //TODO Priority - //nfilter->priority = (uint8_t)filter->priority; - bfilter->enables = en; return 0;