From patchwork Thu Apr 20 16:20:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zhang X-Patchwork-Id: 126294 X-Patchwork-Delegate: qi.z.zhang@intel.com 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 2670F42995; Thu, 20 Apr 2023 10:01:49 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 032B140A4B; Thu, 20 Apr 2023 10:01:49 +0200 (CEST) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mails.dpdk.org (Postfix) with ESMTP id 3381240687 for ; Thu, 20 Apr 2023 10:01:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1681977707; x=1713513707; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=WO8YZbFi9nq+F9xNtIUzjhM/wpJ31KKYBncCAjmxR9U=; b=P4m/KjRej3Sls9P2yDKJ+h20cqzVhm37M06pYxhNBTPPS+EOkbm3dlqM 173+1AenzkkhS8nXkoMSxXZOk4T8G0Dww8n0wkL09NNS8HPYXheM1Oflg kyNpxmCvYM2vUXLkcoS4bR+TPJAdloJeDIlILnlnawjLUMDszSIK2j5Eq vL4lDr2y2YXkz6pn26gK/KyRcy5/52DTxXagqLoI4e4RQN71PP2hAPh8F ArtrOfMkGGnZMBAVq4d+uR3XY76ZDMTyJJ7TTge04YVOI5HOoX6dgs5i0 qFGJSYTbr9UO6eGwr2W8IAYTkfcgpMVGLnpgrHOe6gtv/33eKKKkxf47j A==; X-IronPort-AV: E=McAfee;i="6600,9927,10685"; a="344419945" X-IronPort-AV: E=Sophos;i="5.99,212,1677571200"; d="scan'208";a="344419945" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Apr 2023 01:01:46 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10685"; a="835628417" X-IronPort-AV: E=Sophos;i="5.99,212,1677571200"; d="scan'208";a="835628417" Received: from dpdk-qzhan15-test02.sh.intel.com ([10.67.115.37]) by fmsmga001.fm.intel.com with ESMTP; 20 Apr 2023 01:01:45 -0700 From: Qi Zhang To: beilei.xing@intel.com Cc: dev@dpdk.org, Qi Zhang Subject: [PATCH] common/idpf: remove unnecessary field in vport Date: Thu, 20 Apr 2023 12:20:38 -0400 Message-Id: <20230420162038.637079-1-qi.z.zhang@intel.com> X-Mailer: git-send-email 2.31.1 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 Remove the pointer to rte_eth_dev instance, as 1. there is already a pointer to rte_eth_dev_data. 2. a pointer to rte_eth_dev will break multi-process usage. Signed-off-by: Qi Zhang Acked-by: Beilei Xing --- drivers/common/idpf/idpf_common_device.h | 1 - drivers/net/cpfl/cpfl_ethdev.c | 4 ++-- drivers/net/idpf/idpf_ethdev.c | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/common/idpf/idpf_common_device.h b/drivers/common/idpf/idpf_common_device.h index 7a54f7c937..d29bcc71ab 100644 --- a/drivers/common/idpf/idpf_common_device.h +++ b/drivers/common/idpf/idpf_common_device.h @@ -117,7 +117,6 @@ struct idpf_vport { struct virtchnl2_vport_stats eth_stats_offset; - void *dev; /* Event from ipf */ bool link_up; uint32_t link_speed; diff --git a/drivers/net/cpfl/cpfl_ethdev.c b/drivers/net/cpfl/cpfl_ethdev.c index f1d4425ce2..680c2326ec 100644 --- a/drivers/net/cpfl/cpfl_ethdev.c +++ b/drivers/net/cpfl/cpfl_ethdev.c @@ -1061,7 +1061,8 @@ static void cpfl_handle_event_msg(struct idpf_vport *vport, uint8_t *msg, uint16_t msglen) { struct virtchnl2_event *vc_event = (struct virtchnl2_event *)msg; - struct rte_eth_dev *dev = (struct rte_eth_dev *)vport->dev; + struct rte_eth_dev_data *data = vport->dev_data; + struct rte_eth_dev *dev = &rte_eth_devices[data->port_id]; if (msglen < sizeof(struct virtchnl2_event)) { PMD_DRV_LOG(ERR, "Error event"); @@ -1245,7 +1246,6 @@ cpfl_dev_vport_init(struct rte_eth_dev *dev, void *init_params) vport->adapter = &adapter->base; vport->sw_idx = param->idx; vport->devarg_id = param->devarg_id; - vport->dev = dev; memset(&create_vport_info, 0, sizeof(create_vport_info)); ret = idpf_vport_info_init(vport, &create_vport_info); diff --git a/drivers/net/idpf/idpf_ethdev.c b/drivers/net/idpf/idpf_ethdev.c index e01eb3a2ec..38ad4e7ac0 100644 --- a/drivers/net/idpf/idpf_ethdev.c +++ b/drivers/net/idpf/idpf_ethdev.c @@ -1024,7 +1024,8 @@ static void idpf_handle_event_msg(struct idpf_vport *vport, uint8_t *msg, uint16_t msglen) { struct virtchnl2_event *vc_event = (struct virtchnl2_event *)msg; - struct rte_eth_dev *dev = (struct rte_eth_dev *)vport->dev; + struct rte_eth_dev_data *data = vport->dev_data; + struct rte_eth_dev *dev = &rte_eth_devices[data->port_id]; if (msglen < sizeof(struct virtchnl2_event)) { PMD_DRV_LOG(ERR, "Error event"); @@ -1235,7 +1236,6 @@ idpf_dev_vport_init(struct rte_eth_dev *dev, void *init_params) vport->adapter = &adapter->base; vport->sw_idx = param->idx; vport->devarg_id = param->devarg_id; - vport->dev = dev; memset(&create_vport_info, 0, sizeof(create_vport_info)); ret = idpf_vport_info_init(vport, &create_vport_info);