lkml.org 
[lkml]   [2009]   [Jun]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[Patch 04/12] GRU - collect per-context user statistics
From: Jack Steiner <steiner@sgi.com>

Collect GRU statistics for each user GRU context. Statistics are
kept for TLB misses & content resource contention. Add user
request for retrieving the statistics.

Signed-off-by: Jack Steiner <steiner@sgi.com>

---
drivers/misc/sgi-gru/grufault.c | 27 +++++++++++++++++++++++++++
drivers/misc/sgi-gru/grufile.c | 3 +++
drivers/misc/sgi-gru/grulib.h | 18 ++++++++++++++++++
drivers/misc/sgi-gru/grumain.c | 1 +
drivers/misc/sgi-gru/grutables.h | 3 +++
5 files changed, 52 insertions(+)

Index: linux/drivers/misc/sgi-gru/grufault.c
===================================================================
--- linux.orig/drivers/misc/sgi-gru/grufault.c 2009-04-29 13:40:36.000000000 -0500
+++ linux/drivers/misc/sgi-gru/grufault.c 2009-04-29 13:43:42.000000000 -0500
@@ -502,6 +502,7 @@ irqreturn_t gru_intr(int irq, void *dev_
*/
if (!gts->ts_force_cch_reload &&
down_read_trylock(&gts->ts_mm->mmap_sem)) {
+ gts->ustats.fmm_tlbdropin++;
gru_try_dropin(gts, tfh, NULL);
up_read(&gts->ts_mm->mmap_sem);
} else {
@@ -520,6 +521,7 @@ static int gru_user_dropin(struct gru_th
struct gru_mm_struct *gms = gts->ts_gms;
int ret;

+ gts->ustats.upm_tlbdropin++;
while (1) {
wait_event(gms->ms_wait_queue,
atomic_read(&gms->ms_range_active) == 0);
@@ -723,6 +725,31 @@ int gru_user_flush_tlb(unsigned long arg
}

/*
+ * Fetch GSEG statisticss
+ */
+long gru_get_gseg_statistics(unsigned long arg)
+{
+ struct gru_thread_state *gts;
+ struct gru_get_gseg_statistics_req req;
+
+ if (copy_from_user(&req, (void __user *)arg, sizeof(req)))
+ return -EFAULT;
+
+ gts = gru_find_lock_gts(req.gseg);
+ if (gts) {
+ memcpy(&req.stats, &gts->ustats, sizeof(gts->ustats));
+ gru_unlock_gts(gts);
+ } else {
+ memset(&req.stats, 0, sizeof(gts->ustats));
+ }
+
+ if (copy_to_user((void __user *)arg, &req, sizeof(req)))
+ return -EFAULT;
+
+ return 0;
+}
+
+/*
* Register the current task as the user of the GSEG slice.
* Needed for TLB fault interrupt targeting.
*/
Index: linux/drivers/misc/sgi-gru/grufile.c
===================================================================
--- linux.orig/drivers/misc/sgi-gru/grufile.c 2009-04-29 13:42:22.000000000 -0500
+++ linux/drivers/misc/sgi-gru/grufile.c 2009-04-29 13:43:42.000000000 -0500
@@ -251,6 +251,9 @@ static long gru_file_unlocked_ioctl(stru
case GRU_USER_CALL_OS:
err = gru_handle_user_call_os(arg);
break;
+ case GRU_GET_GSEG_STATISTICS:
+ err = gru_get_gseg_statistics(arg);
+ break;
case GRU_KTEST:
err = gru_ktest(arg);
break;
Index: linux/drivers/misc/sgi-gru/grulib.h
===================================================================
--- linux.orig/drivers/misc/sgi-gru/grulib.h 2009-04-29 13:40:16.000000000 -0500
+++ linux/drivers/misc/sgi-gru/grulib.h 2009-04-29 13:43:42.000000000 -0500
@@ -50,6 +50,9 @@
/* For dumpping GRU chiplet state */
#define GRU_DUMP_CHIPLET_STATE _IOWR(GRU_IOCTL_NUM, 11, void *)

+/* For getting gseg statistics */
+#define GRU_GET_GSEG_STATISTICS _IOWR(GRU_IOCTL_NUM, 12, void *)
+
/* For user TLB flushing (primarily for tests) */
#define GRU_USER_FLUSH_TLB _IOWR(GRU_IOCTL_NUM, 50, void *)

@@ -61,6 +64,21 @@

#define CONTEXT_WINDOW_BYTES(th) (GRU_GSEG_PAGESIZE * (th))
#define THREAD_POINTER(p, th) (p + GRU_GSEG_PAGESIZE * (th))
+#define GSEG_START(cb) ((void *)((unsigned long)(cb) & ~(GRU_GSEG_PAGESIZE - 1)))
+
+/*
+ * Statictics kept on a per-GTS basis.
+ */
+struct gts_statistics {
+ unsigned long fmm_tlbdropin;
+ unsigned long upm_tlbdropin;
+ unsigned long context_stolen;
+};
+
+struct gru_get_gseg_statistics_req {
+ unsigned long gseg;
+ struct gts_statistics stats;
+};

/*
* Structure used to pass TLB flush parameters to the driver
Index: linux/drivers/misc/sgi-gru/grumain.c
===================================================================
--- linux.orig/drivers/misc/sgi-gru/grumain.c 2009-04-29 13:40:15.000000000 -0500
+++ linux/drivers/misc/sgi-gru/grumain.c 2009-04-29 13:43:42.000000000 -0500
@@ -744,6 +744,7 @@ void gru_steal_context(struct gru_thread
spin_unlock(&blade->bs_lock);

if (ngts) {
+ gts->ustats.context_stolen++;
ngts->ts_steal_jiffies = jiffies;
gru_unload_context(ngts, is_kernel_context(ngts) ? 0 : 1);
gts_stolen(ngts, blade);
Index: linux/drivers/misc/sgi-gru/grutables.h
===================================================================
--- linux.orig/drivers/misc/sgi-gru/grutables.h 2009-04-29 13:43:22.000000000 -0500
+++ linux/drivers/misc/sgi-gru/grutables.h 2009-04-29 13:44:08.000000000 -0500
@@ -148,6 +148,7 @@
#include <linux/wait.h>
#include <linux/mmu_notifier.h>
#include "gru.h"
+#include "grulib.h"
#include "gruhandles.h"

extern struct gru_stats_s gru_stats;
@@ -388,6 +389,7 @@ struct gru_thread_state {
allocated CB */
int ts_data_valid; /* Indicates if ts_gdata has
valid data */
+ struct gts_statistics ustats; /* User statistics */
unsigned long ts_gdata[0]; /* save area for GRU data (CB,
DS, CBE) */
};
@@ -641,6 +643,7 @@ extern void gru_tgh_flush_init(struct gr
extern int gru_kservices_init(void);
extern void gru_kservices_exit(void);
extern int gru_dump_chiplet_request(unsigned long arg);
+extern long gru_get_gseg_statistics(unsigned long arg);
extern irqreturn_t gru_intr(int irq, void *dev_id);
extern int gru_handle_user_call_os(unsigned long address);
extern int gru_user_flush_tlb(unsigned long arg);


\
 
 \ /
  Last update: 2009-06-08 19:25    [W:0.072 / U:0.320 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site