Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BA1AE392C29; Tue, 21 Jul 2026 18:23:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784658217; cv=none; b=SHWJc22MpEHcXhkxaxCRCeWfvDeXpPc+U+lffgCNS9i7hretuaecXsZ9L2sQ4KREdrU8DvS4Asn+ZsnV9a5dDUTQcqjD91rDMUu8GsxtwInrO1SA8tVhMSH9m+cPc7drvIFeNlfMmPEf4WCPMoAMdFkDjIxBTWcLFcd+Y3Xdpfw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784658217; c=relaxed/simple; bh=mvI0xGoWqcp8Ghhv8zdXw+CZU6vIlaNSMMxIRTtw0l0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=eGwlPa7wbVHWNip5d37e3TXw8MFaxwfN/IvYrZR3iBA1NJ3L/XrG1Y3WUhnDKmcdTpl8aLR/JRwSYPzsOaTo7+VA/9YDDTlJjHvw34JqZM32maSVbR8JLtSdZxmR+H8zlCWlU5+7HuTyKu6AcgWZ71ubI2chmXOm7qZrIoGwxwY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=sqc9n6+G; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="sqc9n6+G" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2D2E61F000E9; Tue, 21 Jul 2026 18:23:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784658216; bh=F7/GpQHvnA0M6+Zn7fr2nqPeJ85TPB7u0alZ08aP49A=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=sqc9n6+GuPx1odEbs4Rjb1ZOVdyjoKZJJR6oT+/ZFMu8H3meWNBFQ516mPCAwOWVH LkVeCrSvaDdeCPwTflbncXBn26iqcCMmuWXmEeREatGCY26WaWJ7IaYgXwGLZYFVKF 12viawesL1fqf9n8e4zXNVl7RnciwrzkBzD61pcg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Michal Wajdeczko , =?UTF-8?q?Micha=C5=82=20Winiarski?= , =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= , Sasha Levin Subject: [PATCH 6.18 1023/1611] drm/xe/pf: Dont attempt to process FAST_REQ or EVENT relays Date: Tue, 21 Jul 2026 17:18:59 +0200 Message-ID: <20260721152538.401447441@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152514.750365251@linuxfoundation.org> References: <20260721152514.750365251@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Michal Wajdeczko [ Upstream commit ed8b0d731892c68b41ecbd27c952af284816dec1 ] Currently defined VF/PF relay actions use regular REQUEST messages only and the PF shouldn't attempt to handle FAST_REQUEST nor EVENT messages as this would result in breaking the VFPF ABI protocol and also might trigger an assert on the PF side. Fixes: 98e62805921c ("drm/xe/pf: Add SR-IOV GuC Relay PF services") Signed-off-by: Michal Wajdeczko Reviewed-by: Michał Winiarski Link: https://patch.msgid.link/20260527183735.22616-1-michal.wajdeczko@intel.com (cherry picked from commit 1714d360fc5ae2e0886a69e979095d9c7ff3568a) Signed-off-by: Thomas Hellström Signed-off-by: Sasha Levin --- drivers/gpu/drm/xe/xe_guc_relay.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_guc_relay.c b/drivers/gpu/drm/xe/xe_guc_relay.c index e5dc94f3e61810..09febc2b152eb1 100644 --- a/drivers/gpu/drm/xe/xe_guc_relay.c +++ b/drivers/gpu/drm/xe/xe_guc_relay.c @@ -677,12 +677,17 @@ static int relay_action_handler(struct xe_guc_relay *relay, u32 origin, return relay_testloop_action_handler(relay, origin, msg, len, response, size); type = FIELD_GET(GUC_HXG_MSG_0_TYPE, msg[0]); + relay_assert(relay, guc_hxg_type_is_action(type)); - if (IS_SRIOV_PF(relay_to_xe(relay))) - ret = xe_gt_sriov_pf_service_process_request(gt, origin, msg, len, response, size); - else + if (IS_SRIOV_PF(relay_to_xe(relay))) { + if (type == GUC_HXG_TYPE_REQUEST) + ret = xe_gt_sriov_pf_service_process_request(gt, origin, msg, len, + response, size); + else + ret = -EOPNOTSUPP; + } else { ret = -EOPNOTSUPP; - + } if (type == GUC_HXG_TYPE_EVENT) relay_assert(relay, ret <= 0); -- 2.53.0