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 21E31C531D0 for ; Fri, 24 Jul 2026 01:10:17 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D04D310E639; Fri, 24 Jul 2026 01:10:16 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="MSrIfo88"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) by gabe.freedesktop.org (Postfix) with ESMTPS id A9B7310E639 for ; Fri, 24 Jul 2026 01:09:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1784855393; x=1816391393; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=m3CjBgpvprzIhaA27MbYtLYvrXICo+IyGQ/SX820Q2U=; b=MSrIfo88SIHYdDSGo+u+qSc9vKqK9FE7Ay+4wMBwP8vpqQqDtxdzfg9v eusd+OXbloVkDkIJNkMk4NUlT1iOurkydzdegwY3KESwazdYDuycZ0jsX QJO989vY2pIlHYntgxH5y4W1VWIiR2tZ7bCD4KiXi8XqxnwJFoLnmT6vl 31gMrCMjwhvdjS/wE/rKR/OLv4TXaDrXx7HtXYdKE5g5ECLrsljp+Q7aO vb5Vn+eabITjI/g+9EcP77PEqLc7e/oA5dpVEMqI5LfndS3W8sowg+jQw 74/aKlcDx21uAg0NHpvmQzVPjV2g+Yhqnpbvf0CjAwYffRHczwNqYJR6D Q==; X-CSE-ConnectionGUID: R3exld6gSJW3/GmfOHFm2g== X-CSE-MsgGUID: 5dsgJf3ZTWe1pKVOkvnGjA== X-IronPort-AV: E=McAfee;i="6800,10657,11854"; a="73064792" X-IronPort-AV: E=Sophos;i="6.25,181,1779174000"; d="scan'208";a="73064792" Received: from fmviesa008.fm.intel.com ([10.60.135.148]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jul 2026 18:09:52 -0700 X-CSE-ConnectionGUID: oOs8NejZRaeqGqFXAlVgow== X-CSE-MsgGUID: SBUQF8hUR7CWioq9g5A2CQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.25,181,1779174000"; d="scan'208";a="255929093" Received: from gsse-cloud1.jf.intel.com ([10.54.39.91]) by fmviesa008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jul 2026 18:09:52 -0700 From: Matthew Brost To: intel-xe@lists.freedesktop.org Cc: Maciej Patelczyk Subject: [PATCH v6 05/12] drm/xe: Add num_pf_work modparam Date: Thu, 23 Jul 2026 18:09:40 -0700 Message-Id: <20260724010947.1573757-6-matthew.brost@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260724010947.1573757-1-matthew.brost@intel.com> References: <20260724010947.1573757-1-matthew.brost@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" Add a module parameter to control the number of page-fault work threads, making it easy to experiment with how different numbers of work threads impact performance. Signed-off-by: Matthew Brost Reviewed-by: Maciej Patelczyk --- drivers/gpu/drm/xe/xe_defaults.h | 1 + drivers/gpu/drm/xe/xe_device.c | 14 ++++++++++++-- drivers/gpu/drm/xe/xe_device_types.h | 11 ++++------- drivers/gpu/drm/xe/xe_module.c | 4 ++++ drivers/gpu/drm/xe/xe_module.h | 1 + drivers/gpu/drm/xe/xe_pagefault.c | 6 +++--- drivers/gpu/drm/xe/xe_vm.c | 3 ++- 7 files changed, 27 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_defaults.h b/drivers/gpu/drm/xe/xe_defaults.h index c8ae1d5f3d60..0884224ef7c7 100644 --- a/drivers/gpu/drm/xe/xe_defaults.h +++ b/drivers/gpu/drm/xe/xe_defaults.h @@ -22,5 +22,6 @@ #define XE_DEFAULT_WEDGED_MODE XE_WEDGED_MODE_UPON_CRITICAL_ERROR #define XE_DEFAULT_WEDGED_MODE_STR "upon-critical-error" #define XE_DEFAULT_SVM_NOTIFIER_SIZE 512 +#define XE_DEFAULT_NUM_PF_WORK 2 #endif diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c index 4eed9a251e65..ff24d4a00c24 100644 --- a/drivers/gpu/drm/xe/xe_device.c +++ b/drivers/gpu/drm/xe/xe_device.c @@ -513,6 +513,17 @@ struct xe_device *xe_device_create(struct pci_dev *pdev) } ALLOW_ERROR_INJECTION(xe_device_create, ERRNO); /* See xe_pci_probe() */ +static void xe_device_parse_modparam(struct xe_device *xe) +{ + xe->atomic_svm_timeslice_ms = 5; + xe->min_run_period_lr_ms = 5; + xe->info.num_pf_work = xe_modparam.num_pf_work; + if (xe->info.num_pf_work < 1) + xe->info.num_pf_work = 1; + else if (xe->info.num_pf_work > XE_PAGEFAULT_WORK_MAX) + xe->info.num_pf_work = XE_PAGEFAULT_WORK_MAX; +} + /** * xe_device_init_early() - Initialize a new &xe_device instance * @xe: the &xe_device to initialize @@ -539,8 +550,7 @@ int xe_device_init_early(struct xe_device *xe) if (err) return err; - xe->atomic_svm_timeslice_ms = 5; - xe->min_run_period_lr_ms = 5; + xe_device_parse_modparam(xe); err = xe_irq_init(xe); if (err) diff --git a/drivers/gpu/drm/xe/xe_device_types.h b/drivers/gpu/drm/xe/xe_device_types.h index 8d41b7e77176..6c037b205942 100644 --- a/drivers/gpu/drm/xe/xe_device_types.h +++ b/drivers/gpu/drm/xe/xe_device_types.h @@ -123,6 +123,8 @@ struct xe_device { u8 revid; /** @info.step: stepping information for each IP */ struct xe_step_info step; + /** @info.num_pf_work: Number of page fault work thread */ + int num_pf_work; /** @info.dma_mask_size: DMA address bits */ u8 dma_mask_size; /** @info.vram_flags: Vram flags */ @@ -309,14 +311,9 @@ struct xe_device { struct rw_semaphore lock; /** @usm.pf_wq: page fault work queue, unbound, high priority */ struct workqueue_struct *pf_wq; - /* - * We pick 4 here because, in the current implementation, it - * yields the best bandwidth utilization of the kernel paging - * engine. - */ -#define XE_PAGEFAULT_WORK_COUNT 4 +#define XE_PAGEFAULT_WORK_MAX 8 /** @usm.pf_workers: Page fault workers */ - struct xe_pagefault_work pf_workers[XE_PAGEFAULT_WORK_COUNT]; + struct xe_pagefault_work pf_workers[XE_PAGEFAULT_WORK_MAX]; /** @usm.pf_queue: Page fault queue */ struct xe_pagefault_queue pf_queue; #if IS_ENABLED(CONFIG_DRM_XE_PAGEMAP) diff --git a/drivers/gpu/drm/xe/xe_module.c b/drivers/gpu/drm/xe/xe_module.c index 848d65265443..4bc28dfc1992 100644 --- a/drivers/gpu/drm/xe/xe_module.c +++ b/drivers/gpu/drm/xe/xe_module.c @@ -29,6 +29,7 @@ struct xe_modparam xe_modparam = { .max_vfs = XE_DEFAULT_MAX_VFS, #endif .wedged_mode = XE_DEFAULT_WEDGED_MODE, + .num_pf_work = XE_DEFAULT_NUM_PF_WORK, .svm_notifier_size = XE_DEFAULT_SVM_NOTIFIER_SIZE, /* the rest are 0 by default */ }; @@ -81,6 +82,9 @@ MODULE_PARM_DESC(wedged_mode, "Module's default policy for the wedged mode (0=never, 1=upon-critical-error, 2=upon-any-hang-no-reset " "[default=" XE_DEFAULT_WEDGED_MODE_STR "])"); +module_param_named(num_pf_work, xe_modparam.num_pf_work, uint, 0600); +MODULE_PARM_DESC(num_pf_work, "Number of page fault work threads, default=2, min=1, max=8"); + static int xe_check_nomodeset(void) { if (drm_firmware_drivers_only()) diff --git a/drivers/gpu/drm/xe/xe_module.h b/drivers/gpu/drm/xe/xe_module.h index a0eb7db07770..6272d9e41207 100644 --- a/drivers/gpu/drm/xe/xe_module.h +++ b/drivers/gpu/drm/xe/xe_module.h @@ -23,6 +23,7 @@ struct xe_modparam { unsigned int max_vfs; #endif unsigned int wedged_mode; + unsigned int num_pf_work; u32 svm_notifier_size; }; diff --git a/drivers/gpu/drm/xe/xe_pagefault.c b/drivers/gpu/drm/xe/xe_pagefault.c index 410dc53b7df6..2322eb7369f1 100644 --- a/drivers/gpu/drm/xe/xe_pagefault.c +++ b/drivers/gpu/drm/xe/xe_pagefault.c @@ -424,7 +424,7 @@ int xe_pagefault_init(struct xe_device *xe) xe->usm.pf_wq = alloc_workqueue("xe_page_fault_work_queue", WQ_UNBOUND | WQ_HIGHPRI, - XE_PAGEFAULT_WORK_COUNT); + xe->info.num_pf_work); if (!xe->usm.pf_wq) return -ENOMEM; @@ -432,7 +432,7 @@ int xe_pagefault_init(struct xe_device *xe) if (err) goto err_out; - for (i = 0; i < XE_PAGEFAULT_WORK_COUNT; ++i) { + for (i = 0; i < xe->info.num_pf_work; ++i) { struct xe_pagefault_work *pf_work = xe->usm.pf_workers + i; pf_work->xe = xe; @@ -498,7 +498,7 @@ static int xe_pagefault_work_index(struct xe_device *xe) { lockdep_assert_held(&xe->usm.pf_queue.lock); - return xe->usm.current_pf_work++ % XE_PAGEFAULT_WORK_COUNT; + return xe->usm.current_pf_work++ % xe->info.num_pf_work; } /** diff --git a/drivers/gpu/drm/xe/xe_vm.c b/drivers/gpu/drm/xe/xe_vm.c index 591ef932ea1f..b9772af95055 100644 --- a/drivers/gpu/drm/xe/xe_vm.c +++ b/drivers/gpu/drm/xe/xe_vm.c @@ -3233,7 +3233,8 @@ static int prefetch_ranges(struct xe_vm *vm, struct xe_vma_ops *vops, skip_threads = op->prefetch_range.ranges_count == 1 || (!dpagemap && !(vops->flags & XE_VMA_OPS_FLAG_HAS_SVM_VALID_RANGE)) || - !(vops->flags & XE_VMA_OPS_FLAG_DOWNGRADE_LOCK); + !(vops->flags & XE_VMA_OPS_FLAG_DOWNGRADE_LOCK) || + vm->xe->info.num_pf_work == 1; thread = skip_threads ? &stack_thread : NULL; if (!skip_threads) { -- 2.34.1