From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) (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 6E2E331A572 for ; Tue, 23 Jun 2026 16:46:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782233192; cv=none; b=ONfjutuXgDhYcQNM7oZprQQOe9iqbO/3wBdbA7kY0iD08l4pz8lB0XNGr0X168VoalpffhPpv9TOZXJZAQfQE4YGn9HOAVg9Owpounxn8a+F/rfeA0Jbz0/CRwyzh7BLBfe2F6QEmiE0Zs8YGVvR5zp/S0J+IqRxTrMZGcurAPQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782233192; c=relaxed/simple; bh=nwYLYcEJ5g4Hiz5xw1YN9boWQ1HB7OcCqfu1fYiorVQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=kPRXqHlOGUJBWg7ffYlQMk2gDut6Agsucwl2pOzMAHbA21fLK2l8jtW0vnqc1DEaWfIg9S+mu5/YJplrnvzrgxCy4Vp2tGwY8yY/8LtG4Rx5EeS6hmM3cdrqGW9tXzLDBAKfg/xMw4/ejeXCbJX6VLPMywQiRkQArZsIkDphXug= 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=mpij6cqZ; arc=none smtp.client-ip=192.198.163.18 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="mpij6cqZ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1782233184; x=1813769184; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=nwYLYcEJ5g4Hiz5xw1YN9boWQ1HB7OcCqfu1fYiorVQ=; b=mpij6cqZQAtF0Es8+rAAKGxuQ/3NovB4wdV6Np9sEAWfImzOPUfWFyS1 /UvGbf6wlobaQNWt/pNkXXtvYSaQ/01fMpK9grkthq4PCCsN7in6sMr3Y d1g8DSej9Q26Q9y9Jqe3cEkBfLudnPHqDDxtOiGioG8H5NGxBS09fBGpP 3hup7pvLdvO7SXmDYbF3xYLb5lKw4KfCPJPZiYxurcpFn7oewl3/lyO55 VuELWJ72RnCjWtrpHGiktEyyPu2w+vlQ9ZuuHI0QATazlf9iCdt2lzB93 1otoQiNxJxb/gR13RVN/baVA7Ce/vBNesVzgx6yG32IPZ0WNgCQo+p5zy Q==; X-CSE-ConnectionGUID: TT4EkaPJS3+315C9HstFAQ== X-CSE-MsgGUID: q0b///LETLGU85mcZCtSWw== X-IronPort-AV: E=McAfee;i="6800,10657,11826"; a="82089378" X-IronPort-AV: E=Sophos;i="6.24,221,1774335600"; d="scan'208";a="82089378" Received: from fmviesa003.fm.intel.com ([10.60.135.143]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2026 09:46:24 -0700 X-CSE-ConnectionGUID: 6XBqqjeUQvahVDJeZRYMfw== X-CSE-MsgGUID: UykqbDn+Q5y/Wv7KePAQ3w== X-ExtLoop1: 1 Received: from osgc-sh-dragon.sh.intel.com ([10.239.81.44]) by fmviesa003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2026 09:46:21 -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 v5 2/2] drm/xe/vm: Add srcid to xe_vm_get_property_ioctl fault report Date: Wed, 24 Jun 2026 00:46:10 +0800 Message-ID: <20260623164610.1019512-3-jonathan.cavitt@intel.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260623164610.1019512-1-jonathan.cavitt@intel.com> References: <20260623164610.1019512-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: 8bit 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) v3: - Squash SRCID with ASID to keep the struct compact (Matthew) Signed-off-by: Jonathan Cavitt Reviewed-by: Matthew Brost Cc: Matthew Brost Cc: Thomas Hellström 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..acbfce19b356 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 = FIELD_GET(XE_PAGEFAULT_LEVEL_MASK, pf->consumer.fault_type_level); + e->srcid = FIELD_GET(XE_PAGEFAULT_SRCID_MASK, pf->consumer.id); 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; } +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 = xe_to_user_fault_type(entry->fault_type); fault_entry.fault_level = xe_to_user_fault_level(entry->fault_level); + fault_entry.srcid = xe_to_user_srcid(entry->srcid); + memcpy(&fault_list[i], &fault_entry, entry_size); i++; diff --git a/drivers/gpu/drm/xe/xe_vm_types.h b/drivers/gpu/drm/xe/xe_vm_types.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; }; struct xe_vm { diff --git a/include/uapi/drm/xe_drm.h b/include/uapi/drm/xe_drm.h index 50c80af4ad4e..ee4cfd6b2246 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]; }; -- 2.53.0