Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 287F3CCD192 for ; Thu, 2 Oct 2025 05:54:13 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DAD2F10E7A4; Thu, 2 Oct 2025 05:54:11 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="CAldb6cL"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.15]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1DEF910E795 for ; Thu, 2 Oct 2025 05:54:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1759384449; x=1790920449; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=CM0fY+YK+2bQQqBMJqZsaDHM8rrke6zSSMJ29bxJrls=; b=CAldb6cLu2vl91vIIaQ42HL7D9WwRYZIQ4orq5yqSdGlV5+7o1oNmtgQ EM2ssA0lfIRc+0beiXH+jOXDKsclnc8okNj8x1RlihRk3w1BGy42kKrMX Qp/j+d88Rl3opb5KI4b+DM4xL98tJ7LfYZP7bkUnsZ6O9vDxE5s026o/w 64luAXN+Jwz/j/0S3BuzJT4w5ho5gQ66PXpNsNlXf4cXuUOF+Kz5pLO49 W7hFRHmm5Usef3AioAbNr/SAMh8TYF9n+dPjOMW2WppuR08+sVIgTibjA yyoSFJWXdoGpasjGhRybcmXkWZYNVKSX+5uc3Gw/41tII5sOi5zYJ9kgD g==; X-CSE-ConnectionGUID: 4qt5hn3qR8ysKdcmbTq6mQ== X-CSE-MsgGUID: TkLlLXreScGms29xqmFRQA== X-IronPort-AV: E=McAfee;i="6800,10657,11569"; a="65304513" X-IronPort-AV: E=Sophos;i="6.18,308,1751266800"; d="scan'208";a="65304513" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa107.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Oct 2025 22:54:07 -0700 X-CSE-ConnectionGUID: BjfmPq13QYm8OO9u5OT8UQ== X-CSE-MsgGUID: 5zaVxjXrQLe2A5DKDXhZxw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.18,308,1751266800"; d="scan'208";a="216083545" Received: from lstrano-desk.jf.intel.com ([10.54.39.91]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Oct 2025 22:54:07 -0700 From: Matthew Brost To: intel-xe@lists.freedesktop.org Subject: [PATCH v4 20/34] drm/xe/vf: Use GUC_HXG_TYPE_EVENT for GuC context register Date: Wed, 1 Oct 2025 22:53:48 -0700 Message-Id: <20251002055402.1865880-21-matthew.brost@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251002055402.1865880-1-matthew.brost@intel.com> References: <20251002055402.1865880-1-matthew.brost@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" The only case where the GuC submission backend cannot reason 100% correctly is when a GuC context is registered during VF post-migration recovery. In this scenario, it's possible that the GuC context register H2G is processed, but the immediately following schedule-enable H2G gets lost. A double register is harmless when using `GUC_HXG_TYPE_EVENT`, as GuC simply drops the duplicate H2G. To keep things simple, use `GUC_HXG_TYPE_EVENT` for all context registrations on VFs. Signed-off-by: Matthew Brost --- drivers/gpu/drm/xe/xe_guc_ct.c | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_guc_ct.c b/drivers/gpu/drm/xe/xe_guc_ct.c index d0fde371fae3..d84de8544532 100644 --- a/drivers/gpu/drm/xe/xe_guc_ct.c +++ b/drivers/gpu/drm/xe/xe_guc_ct.c @@ -736,6 +736,26 @@ static u16 next_ct_seqno(struct xe_guc_ct *ct, bool is_g2h_fence) return seqno; } +#define MAKE_ACTION(type, __action) \ +({ \ + FIELD_PREP(GUC_HXG_MSG_0_TYPE, type) | \ + FIELD_PREP(GUC_HXG_EVENT_MSG_0_ACTION | \ + GUC_HXG_EVENT_MSG_0_DATA0, __action); \ +}) + +static bool vf_action_can_safely_fail(struct xe_device *xe, u32 action) +{ + /* + * If we are VF resuming, we can't exactly track if a context + * registration has been completed in the GuC state machine, it is + * harmless to resend as it will just fail silently if + * GUC_HXG_TYPE_EVENT is used. + */ + return IS_SRIOV_VF(xe) && + (action == XE_GUC_ACTION_REGISTER_CONTEXT_MULTI_LRC || + action == XE_GUC_ACTION_REGISTER_CONTEXT); +} + #define H2G_CT_HEADERS (GUC_CTB_HDR_LEN + 1) /* one DW CTB header and one DW HxG header */ static int h2g_write(struct xe_guc_ct *ct, const u32 *action, u32 len, @@ -807,18 +827,14 @@ static int h2g_write(struct xe_guc_ct *ct, const u32 *action, u32 len, FIELD_PREP(GUC_CTB_MSG_0_NUM_DWORDS, len) | FIELD_PREP(GUC_CTB_MSG_0_FENCE, ct_fence_value); if (want_response) { - cmd[1] = - FIELD_PREP(GUC_HXG_MSG_0_TYPE, GUC_HXG_TYPE_REQUEST) | - FIELD_PREP(GUC_HXG_EVENT_MSG_0_ACTION | - GUC_HXG_EVENT_MSG_0_DATA0, action[0]); + cmd[1] = MAKE_ACTION(GUC_HXG_TYPE_REQUEST, action[0]); + } else if (vf_action_can_safely_fail(xe, action[0])) { + cmd[1] = MAKE_ACTION(GUC_HXG_TYPE_EVENT, action[0]); } else { fast_req_track(ct, ct_fence_value, FIELD_GET(GUC_HXG_EVENT_MSG_0_ACTION, action[0])); - cmd[1] = - FIELD_PREP(GUC_HXG_MSG_0_TYPE, GUC_HXG_TYPE_FAST_REQUEST) | - FIELD_PREP(GUC_HXG_EVENT_MSG_0_ACTION | - GUC_HXG_EVENT_MSG_0_DATA0, action[0]); + cmd[1] = MAKE_ACTION(GUC_HXG_TYPE_FAST_REQUEST, action[0]); } /* H2G header in cmd[1] replaces action[0] so: */ -- 2.34.1