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 849AAC77B75 for ; Mon, 22 May 2023 16:18:53 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 513FF10E36F; Mon, 22 May 2023 16:18:53 +0000 (UTC) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 33F2110E36B for ; Mon, 22 May 2023 16:18:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1684772325; x=1716308325; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=xeRBgqvWaMTUwcKY97FleVExQ1VKiiBfQBIpMoLJn38=; b=kkyAq7tMBRnlIAiDZg4t+I1To1/WtODpQ3mlo1WHNTFYvSqEfplL4jno fTf6YixqCUtfXCqKhfrgrALw6VO6wjBc9qEcAUMV9MWKIhVb3nff0FXEl FwNx6ZpAyt9fcF7NTCXlBtr4xzRZ2K399vfO5wAQyZSeVjhTF/ftpKI3W t5uMWfCalppj6zK0Fy/hr9IntNUatiaUT4WWk6XF0xC2/wCyoSUohsYK5 qxko7r+uQWCy3uECswvOro5b4Vczh1WTcLHO3mMaRBZF70v2AMdRCIZRc inFCIgxhbCHBa/fuWwdBYTyLNdn7v45M41gok9qMN7Au/zbS6los5Vebj w==; X-IronPort-AV: E=McAfee;i="6600,9927,10718"; a="381199219" X-IronPort-AV: E=Sophos;i="6.00,184,1681196400"; d="scan'208";a="381199219" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 May 2023 09:15:57 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10718"; a="703586530" X-IronPort-AV: E=Sophos;i="6.00,184,1681196400"; d="scan'208";a="703586530" Received: from amigon-mobl.ger.corp.intel.com (HELO mwauld-desk1.intel.com) ([10.249.128.230]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 May 2023 09:15:54 -0700 From: Matthew Auld To: intel-xe@lists.freedesktop.org Date: Mon, 22 May 2023 17:14:03 +0100 Message-Id: <20230522161403.79731-7-matthew.auld@intel.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230522161403.79731-1-matthew.auld@intel.com> References: <20230522161403.79731-1-matthew.auld@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Intel-xe] [PATCH v7 7/7] drm/xe: Use atomic for mem_access.ref 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: , Cc: Rodrigo Vivi Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" From: Maarten Lankhorst xe_guc_ct_fast_path() is called from an irq context, and cannot lock the mutex used by xe_device_mem_access_ongoing(). Fortunately it is easy to fix if we switch the ref over to an atomic. Signed-off-by: Maarten Lankhorst Signed-off-by: Matthew Auld Cc: Rodrigo Vivi Cc: Thomas Hellström Cc: Matthew Brost Reviewed-by: Rodrigo Vivi --- drivers/gpu/drm/xe/xe_device.c | 34 ++++++++++++---------------- drivers/gpu/drm/xe/xe_device_types.h | 6 ++--- 2 files changed, 18 insertions(+), 22 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c index 55f974b1ee78..01ef88bf099d 100644 --- a/drivers/gpu/drm/xe/xe_device.c +++ b/drivers/gpu/drm/xe/xe_device.c @@ -403,30 +403,23 @@ u32 xe_device_ccs_bytes(struct xe_device *xe, u64 size) DIV_ROUND_UP(size, NUM_BYTES_PER_CCS_BYTE) : 0; } -void xe_device_assert_mem_access(struct xe_device *xe) -{ - if (xe_pm_read_callback_task(xe) == current) - return; - - XE_WARN_ON(!xe->mem_access.ref); -} - bool xe_device_mem_access_ongoing(struct xe_device *xe) { - bool ret; - if (xe_pm_read_callback_task(xe) == current) return true; - mutex_lock(&xe->mem_access.lock); - ret = xe->mem_access.ref; - mutex_unlock(&xe->mem_access.lock); + return atomic_read(&xe->mem_access.ref); +} - return ret; +void xe_device_assert_mem_access(struct xe_device *xe) +{ + XE_WARN_ON(!xe_device_mem_access_ongoing(xe)); } void xe_device_mem_access_get(struct xe_device *xe) { + int ref; + /* * This looks racy, but should be fine since the pm_callback_task only * transitions from NULL -> current (and back to NULL again), during the @@ -446,23 +439,26 @@ void xe_device_mem_access_get(struct xe_device *xe) * for example just on the 0 -> 1. */ mutex_lock(&xe->mem_access.lock); - if (xe->mem_access.ref == 0) + if (atomic_read(&xe->mem_access.ref) == 0) xe->mem_access.hold_rpm = xe_pm_runtime_resume_and_get(xe); - xe->mem_access.ref++; + ref = atomic_inc_return(&xe->mem_access.ref); mutex_unlock(&xe->mem_access.lock); - XE_WARN_ON(xe->mem_access.ref == S32_MAX); + XE_WARN_ON(ref == S32_MAX); } void xe_device_mem_access_put(struct xe_device *xe) { + int ref; + if (xe_pm_read_callback_task(xe) == current) return; mutex_lock(&xe->mem_access.lock); - if (--xe->mem_access.ref == 0 && xe->mem_access.hold_rpm) + ref = atomic_dec_return(&xe->mem_access.ref); + if (ref == 0 && xe->mem_access.hold_rpm) xe_pm_runtime_put(xe); mutex_unlock(&xe->mem_access.lock); - XE_WARN_ON(xe->mem_access.ref < 0); + XE_WARN_ON(ref < 0); } diff --git a/drivers/gpu/drm/xe/xe_device_types.h b/drivers/gpu/drm/xe/xe_device_types.h index b5a56e112c0a..f1515aff8437 100644 --- a/drivers/gpu/drm/xe/xe_device_types.h +++ b/drivers/gpu/drm/xe/xe_device_types.h @@ -261,9 +261,9 @@ struct xe_device { */ struct { /** - * @lock: Protects @ref and serializes multiple callers. + * @lock: Serializes multiple callers. * - * Also used as lockdep aid to hopefully ensure that it sees + * But mainly used as lockdep aid to hopefully ensure that it sees * that the runtime_pm callbacks can be called while holding * @lock, and therefore any locks that the caller is holding * also have a clear dependency on the @lock and any locks the @@ -274,7 +274,7 @@ struct xe_device { */ struct mutex lock; /** @ref: ref count of memory accesses */ - s32 ref; + atomic_t ref; /** @hold_rpm: need to put rpm ref back at the end */ bool hold_rpm; } mem_access; -- 2.40.1