From nobody Thu Dec 28 13:57:20 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T197504qLz55sw1; Thu, 28 Dec 2023 13:57:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T19745Z6yz4XB2; Thu, 28 Dec 2023 13:57:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703771840; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PMQY/Ch4JC97ZNGD+owP3cLIqxvDfNW2Vpv03YOLguk=; b=Xs45OVLqQhhOztmuYM6FiGAAPH1B6v+4i23KzACNPHLnUrhX33qFeZ72P6gNxovLlpDBm6 5anjYiD0n6cDLClUUXf/2HiJvSrzhA4z0YYZNDjD0wasiHQo6Zrd+HJG/yQY31s3kYXEIC 99bLw2bzUk0nmxKYg7Ov9bWW4HzYwoQ2i7Dbtj5ftP/iCYygH2uamE+SXOg1A422iYY9Tn APMRq38gSyj2Bia2pIT7oQNtRzek+Xzz2Ckdm7xwXfm/rL5+IUeoebA6SlTyr5jk7VApnF PxuNyqfmhMDSo2PzEAVcqhjzw4C/mNQgiXii9xNKgHSrHLAz3o9WmH9DYy3DFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703771840; a=rsa-sha256; cv=none; b=xTLt3q+othWXlmsbMmVElA37gJw+gZn52mB5pv4XLe/f/8Pf/CRMX2aajJsBYZcbOHN4o3 JzzeaD/0xXEbv/H7x5BCvciakNvZnqV2/GHcixbB8kvv5unC4/R4o2HkxNMqBAE8TEXKgU 99+c+LqA+FHbnka+/yykl4kqZo3gIvtLWb+eeQf4hi/5JECPspv0BpS87HMrEH2P/c7Dep 2UsphyiQjul8QnCb4UQOIID7LmwWQJc6mJyyxvFuRDe8lQMgRQkbg2Mq2nm/jCboys4D8R zy5wGUswrVXQTObxS/UKzFPstUc2i5w2Yp0EfQNpR+nbP897G2678OCroBeBow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703771840; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PMQY/Ch4JC97ZNGD+owP3cLIqxvDfNW2Vpv03YOLguk=; b=vbS79KctSheNq3nTv6qTKmDB0MEqb328vp7d9QCnJQATQD4b2wK/ibLvk/3O9HIsutqtxt hBaO/qAYmuoTy21ISeyExb+rdVcKIAiGlIwkkBLJIOiE5dZEK48h9GQBr439OQiFlOKBsJ MLWBiJYlVtfuVmG+dXmpWM3l3MLOxuVjkKb4cgRY/4fDvaGaXIEYNPMxEpblziV3KllL+9 ggOX6Nb3sKyJRmFZZrab735AtZjenWS5BmacyiKBUrieQ1Jddt5VGY2OdXz6xDL4s4xMYj YDScK8C1upWbD2KbeFdIZyR0RQ3B0u3se6LDcDhMswg5FFZLyFJyEPbAL+IzBA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T19744dwzzB20; Thu, 28 Dec 2023 13:57:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BSDvKpi036276; Thu, 28 Dec 2023 13:57:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BSDvK9Q036273; Thu, 28 Dec 2023 13:57:20 GMT (envelope-from git) Date: Thu, 28 Dec 2023 13:57:20 GMT Message-Id: <202312281357.3BSDvK9Q036273@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Arthur Kiyanovski Subject: git: 36d42c862f4a - main - ena: Support srd metrics with sysctl List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: akiyano X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 36d42c862f4a5643f6e2395e8d7b7e5c4580499a Auto-Submitted: auto-generated The branch main has been updated by akiyano: URL: https://cgit.FreeBSD.org/src/commit/?id=36d42c862f4a5643f6e2395e8d7b7e5c4580499a commit 36d42c862f4a5643f6e2395e8d7b7e5c4580499a Author: Osama Abboud AuthorDate: 2023-09-12 11:17:45 +0000 Commit: Arthur Kiyanovski CommitDate: 2023-12-28 13:56:30 +0000 ena: Support srd metrics with sysctl This commit introduces SRD metrics through sysctl. The metrics can be queried using the following sysctl node: sysctl dev.ena..ena_srd_info Approved by: cperciva (mentor) MFC after: 2 weeks Sponsored by: Amazon, Inc. --- sys/dev/ena/ena.c | 10 +++++++ sys/dev/ena/ena.h | 1 + sys/dev/ena/ena_sysctl.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 86 insertions(+), 1 deletion(-) diff --git a/sys/dev/ena/ena.c b/sys/dev/ena/ena.c index 64c3d79f00db..45bca630b4c2 100644 --- a/sys/dev/ena/ena.c +++ b/sys/dev/ena/ena.c @@ -166,6 +166,7 @@ static int ena_enable_msix_and_set_admin_interrupts(struct ena_adapter *); static void ena_update_on_link_change(void *, struct ena_admin_aenq_entry *); static void unimplemented_aenq_handler(void *, struct ena_admin_aenq_entry *); static int ena_copy_eni_metrics(struct ena_adapter *); +static int ena_copy_srd_metrics(struct ena_adapter *); static int ena_copy_customer_metrics(struct ena_adapter *); static void ena_timer_service(void *); @@ -3306,6 +3307,12 @@ ena_copy_eni_metrics(struct ena_adapter *adapter) return (rc); } +static int +ena_copy_srd_metrics(struct ena_adapter *adapter) +{ + return ena_com_get_ena_srd_info(adapter->ena_dev, &adapter->ena_srd_info); +} + static int ena_copy_customer_metrics(struct ena_adapter *adapter) { @@ -3568,6 +3575,9 @@ ena_metrics_task(void *arg, int pending) else if (ena_com_get_cap(adapter->ena_dev, ENA_ADMIN_ENI_STATS)) (void)ena_copy_eni_metrics(adapter); + if (ena_com_get_cap(adapter->ena_dev, ENA_ADMIN_ENA_SRD_INFO)) + (void)ena_copy_srd_metrics(adapter); + ENA_LOCK_UNLOCK(); } diff --git a/sys/dev/ena/ena.h b/sys/dev/ena/ena.h index 18988d719a18..5647fe973502 100644 --- a/sys/dev/ena/ena.h +++ b/sys/dev/ena/ena.h @@ -487,6 +487,7 @@ struct ena_adapter { struct ena_stats_dev dev_stats; struct ena_hw_stats hw_stats; struct ena_admin_eni_stats eni_metrics; + struct ena_admin_ena_srd_info ena_srd_info; uint64_t *customer_metrics_array; enum ena_regs_reset_reason_types reset_reason; diff --git a/sys/dev/ena/ena_sysctl.c b/sys/dev/ena/ena_sysctl.c index 82030a2a7539..5efad01f372e 100644 --- a/sys/dev/ena/ena_sysctl.c +++ b/sys/dev/ena/ena_sysctl.c @@ -38,6 +38,7 @@ static void ena_sysctl_add_wd(struct ena_adapter *); static void ena_sysctl_add_stats(struct ena_adapter *); static void ena_sysctl_add_eni_metrics(struct ena_adapter *); static void ena_sysctl_add_customer_metrics(struct ena_adapter *); +static void ena_sysctl_add_srd_info(struct ena_adapter *); static void ena_sysctl_add_tuneables(struct ena_adapter *); static void ena_sysctl_add_irq_affinity(struct ena_adapter *); /* Kernel option RSS prevents manipulation of key hash and indirection table. */ @@ -59,18 +60,46 @@ static int ena_sysctl_rss_indir_table(SYSCTL_HANDLER_ARGS); #define ENA_METRICS_MAX_SAMPLE_INTERVAL 3600 #define ENA_HASH_KEY_MSG_SIZE (ENA_HASH_KEY_SIZE * 2 + 1) -#define SYSCTL_GSTRING_LEN 64 +#define SYSCTL_GSTRING_LEN 128 #define ENA_METRIC_ENI_ENTRY(stat, desc) { \ .name = #stat, \ .description = #desc, \ } +#define ENA_STAT_ENTRY(stat, desc, stat_type) { \ + .name = #stat, \ + .description = #desc, \ + .stat_offset = offsetof(struct ena_admin_##stat_type, stat) / sizeof(u64), \ +} + +#define ENA_STAT_ENA_SRD_ENTRY(stat, desc) \ + ENA_STAT_ENTRY(stat, desc, ena_srd_stats) + struct ena_hw_metrics { char name[SYSCTL_GSTRING_LEN]; char description[SYSCTL_GSTRING_LEN]; }; +struct ena_srd_metrics { + char name[SYSCTL_GSTRING_LEN]; + char description[SYSCTL_GSTRING_LEN]; + int stat_offset; +}; + +static const struct ena_srd_metrics ena_srd_stats_strings[] = { + ENA_STAT_ENA_SRD_ENTRY( + ena_srd_tx_pkts, Number of packets transmitted over ENA SRD), + ENA_STAT_ENA_SRD_ENTRY( + ena_srd_eligible_tx_pkts, Number of packets transmitted or could + have been transmitted over ENA SRD), + ENA_STAT_ENA_SRD_ENTRY( + ena_srd_rx_pkts, Number of packets received over ENA SRD), + ENA_STAT_ENA_SRD_ENTRY( + ena_srd_resource_utilization, Percentage of the ENA SRD resources + that are in use), +}; + static const struct ena_hw_metrics ena_hw_stats_strings[] = { ENA_METRIC_ENI_ENTRY( bw_in_allowance_exceeded, Inbound BW allowance exceeded), @@ -91,6 +120,7 @@ static const struct ena_hw_metrics ena_hw_stats_strings[] = { #endif #define ENA_CUSTOMER_METRICS_ARRAY_SIZE ARRAY_SIZE(ena_hw_stats_strings) +#define ENA_SRD_METRICS_ARRAY_SIZE ARRAY_SIZE(ena_srd_stats_strings) static SYSCTL_NODE(_hw, OID_AUTO, ena, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, "ENA driver parameters"); @@ -153,6 +183,9 @@ ena_sysctl_add_nodes(struct ena_adapter *adapter) else if (ena_com_get_cap(dev, ENA_ADMIN_ENI_STATS)) ena_sysctl_add_eni_metrics(adapter); + if (ena_com_get_cap(adapter->ena_dev, ENA_ADMIN_ENA_SRD_INFO)) + ena_sysctl_add_srd_info(adapter); + ena_sysctl_add_wd(adapter); ena_sysctl_add_stats(adapter); ena_sysctl_add_tuneables(adapter); @@ -379,6 +412,47 @@ ena_sysctl_add_stats(struct ena_adapter *adapter) &admin_stats->no_completion, 0, "Commands not completed"); } +static void +ena_sysctl_add_srd_info(struct ena_adapter *adapter) +{ + device_t dev; + + struct sysctl_oid *ena_srd_info; + struct sysctl_oid_list *srd_list; + + struct sysctl_ctx_list *ctx; + struct sysctl_oid *tree; + struct sysctl_oid_list *child; + + struct ena_admin_ena_srd_stats *srd_stats_ptr; + struct ena_srd_metrics cur_stat_strings; + + int i; + + dev = adapter->pdev; + + ctx = device_get_sysctl_ctx(dev); + tree = device_get_sysctl_tree(dev); + child = SYSCTL_CHILDREN(tree); + + ena_srd_info = SYSCTL_ADD_NODE(ctx, child, OID_AUTO, "ena_srd_info", + CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, "ENA's SRD information"); + srd_list = SYSCTL_CHILDREN(ena_srd_info); + + SYSCTL_ADD_U64(ctx, srd_list, OID_AUTO, "ena_srd_mode", + CTLFLAG_RD, &adapter->ena_srd_info.flags, 0, + "Describes which ENA-express features are enabled"); + + srd_stats_ptr = &adapter->ena_srd_info.ena_srd_stats; + + for (i = 0 ; i < ENA_SRD_METRICS_ARRAY_SIZE; i++) { + cur_stat_strings = ena_srd_stats_strings[i]; + SYSCTL_ADD_U64(ctx, srd_list, OID_AUTO, cur_stat_strings.name, + CTLFLAG_RD, (u64 *)srd_stats_ptr + cur_stat_strings.stat_offset, + 0, cur_stat_strings.description); + } +} + static void ena_sysctl_add_customer_metrics(struct ena_adapter *adapter) {