From: Michal Wajdeczko <michal.wajdeczko@intel.com>
To: "Piotr Piórkowski" <piotr.piorkowski@intel.com>
Cc: intel-xe@lists.freedesktop.org
Subject: Re: [PATCH 7/8] drm/xe/pf: Track adverse events notifications from GuC
Date: Tue, 14 May 2024 18:23:13 +0200 [thread overview]
Message-ID: <3493ef4c-f4bf-4fd1-b77f-fbb5f82fc45e@intel.com> (raw)
In-Reply-To: <20240514103727.v46ftf2jodytv6kl@intel.com>
On 14.05.2024 12:37, Piotr Piórkowski wrote:
> Michal Wajdeczko <michal.wajdeczko@intel.com> wrote on pon [2024-maj-06 15:38:13 +0200]:
>> When thresholds used to monitor VFs activities are configured,
>> then GuC may send GUC2PF_ADVERSE_EVENT messages informing the
>> PF driver about exceeded thresholds. Start handling such messages.
>>
>> Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
>> ---
>> drivers/gpu/drm/xe/Makefile | 1 +
>> drivers/gpu/drm/xe/xe_gt_sriov_pf_monitor.c | 143 ++++++++++++++++++
>> drivers/gpu/drm/xe/xe_gt_sriov_pf_monitor.h | 27 ++++
>> .../gpu/drm/xe/xe_gt_sriov_pf_monitor_types.h | 22 +++
>> drivers/gpu/drm/xe/xe_gt_sriov_pf_types.h | 5 +
>> drivers/gpu/drm/xe/xe_guc_ct.c | 4 +
>> 6 files changed, 202 insertions(+)
>> create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf_monitor.c
>> create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf_monitor.h
>> create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf_monitor_types.h
>>
>> diff --git a/drivers/gpu/drm/xe/Makefile b/drivers/gpu/drm/xe/Makefile
>> index b620389761d5..31198375022a 100644
>> --- a/drivers/gpu/drm/xe/Makefile
>> +++ b/drivers/gpu/drm/xe/Makefile
>> @@ -164,6 +164,7 @@ xe-$(CONFIG_PCI_IOV) += \
>> xe_gt_sriov_pf_config.o \
>> xe_gt_sriov_pf_control.o \
>> xe_gt_sriov_pf_debugfs.o \
>> + xe_gt_sriov_pf_monitor.o \
>> xe_gt_sriov_pf_policy.o \
>> xe_gt_sriov_pf_service.o \
>> xe_lmtt.o \
>> diff --git a/drivers/gpu/drm/xe/xe_gt_sriov_pf_monitor.c b/drivers/gpu/drm/xe/xe_gt_sriov_pf_monitor.c
>> new file mode 100644
>> index 000000000000..2c0c5572a6cf
>> --- /dev/null
>> +++ b/drivers/gpu/drm/xe/xe_gt_sriov_pf_monitor.c
>> @@ -0,0 +1,143 @@
>> +// SPDX-License-Identifier: MIT
>> +/*
>> + * Copyright © 2023-2024 Intel Corporation
>> + */
>> +
>> +#include "abi/guc_actions_sriov_abi.h"
>> +#include "abi/guc_messages_abi.h"
>> +
>> +#include "xe_gt_sriov_pf_config.h"
>> +#include "xe_gt_sriov_pf_helpers.h"
>> +#include "xe_gt_sriov_pf_monitor.h"
>> +#include "xe_gt_sriov_printk.h"
>> +#include "xe_guc_klv_helpers.h"
>> +#include "xe_guc_klv_thresholds_set.h"
>> +
>> +/**
>> + * xe_gt_sriov_pf_monitor_flr - Process VF FLR.
>
> The description is more suitable for the VF FLR handling function
will try to improve
>
>> + * @gt: the &xe_gt
>> + * @vfid: the VF identifier
>> + *
>> + * On FLR this function will reset all event data related to the VF.
>> + * This function is for PF only.
>> + */
>> +void xe_gt_sriov_pf_monitor_flr(struct xe_gt *gt, u32 vfid)
>> +{
>> + int e;
>> +
>> + xe_gt_assert(gt, IS_SRIOV_PF(gt_to_xe(gt)));
>> + xe_gt_sriov_pf_assert_vfid(gt, vfid);
>> +
>> + for (e = 0; e < XE_GUC_KLV_NUM_THRESHOLDS; e++)
>> + gt->sriov.pf.vfs[vfid].monitor.guc.events[e] = 0;
>> +}
>> +
>> +static void pf_update_event_counter(struct xe_gt *gt, u32 vfid,
>> + enum xe_guc_klv_threshold_index e)
>> +{
>> + xe_gt_assert(gt, e < XE_GUC_KLV_NUM_THRESHOLDS);
>> + gt->sriov.pf.vfs[vfid].monitor.guc.events[e]++;
>> +}
>> +
>> +static int pf_handle_vf_threshold_event(struct xe_gt *gt, u32 vfid, u32 threshold)
>> +{
>> + char origin[8];
>> + int e;
>> +
>> + e = xe_guc_klv_threshold_key_to_index(threshold);
>> + xe_sriov_function_name(vfid, origin, sizeof(origin));
>> +
>> + /* was there a new KEY added that we missed? */
>> + if (unlikely(e < 0)) {
>> + xe_gt_sriov_notice(gt, "unknown threshold key %#x reported for %s\n",
>> + threshold, origin);
>> + return -ENOTCONN;
>> + }
>> +
>> + xe_gt_sriov_dbg(gt, "%s exceeded threshold %u %s\n",
>> + origin, xe_gt_sriov_pf_config_get_threshold(gt, vfid, e),
>> + xe_guc_klv_key_to_string(threshold));
>> +
>> + pf_update_event_counter(gt, vfid, e);
>> +
>> + return 0;
>> +}
>> +
>> +/**
>> + * xe_gt_sriov_pf_monitor_process_guc2pf - Handle adverse event notification from the GuC.
>> + * @gt: the &xe_gt
>> + * @msg: G2H event message
>> + * @len: length of the message
>> + *
>> + * This function is intended for PF only.
>> + *
>> + * Return: 0 on success or a negative error code on failure.
>> + */
>> +int xe_gt_sriov_pf_monitor_process_guc2pf(struct xe_gt *gt, const u32 *msg, u32 len)
>> +{
>> + struct xe_device *xe = gt_to_xe(gt);
>> + u32 vfid;
>> + u32 threshold;
>> +
>> + xe_gt_assert(gt, len >= GUC_HXG_MSG_MIN_LEN);
>> + xe_gt_assert(gt, FIELD_GET(GUC_HXG_MSG_0_ORIGIN, msg[0]) == GUC_HXG_ORIGIN_GUC);
>> + xe_gt_assert(gt, FIELD_GET(GUC_HXG_MSG_0_TYPE, msg[0]) == GUC_HXG_TYPE_EVENT);
>> + xe_gt_assert(gt, FIELD_GET(GUC_HXG_EVENT_MSG_0_ACTION, msg[0]) ==
>> + GUC_ACTION_GUC2PF_ADVERSE_EVENT);
>> +
>> + if (unlikely(!IS_SRIOV_PF(xe)))
>> + return -EPROTO;
>> +
>> + if (unlikely(FIELD_GET(GUC2PF_ADVERSE_EVENT_EVENT_MSG_0_MBZ, msg[0])))
>> + return -EPFNOSUPPORT;
>> +
>> + if (unlikely(len < GUC2PF_ADVERSE_EVENT_EVENT_MSG_LEN))
>> + return -EPROTO;
>> +
>> + vfid = FIELD_GET(GUC2PF_ADVERSE_EVENT_EVENT_MSG_1_VFID, msg[1]);
>> + threshold = FIELD_GET(GUC2PF_ADVERSE_EVENT_EVENT_MSG_2_THRESHOLD, msg[2]);
>> +
>> + if (unlikely(vfid > xe_gt_sriov_pf_get_totalvfs(gt)))
>> + return -EINVAL;
>> +
>> + return pf_handle_vf_threshold_event(gt, vfid, threshold);
>> +}
>> +
>> +/**
>> + * xe_gt_sriov_pf_monitor_print_events - Print adverse events counters.
>> + * @gt: the &xe_gt to print events from
>> + * @p: the &drm_printer
>> + *
>> + * Print adverse events counters for all VFs.
>> + * VFs with no events are not printed.
>> + *
>> + * This function can only be called on PF.
>> + */
>> +void xe_gt_sriov_pf_monitor_print_events(struct xe_gt *gt, struct drm_printer *p)
>> +{
>> + unsigned int n, total_vfs = xe_gt_sriov_pf_get_totalvfs(gt);
>> + const struct xe_gt_sriov_monitor *data;
>> + int e;
>> +
>
> If you describe that the function is only for PF, then add some assert.
it's already in xe_gt_sriov_pf_get_totalvfs() but since I'm using
gt.sriov.pf data here, will add explicit one as a documentation
>
>> + for (n = 1; n <= total_vfs; n++) {
>> + data = >->sriov.pf.vfs[n].monitor;
>> +
>> + for (e = 0; e < XE_GUC_KLV_NUM_THRESHOLDS; e++)
>> + if (data->guc.events[e])
>> + break;
>> +
>> + /* skip empty unless in debug mode */
>> + if (e >= XE_GUC_KLV_NUM_THRESHOLDS &&
>> + !IS_ENABLED(CONFIG_DRM_XE_DEBUG_SRIOV))
>> + continue;
>> +
>> +#define __format(...) "%s:%u "
>> +#define __value(TAG, NAME, ...) , #NAME, data->guc.events[MAKE_XE_GUC_KLV_THRESHOLD_INDEX(TAG)]
>> +
>> + drm_printf(p, "VF%u:\t" MAKE_XE_GUC_KLV_THRESHOLDS_SET(__format) "\n",
>> + n MAKE_XE_GUC_KLV_THRESHOLDS_SET(__value));
>> +
>> +#undef __format
>> +#undef __value
>> + }
>> +}
>> diff --git a/drivers/gpu/drm/xe/xe_gt_sriov_pf_monitor.h b/drivers/gpu/drm/xe/xe_gt_sriov_pf_monitor.h
>> new file mode 100644
>> index 000000000000..7ca9351a271b
>> --- /dev/null
>> +++ b/drivers/gpu/drm/xe/xe_gt_sriov_pf_monitor.h
>> @@ -0,0 +1,27 @@
>> +/* SPDX-License-Identifier: MIT */
>> +/*
>> + * Copyright © 2023-2024 Intel Corporation
>> + */
>> +
>> +#ifndef _XE_GT_SRIOV_PF_MONITOR_H_
>> +#define _XE_GT_SRIOV_PF_MONITOR_H_
>> +
>> +#include <linux/errno.h>
>> +#include <linux/types.h>
>> +
>> +struct drm_printer;
>> +struct xe_gt;
>> +
>> +void xe_gt_sriov_pf_monitor_flr(struct xe_gt *gt, u32 vfid);
>> +void xe_gt_sriov_pf_monitor_print_events(struct xe_gt *gt, struct drm_printer *p);
>> +
>> +#ifdef CONFIG_PCI_IOV
>> +int xe_gt_sriov_pf_monitor_process_guc2pf(struct xe_gt *gt, const u32 *msg, u32 len);
>> +#else
>> +static inline int xe_gt_sriov_pf_monitor_process_guc2pf(struct xe_gt *gt, const u32 *msg, u32 len)
>> +{
>> + return -EPROTO;
>> +}
>> +#endif
>> +
>> +#endif
>> diff --git a/drivers/gpu/drm/xe/xe_gt_sriov_pf_monitor_types.h b/drivers/gpu/drm/xe/xe_gt_sriov_pf_monitor_types.h
>> new file mode 100644
>> index 000000000000..e27c0308c5db
>> --- /dev/null
>> +++ b/drivers/gpu/drm/xe/xe_gt_sriov_pf_monitor_types.h
>> @@ -0,0 +1,22 @@
>> +/* SPDX-License-Identifier: MIT */
>> +/*
>> + * Copyright © 2023-2024 Intel Corporation
>> + */
>> +
>> +#ifndef _XE_GT_SRIOV_PF_MONITOR_TYPES_H_
>> +#define _XE_GT_SRIOV_PF_MONITOR_TYPES_H_
>> +
>> +#include "xe_guc_klv_thresholds_set_types.h"
>> +
>> +/**
>> + * struct xe_gt_sriov_monitor - GT level per-VF monitoring data.
>> + */
>> +struct xe_gt_sriov_monitor {
>> + /** @guc: monitoring data related to the GuC. */
>> + struct {
>> + /** @guc.events: number of adverse events reported by the GuC. */
>> + unsigned int events[XE_GUC_KLV_NUM_THRESHOLDS];
>> + } guc;
>> +};
>> +
>> +#endif
>> diff --git a/drivers/gpu/drm/xe/xe_gt_sriov_pf_types.h b/drivers/gpu/drm/xe/xe_gt_sriov_pf_types.h
>> index 880754f3e215..40cbaea3ef44 100644
>> --- a/drivers/gpu/drm/xe/xe_gt_sriov_pf_types.h
>> +++ b/drivers/gpu/drm/xe/xe_gt_sriov_pf_types.h
>> @@ -9,6 +9,7 @@
>> #include <linux/types.h>
>>
>> #include "xe_gt_sriov_pf_config_types.h"
>> +#include "xe_gt_sriov_pf_monitor_types.h"
>> #include "xe_gt_sriov_pf_policy_types.h"
>> #include "xe_gt_sriov_pf_service_types.h"
>>
>> @@ -18,6 +19,10 @@
>> struct xe_gt_sriov_metadata {
>> /** @config: per-VF provisioning data. */
>> struct xe_gt_sriov_config config;
>> +
>> + /** @monitor: per-VF monitoring data. */
>> + struct xe_gt_sriov_monitor monitor;
>> +
>> /** @version: negotiated VF/PF ABI version */
>> struct xe_gt_sriov_pf_service_version version;
>> };
>> diff --git a/drivers/gpu/drm/xe/xe_guc_ct.c b/drivers/gpu/drm/xe/xe_guc_ct.c
>> index 8ac819a7061e..be9aaf30974a 100644
>> --- a/drivers/gpu/drm/xe/xe_guc_ct.c
>> +++ b/drivers/gpu/drm/xe/xe_guc_ct.c
>> @@ -22,6 +22,7 @@
>> #include "xe_gt_pagefault.h"
>> #include "xe_gt_printk.h"
>> #include "xe_gt_sriov_pf_control.h"
>> +#include "xe_gt_sriov_pf_monitor.h"
>> #include "xe_gt_tlb_invalidation.h"
>> #include "xe_guc.h"
>> #include "xe_guc_relay.h"
>> @@ -1066,6 +1067,9 @@ static int process_g2h_msg(struct xe_guc_ct *ct, u32 *msg, u32 len)
>> case GUC_ACTION_GUC2PF_VF_STATE_NOTIFY:
>> ret = xe_gt_sriov_pf_control_process_guc2pf(gt, hxg, hxg_len);
>> break;
>> + case GUC_ACTION_GUC2PF_ADVERSE_EVENT:
>> + ret = xe_gt_sriov_pf_monitor_process_guc2pf(gt, hxg, hxg_len);
>> + break;
>> default:
>> xe_gt_err(gt, "unexpected G2H action 0x%04x\n", action);
>> }
>
> With fixes:
> Reviewed-by: Piotr Piórkowski <piotr.piorkowski@intel.com>
>
>
>> --
>> 2.43.0
>>
>
next prev parent reply other threads:[~2024-05-14 16:23 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-06 13:38 [PATCH 0/8] PF: Support for adverse events notifications Michal Wajdeczko
2024-05-06 13:38 ` [PATCH 1/8] drm/xe/guc: Add more KLV helper macros Michal Wajdeczko
2024-05-14 6:57 ` Piotr Piórkowski
2024-05-06 13:38 ` [PATCH 2/8] drm/xe/guc: Introduce GuC KLV thresholds set Michal Wajdeczko
2024-05-14 8:08 ` Piotr Piórkowski
2024-05-14 16:14 ` Michal Wajdeczko
2024-05-06 13:38 ` [PATCH 3/8] drm/xe/guc: Add support for threshold KLVs in to_string() helper Michal Wajdeczko
2024-05-14 8:20 ` Piotr Piórkowski
2024-05-14 16:15 ` Michal Wajdeczko
2024-05-06 13:38 ` [PATCH 4/8] drm/xe/pf: Introduce functions to configure VF thresholds Michal Wajdeczko
2024-05-14 8:31 ` Piotr Piórkowski
2024-05-14 16:19 ` Michal Wajdeczko
2024-05-06 13:38 ` [PATCH 5/8] drm/xe/pf: Allow configuration of VF thresholds over debugfs Michal Wajdeczko
2024-05-14 9:03 ` Piotr Piórkowski
2024-05-06 13:38 ` [PATCH 6/8] drm/xe/guc: Add GUC2PF_ADVERSE_EVENT to ABI Michal Wajdeczko
2024-05-14 9:14 ` Piotr Piórkowski
2024-05-06 13:38 ` [PATCH 7/8] drm/xe/pf: Track adverse events notifications from GuC Michal Wajdeczko
2024-05-14 10:37 ` Piotr Piórkowski
2024-05-14 16:23 ` Michal Wajdeczko [this message]
2024-05-06 13:38 ` [PATCH 8/8] drm/xe/pf: Expose PF monitor details via debugfs Michal Wajdeczko
2024-05-14 10:38 ` Piotr Piórkowski
2024-05-06 16:05 ` ✓ CI.Patch_applied: success for PF: Support for adverse events notifications Patchwork
2024-05-06 16:05 ` ✗ CI.checkpatch: warning " Patchwork
2024-05-06 16:06 ` ✓ CI.KUnit: success " Patchwork
2024-05-06 16:19 ` ✓ CI.Build: " Patchwork
2024-05-06 16:22 ` ✗ CI.Hooks: failure " Patchwork
2024-05-06 16:26 ` ✓ CI.checksparse: success " Patchwork
2024-05-06 17:48 ` ✓ CI.BAT: " Patchwork
2024-05-06 19:38 ` ✓ CI.FULL: " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3493ef4c-f4bf-4fd1-b77f-fbb5f82fc45e@intel.com \
--to=michal.wajdeczko@intel.com \
--cc=intel-xe@lists.freedesktop.org \
--cc=piotr.piorkowski@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).