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 0B299D116F1 for ; Mon, 1 Dec 2025 18:40:00 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A170210E457; Mon, 1 Dec 2025 18:40:00 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="LHUitSts"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) by gabe.freedesktop.org (Postfix) with ESMTPS id 026B110E459; Mon, 1 Dec 2025 18:39:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1764614400; x=1796150400; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=EQGssfzCUYwNZK0I6rlvV9RXLC97b76HeBHLA9yVfUU=; b=LHUitStsjJLmQwjN7KLj4BELg38tAU9sGJiP0NbLlY7V4kDkigBJplbl yc/50REnKqiFiXnbbIZIo56SbLAYFvgXW6GRjhPcAGWxkuYm08/y9dV8J c5h8G0qpFeirDWOZXfpdLYgyYQKXuRZK1qS7ZC+MqXJnRk83b/ARuzHWJ W3Fr3n9uhxOV+WDeQZLJ3wjuK5DsVZ24rdjSkBDhvqaMO5ZZPnB7S3X6P Pjkz5dk3+49R92b383Nv4eAin9vuhw67FeAb+WoZ2+0HEq2o3RI+sUefd wiPKLNA2cQpiUnZeJqtQZZGFhWi3PGP5vPpteOtwVpnhtoasoY4pshohh w==; X-CSE-ConnectionGUID: 4quVsuMWQESV0Q76aqVvfg== X-CSE-MsgGUID: ns1rsXaTSLK9pHIRC+0T2w== X-IronPort-AV: E=McAfee;i="6800,10657,11630"; a="78031144" X-IronPort-AV: E=Sophos;i="6.20,241,1758610800"; d="scan'208";a="78031144" Received: from fmviesa008.fm.intel.com ([10.60.135.148]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Dec 2025 10:39:59 -0800 X-CSE-ConnectionGUID: wDRlxIZaTyaJoP1i/DSEDg== X-CSE-MsgGUID: leHpgfn/ReWH7kJ/QpsBCA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.20,241,1758610800"; d="scan'208";a="194359102" Received: from lstrano-desk.jf.intel.com ([10.54.39.91]) by fmviesa008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Dec 2025 10:39:58 -0800 From: Matthew Brost To: intel-xe@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Subject: [PATCH v7 3/9] drm/xe: Add dedicated message lock Date: Mon, 1 Dec 2025 10:39:48 -0800 Message-Id: <20251201183954.852637-4-matthew.brost@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251201183954.852637-1-matthew.brost@intel.com> References: <20251201183954.852637-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" Stop abusing DRM scheduler job list lock for messages, add dedicated message lock. Signed-off-by: Matthew Brost Reviewed-by: Niranjana Vishwanathapura --- drivers/gpu/drm/xe/xe_gpu_scheduler.c | 5 +++-- drivers/gpu/drm/xe/xe_gpu_scheduler.h | 4 ++-- drivers/gpu/drm/xe/xe_gpu_scheduler_types.h | 2 ++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_gpu_scheduler.c b/drivers/gpu/drm/xe/xe_gpu_scheduler.c index f91e06d03511..f4f23317191f 100644 --- a/drivers/gpu/drm/xe/xe_gpu_scheduler.c +++ b/drivers/gpu/drm/xe/xe_gpu_scheduler.c @@ -77,6 +77,7 @@ int xe_sched_init(struct xe_gpu_scheduler *sched, }; sched->ops = xe_ops; + spin_lock_init(&sched->msg_lock); INIT_LIST_HEAD(&sched->msgs); INIT_WORK(&sched->work_process_msg, xe_sched_process_msg_work); @@ -117,7 +118,7 @@ void xe_sched_add_msg(struct xe_gpu_scheduler *sched, void xe_sched_add_msg_locked(struct xe_gpu_scheduler *sched, struct xe_sched_msg *msg) { - lockdep_assert_held(&sched->base.job_list_lock); + lockdep_assert_held(&sched->msg_lock); list_add_tail(&msg->link, &sched->msgs); xe_sched_process_msg_queue(sched); @@ -131,7 +132,7 @@ void xe_sched_add_msg_locked(struct xe_gpu_scheduler *sched, void xe_sched_add_msg_head(struct xe_gpu_scheduler *sched, struct xe_sched_msg *msg) { - lockdep_assert_held(&sched->base.job_list_lock); + lockdep_assert_held(&sched->msg_lock); list_add(&msg->link, &sched->msgs); xe_sched_process_msg_queue(sched); diff --git a/drivers/gpu/drm/xe/xe_gpu_scheduler.h b/drivers/gpu/drm/xe/xe_gpu_scheduler.h index c7a77a3a9681..dceb2cd0ee5b 100644 --- a/drivers/gpu/drm/xe/xe_gpu_scheduler.h +++ b/drivers/gpu/drm/xe/xe_gpu_scheduler.h @@ -33,12 +33,12 @@ void xe_sched_add_msg_head(struct xe_gpu_scheduler *sched, static inline void xe_sched_msg_lock(struct xe_gpu_scheduler *sched) { - spin_lock(&sched->base.job_list_lock); + spin_lock(&sched->msg_lock); } static inline void xe_sched_msg_unlock(struct xe_gpu_scheduler *sched) { - spin_unlock(&sched->base.job_list_lock); + spin_unlock(&sched->msg_lock); } static inline void xe_sched_stop(struct xe_gpu_scheduler *sched) diff --git a/drivers/gpu/drm/xe/xe_gpu_scheduler_types.h b/drivers/gpu/drm/xe/xe_gpu_scheduler_types.h index 6731b13da8bb..63d9bf92583c 100644 --- a/drivers/gpu/drm/xe/xe_gpu_scheduler_types.h +++ b/drivers/gpu/drm/xe/xe_gpu_scheduler_types.h @@ -47,6 +47,8 @@ struct xe_gpu_scheduler { const struct xe_sched_backend_ops *ops; /** @msgs: list of messages to be processed in @work_process_msg */ struct list_head msgs; + /** @msg_lock: Message lock */ + spinlock_t msg_lock; /** @work_process_msg: processes messages */ struct work_struct work_process_msg; }; -- 2.34.1