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 D098B45501; Wed, 26 Jun 2024 21:57:48 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 599CD40B94; Wed, 26 Jun 2024 21:56:22 +0200 (CEST) Received: from egress-ip42a.ess.de.barracuda.com (egress-ip42a.ess.de.barracuda.com [18.185.115.201]) by mails.dpdk.org (Postfix) with ESMTP id 09898409FA for ; Wed, 26 Jun 2024 21:56:14 +0200 (CEST) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05lp2105.outbound.protection.outlook.com [104.47.18.105]) by mx-outbound42-4.eu-central-1c.ess.aws.cudaops.com (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Wed, 26 Jun 2024 19:56:13 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=A6i5vDAavENgZDr3BH0NLmVIZ0QKhFFC36S1Dy79D+W2GaDmWEvfbfAL7i+7GwLafBJmVu9HOJAAKzuVeQ3CnDFk8RvYK2+XohJY8T46CchEERK3gzTCyET92HgBiiEKghz2MhuaIsZb2+rP3DHHuU9VevfQBsPat1gMGiI626TKVGHbfLWWGBTr+1wot4WpvaVUG8RJCZs+GlM798aI3NvpkJP7ihpjjTIIyk/zA950OMU70JahnRAsbRBaIHffcOBTSud9N/htk0nQk/H/hzERGQcjijmFE/dk6a+EAXJvm+8E7zXUQrrLZCZGz7KqHxQzNi+WSJsCoEBdWptAhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=noNOMOxq/45rdfCGU55RNSEsb8EpMUo1DpTm+RceZOU=; b=g9lnmwrDvW2J3gfaaUomSdcXptJnE7cqcl0u1EJ83MP9WVcYiV2l10V9t8GsnFqzQ4TgXf7B6TE2K7wlFT9haCF9yQuAwvYjwFfQ3inbvmknyHRg09q8eSI4qNFHtKDJys7vKN4bjkypwhbaB/LgcC1X/pp8TqcpZs3iDz0nXXjGT18w8IgLthv6WmCdAudMapmkcAh69TWpn9klVNOaskpHrOZWAuk/1lmyG8v8u3m9Nn7lf5p15csLWA5NgRT4JGznw0DJsiMBz3NdSr1IjJ0uNX3el46Z20x9S7WloaRmKz8oZnUpKizm8rAIm2Ij8iqH/PcXnzBcWS/OJwGWaA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=fail (sender ip is 178.72.21.4) smtp.rcpttodomain=dpdk.org smtp.mailfrom=napatech.com; dmarc=fail (p=reject sp=reject pct=100) action=oreject header.from=napatech.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=napatech.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=noNOMOxq/45rdfCGU55RNSEsb8EpMUo1DpTm+RceZOU=; b=IhiUBd3ZI/Nr013w8dm+C/738aozotW23DZD9EXmijZ5pxCp2d6nq+CqkPg5p6Pvt1v4QQ4gzZVZMrttYdD6ikYby8SxtKQFfy/e/fy0zePSVKI8x0r8S+/j81lK8u6N/sysVvC5x2MTbmudYF50bI2ntb0S4gbbCIniWUEiXng= Received: from AS4P250CA0030.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:5e3::20) by VE1P190MB0896.EURP190.PROD.OUTLOOK.COM (2603:10a6:800:1a7::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7698.32; Wed, 26 Jun 2024 19:56:09 +0000 Received: from AMS0EPF000001AC.eurprd05.prod.outlook.com (2603:10a6:20b:5e3:cafe::b0) by AS4P250CA0030.outlook.office365.com (2603:10a6:20b:5e3::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7719.25 via Frontend Transport; Wed, 26 Jun 2024 19:56:09 +0000 X-MS-Exchange-Authentication-Results: spf=fail (sender IP is 178.72.21.4) smtp.mailfrom=napatech.com; dkim=none (message not signed) header.d=none;dmarc=fail action=oreject header.from=napatech.com; Received-SPF: Fail (protection.outlook.com: domain of napatech.com does not designate 178.72.21.4 as permitted sender) receiver=protection.outlook.com; client-ip=178.72.21.4; helo=localhost.localdomain; Received: from localhost.localdomain (178.72.21.4) by AMS0EPF000001AC.mail.protection.outlook.com (10.167.16.152) with Microsoft SMTP Server id 15.20.7677.15 via Frontend Transport; Wed, 26 Jun 2024 19:56:09 +0000 From: Serhii Iliushyk To: dev@dpdk.org Cc: mko-plv@napatech.com, sil-plv@napatech.com, ckm@napatech.com, andrew.rybchenko@oktetlabs.ru, ferruh.yigit@amd.com Subject: [PATCH v4 15/23] net/ntnic: add MAC and packet features Date: Wed, 26 Jun 2024 21:55:25 +0200 Message-ID: <20240626195545.1793419-15-sil-plv@napatech.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240626195545.1793419-1-sil-plv@napatech.com> References: <20240530144929.4127931-1-sil-plv@napatech.com> <20240626195545.1793419-1-sil-plv@napatech.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AMS0EPF000001AC:EE_|VE1P190MB0896:EE_ Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: 4f027198-5a2a-443a-1788-08dc961a062e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230038|82310400024|376012|36860700011|1800799022; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?TylZ2nTksDpWoqh8LyYNTxf19NDJxbB7xt0CrAUkRX+cGOj/rc0LtBosX4xy?= =?us-ascii?Q?1IbJnncP8P0rV4oiJvna3uDGegk9gFTRE6qMzz7Qipqr6VSNfBcNxncldmtt?= =?us-ascii?Q?oJyT5Ss2vVeGRggKxGsklHipcyWBVZfUMGByA0mfY/WZzHvsVXNbdhKKQOQ3?= =?us-ascii?Q?OKMzMm9xymJno2yFgseweYrBd1fCwvpwnljSB9zY3AJ8ZvOv0iXV6fchvjY/?= =?us-ascii?Q?jO/PTwUYOIeB6BlLQ7MLQihEp7SHk+2ydQEQ1nuILk5zC9A9LLjLt3l+AAMI?= =?us-ascii?Q?5//C0xFNOrTGXP0utJRcz4aUNUVmm/4qOAiAU3lymd1niLrbLBhXT+ziH4lh?= =?us-ascii?Q?L0DmKNvvj4ngePYHtLqn5mtFO0q+NNhIgvuyHJNcIJ+lLHA8kooZ9uclLedk?= =?us-ascii?Q?Sb/eC1HSe7bibYdPbokeHmAo6GMc8uT34oDROudPjo/n46Wq27mUtgCYWn7M?= =?us-ascii?Q?VJPLyWA5qBAmKCxPL+yVbg3KCssFW9c9CzLiapXXdP94gEvZRamXxx62be1E?= =?us-ascii?Q?vrvpSLS/JGUg2ZJkGpTlR1poAPPX9BVYbxKi4G4ls8bf8jr+jUKUxjMNf3HD?= =?us-ascii?Q?NkJ1Qs/nL+bt9Mm+MYf21uLeTYJ4GVQp/yTeVdaZHRvp8tjVFwGFfQ9n8sPx?= =?us-ascii?Q?6b7vaJN3kBuiWt96cUaDhXZRpIgeVrhrth0zIbGbWEcbeb/pXx/n49oXrn5W?= =?us-ascii?Q?ZhthP7vq9WaU5HwqCQOdl2vPTxXqg5chmH2FtI60fANheERDgmdius5iazkf?= =?us-ascii?Q?5EOcHIh/mAnJZZiqQtlAGn5qhmzQUyHsvX8UTXqIANdqCOG+tvA8grzVtSvK?= =?us-ascii?Q?u8dFcN+hGI9vLw6TkG+kU9HM/8DjT2qBesQ8kqpcHTxPPP+DY/6/OugMuW5R?= =?us-ascii?Q?fxCmnAscjPy1mbAm7TxRn0A597bUu/dqPZI49UOR2Y7k9St7ZfJjcF0mFk2f?= =?us-ascii?Q?oJ6hc9ylHPOMyPuM2neAWSmcCCfLbQDkxRiWPUib/b27nJAQx/gN3xvo5YNZ?= =?us-ascii?Q?5lmUY9YDhJ8NdUdt7GHnACi6dpiIDXfos3fp/YATea+1IevQ1yVeaeBBMbru?= =?us-ascii?Q?2d0g0H4yG+xs2S398+HcTPJcc/oOEfqd2DbgiQ/JsCe/2z2pjpmjr1xg996x?= =?us-ascii?Q?y4rHcUl/2AJmVk9Cuy2/52BY4slHHWMnG0oC+E94ogDED44n8ym+Lmf56UCl?= =?us-ascii?Q?XP7TvKvjCYmYshcorGdw9ZYwUmU5DBNF2sfrH4YVjVnthb5jD6nN+4JU9PkL?= =?us-ascii?Q?pETqhJJFCte+JIldcUGnfYcQVGwj7m+Fy8b6WQo20jVixCHlEVQak3EcdptB?= =?us-ascii?Q?ZwmxYFAoD4WCNdrChOzLL82md1H01O4KVJkSVIcOQUFMk4T2PxcTyQmDLt20?= =?us-ascii?Q?g25K3arft5+XzCg9gtS3FQ1/y23O5+7v6Gey9OrQivUewzV1o+g1Kiuuf7eS?= =?us-ascii?Q?Upz6HKtsFAeX6fU6idPNd1XshqTnSObi?= X-Forefront-Antispam-Report: CIP:178.72.21.4; CTRY:DK; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:localhost.localdomain; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230038)(82310400024)(376012)(36860700011)(1800799022); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: sgIvVojNaNaM1dtq0bcZSJnK51eRd5JWbFoYfkBT6+zXZsV0erwH865O/z4zgUN/cf3ho75dvOYyxGNlT6bp0uT0CEGeEq4v5a2LjAOZKmsR+Xl+VySBY4P2tYN12RNZ7rDu1GJkWAEYsjQsUggFcQit5ckPePgzwMnhYUwACkZI1V6YgIJYw9iyd0nS6rpzrGE3gdcnWwxrBVwoqd6nqBdYsoG4PchHRtUfbg2clWsC3seogM10n9V6C6DZgH0ReN2iWiZaNJKjyGfp3dC96NOVQ/oa8hJLQtkUdkajietjW5GIFKDl9WFdFqbjR/ABXmlT3l9ESX+KZh9/2N15VCqgIZ5ytv0slLla5hNuCinW37mdVp6l2+47GqatFh/OgjdR0VXk3R4AdOuL7HlOTWRlFOJwID11j6hLIpqkJolTtyhaT3Es2YkLHKsWtKW/SaaXbg5YrJAjjLJ+L7ArNBn4sW/YGJ+dPCZ0V/r5e3b4y+fd8yHQKaj6HSRk+pOwIf9Y1mJj1EE/PjLIXA/uz4bE8mnkO4H53HLTdDlKTdiA6TzQv4fBtMBVhDLGie+8WRf4OEOTmelnDAtbXDfc/5fnow/ILNsrcnnK5doM8S2K5aiaJX6P25ecv4T7JINGvPaKqvAa9WmfWlCKKST+4A== X-OriginatorOrg: napatech.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jun 2024 19:56:09.5361 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4f027198-5a2a-443a-1788-08dc961a062e X-MS-Exchange-CrossTenant-Id: c4540d0b-728a-4233-9da5-9ea30c7ec3ed X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=c4540d0b-728a-4233-9da5-9ea30c7ec3ed; Ip=[178.72.21.4]; Helo=[localhost.localdomain] X-MS-Exchange-CrossTenant-AuthSource: AMS0EPF000001AC.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1P190MB0896 X-BESS-ID: 1719431773-310756-4526-8804-1 X-BESS-VER: 2019.1_20240620.2317 X-BESS-Apparent-Source-IP: 104.47.18.105 X-BESS-Parts: H4sIAAAAAAACA4uuVkqtKFGyUioBkjpK+cVKViZmpuZAVgZQMNE0KSXJ0Ng4yd DUzMA0xSLVIiXFxNTYxNDA2NLQNCVFqTYWAKyhG1dBAAAA X-BESS-Outbound-Spam-Score: 0.00 X-BESS-Outbound-Spam-Report: Code version 3.2, rules version 3.2.2.257218 [from cloudscan20-13.eu-central-1b.ess.aws.cudaops.com] Rule breakdown below pts rule name description ---- ---------------------- -------------------------------- 0.00 BSF_BESS_OUTBOUND META: BESS Outbound X-BESS-Outbound-Spam-Status: SCORE=0.00 using account:ESS113687 scores of KILL_LEVEL=7.0 tests=BSF_BESS_OUTBOUND X-BESS-BRTS-Status: 1 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 Add basic control for MAC addresses packets and queues Signed-off-by: Serhii Iliushyk --- drivers/net/ntnic/include/ntos_drv.h | 15 +++++++++++ drivers/net/ntnic/ntnic_ethdev.c | 39 ++++++++++++++++++++++++++-- 2 files changed, 52 insertions(+), 2 deletions(-) diff --git a/drivers/net/ntnic/include/ntos_drv.h b/drivers/net/ntnic/include/ntos_drv.h index 0014e267ec..6fdffa8357 100644 --- a/drivers/net/ntnic/include/ntos_drv.h +++ b/drivers/net/ntnic/include/ntos_drv.h @@ -26,9 +26,24 @@ struct pmd_internals { char name[20]; int n_intf_no; int if_index; + int lpbk_mode; + uint8_t ts_multiplier; + uint16_t min_tx_pkt_size; + uint16_t max_tx_pkt_size; + unsigned int nb_rx_queues; + unsigned int nb_tx_queues; uint32_t port; uint32_t port_id; + /* Offset of the VF from the PF */ + uint8_t vf_offset; + nt_meta_port_type_t type; + /* if a virtual port type - the vhid */ + int vhid; struct drv_s *p_drv; + /* Ethernet (MAC) addresses. Element number zero denotes default address. */ + struct rte_ether_addr eth_addrs[NUM_MAC_ADDRS_PER_PORT]; + /* Multicast ethernet (MAC) addresses. */ + struct rte_ether_addr mc_addrs[NUM_MULTICAST_ADDRS_PER_PORT]; struct pmd_internals *next; }; diff --git a/drivers/net/ntnic/ntnic_ethdev.c b/drivers/net/ntnic/ntnic_ethdev.c index 364ef8df17..2d2a228bdc 100644 --- a/drivers/net/ntnic/ntnic_ethdev.c +++ b/drivers/net/ntnic/ntnic_ethdev.c @@ -19,6 +19,9 @@ #include "ntnic_mod_reg.h" #include "nt_util.h" +#define HW_MAX_PKT_LEN (10000) +#define MAX_MTU (HW_MAX_PKT_LEN - RTE_ETHER_HDR_LEN - RTE_ETHER_CRC_LEN) + #define EXCEPTION_PATH_HID 0 /* Global static variables: */ @@ -108,6 +111,16 @@ eth_dev_infos_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *dev_info dev_info->if_index = internals->if_index; dev_info->driver_name = internals->name; + dev_info->max_mac_addrs = NUM_MAC_ADDRS_PER_PORT; + dev_info->max_rx_pktlen = HW_MAX_PKT_LEN; + dev_info->max_mtu = MAX_MTU; + + if (internals->p_drv) { + dev_info->max_rx_queues = internals->nb_rx_queues; + dev_info->max_tx_queues = internals->nb_tx_queues; + + dev_info->min_rx_bufsize = 64; + } return 0; } @@ -142,8 +155,8 @@ eth_dev_stop(struct rte_eth_dev *eth_dev) { struct pmd_internals *internals = (struct pmd_internals *)eth_dev->data->dev_private; - NT_LOG_DBGX(DEBUG, NTNIC, "Port %u, %u\n", - internals->n_intf_no, internals->if_index); + NT_LOG_DBGX(DEBUG, NTNIC, "Port %u, %u, type %u\n", + internals->n_intf_no, internals->if_index, internals->type); eth_dev->data->dev_link.link_status = RTE_ETH_LINK_DOWN; return 0; @@ -212,6 +225,9 @@ eth_fw_version_get(struct rte_eth_dev *eth_dev, char *fw_version, size_t fw_size { struct pmd_internals *internals = (struct pmd_internals *)eth_dev->data->dev_private; + if (internals->type == PORT_TYPE_VIRTUAL || internals->type == PORT_TYPE_OVERRIDE) + return 0; + fpga_info_t *fpga_info = &internals->p_drv->ntdrv.adapter_info.fpga_info; const int length = snprintf(fw_version, fw_size, "%03d-%04d-%02d-%02d", fpga_info->n_fpga_type_id, fpga_info->n_fpga_prod_id, @@ -384,6 +400,12 @@ nthw_pci_dev_init(struct rte_pci_device *pci_dev) internals->pci_dev = pci_dev; internals->n_intf_no = n_intf_no; internals->if_index = n_intf_no; + internals->min_tx_pkt_size = 64; + internals->max_tx_pkt_size = 10000; + internals->type = PORT_TYPE_PHYSICAL; + internals->vhid = -1; + internals->nb_rx_queues = nb_rx_queues; + internals->nb_tx_queues = nb_tx_queues; /* Setup queue_ids */ @@ -399,6 +421,18 @@ nthw_pci_dev_init(struct rte_pci_device *pci_dev) 0 /*port*/, nb_tx_queues); } + /* Set MAC address (but only if the MAC address is permitted) */ + if (n_intf_no < fpga_info->nthw_hw_info.vpd_info.mn_mac_addr_count) { + const uint64_t mac = + fpga_info->nthw_hw_info.vpd_info.mn_mac_addr_value + n_intf_no; + internals->eth_addrs[0].addr_bytes[0] = (mac >> 40) & 0xFFu; + internals->eth_addrs[0].addr_bytes[1] = (mac >> 32) & 0xFFu; + internals->eth_addrs[0].addr_bytes[2] = (mac >> 24) & 0xFFu; + internals->eth_addrs[0].addr_bytes[3] = (mac >> 16) & 0xFFu; + internals->eth_addrs[0].addr_bytes[4] = (mac >> 8) & 0xFFu; + internals->eth_addrs[0].addr_bytes[5] = (mac >> 0) & 0xFFu; + } + eth_dev = rte_eth_dev_allocate(name); /* TODO: name */ if (!eth_dev) { @@ -413,6 +447,7 @@ nthw_pci_dev_init(struct rte_pci_device *pci_dev) /* connect structs */ internals->p_drv = p_drv; eth_dev->data->dev_private = internals; + eth_dev->data->mac_addrs = internals->eth_addrs; internals->port_id = eth_dev->data->port_id; -- 2.45.0