ena: Support srd metrics with sysctl
AcceptedPublic
Actions

Authored by osamaabb_amazon.com on Nov 17 2023, 6:03 PM.

Details

Reviewers

mw
akiyano_amazon.com

Summary

This commit introduces SRD metrics through sysctl.
The metrics can be queried using the following sysctl node:
sysctl dev.ena.<device index>.ena_srd_info

MFC after: 2 weeks
Sponsored by: Amazon, Inc.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Skipped

Unit

Tests Skipped

Event Timeline

osamaabb_amazon.com created this revision.Nov 17 2023, 6:03 PM

osamaabb_amazon.com created this object with edit policy "No One".

Herald added a subscriber: imp. · View Herald TranscriptNov 17 2023, 6:03 PM

osamaabb_amazon.com requested review of this revision.Nov 17 2023, 6:03 PM

osamaabb_amazon.com edited the summary of this revision. (Show Details)Nov 21 2023, 10:08 AM

osamaabb_amazon.com updated this revision to Diff 130568.Nov 25 2023, 9:31 AM

osamaabb_amazon.com edited the summary of this revision. (Show Details)Nov 26 2023, 6:54 PM

osamaabb_amazon.com changed the edit policy from "No One" to "Custom Policy".Dec 5 2023, 6:37 AM

mw accepted this revision.Dec 18 2023, 12:16 PM

This revision is now accepted and ready to land.Dec 18 2023, 12:16 PM

Revision Contents
Changeset List

Path

Size

sys/

dev/

ena/

ena.h

1 line

ena.c

10 lines

ena_sysctl.c

76 lines

Diff 130568

View Options

sys/dev/ena/ena.h

	Show First 20 Lines • Show All 4,688 Lines • ▼ Show 20 Lines
	* ixgbe_sbuf_fw_version			* ixgbe_sbuf_fw_version
	************************************************************************/			************************************************************************/
	static void			static void
	ixgbe_sbuf_fw_version(struct ixgbe_hw hw, struct sbuf buf)			ixgbe_sbuf_fw_version(struct ixgbe_hw hw, struct sbuf buf)
	{			{
	struct ixgbe_nvm_version nvm_ver = {0};			struct ixgbe_nvm_version nvm_ver = {0};
	uint16_t phyfw = 0;			uint16_t phyfw = 0;
	int status;			int status;
				const char *space = "";

				impUnsubmitted Not Done Inline Actions I'd add a const char space = ""; here imp:* I'd add a const char *space = ""; here
	ixgbe_get_oem_prod_version(hw, &nvm_ver); /* OEM's NVM version */			ixgbe_get_oem_prod_version(hw, &nvm_ver); /* OEM's NVM version */
	ixgbe_get_orom_version(hw, &nvm_ver); /* Option ROM */			ixgbe_get_orom_version(hw, &nvm_ver); /* Option ROM */
	ixgbe_get_etk_id(hw, &nvm_ver); /* eTrack identifies a build in Intel's SCM */			ixgbe_get_etk_id(hw, &nvm_ver); /* eTrack identifies a build in Intel's SCM */
	status = ixgbe_get_phy_firmware_version(hw, &phyfw);			status = ixgbe_get_phy_firmware_version(hw, &phyfw);

	if (nvm_ver.oem_valid)			if (nvm_ver.oem_valid) {
	sbuf_printf(buf, "NVM OEM V%d.%d R%d ", nvm_ver.oem_major,			sbuf_printf(buf, "NVM OEM V%d.%d R%d", nvm_ver.oem_major,
	nvm_ver.oem_minor, nvm_ver.oem_release);			nvm_ver.oem_minor, nvm_ver.oem_release);
				space = " ";
				}
				impUnsubmitted Done Inline Actions Then add space =" "; here with {} imp: Then add space =" "; here with {}

	if (nvm_ver.or_valid)			if (nvm_ver.or_valid) {
	sbuf_printf(buf, "Option ROM V%d-b%d-p%d ", nvm_ver.or_major,			sbuf_printf(buf, "%sOption ROM V%d-b%d-p%d",
				impUnsubmitted Done Inline Actions and use space here instead of this express.... imp: and use space here instead of this express....
	nvm_ver.or_build, nvm_ver.or_patch);			space, nvm_ver.or_major, nvm_ver.or_build, nvm_ver.or_patch);
				impUnsubmitted Done Inline Actions with the same space = " "; here. imp: with the same space = " "; here.
				space = " ";
				}

	if (nvm_ver.etk_id != ((NVM_VER_INVALID << NVM_ETK_SHIFT) \| NVM_VER_INVALID))			if (nvm_ver.etk_id != ((NVM_VER_INVALID << NVM_ETK_SHIFT) \|
	sbuf_printf(buf, "eTrack 0x%08x ", nvm_ver.etk_id);			NVM_VER_INVALID)) {
				impUnsubmitted Done Inline Actions and replace this with space. imp: and replace this with space.
				sbuf_printf(buf, "%seTrack 0x%08x", space, nvm_ver.etk_id);
				space = " ";
				}

	if (phyfw != 0 && status == IXGBE_SUCCESS)			if (phyfw != 0 && status == IXGBE_SUCCESS)
	sbuf_printf(buf, "PHY FW V%d ", phyfw);			sbuf_printf(buf, "%sPHY FW V%d", space, phyfw);
				impUnsubmitted Done Inline Actions I think you missed one of the trailing white spaces here.. It would have been trimmed before. imp: I think you missed one of the trailing white spaces here.. It would have been trimmed before.

	sbuf_trim(buf);
	} /* ixgbe_sbuf_fw_version */			} /* ixgbe_sbuf_fw_version */

	/************************************************************************			/************************************************************************
	* ixgbe_print_fw_version			* ixgbe_print_fw_version
	************************************************************************/			************************************************************************/
	static void			static void
	ixgbe_print_fw_version(if_ctx_t ctx)			ixgbe_print_fw_version(if_ctx_t ctx)
	{			{
	▲ Show 20 Lines • Show All 51 Lines • Show Last 20 Lines

View Options

sys/dev/ena/ena.c

	Show First 20 Lines • Show All 4,688 Lines • ▼ Show 20 Lines
	* ixgbe_sbuf_fw_version			* ixgbe_sbuf_fw_version
	************************************************************************/			************************************************************************/
	static void			static void
	ixgbe_sbuf_fw_version(struct ixgbe_hw hw, struct sbuf buf)			ixgbe_sbuf_fw_version(struct ixgbe_hw hw, struct sbuf buf)
	{			{
	struct ixgbe_nvm_version nvm_ver = {0};			struct ixgbe_nvm_version nvm_ver = {0};
	uint16_t phyfw = 0;			uint16_t phyfw = 0;
	int status;			int status;
				const char *space = "";

				impUnsubmitted Not Done Inline Actions I'd add a const char space = ""; here imp:* I'd add a const char *space = ""; here
	ixgbe_get_oem_prod_version(hw, &nvm_ver); /* OEM's NVM version */			ixgbe_get_oem_prod_version(hw, &nvm_ver); /* OEM's NVM version */
	ixgbe_get_orom_version(hw, &nvm_ver); /* Option ROM */			ixgbe_get_orom_version(hw, &nvm_ver); /* Option ROM */
	ixgbe_get_etk_id(hw, &nvm_ver); /* eTrack identifies a build in Intel's SCM */			ixgbe_get_etk_id(hw, &nvm_ver); /* eTrack identifies a build in Intel's SCM */
	status = ixgbe_get_phy_firmware_version(hw, &phyfw);			status = ixgbe_get_phy_firmware_version(hw, &phyfw);

	if (nvm_ver.oem_valid)			if (nvm_ver.oem_valid) {
	sbuf_printf(buf, "NVM OEM V%d.%d R%d ", nvm_ver.oem_major,			sbuf_printf(buf, "NVM OEM V%d.%d R%d", nvm_ver.oem_major,
	nvm_ver.oem_minor, nvm_ver.oem_release);			nvm_ver.oem_minor, nvm_ver.oem_release);
				space = " ";
				}
				impUnsubmitted Done Inline Actions Then add space =" "; here with {} imp: Then add space =" "; here with {}

	if (nvm_ver.or_valid)			if (nvm_ver.or_valid) {
	sbuf_printf(buf, "Option ROM V%d-b%d-p%d ", nvm_ver.or_major,			sbuf_printf(buf, "%sOption ROM V%d-b%d-p%d",
				impUnsubmitted Done Inline Actions and use space here instead of this express.... imp: and use space here instead of this express....
	nvm_ver.or_build, nvm_ver.or_patch);			space, nvm_ver.or_major, nvm_ver.or_build, nvm_ver.or_patch);
				impUnsubmitted Done Inline Actions with the same space = " "; here. imp: with the same space = " "; here.
				space = " ";
				}

	if (nvm_ver.etk_id != ((NVM_VER_INVALID << NVM_ETK_SHIFT) \| NVM_VER_INVALID))			if (nvm_ver.etk_id != ((NVM_VER_INVALID << NVM_ETK_SHIFT) \|
	sbuf_printf(buf, "eTrack 0x%08x ", nvm_ver.etk_id);			NVM_VER_INVALID)) {
				impUnsubmitted Done Inline Actions and replace this with space. imp: and replace this with space.
				sbuf_printf(buf, "%seTrack 0x%08x", space, nvm_ver.etk_id);
				space = " ";
				}

	if (phyfw != 0 && status == IXGBE_SUCCESS)			if (phyfw != 0 && status == IXGBE_SUCCESS)
	sbuf_printf(buf, "PHY FW V%d ", phyfw);			sbuf_printf(buf, "%sPHY FW V%d", space, phyfw);
				impUnsubmitted Done Inline Actions I think you missed one of the trailing white spaces here.. It would have been trimmed before. imp: I think you missed one of the trailing white spaces here.. It would have been trimmed before.

	sbuf_trim(buf);
	} /* ixgbe_sbuf_fw_version */			} /* ixgbe_sbuf_fw_version */

	/************************************************************************			/************************************************************************
	* ixgbe_print_fw_version			* ixgbe_print_fw_version
	************************************************************************/			************************************************************************/
	static void			static void
	ixgbe_print_fw_version(if_ctx_t ctx)			ixgbe_print_fw_version(if_ctx_t ctx)
	{			{
	▲ Show 20 Lines • Show All 51 Lines • Show Last 20 Lines

View Options

sys/dev/ena/ena_sysctl.c

	Show First 20 Lines • Show All 4,688 Lines • ▼ Show 20 Lines
	* ixgbe_sbuf_fw_version			* ixgbe_sbuf_fw_version
	************************************************************************/			************************************************************************/
	static void			static void
	ixgbe_sbuf_fw_version(struct ixgbe_hw hw, struct sbuf buf)			ixgbe_sbuf_fw_version(struct ixgbe_hw hw, struct sbuf buf)
	{			{
	struct ixgbe_nvm_version nvm_ver = {0};			struct ixgbe_nvm_version nvm_ver = {0};
	uint16_t phyfw = 0;			uint16_t phyfw = 0;
	int status;			int status;
				const char *space = "";

				impUnsubmitted Not Done Inline Actions I'd add a const char space = ""; here imp:* I'd add a const char *space = ""; here
	ixgbe_get_oem_prod_version(hw, &nvm_ver); /* OEM's NVM version */			ixgbe_get_oem_prod_version(hw, &nvm_ver); /* OEM's NVM version */
	ixgbe_get_orom_version(hw, &nvm_ver); /* Option ROM */			ixgbe_get_orom_version(hw, &nvm_ver); /* Option ROM */
	ixgbe_get_etk_id(hw, &nvm_ver); /* eTrack identifies a build in Intel's SCM */			ixgbe_get_etk_id(hw, &nvm_ver); /* eTrack identifies a build in Intel's SCM */
	status = ixgbe_get_phy_firmware_version(hw, &phyfw);			status = ixgbe_get_phy_firmware_version(hw, &phyfw);

	if (nvm_ver.oem_valid)			if (nvm_ver.oem_valid) {
	sbuf_printf(buf, "NVM OEM V%d.%d R%d ", nvm_ver.oem_major,			sbuf_printf(buf, "NVM OEM V%d.%d R%d", nvm_ver.oem_major,
	nvm_ver.oem_minor, nvm_ver.oem_release);			nvm_ver.oem_minor, nvm_ver.oem_release);
				space = " ";
				}
				impUnsubmitted Done Inline Actions Then add space =" "; here with {} imp: Then add space =" "; here with {}

	if (nvm_ver.or_valid)			if (nvm_ver.or_valid) {
	sbuf_printf(buf, "Option ROM V%d-b%d-p%d ", nvm_ver.or_major,			sbuf_printf(buf, "%sOption ROM V%d-b%d-p%d",
				impUnsubmitted Done Inline Actions and use space here instead of this express.... imp: and use space here instead of this express....
	nvm_ver.or_build, nvm_ver.or_patch);			space, nvm_ver.or_major, nvm_ver.or_build, nvm_ver.or_patch);
				impUnsubmitted Done Inline Actions with the same space = " "; here. imp: with the same space = " "; here.
				space = " ";
				}

	if (nvm_ver.etk_id != ((NVM_VER_INVALID << NVM_ETK_SHIFT) \| NVM_VER_INVALID))			if (nvm_ver.etk_id != ((NVM_VER_INVALID << NVM_ETK_SHIFT) \|
	sbuf_printf(buf, "eTrack 0x%08x ", nvm_ver.etk_id);			NVM_VER_INVALID)) {
				impUnsubmitted Done Inline Actions and replace this with space. imp: and replace this with space.
				sbuf_printf(buf, "%seTrack 0x%08x", space, nvm_ver.etk_id);
				space = " ";
				}

	if (phyfw != 0 && status == IXGBE_SUCCESS)			if (phyfw != 0 && status == IXGBE_SUCCESS)
	sbuf_printf(buf, "PHY FW V%d ", phyfw);			sbuf_printf(buf, "%sPHY FW V%d", space, phyfw);
				impUnsubmitted Done Inline Actions I think you missed one of the trailing white spaces here.. It would have been trimmed before. imp: I think you missed one of the trailing white spaces here.. It would have been trimmed before.

	sbuf_trim(buf);
	} /* ixgbe_sbuf_fw_version */			} /* ixgbe_sbuf_fw_version */

	/************************************************************************			/************************************************************************
	* ixgbe_print_fw_version			* ixgbe_print_fw_version
	************************************************************************/			************************************************************************/
	static void			static void
	ixgbe_print_fw_version(if_ctx_t ctx)			ixgbe_print_fw_version(if_ctx_t ctx)
	{			{
	▲ Show 20 Lines • Show All 51 Lines • Show Last 20 Lines

ena: Support srd metrics with sysctlAcceptedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 130568

sys/dev/ena/ena.h

sys/dev/ena/ena.c

sys/dev/ena/ena_sysctl.c

ena: Support srd metrics with sysctl
AcceptedPublic
Actions

Revision Contents
Changeset List