From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4333744173; Thu, 6 Jun 2024 12:45:29 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2DE4B42DF0; Thu, 6 Jun 2024 12:45:29 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) by mails.dpdk.org (Postfix) with ESMTP id 3B62D40299 for ; Thu, 6 Jun 2024 12:45:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1717670727; x=1749206727; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=WnPAMAGcxxz0Po3X5x/GQ72/H0qDtpRWj7ilbm36WaM=; b=S2fghHPymlK8A3HAdr1xVUflWghHpFgZznQfLzFsxWcSAJ+krANv4iaY Okt4sIYEXxIDP8Pay/CX6vWPgrNWUvJJrcwbXaGuYhARpCjQVz8NQu0z1 S4ezbJHjLrU6oDHCusyRP+5JIAm3dOuIOUeiiOi/ZO0IqGoD7AdUNSzpN Am2pTZTv7JlCPQCzWwc8xs8eJ/FG4kKYEdyXZuiceY6wRu03NnoYST32Q lmaE/awHt9cPz+0qdlfkeBc6QeGt/EB9pKKg65Ood108cYliwvFCZ9BAM cJb3/+k/jbn8wq0D5u3qQAB9KuM3jvJqWaPpHS4SeOEZVavtbiH4FVNVj g==; X-CSE-ConnectionGUID: obwbBObUQAql28Q7ty5cJg== X-CSE-MsgGUID: zL877tDTQBeZa7LhApviJQ== X-IronPort-AV: E=McAfee;i="6600,9927,11094"; a="31872586" X-IronPort-AV: E=Sophos;i="6.08,219,1712646000"; d="scan'208";a="31872586" Received: from orviesa009.jf.intel.com ([10.64.159.149]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jun 2024 03:45:26 -0700 X-CSE-ConnectionGUID: ed3K9z1cQFS1x7I1T0aozA== X-CSE-MsgGUID: g4bv4kArQD+l8pLlOIZsKA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,219,1712646000"; d="scan'208";a="37990206" Received: from unknown (HELO srv24.iind.intel.com) ([10.138.167.40]) by orviesa009.jf.intel.com with ESMTP; 06 Jun 2024 03:45:25 -0700 From: Shaiq Wani To: dev@dpdk.org Subject: [PATCH v5] net/cpfl: get running host ID for CPFL PMD Date: Thu, 6 Jun 2024 10:44:22 +0000 Message-Id: <20240606104422.1230909-1-shaiq.wani@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240530093958.801348-1-shaiq.wani@intel.com> References: <20240530093958.801348-1-shaiq.wani@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Check whether CPFL PMD runs on Host or ACC --- v2 Changes: -Changed implementation based on review comment. v3 Changes: -Fixed indentation. v4 Changes: -Fix ipu_imc and ipu_acc to ipu-imc and ipu-acc. v5 Changes: -Updated the documentation with the changes implemented in this patch. --- Signed-off-by: Shaiq Wani --- doc/guides/nics/cpfl.rst | 3 +++ drivers/net/cpfl/cpfl_ethdev.c | 19 +++++++++++++++++++ drivers/net/cpfl/cpfl_ethdev.h | 5 ++++- 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/doc/guides/nics/cpfl.rst b/doc/guides/nics/cpfl.rst index 9b7a99c894..3430ac7398 100644 --- a/doc/guides/nics/cpfl.rst +++ b/doc/guides/nics/cpfl.rst @@ -150,6 +150,9 @@ Runtime Configuration Then the PMD will load json file for device ``ca:00.0``. The parameter is optional. + As CPFL PMD can run on both XEON host and IPU's ACC, the driver dynamically detects + which system it is running on using get_running_host_id functionality. + Driver compilation and testing ------------------------------ diff --git a/drivers/net/cpfl/cpfl_ethdev.c b/drivers/net/cpfl/cpfl_ethdev.c index ef19aa1b6a..4e9fea9643 100644 --- a/drivers/net/cpfl/cpfl_ethdev.c +++ b/drivers/net/cpfl/cpfl_ethdev.c @@ -14,6 +14,7 @@ #include "cpfl_ethdev.h" #include +#include #include "cpfl_rxtx.h" #include "cpfl_flow.h" #include "cpfl_rules.h" @@ -2270,6 +2271,23 @@ cpfl_repr_allowlist_uninit(struct cpfl_adapter_ext *adapter) rte_hash_free(adapter->repr_allowlist_hash); } +static uint8_t +get_running_host_id(void) +{ + struct utsname unamedata; + uint8_t host_id = CPFL_INVALID_HOST_ID; + + if (uname(&unamedata) != 0) + PMD_INIT_LOG(ERR, "Cannot fetch node_name for host\n"); + else if (strstr(unamedata.nodename, "ipu-imc")) + PMD_INIT_LOG(ERR, "CPFL PMD cannot be running on IMC."); + else if (strstr(unamedata.nodename, "ipu-acc")) + host_id = CPFL_HOST_ID_ACC; + else + host_id = CPFL_HOST_ID_HOST; + + return host_id; +} static int cpfl_adapter_ext_init(struct rte_pci_device *pci_dev, struct cpfl_adapter_ext *adapter, @@ -2289,6 +2307,7 @@ cpfl_adapter_ext_init(struct rte_pci_device *pci_dev, struct cpfl_adapter_ext *a hw->vendor_id = pci_dev->id.vendor_id; hw->device_id = pci_dev->id.device_id; hw->subsystem_vendor_id = pci_dev->id.subsystem_vendor_id; + adapter->host_id = get_running_host_id(); strncpy(adapter->name, pci_dev->device.name, PCI_PRI_STR_SIZE); diff --git a/drivers/net/cpfl/cpfl_ethdev.h b/drivers/net/cpfl/cpfl_ethdev.h index 457db6d6be..3f6f9ca5ea 100644 --- a/drivers/net/cpfl/cpfl_ethdev.h +++ b/drivers/net/cpfl/cpfl_ethdev.h @@ -66,6 +66,7 @@ #define CPFL_PF_TYPE_NUM 2 #define CPFL_HOST_ID_HOST 0 #define CPFL_HOST_ID_ACC 1 +#define CPFL_INVALID_HOST_ID UINT8_MAX #define CPFL_PF_TYPE_APF 0 #define CPFL_PF_TYPE_CPF 1 @@ -230,6 +231,7 @@ struct cpfl_adapter_ext { uint8_t ctrl_vport_recv_info[IDPF_DFLT_MBX_BUF_SIZE]; struct idpf_ctlq_info *ctlqp[CPFL_CFGQ_NUM]; struct cpfl_ctlq_create_info cfgq_info[CPFL_CFGQ_NUM]; + uint8_t host_id; }; TAILQ_HEAD(cpfl_adapter_list, cpfl_adapter_ext); @@ -296,7 +298,8 @@ cpfl_get_vsi_id(struct cpfl_itf *itf) vport_identity.func_type = CPCHNL2_FTYPE_LAN_PF; /* host: CPFL_HOST0_CPF_ID, acc: CPFL_ACC_CPF_ID */ - vport_identity.pf_id = CPFL_ACC_CPF_ID; + vport_identity.pf_id = (itf->adapter->host_id == CPFL_HOST_ID_ACC) ? + CPFL_ACC_CPF_ID : CPFL_HOST0_CPF_ID; vport_identity.vf_id = 0; vport_identity.vport_id = vport_id; ret = rte_hash_lookup_data(itf->adapter->vport_map_hash, -- 2.34.1