nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-24 10:34:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: use nvgpu list for channel and debug session lists

Browse Source 
Use nvgpu list APIs instead of linux list APIs
to store channel list in debug session and to store
debug session list in channel

Jira NVGPU-13

Change-Id: Iaf89524955a155adcb8a24505df6613bd9c4ccfb
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: http://git-master/r/1454690
Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
This commit is contained in:
Deepak Nibade
2017-04-04 14:02:42 +05:30
committed by mobile promotions
parent db2ee5c127
commit e4464fd552
4 changed files with 39 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/nvgpu/gk20a/channel_gk20a.c
View File

@@ -2641,7 +2641,7 @@ int gk20a_init_channel_support(struct gk20a *g, u32 chid)
nvgpu_raw_spinlock_init(&c->timeout.lock);
INIT_LIST_HEAD(&c->joblist.dynamic.jobs);
INIT_LIST_HEAD(&c->dbg_s_list);
nvgpu_init_list_node(&c->dbg_s_list);
INIT_LIST_HEAD(&c->event_id_list);
INIT_LIST_HEAD(&c->worker_item);

2
drivers/gpu/nvgpu/gk20a/channel_gk20a.h
View File

@@ -224,7 +224,7 @@ struct channel_gk20a {
struct gk20a_cs_snapshot_client *cs_client;
#endif
struct nvgpu_mutex dbg_s_lock;
struct list_head dbg_s_list;
struct nvgpu_list_node dbg_s_list;
struct list_head event_id_list;
struct nvgpu_mutex event_id_list_lock;

35
drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c
View File

@@ -47,13 +47,13 @@ nvgpu_dbg_gpu_get_session_channel(struct dbg_session_gk20a *dbg_s)
struct gk20a *g = dbg_s->g;
nvgpu_mutex_acquire(&dbg_s->ch_list_lock);
if (list_empty(&dbg_s->ch_list)) {
if (nvgpu_list_empty(&dbg_s->ch_list)) {
nvgpu_mutex_release(&dbg_s->ch_list_lock);
return NULL;
}
ch_data = list_first_entry(&dbg_s->ch_list,
struct dbg_session_channel_data,
ch_data = nvgpu_list_first_entry(&dbg_s->ch_list,
dbg_session_channel_data,
ch_entry);
ch = g->fifo.channel + ch_data->chid;
@@ -138,7 +138,7 @@ static int gk20a_dbg_gpu_do_dev_open(struct inode *inode,
dbg_session->is_timeout_disabled = false;
init_waitqueue_head(&dbg_session->dbg_events.wait_queue);
INIT_LIST_HEAD(&dbg_session->ch_list);
nvgpu_init_list_node(&dbg_session->ch_list);
err = nvgpu_mutex_init(&dbg_session->ch_list_lock);
if (err)
goto err_free_session;
@@ -305,7 +305,8 @@ void gk20a_dbg_gpu_post_events(struct channel_gk20a *ch)
/* guard against the session list being modified */
nvgpu_mutex_acquire(&ch->dbg_s_lock);
list_for_each_entry(session_data, &ch->dbg_s_list, dbg_s_entry) {
nvgpu_list_for_each_entry(session_data, &ch->dbg_s_list,
dbg_session_data, dbg_s_entry) {
dbg_s = session_data->dbg_s;
if (dbg_s->dbg_events.events_enabled) {
gk20a_dbg(gpu_dbg_gpu_dbg, "posting event on session id %d",
@@ -333,7 +334,8 @@ bool gk20a_dbg_gpu_broadcast_stop_trigger(struct channel_gk20a *ch)
/* guard against the session list being modified */
nvgpu_mutex_acquire(&ch->dbg_s_lock);
list_for_each_entry(session_data, &ch->dbg_s_list, dbg_s_entry) {
nvgpu_list_for_each_entry(session_data, &ch->dbg_s_list,
dbg_session_data, dbg_s_entry) {
dbg_s = session_data->dbg_s;
if (dbg_s->broadcast_stop_trigger) {
gk20a_dbg(gpu_dbg_gpu_dbg | gpu_dbg_fn | gpu_dbg_intr,
@@ -358,7 +360,8 @@ int gk20a_dbg_gpu_clear_broadcast_stop_trigger(struct channel_gk20a *ch)
/* guard against the session list being modified */
nvgpu_mutex_acquire(&ch->dbg_s_lock);
list_for_each_entry(session_data, &ch->dbg_s_list, dbg_s_entry) {
nvgpu_list_for_each_entry(session_data, &ch->dbg_s_list,
dbg_session_data, dbg_s_entry) {
dbg_s = session_data->dbg_s;
if (dbg_s->broadcast_stop_trigger) {
gk20a_dbg(gpu_dbg_gpu_dbg | gpu_dbg_fn | gpu_dbg_intr,
@@ -440,10 +443,10 @@ int dbg_unbind_single_channel_gk20a(struct dbg_session_gk20a *dbg_s,
}
}
list_del_init(&ch_data->ch_entry);
nvgpu_list_del(&ch_data->ch_entry);
session_data = ch_data->session_data;
list_del_init(&session_data->dbg_s_entry);
nvgpu_list_del(&session_data->dbg_s_entry);
nvgpu_kfree(dbg_s->g, session_data);
fput(ch_data->ch_f);
@@ -459,7 +462,8 @@ static int dbg_unbind_all_channels_gk20a(struct dbg_session_gk20a *dbg_s)
nvgpu_mutex_acquire(&g->dbg_sessions_lock);
nvgpu_mutex_acquire(&dbg_s->ch_list_lock);
list_for_each_entry_safe(ch_data, tmp, &dbg_s->ch_list, ch_entry)
nvgpu_list_for_each_entry_safe(ch_data, tmp, &dbg_s->ch_list,
dbg_session_channel_data, ch_entry)
dbg_unbind_single_channel_gk20a(dbg_s, ch_data);
nvgpu_mutex_release(&dbg_s->ch_list_lock);
nvgpu_mutex_release(&g->dbg_sessions_lock);
@@ -486,7 +490,8 @@ static int dbg_unbind_channel_gk20a(struct dbg_session_gk20a *dbg_s,
}
nvgpu_mutex_acquire(&dbg_s->ch_list_lock);
list_for_each_entry(ch_data, &dbg_s->ch_list, ch_entry) {
nvgpu_list_for_each_entry(ch_data, &dbg_s->ch_list,
dbg_session_channel_data, ch_entry) {
if (ch->hw_chid == ch_data->chid) {
channel_found = true;
break;
@@ -591,7 +596,7 @@ static int dbg_bind_channel_gk20a(struct dbg_session_gk20a *dbg_s,
ch_data->ch_f = f;
ch_data->channel_fd = args->channel_fd;
ch_data->chid = ch->hw_chid;
INIT_LIST_HEAD(&ch_data->ch_entry);
nvgpu_init_list_node(&ch_data->ch_entry);
session_data = nvgpu_kzalloc(g, sizeof(*session_data));
if (!session_data) {
@@ -600,13 +605,13 @@ static int dbg_bind_channel_gk20a(struct dbg_session_gk20a *dbg_s,
return -ENOMEM;
}
session_data->dbg_s = dbg_s;
INIT_LIST_HEAD(&session_data->dbg_s_entry);
nvgpu_init_list_node(&session_data->dbg_s_entry);
ch_data->session_data = session_data;
list_add(&session_data->dbg_s_entry, &ch->dbg_s_list);
nvgpu_list_add(&session_data->dbg_s_entry, &ch->dbg_s_list);
nvgpu_mutex_acquire(&dbg_s->ch_list_lock);
list_add_tail(&ch_data->ch_entry, &dbg_s->ch_list);
nvgpu_list_add_tail(&ch_data->ch_entry, &dbg_s->ch_list);
nvgpu_mutex_release(&dbg_s->ch_list_lock);
nvgpu_mutex_release(&ch->dbg_s_lock);

20
drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.h
View File

@@ -69,7 +69,7 @@ struct dbg_session_gk20a {
struct gk20a *g;
/* list of bound channels, if any */
struct list_head ch_list;
struct nvgpu_list_node ch_list;
struct nvgpu_mutex ch_list_lock;
/* event support */
@@ -82,17 +82,31 @@ struct dbg_session_gk20a {
struct dbg_session_data {
struct dbg_session_gk20a *dbg_s;
struct list_head dbg_s_entry;
struct nvgpu_list_node dbg_s_entry;
};
static inline struct dbg_session_data *
dbg_session_data_from_dbg_s_entry(struct nvgpu_list_node *node)
{
return (struct dbg_session_data *)
((uintptr_t)node - offsetof(struct dbg_session_data, dbg_s_entry));
};
struct dbg_session_channel_data {
struct file *ch_f;
int channel_fd;
int chid;
struct list_head ch_entry;
struct nvgpu_list_node ch_entry;
struct dbg_session_data *session_data;
};
static inline struct dbg_session_channel_data *
dbg_session_channel_data_from_ch_entry(struct nvgpu_list_node *node)
{
return (struct dbg_session_channel_data *)
((uintptr_t)node - offsetof(struct dbg_session_channel_data, ch_entry));
};
struct dbg_profiler_object_data {
int session_id;
u32 prof_handle;