From mboxrd@z Thu Jan 1 00:00:00 1970 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 7E42CCC6B1A for ; Tue, 13 Oct 2026 20:19:39 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3F94910E137; Tue, 13 Oct 2026 20:19:34 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) by gabe.freedesktop.org (Postfix) with ESMTPS id F13E410F980 for ; Tue, 13 Oct 2026 20:19:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1791922768; x=1823458768; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=+p6zwcbNNwqVwp9VEyj8MzPQxMAFNKT2WYyfuExwu6U=; b=j2geZSs/FD6GaxnJxG4em7kw2NgoJx+FUm/mdyFD0xHI7vT9NvlxSx3L wa0pqWEFdtpVaZd7MNNStOq2zbDI/te30rCm3EBjBERGejME0Y2ogaaAw cxhZSc6RWZYjbYSh8byvH5jVObQXNBFx9EHRwEd91CRG/vXTy2OSJhAzw 4m2wM8dF+ac5bo52wmNLYmLON7+N86Ob6EHmW9vCZJVNJPhwD47gLJJzf 9abCMiViebQwywguCDeR/vLUBIyu66vLwMaVUkLL/Ua4imHLCdUJM3uJq 9p17etC1GvjqJS7mP2Ey7Y9n4oSE/oQAkJLO/bY27Yjqu8QyzwyxPgt2d g==; X-CSE-ConnectionGUID: /fgyC2IKT2ax/6HqmAN01A== X-CSE-MsgGUID: PlYg6VU6QMSSdPRh56ccfQ== X-IronPort-AV: E=McAfee;i="6800,10657,11934"; a="678543" X-IronPort-AV: E=Sophos;i="6.27,156,1787036400"; d="scan'208";a="678543" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Oct 2026 13:19:22 -0700 X-CSE-ConnectionGUID: AnJRmKZtSd6dlyr/kH0Q7A== X-CSE-MsgGUID: fCaDyUA3T/OrcOYppBOEBQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.27,156,1787036400"; d="scan'208";a="1348479" Received: from danielcm-desk1.jf.intel.com ([10.24.81.120]) by fmviesa002.fm.intel.com with ESMTP; 13 Oct 2026 13:19:23 -0700 From: Daniel Charles To: intel-xe@lists.freedesktop.org Cc: x.wang@intel.com, jia.yao@intel.com, jonathan.cavitt@intel.com, matthew.brost@intel.com, stable Subject: [PATCH v2 1/3] drm/xe: Read scheduler message opcode under lock Date: Tue, 13 Oct 2026 13:15:06 -0700 Message-ID: <20261013201508.514480-2-daniel.charles@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20261013201508.514480-1-daniel.charles@intel.com> References: <20261013201508.514480-1-daniel.charles@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" From: Matthew Brost For static scheduler messages, the opcode is only guaranteed to remain stable while the message is on the pending message list. Read the opcode under the message lock before removing the message from the pending list, and pass it through the processing pipeline. Fixes: ff796870f5dd ("drm/xe/guc: rework exec queue teardown PM/unplug handling") Cc: stable Signed-off-by: Matthew Brost --- drivers/gpu/drm/xe/xe_gpu_scheduler.c | 13 +++++++++---- drivers/gpu/drm/xe/xe_gpu_scheduler_types.h | 2 +- drivers/gpu/drm/xe/xe_guc_submit.c | 7 ++++--- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_gpu_scheduler.c b/drivers/gpu/drm/xe/xe_gpu_scheduler.c index 9c8004d5dd915..d656db758cb3c 100644 --- a/drivers/gpu/drm/xe/xe_gpu_scheduler.c +++ b/drivers/gpu/drm/xe/xe_gpu_scheduler.c @@ -23,15 +23,19 @@ static void xe_sched_process_msg_queue_if_ready(struct xe_gpu_scheduler *sched) } static struct xe_sched_msg * -xe_sched_get_msg(struct xe_gpu_scheduler *sched) +xe_sched_get_msg(struct xe_gpu_scheduler *sched, unsigned int *opcode) { struct xe_sched_msg *msg; xe_sched_msg_lock(sched); msg = list_first_entry_or_null(&sched->msgs, struct xe_sched_msg, link); - if (msg) + if (msg) { + /* The opcode is only stable under lock for static messages */ + *opcode = msg->opcode; + list_del_init(&msg->link); + } xe_sched_msg_unlock(sched); return msg; @@ -42,13 +46,14 @@ static void xe_sched_process_msg_work(struct work_struct *w) struct xe_gpu_scheduler *sched = container_of(w, struct xe_gpu_scheduler, work_process_msg); struct xe_sched_msg *msg; + unsigned int opcode; if (drm_sched_is_stopped(&sched->base)) return; - msg = xe_sched_get_msg(sched); + msg = xe_sched_get_msg(sched, &opcode); if (msg) { - sched->ops->process_msg(msg); + sched->ops->process_msg(msg, opcode); xe_sched_process_msg_queue_if_ready(sched); } diff --git a/drivers/gpu/drm/xe/xe_gpu_scheduler_types.h b/drivers/gpu/drm/xe/xe_gpu_scheduler_types.h index 78ef2e8ded4f3..163a0d85e3cb9 100644 --- a/drivers/gpu/drm/xe/xe_gpu_scheduler_types.h +++ b/drivers/gpu/drm/xe/xe_gpu_scheduler_types.h @@ -34,7 +34,7 @@ struct xe_sched_backend_ops { * @process_msg: Process a message. Allowed to block, it is this * function's responsibility to free message if dynamically allocated. */ - void (*process_msg)(struct xe_sched_msg *msg); + void (*process_msg)(struct xe_sched_msg *msg, unsigned int opcode); }; /** diff --git a/drivers/gpu/drm/xe/xe_guc_submit.c b/drivers/gpu/drm/xe/xe_guc_submit.c index 7ce73489c35fc..c4ef3e9bf7a18 100644 --- a/drivers/gpu/drm/xe/xe_guc_submit.c +++ b/drivers/gpu/drm/xe/xe_guc_submit.c @@ -2056,16 +2056,17 @@ static void __guc_exec_queue_process_msg_cgp_sync(struct xe_sched_msg *msg, #define MSG_HEAD BIT(9) #define MSG_PM_REF BIT(10) -static void guc_exec_queue_process_msg(struct xe_sched_msg *msg) +static void guc_exec_queue_process_msg(struct xe_sched_msg *msg, + unsigned int opcode) { struct xe_device *xe = guc_to_xe(exec_queue_to_guc(msg->private_data)); int idx; - bool pm_ref = !!(msg->opcode & MSG_PM_REF); + bool pm_ref = !!(opcode & MSG_PM_REF); bool bound = drm_dev_enter(&xe->drm, &idx); trace_xe_sched_msg_recv(msg); - switch (msg->opcode & OPCODE_MASK) { + switch (opcode & OPCODE_MASK) { case CLEANUP: __guc_exec_queue_process_msg_cleanup(msg, bound); break; -- 2.43.0