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 DB97844042; Thu, 16 May 2024 10:17:05 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 530BF4026E; Thu, 16 May 2024 10:17:05 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) by mails.dpdk.org (Postfix) with ESMTP id D4D324025C for ; Thu, 16 May 2024 10:13:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1715847197; x=1747383197; h=from:to:subject:date:message-id:mime-version: content-transfer-encoding; bh=C7pPfM1/neqSSpmrnJeDm/vMC59CJ+wdpv08QqHYiVU=; b=Jh3IplrTmIQPi3yGj/usDIIfieIJZaZgslLURid9icPNRLuWBHBNDQzh EIQu+4d78T2XLnS8RTu17iuSJ0Jdgtk8QXwQ6I7zmiRwmI3ueN3MQz+GL sUHEOmG93RC38DC+6jLmK7oVQuhHm9NZC8JxChsQvgnim/zZSLg58F+0f Rx9ynwA9AwyuinwGesMZMFgcbCX16aR2NeUXUkUNsP4dGr1Id9+ZS9AaH 2RNbMrGsG9XKYidBZqtpR3B7vXukStazwbt1wDLSoD0jAZ+qwPQGUoov4 zN5xZzkgiW3wIxthq/hFlLjSEJeGto5ItOozsNmjaU79vDtT7qUKzfgI/ g==; X-CSE-ConnectionGUID: bZVNZqr+Q7WWjtQ58t/vHQ== X-CSE-MsgGUID: FxnUGWxuS5mU55TzwwJ3aQ== X-IronPort-AV: E=McAfee;i="6600,9927,11074"; a="29440854" X-IronPort-AV: E=Sophos;i="6.08,163,1712646000"; d="scan'208";a="29440854" Received: from orviesa002.jf.intel.com ([10.64.159.142]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 May 2024 01:13:16 -0700 X-CSE-ConnectionGUID: BNj7f15nSXiSz8P0OunUXA== X-CSE-MsgGUID: 54f7WpydRrqilnGYNoPsPg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,163,1712646000"; d="scan'208";a="62191984" Received: from unknown (HELO srv24.iind.intel.com) ([10.138.167.40]) by orviesa002.jf.intel.com with ESMTP; 16 May 2024 01:13:14 -0700 From: Shaiq Wani To: dev@dpdk.org Subject: [PATCH v1] net/cpfl: check if DPDK is running on host IMC ACC Date: Thu, 16 May 2024 08:12:43 +0000 Message-Id: <20240516081243.576723-1-shaiqwani@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Mailman-Approved-At: Thu, 16 May 2024 10:17:04 +0200 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 Checks if DPDK is running on host, IMC or ACC Signed-off-by: Shaiq Wani --- get_running_host_id.patch | 70 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 get_running_host_id.patch diff --git a/get_running_host_id.patch b/get_running_host_id.patch new file mode 100644 index 0000000000..32aa3445ab --- /dev/null +++ b/get_running_host_id.patch @@ -0,0 +1,70 @@ +diff --git a/drivers/net/cpfl/cpfl_ethdev.c b/drivers/net/cpfl/cpfl_ethdev.c +index ef19aa1b6a..cc708039da 100644 +--- a/drivers/net/cpfl/cpfl_ethdev.c ++++ b/drivers/net/cpfl/cpfl_ethdev.c +@@ -2270,6 +2270,33 @@ cpfl_repr_allowlist_uninit(struct cpfl_adapter_ext *adapter) + rte_hash_free(adapter->repr_allowlist_hash); +} ++static uint8_t ++get_running_host_id(void) ++{ ++ char buf[BUFSIZ]; ++ FILE *fd; ++ uint8_t host_id = CPFL_INVALID_HOST_ID; ++ ++ fd = fopen("/etc/issue.net", "r"); ++ if (fd == NULL) { ++ PMD_INIT_LOG(ERR, "Cannot open /etc/issue.net\n"); ++ return host_id; ++ } ++ ++ if (fgets(buf, sizeof(buf), fd)) { ++ /* get the first line */ ++ if (strstr(buf, "IMC")) { ++ PMD_INIT_LOG(ERR, "CPFL PMD cannot running on IMC."); ++ } else if (strstr(buf, "ACC")) { ++ host_id = CPFL_HOST_ID_ACC; ++ } else { ++ host_id = CPFL_HOST_ID_HOST; ++ } ++ } ++ ++ fclose(fd); ++ return host_id; ++} +static int +cpfl_adapter_ext_init(struct rte_pci_device *pci_dev, struct cpfl_adapter_ext *adapter, +@@ -2290,6 +2317,7 @@ cpfl_adapter_ext_init(struct rte_pci_device *pci_dev, struct cpfl_adapter_ext *a + 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); + rte_memcpy(&base->caps, &req_caps, sizeof(struct virtchnl2_get_capabilities)); +diff --git a/drivers/net/cpfl/cpfl_ethdev.h b/drivers/net/cpfl/cpfl_ethdev.h +index 457db6d6be..3987afbd82 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,8 @@ 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 +299,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, \ No newline at end of file -- 2.34.1