From: Oded Gabbay <oded.gabbay@gmail.com>
To: David Airlie <airlied@linux.ie>,
Alex Deucher <alexander.deucher@amd.com>,
Jerome Glisse <j.glisse@gmail.com>
Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org,
John Bridgman <John.Bridgman@amd.com>,
Andrew Lewycky <Andrew.Lewycky@amd.com>,
Joerg Roedel <joro@8bytes.org>, Ben Goz <ben.goz@amd.com>,
Oded Gabbay <oded.gabbay@amd.com>
Subject: [PATCH 50/83] hsa/radeon: Add module parameter of scheduling policy
Date: Fri, 11 Jul 2014 00:54:06 +0300 [thread overview]
Message-ID: <1405029279-6894-22-git-send-email-oded.gabbay@amd.com> (raw)
In-Reply-To: <1405029279-6894-1-git-send-email-oded.gabbay@amd.com>
From: Ben Goz <ben.goz@amd.com>
This patch adds a new parameter to the KFD module. This parameter enables the
user to select the scheduling policy of the CP. The choices are:
* CP Scheduling with support for over-subscription
* CP Scheduling without support for over-subscription
* Without CP Scheduling
Signed-off-by: Ben Goz <ben.goz@amd.com>
Signed-off-by: Oded Gabbay <oded.gabbay@amd.com>
---
drivers/gpu/hsa/radeon/kfd_module.c | 5 +++
drivers/gpu/hsa/radeon/kfd_priv.h | 65 +++++++++++++++++++++++++++++++++++++
2 files changed, 70 insertions(+)
diff --git a/drivers/gpu/hsa/radeon/kfd_module.c b/drivers/gpu/hsa/radeon/kfd_module.c
index a03743a..e8bb67c 100644
--- a/drivers/gpu/hsa/radeon/kfd_module.c
+++ b/drivers/gpu/hsa/radeon/kfd_module.c
@@ -23,6 +23,7 @@
#include <linux/module.h>
#include <linux/sched.h>
#include <linux/notifier.h>
+#include <linux/moduleparam.h>
#include "kfd_priv.h"
@@ -43,6 +44,10 @@ static const struct kgd2kfd_calls kgd2kfd = {
.resume = kgd2kfd_resume,
};
+int sched_policy = KFD_SCHED_POLICY_HWS_NO_OVERSUBSCRIPTION;
+module_param(sched_policy, int, S_IRUSR | S_IWUSR);
+MODULE_PARM_DESC(sched_policy, "Kernel comline parameter define the kfd scheduling policy");
+
bool kgd2kfd_init(unsigned interface_version,
const struct kfd2kgd_calls *f2g,
const struct kgd2kfd_calls **g2f)
diff --git a/drivers/gpu/hsa/radeon/kfd_priv.h b/drivers/gpu/hsa/radeon/kfd_priv.h
index 3a5cecf..b3889aa 100644
--- a/drivers/gpu/hsa/radeon/kfd_priv.h
+++ b/drivers/gpu/hsa/radeon/kfd_priv.h
@@ -70,6 +70,15 @@ struct kfd_scheduler_class;
/* Macro for allocating structures */
#define kfd_alloc_struct(ptr_to_struct) ((typeof(ptr_to_struct)) kzalloc(sizeof(*ptr_to_struct), GFP_KERNEL))
+/* Kernel module parameter to specify the scheduling policy */
+extern int sched_policy;
+
+enum kfd_sched_policy {
+ KFD_SCHED_POLICY_HWS = 0,
+ KFD_SCHED_POLICY_HWS_NO_OVERSUBSCRIPTION,
+ KFD_SCHED_POLICY_NO_HWS
+};
+
/* Large enough to hold the maximum usable pasid + 1.
** It must also be able to store the number of doorbells reported by a KFD device. */
typedef unsigned int pasid_t;
@@ -243,6 +252,51 @@ enum KFD_MQD_TYPE {
KFD_MQD_TYPE_MAX
};
+struct scheduling_resources {
+ unsigned int vmid_mask;
+ enum kfd_queue_type type;
+ uint64_t queue_mask;
+ uint64_t gws_mask;
+ uint32_t oac_mask;
+ uint32_t gds_heap_base;
+ uint32_t gds_heap_size;
+};
+
+struct process_queue_manager {
+ /* data */
+ struct kfd_process *process;
+ unsigned int num_concurrent_processes;
+ struct list_head queues;
+ unsigned long *queue_slot_bitmap;
+};
+
+struct qcm_process_device {
+ /* The Device Queue Manager that owns this data */
+ struct device_queue_manager *dqm;
+ struct process_queue_manager *pqm;
+ /* Device Queue Manager lock */
+ struct mutex *lock;
+ /* Queues list */
+ struct list_head queues_list;
+ struct list_head priv_queue_list;
+
+ unsigned int queue_count;
+ unsigned int vmid;
+ bool is_debug;
+ /*
+ * All the memory management data should be here too
+ */
+ uint64_t gds_context_area;
+ uint32_t sh_mem_config;
+ uint32_t sh_mem_bases;
+ uint32_t sh_mem_ape1_base;
+ uint32_t sh_mem_ape1_limit;
+ uint32_t page_table_base;
+ uint32_t gds_size;
+ uint32_t num_gws;
+ uint32_t num_oac;
+};
+
/* Data that is per-process-per device. */
struct kfd_process_device {
/* List of all per-device data for a process. Starts from kfd_process.per_device_data. */
@@ -374,6 +428,8 @@ void print_queue_properties(struct queue_properties *q);
void print_queue(struct queue *q);
struct mqd_manager *mqd_manager_init(enum KFD_MQD_TYPE type, struct kfd_dev *dev);
+struct kernel_queue *kernel_queue_init(struct kfd_dev *dev, enum kfd_queue_type type);
+void kernel_queue_uninit(struct kernel_queue *kq);
/* Packet Manager */
@@ -391,4 +447,13 @@ struct packet_manager {
kfd_mem_obj ib_buffer_obj;
};
+int pm_init(struct packet_manager *pm, struct device_queue_manager *dqm);
+void pm_uninit(struct packet_manager *pm);
+int pm_send_set_resources(struct packet_manager *pm, struct scheduling_resources *res);
+int pm_send_runlist(struct packet_manager *pm, struct list_head *dqm_queues);
+int pm_send_query_status(struct packet_manager *pm, uint64_t fence_address, uint32_t fence_value);
+int pm_send_unmap_queue(struct packet_manager *pm, enum kfd_queue_type type,
+ enum kfd_preempt_type_filter mode, uint32_t filter_param, bool reset);
+void pm_release_ib(struct packet_manager *pm);
+
#endif
--
1.9.1
next prev parent reply other threads:[~2014-07-10 22:05 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-10 21:53 [PATCH 29/83] hsa/radeon: Fix memory size allocated for HPD Oded Gabbay
2014-07-10 21:53 ` [PATCH 30/83] hsa/radeon: Fix list of supported devices Oded Gabbay
2014-07-10 21:53 ` [PATCH 31/83] drm/radeon: extending kfd-kgd interface Oded Gabbay
2014-07-10 21:53 ` [PATCH 32/83] hsa/radeon: implementing IOCTL for clock counters Oded Gabbay
2014-07-11 20:34 ` Jerome Glisse
2014-07-10 21:53 ` [PATCH 33/83] hsa/radeon: Fix coding style in cik_int.h Oded Gabbay
2014-07-10 21:53 ` [PATCH 34/83] drm/radeon: adding synchronization for GRBM GFX Oded Gabbay
2014-07-10 21:53 ` [PATCH 35/83] hsa/radeon: Print ioctl commnad only in debug mode Oded Gabbay
2014-07-10 21:53 ` [PATCH 36/83] hsa/radeon: fixing clock counters bug Oded Gabbay
2014-07-10 21:53 ` [PATCH 37/83] hsa/radeon: Print ISR info only in debug mode Oded Gabbay
2014-07-10 21:53 ` [PATCH 38/83] hsa/radeon: Workaround for a bug in amd_iommu Oded Gabbay
2014-07-11 8:42 ` Joerg Roedel
2014-07-10 21:53 ` [PATCH 39/83] drm/radeon: Extending kfd interface Oded Gabbay
2014-07-10 21:53 ` [PATCH 40/83] hsa/radeon: Adding max clock speeds to topology Oded Gabbay
2014-07-10 21:53 ` [PATCH 41/83] hsa/radeon: Alternating the source of max clock Oded Gabbay
2014-07-10 21:53 ` [PATCH 42/83] hsa/radeon: 32-bit processes support Oded Gabbay
2014-07-10 21:53 ` [PATCH 43/83] hsa/radeon: NULL pointer dereference bug workaround Oded Gabbay
2014-07-10 21:54 ` [PATCH 44/83] hsa/radeon: HSA64/HSA32 modes support Oded Gabbay
2014-07-11 20:41 ` Jerome Glisse
2014-07-10 21:54 ` [PATCH 45/83] hsa/radeon: debugging print statements Oded Gabbay
2014-07-10 21:54 ` [PATCH 46/83] hsa/radeon: Add queue and hw_pointer_store modules Oded Gabbay
2014-07-10 21:54 ` [PATCH 47/83] hsa/radeon: Add support allocating kernel doorbells Oded Gabbay
2014-07-10 21:54 ` [PATCH 48/83] hsa/radeon: Add mqd_manager module Oded Gabbay
2014-07-10 21:54 ` [PATCH 49/83] hsa/radeon: Add kernel queue support for KFD Oded Gabbay
2014-07-10 21:54 ` Oded Gabbay [this message]
2014-07-10 21:54 ` [PATCH 51/83] hsa/radeon: Add packet manager module Oded Gabbay
2014-07-10 21:54 ` [PATCH 52/83] hsa/radeon: Add process queue " Oded Gabbay
2014-07-10 21:54 ` [PATCH 53/83] hsa/radeon: Add device " Oded Gabbay
2014-07-10 21:54 ` [PATCH 54/83] hsa/radeon: Switch to new queue scheduler Oded Gabbay
2014-07-10 21:54 ` [PATCH 55/83] hsa/radeon: Add IOCTL for update queue Oded Gabbay
2014-07-10 21:54 ` [PATCH 56/83] hsa/radeon: Queue Management integration with Memory Management Oded Gabbay
2014-07-10 21:54 ` [PATCH 57/83] hsa/radeon: Eliminate warnings in compilation Oded Gabbay
2014-07-10 21:54 ` [PATCH 58/83] hsa/radeon: Various kernel styling fixes Oded Gabbay
2014-07-10 21:54 ` [PATCH 59/83] hsa/radeon: Exclusive access for perf. counters Oded Gabbay
2014-07-10 21:54 ` [PATCH 60/83] hsa/radeon: Rearrange structures in kfd_ioctl.h Oded Gabbay
2014-07-10 21:54 ` [PATCH 61/83] hsa/radeon: change another pr_info to pr_debug Oded Gabbay
2014-07-10 21:54 ` [PATCH 62/83] hsa/radeon: Fix timeout calculation in sync_with_hw Oded Gabbay
2014-07-10 21:54 ` [PATCH 63/83] hsa/radeon: Update module information and version Oded Gabbay
2014-07-10 21:54 ` [PATCH 64/83] hsa/radeon: update queue fault handling Oded Gabbay
2014-07-10 21:54 ` [PATCH 65/83] hsa/radeon: fixing a bug to support 32b processes Oded Gabbay
2014-07-10 21:54 ` [PATCH 66/83] hsa/radeon: Fix number of pipes per ME Oded Gabbay
2014-07-10 21:54 ` [PATCH 67/83] hsa/radeon: Removing hw pointer store module Oded Gabbay
2014-07-10 21:54 ` [PATCH 68/83] hsa/radeon: Update module version to 0.6.0 Oded Gabbay
2014-07-10 21:54 ` [PATCH 69/83] hsa/radeon: Fix initialization of sh_mem registers Oded Gabbay
2014-07-10 21:54 ` [PATCH 70/83] hsa/radeon: Fix compilation warnings Oded Gabbay
2014-07-10 21:54 ` [PATCH 71/83] hsa/radeon: Remove old scheduler code Oded Gabbay
2014-07-10 21:54 ` [PATCH 72/83] hsa/radeon: Static analysis (smatch) fixes Oded Gabbay
2014-07-10 21:54 ` [PATCH 73/83] hsa/radeon: Adding qcm fence return status Oded Gabbay
2014-07-10 21:54 ` [PATCH 74/83] hsa/radeon: Adding some error messages Oded Gabbay
2014-07-10 21:54 ` [PATCH 75/83] hsa/radeon: Fixing minor issues with kernel queues (DIQ) Oded Gabbay
2014-07-10 21:54 ` [PATCH 76/83] hsa/radeon: Check oversubscription before destroying runlist Oded Gabbay
2014-07-10 21:54 ` [PATCH 77/83] hsa/radeon: Add local memory to topology Oded Gabbay
2014-07-10 21:54 ` [PATCH 78/83] hsa/radeon: Don't verify cksum when parsing CRAT table Oded Gabbay
2014-07-10 21:54 ` [PATCH 79/83] hsa/radeon: Update module version to 0.6.1 Oded Gabbay
2014-07-10 21:54 ` [PATCH 80/83] drm/radeon: Add register access functions to kfd2kgd interface Oded Gabbay
2014-07-10 21:54 ` [PATCH 81/83] hsa/radeon: Eliminating all direct register accesses Oded Gabbay
2014-07-10 21:54 ` [PATCH 82/83] drm/radeon: Remove lock functions from kfd2kgd interface Oded Gabbay
2014-07-10 21:54 ` [PATCH 83/83] hsa/radeon: Update module version to 0.6.2 Oded Gabbay
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1405029279-6894-22-git-send-email-oded.gabbay@amd.com \
--to=oded.gabbay@gmail.com \
--cc=Andrew.Lewycky@amd.com \
--cc=John.Bridgman@amd.com \
--cc=airlied@linux.ie \
--cc=alexander.deucher@amd.com \
--cc=ben.goz@amd.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=j.glisse@gmail.com \
--cc=joro@8bytes.org \
--cc=linux-kernel@vger.kernel.org \
--cc=oded.gabbay@amd.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome