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 E3A01C5DF8E for ; Thu, 20 Aug 2026 21:06:55 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A116010EF32; Thu, 20 Aug 2026 21:06:55 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="Nfuj3gWC"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.13]) by gabe.freedesktop.org (Postfix) with ESMTPS id A08DD10E60F for ; Thu, 20 Aug 2026 21:06:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1787260003; x=1818796003; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=dq7oskvSkw5mVDEOlEBRDzazw4GdH7q01OQNdPb/fhk=; b=Nfuj3gWCIQON4qX0m1ZNGALK6utYLlX8rK2Oly9m3oJzFaXU+rozoALx GCjj1C/DfPwi1xA/Ph7BBrJ1tCFIh8KB17rox9NVZv9Hw3b3o0kyHVW2v 0HRBYh+xaWD/I0YliByiaKhEtfoRNO2AWmbJU1oJrdS7jiE8tUeApBxb4 0T15oSn7QdOg3df+y+y1OS0iPzhLLeCY1+g462WE0PtxwH+rQwM87AypF d5ZIIQ1KTRbWFsr5mrAajhLM1/sYKiQqDrvuxuEM6olM5ZH0WfwJVJh0C wQcivMcjzNLY3343FpRC+pD5F51zOZ+Rm9MPo0zz7n/gVURAp7RgxnmHD g==; X-CSE-ConnectionGUID: 5mbQITaZRo6OOUpGqjmVaQ== X-CSE-MsgGUID: xCI+XuJeSD+1yGNFANubdQ== X-IronPort-AV: E=McAfee;i="6800,10657,11881"; a="98965314" X-IronPort-AV: E=Sophos;i="6.25,233,1779174000"; d="scan'208";a="98965314" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Aug 2026 14:06:43 -0700 X-CSE-ConnectionGUID: 7DUr5S8kTmGVbcQTAYiX9Q== X-CSE-MsgGUID: 860IP4QmRXSc7vM+SrriKw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.25,233,1779174000"; d="scan'208";a="304342461" Received: from dut4475arls.fm.intel.com ([10.105.8.198]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Aug 2026 14:06:42 -0700 From: Stuart Summers To: Cc: intel-xe@lists.freedesktop.org, rodrigo.vivi@intel.com, matthew.brost@intel.com, umesh.nerlige.ramappa@intel.com, Michal.Wajdeczko@intel.com, matthew.d.roper@intel.com, daniele.ceraolospurio@intel.com, shuicheng.lin@intel.com, Stuart Summers Subject: [PATCH 01/10] drm/xe: Guard configfs attribute reads in getters Date: Thu, 20 Aug 2026 21:06:40 +0000 Message-ID: <20260820210639.107524-13-stuart.summers@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260820210639.107524-12-stuart.summers@intel.com> References: <20260820210639.107524-12-stuart.summers@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 configfs getters read dev->config members without holding dev->lock, so a concurrent store can tear the value being returned. The store paths and a few of the getters already take the lock; make it consistent by wrapping every read of dev->config in the getters with a scoped_guard(), covering the surrounding checks that consume those values as well. Signed-off-by: Stuart Summers Assisted-by: Copilot:claude-opus-5 --- drivers/gpu/drm/xe/xe_configfs.c | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_configfs.c b/drivers/gpu/drm/xe/xe_configfs.c index 052cce962161..0a85043a9dd0 100644 --- a/drivers/gpu/drm/xe/xe_configfs.c +++ b/drivers/gpu/drm/xe/xe_configfs.c @@ -1185,7 +1185,8 @@ bool xe_configfs_get_survivability_mode(struct pci_dev *pdev) if (!dev) return device_defaults.survivability_mode; - mode = dev->config.survivability_mode; + scoped_guard(mutex, &dev->lock) + mode = dev->config.survivability_mode; config_group_put(&dev->group); return mode; @@ -1199,7 +1200,8 @@ static u64 get_gt_types_allowed(struct pci_dev *pdev) if (!dev) return device_defaults.gt_types_allowed; - mask = dev->config.gt_types_allowed; + scoped_guard(mutex, &dev->lock) + mask = dev->config.gt_types_allowed; config_group_put(&dev->group); return mask; @@ -1243,7 +1245,8 @@ u64 xe_configfs_get_engines_allowed(struct pci_dev *pdev) if (!dev) return device_defaults.engines_allowed; - engines_allowed = dev->config.engines_allowed; + scoped_guard(mutex, &dev->lock) + engines_allowed = dev->config.engines_allowed; config_group_put(&dev->group); return engines_allowed; @@ -1263,7 +1266,8 @@ bool xe_configfs_get_psmi_enabled(struct pci_dev *pdev) if (!dev) return false; - ret = dev->config.enable_psmi; + scoped_guard(mutex, &dev->lock) + ret = dev->config.enable_psmi; config_group_put(&dev->group); return ret; @@ -1284,7 +1288,8 @@ bool xe_configfs_get_enable_multi_queue(struct pci_dev *pdev) if (!dev) return true; - ret = dev->config.enable_multi_queue; + scoped_guard(mutex, &dev->lock) + ret = dev->config.enable_multi_queue; config_group_put(&dev->group); return ret; @@ -1308,10 +1313,12 @@ u32 xe_configfs_get_ctx_restore_mid_bb(struct pci_dev *pdev, if (!dev) return 0; - if (cs) - *cs = dev->config.ctx_restore_mid_bb[class].cs; + scoped_guard(mutex, &dev->lock) { + if (cs) + *cs = dev->config.ctx_restore_mid_bb[class].cs; - len = dev->config.ctx_restore_mid_bb[class].len; + len = dev->config.ctx_restore_mid_bb[class].len; + } config_group_put(&dev->group); return len; @@ -1335,8 +1342,10 @@ u32 xe_configfs_get_ctx_restore_post_bb(struct pci_dev *pdev, if (!dev) return 0; - *cs = dev->config.ctx_restore_post_bb[class].cs; - len = dev->config.ctx_restore_post_bb[class].len; + scoped_guard(mutex, &dev->lock) { + *cs = dev->config.ctx_restore_post_bb[class].cs; + len = dev->config.ctx_restore_post_bb[class].len; + } config_group_put(&dev->group); return len; -- 2.43.0