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 B530BC433FE for ; Thu, 27 Jan 2022 17:10:54 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9FC3510E1D3; Thu, 27 Jan 2022 17:10:53 +0000 (UTC) Received: from mail-pl1-x635.google.com (mail-pl1-x635.google.com [IPv6:2607:f8b0:4864:20::635]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6149510E1BC; Thu, 27 Jan 2022 17:10:51 +0000 (UTC) Received: by mail-pl1-x635.google.com with SMTP id d1so3003969plh.10; Thu, 27 Jan 2022 09:10:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mlD0uRJ9ShmnWQiuwR1rRBKFKsGAC8qfNh6UyNqzvaU=; b=kubnWOZL+aTtTeB05GV/0bsf4ClyVseFikad5aocEUs3PoIY0lb9FtsNzVfQQzuh+M S15LuNnDMB4+hymrONSSYkHWZmFXCKNUQyNmY6Qd6z7cOviUE+LRsHVi4O87wIdFtXf1 84nRrbaB2yQofnMAlbvCjUeTWcx+55/sW+DfKka+jcPbH39r12ITHUeXaMdHSD6eDDDo nbnNEW0lg0gRneJNPN2WyQm08PpsINdekKlG1MBKcYnOXpstkmBBzB7Ssp23fpCF/Ps2 Xj11pKv+rKraH+08pqbCYurGL+jBbBoSeNin2r4+Eu6EDXIiKzTMn3V0rZsg6HDxUyq7 9Uhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mlD0uRJ9ShmnWQiuwR1rRBKFKsGAC8qfNh6UyNqzvaU=; b=e3k971WEkJyNgqq1xuMWPhzToeKJ2YTJdOMYtdbxzQT4FHR4a5rGm87x9we+nM5m1B Pg7bJ1gEhdOygfCxO3zHY7JjtLlGr6tkcboorC2QxQZoXmnBsXTYmcQ2fCiBe9hnuRNQ 7KPkOzv6iIg9U+r70ia8JDbIn9QISHMNDbFYg2ECscUuf8pOefPKFzstf+5xDuvU112j pbn87CyV1gut8vkylsRrd/F88wbPUnw62KR9YmqTxeURIVHCWjlkpr2K/Jx/+XhYN/7F A3fmYiS4suWahBf7St6tNVsgbuPRAXUtFHIHMzquSV35mzyMOftfe/jztRyeSZ/j/9fW aNpQ== X-Gm-Message-State: AOAM532pXZbIUUE+CbK7rx6v38TJ6aHWa1+dSFOut0v+lZm4SJYum8Me yqV44c8eooigFFhg7le/e71HsLLqQTA= X-Google-Smtp-Source: ABdhPJyRUd3v+/HA1W7kXU13TAEokjZV4wLu9/Wpd4bQD4Pzw29TXvTPiMnAmUSkn/rxoIIg6Gn+pQ== X-Received: by 2002:a17:902:e803:: with SMTP id u3mr4014071plg.41.1643303450242; Thu, 27 Jan 2022 09:10:50 -0800 (PST) Received: from localhost (c-73-25-156-94.hsd1.or.comcast.net. [73.25.156.94]) by smtp.gmail.com with ESMTPSA id mm24sm3390444pjb.20.2022.01.27.09.10.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jan 2022 09:10:49 -0800 (PST) From: Rob Clark To: dri-devel@lists.freedesktop.org Subject: [PATCH 2/2] drm/msm/gpu: Add param to get address space faults Date: Thu, 27 Jan 2022 09:10:39 -0800 Message-Id: <20220127171045.541341-3-robdclark@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220127171045.541341-1-robdclark@gmail.com> References: <20220127171045.541341-1-robdclark@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Rob Clark , Sai Prakash Ranjan , Jonathan Marek , David Airlie , linux-arm-msm@vger.kernel.org, Yangtao Li , Abhinav Kumar , Jordan Crouse , Sean Paul , Stephen Boyd , freedreno@lists.freedesktop.org, =?UTF-8?q?Christian=20K=C3=B6nig?= , open list Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Rob Clark Add a param so that userspace can query the fault count for faults that might effect them (ie. any context sharing the same address space). Signed-off-by: Rob Clark --- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 3 +++ drivers/gpu/drm/msm/msm_drv.c | 1 + drivers/gpu/drm/msm/msm_gem.h | 3 +++ drivers/gpu/drm/msm/msm_gpu.c | 1 + include/uapi/drm/msm_drm.h | 3 ++- 5 files changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c index caa9076197de..05899c77ca38 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c @@ -271,6 +271,9 @@ int adreno_get_param(struct msm_gpu *gpu, struct msm_file_private *ctx, case MSM_PARAM_FAULTS: *value = gpu->global_faults; return 0; + case MSM_PARAM_AS_FAULTS: + *value = ctx->aspace->faults; + return 0; case MSM_PARAM_SUSPENDS: *value = gpu->suspend_count; return 0; diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index 72060247e43c..39ab9a361d7f 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -41,6 +41,7 @@ * - 1.6.0 - Syncobj support * - 1.7.0 - Add MSM_PARAM_SUSPENDS to access suspend count * - 1.8.0 - Add MSM_BO_CACHED_COHERENT for supported GPUs (a6xx) + * - 1.9.0 - Add MSM_PARAM_AS_FAULTS */ #define MSM_VERSION_MAJOR 1 #define MSM_VERSION_MINOR 8 diff --git a/drivers/gpu/drm/msm/msm_gem.h b/drivers/gpu/drm/msm/msm_gem.h index 54ca0817d807..af612add5264 100644 --- a/drivers/gpu/drm/msm/msm_gem.h +++ b/drivers/gpu/drm/msm/msm_gem.h @@ -35,6 +35,9 @@ struct msm_gem_address_space { * will be non-NULL: */ struct pid *pid; + + /* @faults: the number of GPU hangs associated with this address space */ + int faults; }; struct msm_gem_vma { diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c index 2c1049c0ea14..1029a51cb016 100644 --- a/drivers/gpu/drm/msm/msm_gpu.c +++ b/drivers/gpu/drm/msm/msm_gpu.c @@ -372,6 +372,7 @@ static void recover_worker(struct kthread_work *work) /* Increment the fault counts */ gpu->global_faults++; submit->queue->faults++; + submit->aspace->faults++; task = get_pid_task(submit->pid, PIDTYPE_PID); if (task) { diff --git a/include/uapi/drm/msm_drm.h b/include/uapi/drm/msm_drm.h index 6b8fffc28a50..b7d92868b945 100644 --- a/include/uapi/drm/msm_drm.h +++ b/include/uapi/drm/msm_drm.h @@ -75,8 +75,9 @@ struct drm_msm_timespec { #define MSM_PARAM_GMEM_BASE 0x06 #define MSM_PARAM_PRIORITIES 0x07 /* The # of priority levels */ #define MSM_PARAM_PP_PGTABLE 0x08 /* => 1 for per-process pagetables, else 0 */ -#define MSM_PARAM_FAULTS 0x09 +#define MSM_PARAM_FAULTS 0x09 /* global fault count */ #define MSM_PARAM_SUSPENDS 0x0a +#define MSM_PARAM_AS_FAULTS 0x0b /* faults in any context sharing same address space */ /* For backwards compat. The original support for preemption was based on * a single ring per priority level so # of priority levels equals the # -- 2.34.1