From nobody Mon Jun 8 08:28:16 2026 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8DCD63A9DB3 for ; Wed, 3 Jun 2026 15:08:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.9 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780499319; cv=none; b=BIjjL8KAfN5M9z9EulyLfOxQLBgijw95PPQ0jjFcurf38rh/i+Z+/3TpmZ/YGbJToEYXFrwBrvudY6JZeL0BkebANM9AgwkImqGY5Y/h6uyyH/npMoSTh/ac6jcqqn/TuX7aklUcSNlaCNREQ/M49mbUIKoQ9KPr9EPGLZHo20I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780499319; c=relaxed/simple; bh=7Okvw+fsV9Qg1R8JgSR+HzZFPxVLT2qPwpZWC2AiPSo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=mRQWrJ4S5QZLCpOxY4U2kyRYpRc8vixVG0fupdOBHupRVTB6U31BnK2gZTo/E2dU9bGikV/cftFVXFBAbaIiRf6abcxVcLCo6Fx18A4Dis9UJCzfUGQcownLnI4iUdL+T1aFtIP14CWQdMIVQD7PsUQ+/osRtOSMCBZJdjML9h4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=bJlloiQE; arc=none smtp.client-ip=192.198.163.9 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="bJlloiQE" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1780499317; x=1812035317; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=7Okvw+fsV9Qg1R8JgSR+HzZFPxVLT2qPwpZWC2AiPSo=; b=bJlloiQEZDiBaehFBCOygjAFXpBbkfKw0tS6Ccrvsaoduf63turOpuvd k5WMLKo3xkkGCA3hVQ2j7C52+4UHzUj6PkhLd1lRK/m1/dvUkuWUq5qVO gozekElp36pZaYu0gqR0CZH5h6fFvHNy0H8u/pHsHK8gGC05Ci91e5NaR mfX2VrexwSBQxPaq8a9UXKvV0lnpn1aNv3qif0A5FyHQEml4+kSBdwSpr ZosZbKwI8XEQiOy2i+y4L7Z5Do7tZZXRdrXUN3WN/xw5vISoyHjI7/u/q puYQX0rlj/Uty5FhzB7ZQ6dBTO8e9ibWs4G8SjsGbaawdD0ofIjD2O+qO Q==; X-CSE-ConnectionGUID: mttkDjgeQva+A0QiLjUibg== X-CSE-MsgGUID: FKUONs4RSkercdTUuiWvFQ== X-IronPort-AV: E=McAfee;i="6800,10657,11806"; a="91996218" X-IronPort-AV: E=Sophos;i="6.24,185,1774335600"; d="scan'208";a="91996218" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jun 2026 08:08:37 -0700 X-CSE-ConnectionGUID: w3YgxJpdSvW69Cs4ZA+eaQ== X-CSE-MsgGUID: TFfep17DSeOH6NT19l9ZMw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.24,185,1774335600"; d="scan'208";a="241280680" Received: from osgc-sh-dragon.sh.intel.com ([10.239.81.44]) by fmviesa007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jun 2026 08:08:34 -0700 From: Jonathan Cavitt To: dri-devel@lists.freedesktop.org Cc: saurabhg.gupta@intel.com, alex.zuo@intel.com, jonathan.cavitt@intel.com, mripard@kernel.org, airlied@gmail.com, simona@ffwll.ch, linux-kernel@vger.kernel.org, intel-xe@lists.freedesktop.org, Rodrigo.vivi@intel.com, matthew.brost@intel.com, maarten.lankhorst@linux.intel.com, thomas.hellstrom@linux.intel.com, tzimmermann@suse.de Subject: [PATCH v2 1/2] drm/xe/pagefault: Add SRCID to pagefault struct Date: Wed, 3 Jun 2026 23:08:27 +0800 Message-ID: <20260603150828.3751112-2-jonathan.cavitt@intel.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260603150828.3751112-1-jonathan.cavitt@intel.com> References: <20260603150828.3751112-1-jonathan.cavitt@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Add SRCID information to pagefault struct for the purpose of reporting the hardware unit that resulted in the pagefault. Signed-off-by: Jonathan Cavitt Cc: Matthew Brost Cc: Thomas Hellstr=C3=B6m Cc: Rodrigo Vivi Cc: David Airlie Cc: Simona Vetter --- drivers/gpu/drm/xe/xe_guc_pagefault.c | 1 + drivers/gpu/drm/xe/xe_pagefault.c | 6 ++++-- drivers/gpu/drm/xe/xe_pagefault_types.h | 4 +++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_guc_pagefault.c b/drivers/gpu/drm/xe/xe_= guc_pagefault.c index 607e32392f46..17cb7f359261 100644 --- a/drivers/gpu/drm/xe/xe_guc_pagefault.c +++ b/drivers/gpu/drm/xe/xe_guc_pagefault.c @@ -91,6 +91,7 @@ int xe_guc_pagefault_handler(struct xe_guc *guc, u32 *msg= , u32 len) FIELD_GET(PFD_FAULT_TYPE, msg[2])); pf.consumer.engine_class =3D FIELD_GET(PFD_ENG_CLASS, msg[0]); pf.consumer.engine_instance =3D FIELD_GET(PFD_ENG_INSTANCE, msg[0]); + pf.consumer.srcid =3D FIELD_GET(PFD_SRC_ID, msg[0]); =20 pf.producer.private =3D guc; pf.producer.ops =3D &guc_pagefault_ops; diff --git a/drivers/gpu/drm/xe/xe_pagefault.c b/drivers/gpu/drm/xe/xe_page= fault.c index dd3c068e1a39..42b682ba5f9b 100644 --- a/drivers/gpu/drm/xe/xe_pagefault.c +++ b/drivers/gpu/drm/xe/xe_pagefault.c @@ -248,7 +248,8 @@ static void xe_pagefault_print(struct xe_pagefault *pf) "\tAccessType: %lu\n" "\tFaultLevel: %lu\n" "\tEngineClass: %d %s\n" - "\tEngineInstance: %d\n", + "\tEngineInstance: %d\n" + "\tSRCID: 0x%02x\n", pf->consumer.asid, upper_32_bits(pf->consumer.page_addr), lower_32_bits(pf->consumer.page_addr), @@ -260,7 +261,8 @@ static void xe_pagefault_print(struct xe_pagefault *pf) pf->consumer.fault_type_level), pf->consumer.engine_class, xe_hw_engine_class_to_str(pf->consumer.engine_class), - pf->consumer.engine_instance); + pf->consumer.engine_instance, + pf->consumer.srcid); } =20 static void xe_pagefault_save_to_vm(struct xe_device *xe, struct xe_pagefa= ult *pf) diff --git a/drivers/gpu/drm/xe/xe_pagefault_types.h b/drivers/gpu/drm/xe/x= e_pagefault_types.h index c4ee625b93dd..60cc269aeea3 100644 --- a/drivers/gpu/drm/xe/xe_pagefault_types.h +++ b/drivers/gpu/drm/xe/xe_pagefault_types.h @@ -86,8 +86,10 @@ struct xe_pagefault { u8 engine_class; /** @consumer.engine_instance: engine instance */ u8 engine_instance; + /** @consumer.srcid: ID of hardware unit producing fault */ + u8 srcid; /** @consumer.reserved: reserved bits for future expansion */ - u64 reserved; + u8 reserved[7]; } consumer; /** * @producer: State for the producer (i.e., HW/FW interface). Populated --=20 2.53.0 From nobody Mon Jun 8 08:28:16 2026 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 046563BED0F for ; Wed, 3 Jun 2026 15:08:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.9 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780499322; cv=none; b=g7fRSyUdaPz6iCqwbn6k1kzBHXTOwLyfoK/ewpAOlAL+an1ziiJrRLzWO49lWDO6kgqmVARlyQorTWdK3R9IMsxHobXN8bqaiynvybyz4+X6knVnbh/xjAuXxv9gigkRYrBE6zx1PlkFk1PGph37DMP4FbE2yzZBWBGPpxfYLqc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780499322; c=relaxed/simple; bh=6no0fWEC5mlo79MGTUDOKy76rxnIsf3JmSEJmpfUVCo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=EqWqcn0w8Vw7RLT3KaJ4NmOh4x+eYWfHFVybDA9e78Bs7p99iHahlSmyYwchWdu5/wCaCxapr80zBp3z22EsLzFhcKoTUPY2HK5185JKg63ehOKcCaSWGGSZf++veyaJcAAtVUcbMfZJZSstxU70df3wRMYK2CqZlTApgC7Tre4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=N985FAd/; arc=none smtp.client-ip=192.198.163.9 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="N985FAd/" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1780499321; x=1812035321; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=6no0fWEC5mlo79MGTUDOKy76rxnIsf3JmSEJmpfUVCo=; b=N985FAd/3O/ENKTfNJXtGotihIzteA9pDjewm8NvzRTdNhc5eloR3xeg S3y1qhjPmbbHSM5CvBJEooHSvwcrPzROBR8riv2mQk/vluRXoJGV5yWmW 6He8v+AOIspNv51GK0esH+bOcFS4d2x2yk0vslE4CAV0Y+6am9bPWIq25 ab17SFp0cc6PlKd+y1WWoHbIM39t1MjH7LMPXowLk8rFKHnUEnsmXd6q0 eVa9eTfKAx9xpvne/UkepV06JIVqaaQgJFRlRw4E6dZskwov7p75W3lAv uQts3NsjV8z+ZU2FvAMaB3eQfsZgghTEb64EVlfxQf5jA6Os7EHJh0flT w==; X-CSE-ConnectionGUID: 0krnuM0KQoSfIBFVWBkwqQ== X-CSE-MsgGUID: AAutTIkxQgaTaUND8xwIgw== X-IronPort-AV: E=McAfee;i="6800,10657,11806"; a="91996232" X-IronPort-AV: E=Sophos;i="6.24,185,1774335600"; d="scan'208";a="91996232" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jun 2026 08:08:40 -0700 X-CSE-ConnectionGUID: S66yjwBMRsG7QouN1lGn6g== X-CSE-MsgGUID: lBQXIOUoQvC/AjcQKdJXqQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.24,185,1774335600"; d="scan'208";a="241280683" Received: from osgc-sh-dragon.sh.intel.com ([10.239.81.44]) by fmviesa007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jun 2026 08:08:37 -0700 From: Jonathan Cavitt To: dri-devel@lists.freedesktop.org Cc: saurabhg.gupta@intel.com, alex.zuo@intel.com, jonathan.cavitt@intel.com, mripard@kernel.org, airlied@gmail.com, simona@ffwll.ch, linux-kernel@vger.kernel.org, intel-xe@lists.freedesktop.org, Rodrigo.vivi@intel.com, matthew.brost@intel.com, maarten.lankhorst@linux.intel.com, thomas.hellstrom@linux.intel.com, tzimmermann@suse.de Subject: [PATCH v2 2/2] drm/xe/vm: Add srcid to xe_vm_get_property_ioctl fault report Date: Wed, 3 Jun 2026 23:08:28 +0800 Message-ID: <20260603150828.3751112-3-jonathan.cavitt@intel.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260603150828.3751112-1-jonathan.cavitt@intel.com> References: <20260603150828.3751112-1-jonathan.cavitt@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Add the SRCID of the faulting hardware unit to the return of the xe_vm_get_property_ioctl fault report. v2: - Readd pad check, as the pad in the ioctl struct was not changed (jcavitt) Signed-off-by: Jonathan Cavitt Cc: Matthew Brost Cc: Thomas Hellstr=C3=B6m Cc: Rodrigo Vivi Cc: David Airlie Cc: Simona Vetter Cc: Maarten Lankhorst Cc: Maxime Ripard Cc: Thomas Zimmermann --- drivers/gpu/drm/xe/xe_vm.c | 8 ++++++++ drivers/gpu/drm/xe/xe_vm_types.h | 2 ++ include/uapi/drm/xe_drm.h | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_vm.c b/drivers/gpu/drm/xe/xe_vm.c index 080c2fff0e95..7e084c05f10e 100644 --- a/drivers/gpu/drm/xe/xe_vm.c +++ b/drivers/gpu/drm/xe/xe_vm.c @@ -636,6 +636,7 @@ void xe_vm_add_fault_entry_pf(struct xe_vm *vm, struct = xe_pagefault *pf) pf->consumer.fault_type_level); e->fault_level =3D FIELD_GET(XE_PAGEFAULT_LEVEL_MASK, pf->consumer.fault_type_level); + e->srcid =3D pf->consumer.srcid; =20 list_add_tail(&e->list, &vm->faults.list); vm->faults.len++; @@ -4108,6 +4109,11 @@ static u8 xe_to_user_fault_level(u8 fault_level) return fault_level; } =20 +static u8 xe_to_user_srcid(u8 srcid) +{ + return srcid; +} + static int fill_faults(struct xe_vm *vm, struct drm_xe_vm_get_property *args) { @@ -4135,6 +4141,8 @@ static int fill_faults(struct xe_vm *vm, fault_entry.fault_type =3D xe_to_user_fault_type(entry->fault_type); fault_entry.fault_level =3D xe_to_user_fault_level(entry->fault_level); =20 + fault_entry.srcid =3D xe_to_user_srcid(entry->srcid); + memcpy(&fault_list[i], &fault_entry, entry_size); =20 i++; diff --git a/drivers/gpu/drm/xe/xe_vm_types.h b/drivers/gpu/drm/xe/xe_vm_ty= pes.h index 635ed29b9a69..e8aea75341cc 100644 --- a/drivers/gpu/drm/xe/xe_vm_types.h +++ b/drivers/gpu/drm/xe/xe_vm_types.h @@ -196,6 +196,7 @@ struct xe_device; * @access_type: type of address access that resulted in fault * @fault_type: type of fault reported * @fault_level: fault level of the fault + * @srcid: ID of the faulting hardware unit */ struct xe_vm_fault_entry { struct list_head list; @@ -204,6 +205,7 @@ struct xe_vm_fault_entry { u8 access_type; u8 fault_type; u8 fault_level; + u8 srcid; }; =20 struct xe_vm { diff --git a/include/uapi/drm/xe_drm.h b/include/uapi/drm/xe_drm.h index 48e9f1fdb78d..2b45b691a032 100644 --- a/include/uapi/drm/xe_drm.h +++ b/include/uapi/drm/xe_drm.h @@ -1294,8 +1294,8 @@ struct xe_vm_fault { #define FAULT_LEVEL_PML4 3 #define FAULT_LEVEL_PML5 4 __u8 fault_level; - /** @pad: MBZ */ - __u8 pad; + /** @srcid: ID of the faulting hardware unit */ + __u8 srcid; /** @reserved: MBZ */ __u64 reserved[4]; }; --=20 2.53.0