GRU - GRU Driver updates
cover GRU - GRU Driver updates
This patchset is a collection of patches to the GRU driver. All changes are internal to the driver and have no effect on the core kernel or interfaces to/from the core kernel.
PATCH 1/13 GRU - bug fixes for GRU exception handling
From: Jack Steiner <[email protected]>
Bug fixes for GRU exception handling. Additional fields from the CBR must be returned to the user to allow the user to correctly diagnose GRU exceptions.
Handle endcase in TFH TLB miss handling. Verify that TFH actually indicates a pending exception.
--- drivers/misc/sgi-gru/gru_instructions.h | 20 +++++++++++++++++++- drivers/misc/sgi-gru/grufault.c | 25 +++++++++++++++++++++---- drivers/misc/sgi-gru/gruhandles.h | 23 ++++------------------- drivers/misc/sgi-gru/grumain.c | 3 +++ drivers/misc/sgi-gru/gruprocfs.c | 5 +++-- drivers/misc/sgi-gru/grutables.h | 2 ++ 6 files changed, 52 insertions(+), 26 deletions(-)
drivers/misc/sgi-gru/gru_instructions.h +19 -1
@@ -81,6 +81,8 @@ struct control_block_extended_exc_detailint exopc;long exceptdet0;int exceptdet1; +int cbrstate; +int cbrexecstatus; };/*
@@ -107,7 +109,8 @@ struct gru_instruction_bits { unsigned char reserved2: 2; unsigned char istatus: 2; unsigned char isubstatus:4; - unsigned char reserved3: 2; + unsigned char reserved3: 1; + unsigned char tlb_fault_color: 1;/* DW 1 */ unsigned long idef4;/* 42 bits: TRi1, BufSize */ /* DW 2-6 */
@@ -253,6 +256,21 @@ struct gru_instruction {#define CBE_CAUSE_RESPONSE_DATA_ERROR (1 << 16)#define CBE_CAUSE_PROTOCOL_STATE_DATA_ERROR (1 << 17) +/* CBE cbrexecstatus bits */ +#define CBR_EXS_ABORT_OCC_BIT 0 +#define CBR_EXS_INT_OCC_BIT 1 +#define CBR_EXS_PENDING_BIT 2 +#define CBR_EXS_QUEUED_BIT 3 +#define CBR_EXS_TLBHW_BIT 4 +#define CBR_EXS_EXCEPTION_BIT 5 + +#define CBR_EXS_ABORT_OCC (1 << CBR_EXS_ABORT_OCC_BIT) +#define CBR_EXS_INT_OCC (1 << CBR_EXS_INT_OCC_BIT) +#define CBR_EXS_PENDING (1 << CBR_EXS_PENDING_BIT) +#define CBR_EXS_QUEUED (1 << CBR_EXS_QUEUED_BIT) +#define CBR_EXS_TLBHW (1 << CBR_EXS_TLBHW_BIT) +#define CBR_EXS_EXCEPTION (1 << CBR_EXS_EXCEPTION_BIT) +/* * Exceptions are retried for the following cases. If any OTHER bits are set * in ecause, the exception is not retryable.
drivers/misc/sgi-gru/grufault.c +21 -4
@@ -334,6 +334,8 @@ static int gru_try_dropin(struct gru_thr* Might be a hardware race OR a stupid user. Ignore FMM because FMM * is a transient state. */ +if (tfh->status !=TFHSTATUS_EXCEPTION ) + goto failnoexception;if (tfh->state ==TFHSTATE_IDLE ) goto failidle;if (tfh->state ==TFHSTATE_MISS_FMM && cb)
@@ -401,8 +403,17 @@ failfmm:gru_dbg (grudev,"FAILED fmm tfh: 0x%p, state %d\n" , tfh, tfh->state);return 0 ; +failnoexception: +/* TFH status did not show exception pending */ +gru_flush_cache (tfh); +if (cb) +gru_flush_cache (cb); +STAT (tlb_dropin_fail_no_exception); +gru_dbg (grudev,"FAILED non-exception tfh: 0x%p, status %d, state %d\n" , tfh, tfh->status, tfh->state); +return 0 ; + failidle: -/* TFH was idle - no miss pending */ +/* TFH state was idle - no miss pending */ gru_flush_cache (tfh);if (cb)gru_flush_cache (cb);
@@ -472,7 +483,8 @@ irqreturn_t gru_intr(int irq, void *dev_* This is running in interrupt context. Trylock the mmap_sem. * If it fails, retry the fault in user context. */ -if (down_read_trylock (>s->ts_mm->mmap_sem)) { +if (!gts->ts_force_cch_reload && +down_read_trylock (>s->ts_mm->mmap_sem)) {gru_try_dropin (gts, tfh,NULL );up_read (>s->ts_mm->mmap_sem); }else {
@@ -595,14 +607,19 @@ int gru_get_exception_detail(unsigned lo excdet.ecause = cbe->ecause; excdet.exceptdet0 = cbe->idef1upd; excdet.exceptdet1 = cbe->idef3upd; + excdet.cbrstate = cbe->cbrstate; + excdet.cbrexecstatus = cbe->cbrexecstatus; ret =0 ; }else { ret = -EAGAIN ; }gru_unlock_gts (gts); -gru_dbg (grudev,"address 0x%lx, ecause 0x%x\n" , excdet.cb, - excdet.ecause); +gru_dbg (grudev, +"cb 0x%lx, op %d, exopc %d, cbrstate %d, cbrexecstatus 0x%x, ecause 0x%x, " +"exdet0 0x%lx, exdet1 0x%x\n" , + excdet.cb, excdet.opc, excdet.exopc, excdet.cbrstate, excdet.cbrexecstatus, + excdet.ecause, excdet.exceptdet0, excdet.exceptdet1);if (!ret &©_to_user ((void __user *)arg, &excdet,sizeof (excdet))) ret = -EFAULT ;return ret;
drivers/misc/sgi-gru/gruhandles.h +4 -19
@@ -251,15 +251,14 @@ struct gru_tlb_fault_handle { unsigned int fill1:9; unsigned int status:2; - unsigned int fill2:1; - unsigned int color:1; + unsigned int fill2:2; unsigned int state:3; unsigned int fill3:1; - unsigned int cause:7; /* DW 0 - high 32 */ + unsigned int cause:7; unsigned int fill4:1; - unsigned int indexway:12; + unsigned int indexway:12; /* DW 0 - high 32 */ unsigned int fill5:4; unsigned int ctxnum:4;
@@ -457,21 +456,7 @@ enum gru_cbr_state { CBRSTATE_BUSY_INTERRUPT, }; -/* CBE cbrexecstatus bits */ -#define CBR_EXS_ABORT_OCC_BIT 0 -#define CBR_EXS_INT_OCC_BIT 1 -#define CBR_EXS_PENDING_BIT 2 -#define CBR_EXS_QUEUED_BIT 3 -#define CBR_EXS_TLBHW_BIT 4 -#define CBR_EXS_EXCEPTION_BIT 5 - -#define CBR_EXS_ABORT_OCC (1 << CBR_EXS_ABORT_OCC_BIT) -#define CBR_EXS_INT_OCC (1 << CBR_EXS_INT_OCC_BIT) -#define CBR_EXS_PENDING (1 << CBR_EXS_PENDING_BIT) -#define CBR_EXS_QUEUED (1 << CBR_EXS_QUEUED_BIT) -#define CBR_EXS_TLBHW (1 << CBR_EXS_TLBHW_BIT) -#define CBR_EXS_EXCEPTION (1 << CBR_EXS_EXCEPTION_BIT) - +/* CBE cbrexecstatus bits - defined in gru_instructions.h*/ /* CBE ecause bits - defined in gru_instructions.h */ /*
drivers/misc/sgi-gru/grumain.c +3 -0
@@ -599,6 +599,9 @@ int gru_update_cch(struct gru_thread_sta cch->sizeavail[i] = gts->ts_sizeavail; gts->ts_tlb_int_select =gru_cpu_fault_map_id (); cch->tlb_int_select =gru_cpu_fault_map_id (); + cch->tfm_fault_bit_enable = + (gts->ts_user_options ==GRU_OPT_MISS_FMM_POLL + || gts->ts_user_options ==GRU_OPT_MISS_FMM_INTR ); }else {for (i =0 ; i <8 ; i++) cch->asid[i] =0 ;
drivers/misc/sgi-gru/gruprocfs.c +3 -2
@@ -84,6 +84,8 @@ static int statistics_show(struct seq_fiprintstat (s, tlb_dropin_fail_range_active);printstat (s, tlb_dropin_fail_idle);printstat (s, tlb_dropin_fail_fmm); +printstat (s, tlb_dropin_fail_no_exception); +printstat (s, tlb_dropin_fail_no_exception_war);printstat (s, mmu_invalidate_range);printstat (s, mmu_invalidate_page);printstat (s, mmu_clear_flush_young);
@@ -158,8 +160,7 @@ static ssize_t options_write(struct fileunsigned long val;char buf[80 ]; -if (copy_from_user - (buf, userbuf, count <sizeof (buf) ? count :sizeof (buf))) +if (strncpy_from_user (buf, userbuf,sizeof (buf) -1 ) <0 )return -EFAULT ; buf[count -1 ] ='\0' ;if (!strict_strtoul (buf,10 , &val))
drivers/misc/sgi-gru/grutables.h +2 -0
@@ -207,6 +207,8 @@ struct gru_stats_s {atomic_long_t tlb_dropin_fail_range_active;atomic_long_t tlb_dropin_fail_idle;atomic_long_t tlb_dropin_fail_fmm; +atomic_long_t tlb_dropin_fail_no_exception; +atomic_long_t tlb_dropin_fail_no_exception_war;atomic_long_t mmu_invalidate_range;atomic_long_t mmu_invalidate_page;atomic_long_t mmu_clear_flush_young;
PATCH 2/13 GRU - dump chiplet state
In reply to [email protected]From: Jack Steiner <[email protected]>
Add support for dumpping the state of an entire GRU chiplet.
--- drivers/misc/sgi-gru/Makefile | 2 drivers/misc/sgi-gru/grufile.c | 3 drivers/misc/sgi-gru/grukdump.c | 217 +++++++++++++++++++++++++++++++++++++++ drivers/misc/sgi-gru/grulib.h | 33 +++++ drivers/misc/sgi-gru/grutables.h | 12 ++ 5 files changed, 266 insertions(+), 1 deletion(-)
drivers/misc/sgi-gru/Makefile +1 -1
@@ -3,5 +3,5 @@ ifdef CONFIG_SGI_GRU_DEBUG endif obj-$(CONFIG_SGI_GRU) := gru.o -gru-y := grufile.o grumain.o grufault.o grutlbpurge.o gruprocfs.o grukservices.o gruhandles.o +gru-y := grufile.o grumain.o grufault.o grutlbpurge.o gruprocfs.o grukservices.o gruhandles.o grukdump.o
drivers/misc/sgi-gru/grufile.c +3 -0
@@ -255,6 +255,9 @@ static long gru_file_unlocked_ioctl(strucase GRU_GET_CONFIG_INFO : err =gru_get_config_info (arg);break ; +case GRU_DUMP_CHIPLET_STATE : + err =gru_dump_chiplet_request (arg); +break ; }return err; }
drivers/misc/sgi-gru/grukdump.c new file +217 -0
217 lines not on this page · raw message
drivers/misc/sgi-gru/grulib.h +33 -0
@@ -47,6 +47,9 @@/* For fetching GRU chiplet status */ #define GRU_GET_CHIPLET_STATUS _IOWR(GRU_IOCTL_NUM, 10, void *) +/* For dumpping GRU chiplet state */ +#define GRU_DUMP_CHIPLET_STATE _IOWR(GRU_IOCTL_NUM, 11, void *) +/* For user TLB flushing (primarily for tests) */ #define GRU_USER_FLUSH_TLB _IOWR(GRU_IOCTL_NUM, 50, void *)
@@ -84,6 +87,36 @@ struct gru_flush_tlb_req { };/* +* Structure used to pass TLB flush parameters to the driver +*/ +enum {dcs_pid, dcs_gid}; +struct gru_dump_chiplet_state_req { +unsigned int op; +int gid; +int ctxnum; +char data_opt; +char lock_cch; +pid_t pid; +void *buf; +size_t buflen; +/* ---- output --- */ +unsigned int num_contexts; +}; + +#define GRU_DUMP_MAGIC 0x3474ab6c +struct gru_dump_context_header { +unsigned int magic; +unsigned char gid; +unsigned char ctxnum; +unsigned char cbrcnt; +unsigned char dsrcnt; +pid_t pid; +unsigned long vaddr; +int cch_locked; +unsigned long data[0 ]; +}; + +/* * GRU configuration info (temp - for testing) */ struct gru_config_info {
drivers/misc/sgi-gru/grutables.h +12 -0
@@ -554,6 +554,12 @@ struct gru_blade_state {/* Lock hierarchy checking enabled only in emulator */ +/* 0 = lock failed, 1 = locked */ +static inline int __trylock_handle (void *h) +{ +return !test_and_set_bit (1 , h); +} +static inline void __lock_handle (void *h) {while (test_and_set_bit (1 , h))
@@ -565,6 +571,11 @@ static inline void __unlock_handle(voidclear_bit (1 , h); } +static inline int trylock_cch_handle (struct gru_context_configuration_handle *cch) +{ +return __trylock_handle (cch); +} +static inline void lock_cch_handle (struct gru_context_configuration_handle *cch) {__lock_handle (cch);
@@ -606,6 +617,7 @@ extern void gts_drop(struct gru_thread_sextern void gru_tgh_flush_init (struct gru_state *gru);extern int gru_kservices_init (struct gru_state *gru);extern void gru_kservices_exit (struct gru_state *gru); +extern int gru_dump_chiplet_request (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);
Re: [patch 02/13] GRU - dump chiplet state
drivers/misc/sgi-gru/grukdump.c line 28
Quoted 9 lines · On Mon, 06 Apr 2009 11:08:11 -0500 [email protected] wrote:
From: Jack Steiner <[email protected]>
Add support for dumpping the state of an entire GRU chiplet.
...
drivers/misc/sgi-gru/grukdump.c new file +3
-0+static int gru_user_copy_handle (void __user **dp,void *s) +{ +if (copy_to_user (*(void __user **)dp, s,GRU_HANDLE_BYTES ))
the typecast appears to be unneeded?
Quoted 11 lines
drivers/misc/sgi-gru/grukdump.c new file +5
-0+return -1 ; + *dp +=GRU_HANDLE_BYTES ; +return 0 ; +} +
drivers/misc/sgi-gru/grutables.h struct gru_blade_state { · line 561
Quoted 8 lines
drivers/misc/sgi-gru/grutables.h +5
-0@@ -554,6 +554,12 @@ struct gru_blade_state {/* Lock hierarchy checking enabled only in emulator */ +/* 0 = lock failed, 1 = locked */ +static inline int __trylock_handle (void *h) +{ +return !test_and_set_bit (1 , h); +}
It would be safer were this header to include bitops.h.
Re: [patch 02/13] GRU - dump chiplet state
Add support for dumpping the state of an entire GRU chiplet.
---
Updated per comments received from Andrew
drivers/misc/sgi-gru/Makefile | 2 drivers/misc/sgi-gru/grufile.c | 3 drivers/misc/sgi-gru/grukdump.c | 218 +++++++++++++++++++++++++++++++++++++++ drivers/misc/sgi-gru/grulib.h | 33 +++++ drivers/misc/sgi-gru/grutables.h | 12 ++ 5 files changed, 267 insertions(+), 1 deletion(-)
drivers/misc/sgi-gru/Makefile +1 -1
@@ -3,5 +3,5 @@ ifdef CONFIG_SGI_GRU_DEBUG endif obj-$(CONFIG_SGI_GRU) := gru.o -gru-y := grufile.o grumain.o grufault.o grutlbpurge.o gruprocfs.o grukservices.o gruhandles.o +gru-y := grufile.o grumain.o grufault.o grutlbpurge.o gruprocfs.o grukservices.o gruhandles.o grukdump.o
drivers/misc/sgi-gru/grufile.c +3 -0
@@ -255,6 +255,9 @@ static long gru_file_unlocked_ioctl(strucase GRU_GET_CONFIG_INFO : err =gru_get_config_info (arg);break ; +case GRU_DUMP_CHIPLET_STATE : + err =gru_dump_chiplet_request (arg); +break ; }return err; }
drivers/misc/sgi-gru/grukdump.c new file +218 -0
218 lines not on this page · raw message
drivers/misc/sgi-gru/grulib.h +33 -0
@@ -47,6 +47,9 @@/* For fetching GRU chiplet status */ #define GRU_GET_CHIPLET_STATUS _IOWR(GRU_IOCTL_NUM, 10, void *) +/* For dumpping GRU chiplet state */ +#define GRU_DUMP_CHIPLET_STATE _IOWR(GRU_IOCTL_NUM, 11, void *) +/* For user TLB flushing (primarily for tests) */ #define GRU_USER_FLUSH_TLB _IOWR(GRU_IOCTL_NUM, 50, void *)
@@ -84,6 +87,36 @@ struct gru_flush_tlb_req { };/* +* Structure used to pass TLB flush parameters to the driver +*/ +enum {dcs_pid, dcs_gid}; +struct gru_dump_chiplet_state_req { +unsigned int op; +int gid; +int ctxnum; +char data_opt; +char lock_cch; +pid_t pid; +void *buf; +size_t buflen; +/* ---- output --- */ +unsigned int num_contexts; +}; + +#define GRU_DUMP_MAGIC 0x3474ab6c +struct gru_dump_context_header { +unsigned int magic; +unsigned char gid; +unsigned char ctxnum; +unsigned char cbrcnt; +unsigned char dsrcnt; +pid_t pid; +unsigned long vaddr; +int cch_locked; +unsigned long data[0 ]; +}; + +/* * GRU configuration info (temp - for testing) */ struct gru_config_info {
drivers/misc/sgi-gru/grutables.h +12 -0
@@ -554,6 +554,12 @@ struct gru_blade_state {/* Lock hierarchy checking enabled only in emulator */ +/* 0 = lock failed, 1 = locked */ +static inline int __trylock_handle (void *h) +{ +return !test_and_set_bit (1 , h); +} +static inline void __lock_handle (void *h) {while (test_and_set_bit (1 , h))
@@ -565,6 +571,11 @@ static inline void __unlock_handle(voidclear_bit (1 , h); } +static inline int trylock_cch_handle (struct gru_context_configuration_handle *cch) +{ +return __trylock_handle (cch); +} +static inline void lock_cch_handle (struct gru_context_configuration_handle *cch) {__lock_handle (cch);
@@ -606,6 +617,7 @@ extern void gts_drop(struct gru_thread_sextern void gru_tgh_flush_init (struct gru_state *gru);extern int gru_kservices_init (struct gru_state *gru);extern void gru_kservices_exit (struct gru_state *gru); +extern int gru_dump_chiplet_request (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);
PATCH 3/13 GRU - dynamic allocation of kernel contexts
In reply to [email protected]From: Jack Steiner <[email protected]>
Change the interface to gru_alloc_gts() so that it can be used to allocate GRU contexts for kernel threads. Kernel threads do not have vdata structures for the GRU contexts. The GRU resource count are now passed explicitly instead of inside the vdata structure.
--- drivers/misc/sgi-gru/grumain.c | 55 +++++++++++++++++++-------------------- drivers/misc/sgi-gru/grutables.h | 2 + 2 files changed, 30 insertions(+), 27 deletions(-)
drivers/misc/sgi-gru/grumain.c +28 -27
@@ -299,15 +299,13 @@ static struct gru_thread_state *gru_find/* * Allocate a thread state structure. */ -static struct gru_thread_state *gru_alloc_gts (struct vm_area_struct *vma, -struct gru_vma_data *vdata, -int tsid) +struct gru_thread_state *gru_alloc_gts (struct vm_area_struct *vma, +int cbr_au_count,int dsr_au_count,int options,int tsid) {struct gru_thread_state *gts;int bytes; - bytes =DSR_BYTES (vdata->vd_dsr_au_count) + -CBR_BYTES (vdata->vd_cbr_au_count); + bytes =DSR_BYTES (dsr_au_count) +CBR_BYTES (cbr_au_count); bytes +=sizeof (struct gru_thread_state ); gts =kzalloc (bytes,GFP_KERNEL );if (!gts)
@@ -316,21 +314,22 @@ static struct gru_thread_state *gru_alloSTAT (gts_alloc);atomic_set (>s->ts_refcnt,1 );mutex_init (>s->ts_ctxlock); - gts->ts_cbr_au_count = vdata->vd_cbr_au_count; - gts->ts_dsr_au_count = vdata->vd_dsr_au_count; - gts->ts_user_options = vdata->vd_user_options; + gts->ts_cbr_au_count = cbr_au_count; + gts->ts_dsr_au_count = dsr_au_count; + gts->ts_user_options = options; gts->ts_tsid = tsid; - gts->ts_user_options = vdata->vd_user_options; gts->ts_ctxnum =NULLCTX ; - gts->ts_mm = current->mm; - gts->ts_vma = vma; gts->ts_tlb_int_select =-1 ; - gts->ts_gms =gru_register_mmu_notifier (); gts->ts_sizeavail =GRU_SIZEAVAIL (PAGE_SHIFT ); -if (!gts->ts_gms) - goto err; +if (vma) { + gts->ts_mm = current->mm; + gts->ts_vma = vma; + gts->ts_gms =gru_register_mmu_notifier (); +if (!gts->ts_gms) + goto err; + } -gru_dbg (grudev,"alloc vdata %p, new gts %p\n" , vdata, gts); +gru_dbg (grudev,"alloc gts %p\n" , gts);return gts; err:
@@ -381,7 +380,8 @@ struct gru_thread_state *gru_alloc_threastruct gru_vma_data *vdata = vma->vm_private_data;struct gru_thread_state *gts, *ngts; - gts =gru_alloc_gts (vma, vdata, tsid); + gts =gru_alloc_gts (vma, vdata->vd_cbr_au_count, vdata->vd_dsr_au_count, + vdata->vd_user_options, tsid);if (!gts)return NULL ;
@@ -645,7 +645,7 @@ static int gru_retarget_intr(struct gru_#define next_gru (b, g) (((g) < &(b)->bs_grus[GRU_CHIPLETS_PER_BLADE - 1]) ? \ ((g)+1) : &(b)->bs_grus[0]) -static void gru_steal_context (struct gru_thread_state *gts) +static void gru_steal_context (struct gru_thread_state *gts,int blade_id) {struct gru_blade_state *blade;struct gru_state *gru, *gru0;
@@ -655,8 +655,7 @@ static void gru_steal_context(struct gru cbr = gts->ts_cbr_au_count; dsr = gts->ts_dsr_au_count; -preempt_disable (); - blade = gru_base[uv_numa_blade_id ()]; + blade = gru_base[blade_id];spin_lock (&blade->bs_lock); ctxnum =next_ctxnum (blade->bs_lru_ctxnum);
@@ -693,7 +692,6 @@ static void gru_steal_context(struct gru blade->bs_lru_gru = gru; blade->bs_lru_ctxnum = ctxnum;spin_unlock (&blade->bs_lock); -preempt_enable ();if (ngts) {STAT (steal_context);
@@ -713,17 +711,17 @@ static void gru_steal_context(struct gru/* * Scan the GRUs on the local blade & assign a GRU context. */ -static struct gru_state *gru_assign_gru_context (struct gru_thread_state *gts) +static struct gru_state *gru_assign_gru_context (struct gru_thread_state *gts, +int blade) {struct gru_state *gru, *grux;int i, max_active_contexts; -preempt_disable (); again: gru =NULL ; max_active_contexts =GRU_NUM_CCH ; -for_each_gru_on_blade (grux,uv_numa_blade_id (), i) { +for_each_gru_on_blade (grux, blade, i) {if (check_gru_resources (grux, gts->ts_cbr_au_count, gts->ts_dsr_au_count, max_active_contexts)) {
@@ -763,7 +761,6 @@ again:STAT (assign_context_failed); } -preempt_enable ();return gru; }
@@ -778,6 +775,7 @@ int gru_fault(struct vm_area_struct *vma {struct gru_thread_state *gts;unsigned long paddr, vaddr; +int blade_id; vaddr = (unsigned long )vmf->virtual_address; gru_dbg(grudev, "vma %p, vaddr 0x%lx (0x%lx)\n",
@@ -792,8 +790,10 @@ int gru_fault(struct vm_area_struct *vma again:mutex_lock (>s->ts_ctxlock);preempt_disable (); + blade_id =uv_numa_blade_id (); +if (gts->ts_gru) { -if (gts->ts_gru->gs_blade_id !=uv_numa_blade_id ()) { +if (gts->ts_gru->gs_blade_id != blade_id) {STAT (migrated_nopfn_unload);gru_unload_context (gts,1 ); }else {
@@ -803,12 +803,13 @@ again: }if (!gts->ts_gru) { -if (!gru_assign_gru_context (gts)) { +if (!gru_assign_gru_context (gts, blade_id)) {mutex_unlock (>s->ts_ctxlock);preempt_enable ();schedule_timeout (GRU_ASSIGN_DELAY );/* true hack ZZZ */ + blade_id =uv_numa_blade_id ();if (gts->ts_steal_jiffies +GRU_STEAL_DELAY < jiffies) -gru_steal_context (gts); +gru_steal_context (gts, blade_id); goto again; }gru_load_context (gts);
drivers/misc/sgi-gru/grutables.h +2 -0
@@ -630,6 +630,8 @@ extern void gru_flush_all_tlb(struct gruextern int gru_proc_init (void );extern void gru_proc_exit (void ); +extern struct gru_thread_state *gru_alloc_gts (struct vm_area_struct *vma, +int cbr_au_count,int dsr_au_count,int options,int tsid);extern unsigned long gru_reserve_cb_resources (struct gru_state *gru,int cbr_au_count,char *cbmap); extern unsigned long gru_reserve_ds_resources(struct gru_state *gru,
Re: [patch 03/13] GRU - dynamic allocation of kernel contexts
drivers/misc/sgi-gru/grumain.c again: · line 808
Quoted 8 lines · On Mon, 06 Apr 2009 11:08:12 -0500 [email protected] wrote:
drivers/misc/sgi-gru/grumain.c +1
-1@@ -803,12 +803,13 @@ again: }if (!gts->ts_gru) { -if (!gru_assign_gru_context (gts)) { +if (!gru_assign_gru_context (gts, blade_id)) {mutex_unlock (>s->ts_ctxlock);preempt_enable ();
It's strange (but not buggy) to do the operations in this order.
preempt_enable(); mutex_unlock(...);
would be more natural.
drivers/misc/sgi-gru/grumain.c again: · line 809
Quoted 1 line
drivers/misc/sgi-gru/grumain.c +0
-0schedule_timeout (GRU_ASSIGN_DELAY );/* true hack ZZZ */
afacit the hack doesn't do anything because the caller is still in state TASK_RUNNING.
Quoted 1 line
(quoted diff) +1
-0+ blade_id = uv_numa_blade_id();
Re: [patch 03/13] GRU - dynamic allocation of kernel contexts
Change the interface to gru_alloc_gts() so that it can be used to allocate GRU contexts for kernel threads. Kernel threads do not have vdata structures for the GRU contexts. The GRU resource count are now passed explicitly instead of inside the vdata structure.
---
Added fixes from Andrew.
drivers/misc/sgi-gru/grumain.c | 60 ++++++++++++++++++++------------------- drivers/misc/sgi-gru/grutables.h | 2 + 2 files changed, 33 insertions(+), 29 deletions(-)
drivers/misc/sgi-gru/grumain.c +31 -29
@@ -299,15 +299,13 @@ static struct gru_thread_state *gru_find/* * Allocate a thread state structure. */ -static struct gru_thread_state *gru_alloc_gts (struct vm_area_struct *vma, -struct gru_vma_data *vdata, -int tsid) +struct gru_thread_state *gru_alloc_gts (struct vm_area_struct *vma, +int cbr_au_count,int dsr_au_count,int options,int tsid) {struct gru_thread_state *gts;int bytes; - bytes =DSR_BYTES (vdata->vd_dsr_au_count) + -CBR_BYTES (vdata->vd_cbr_au_count); + bytes =DSR_BYTES (dsr_au_count) +CBR_BYTES (cbr_au_count); bytes +=sizeof (struct gru_thread_state ); gts =kzalloc (bytes,GFP_KERNEL );if (!gts)
@@ -316,21 +314,22 @@ static struct gru_thread_state *gru_alloSTAT (gts_alloc);atomic_set (>s->ts_refcnt,1 );mutex_init (>s->ts_ctxlock); - gts->ts_cbr_au_count = vdata->vd_cbr_au_count; - gts->ts_dsr_au_count = vdata->vd_dsr_au_count; - gts->ts_user_options = vdata->vd_user_options; + gts->ts_cbr_au_count = cbr_au_count; + gts->ts_dsr_au_count = dsr_au_count; + gts->ts_user_options = options; gts->ts_tsid = tsid; - gts->ts_user_options = vdata->vd_user_options; gts->ts_ctxnum =NULLCTX ; - gts->ts_mm = current->mm; - gts->ts_vma = vma; gts->ts_tlb_int_select =-1 ; - gts->ts_gms =gru_register_mmu_notifier (); gts->ts_sizeavail =GRU_SIZEAVAIL (PAGE_SHIFT ); -if (!gts->ts_gms) - goto err; +if (vma) { + gts->ts_mm = current->mm; + gts->ts_vma = vma; + gts->ts_gms =gru_register_mmu_notifier (); +if (!gts->ts_gms) + goto err; + } -gru_dbg (grudev,"alloc vdata %p, new gts %p\n" , vdata, gts); +gru_dbg (grudev,"alloc gts %p\n" , gts);return gts; err:
@@ -381,7 +380,8 @@ struct gru_thread_state *gru_alloc_threastruct gru_vma_data *vdata = vma->vm_private_data;struct gru_thread_state *gts, *ngts; - gts =gru_alloc_gts (vma, vdata, tsid); + gts =gru_alloc_gts (vma, vdata->vd_cbr_au_count, vdata->vd_dsr_au_count, + vdata->vd_user_options, tsid);if (!gts)return NULL ;
@@ -645,7 +645,7 @@ static int gru_retarget_intr(struct gru_#define next_gru (b, g) (((g) < &(b)->bs_grus[GRU_CHIPLETS_PER_BLADE - 1]) ? \ ((g)+1) : &(b)->bs_grus[0]) -static void gru_steal_context (struct gru_thread_state *gts) +static void gru_steal_context (struct gru_thread_state *gts,int blade_id) {struct gru_blade_state *blade;struct gru_state *gru, *gru0;
@@ -655,8 +655,7 @@ static void gru_steal_context(struct gru cbr = gts->ts_cbr_au_count; dsr = gts->ts_dsr_au_count; -preempt_disable (); - blade = gru_base[uv_numa_blade_id ()]; + blade = gru_base[blade_id];spin_lock (&blade->bs_lock); ctxnum =next_ctxnum (blade->bs_lru_ctxnum);
@@ -693,7 +692,6 @@ static void gru_steal_context(struct gru blade->bs_lru_gru = gru; blade->bs_lru_ctxnum = ctxnum;spin_unlock (&blade->bs_lock); -preempt_enable ();if (ngts) {STAT (steal_context);
@@ -713,17 +711,17 @@ static void gru_steal_context(struct gru/* * Scan the GRUs on the local blade & assign a GRU context. */ -static struct gru_state *gru_assign_gru_context (struct gru_thread_state *gts) +static struct gru_state *gru_assign_gru_context (struct gru_thread_state *gts, +int blade) {struct gru_state *gru, *grux;int i, max_active_contexts; -preempt_disable (); again: gru =NULL ; max_active_contexts =GRU_NUM_CCH ; -for_each_gru_on_blade (grux,uv_numa_blade_id (), i) { +for_each_gru_on_blade (grux, blade, i) {if (check_gru_resources (grux, gts->ts_cbr_au_count, gts->ts_dsr_au_count, max_active_contexts)) {
@@ -763,7 +761,6 @@ again:STAT (assign_context_failed); } -preempt_enable ();return gru; }
@@ -778,6 +775,7 @@ int gru_fault(struct vm_area_struct *vma {struct gru_thread_state *gts;unsigned long paddr, vaddr; +int blade_id; vaddr = (unsigned long )vmf->virtual_address; gru_dbg(grudev, "vma %p, vaddr 0x%lx (0x%lx)\n",
@@ -792,8 +790,10 @@ int gru_fault(struct vm_area_struct *vma again:mutex_lock (>s->ts_ctxlock);preempt_disable (); + blade_id =uv_numa_blade_id (); +if (gts->ts_gru) { -if (gts->ts_gru->gs_blade_id !=uv_numa_blade_id ()) { +if (gts->ts_gru->gs_blade_id != blade_id) {STAT (migrated_nopfn_unload);gru_unload_context (gts,1 ); }else {
@@ -803,12 +803,14 @@ again: }if (!gts->ts_gru) { -if (!gru_assign_gru_context (gts)) { -mutex_unlock (>s->ts_ctxlock); +if (!gru_assign_gru_context (gts, blade_id)) {preempt_enable (); +mutex_unlock (>s->ts_ctxlock); +set_current_state (TASK_INTERRUPTIBLE );schedule_timeout (GRU_ASSIGN_DELAY );/* true hack ZZZ */ + blade_id =uv_numa_blade_id ();if (gts->ts_steal_jiffies +GRU_STEAL_DELAY < jiffies) -gru_steal_context (gts); +gru_steal_context (gts, blade_id); goto again; }gru_load_context (gts);
@@ -818,8 +820,8 @@ again: vma->vm_page_prot); } -mutex_unlock (>s->ts_ctxlock);preempt_enable (); +mutex_unlock (>s->ts_ctxlock);return VM_FAULT_NOPAGE ; }
drivers/misc/sgi-gru/grutables.h +2 -0
@@ -630,6 +630,8 @@ extern void gru_flush_all_tlb(struct gruextern int gru_proc_init (void );extern void gru_proc_exit (void ); +extern struct gru_thread_state *gru_alloc_gts (struct vm_area_struct *vma, +int cbr_au_count,int dsr_au_count,int options,int tsid);extern unsigned long gru_reserve_cb_resources (struct gru_state *gru,int cbr_au_count,char *cbmap); extern unsigned long gru_reserve_ds_resources(struct gru_state *gru,
Re: [patch 03/13] GRU - dynamic allocation of kernel contexts
drivers/misc/sgi-gru/grumain.c again: · line 810
Quoted 3 lines · On Fri, 10 Apr 2009 08:24:18 -0500 Jack Steiner <[email protected]> wrote:
drivers/misc/sgi-gru/grumain.c +2
-0+mutex_unlock (>s->ts_ctxlock); +set_current_state (TASK_INTERRUPTIBLE );schedule_timeout (GRU_ASSIGN_DELAY );/* true hack ZZZ */
OK... But if the calling task has signal_pending(), the schedule_timeout() will return immediately.
If that's a problem then perhaps use plain old msleep()?
PATCH 4/13 GRU - change context load and unload
In reply to [email protected]From: Jack Steiner <[email protected]>
Remove "static" from the functions for loading/unloading GRU contexts. These functions will be called from other GRU files. Fix bug in unlocking gru context.
--- drivers/misc/sgi-gru/grufault.c | 4 ++-- drivers/misc/sgi-gru/grumain.c | 10 +++++----- drivers/misc/sgi-gru/grutables.h | 4 ++++ 3 files changed, 11 insertions(+), 7 deletions(-)
drivers/misc/sgi-gru/grufault.c +2 -2
@@ -558,8 +558,8 @@ int gru_handle_user_call_os(unsigned lon* CCH may contain stale data if ts_force_cch_reload is set. */ if (gts->ts_gru && gts->ts_force_cch_reload) { -gru_update_cch (gts,0 ); gts->ts_force_cch_reload =0 ; +gru_update_cch (gts,0 ); } ret = -EAGAIN ;
@@ -644,7 +644,7 @@ static int gru_unload_all_contexts(void)if (gts &&mutex_trylock (>s->ts_ctxlock)) {spin_unlock (&gru->gs_lock);gru_unload_context (gts,1 ); -gru_unlock_gts (gts); +mutex_unlock (>s->ts_ctxlock);spin_lock (&gru->gs_lock); } }
drivers/misc/sgi-gru/grumain.c +5 -5
@@ -533,7 +533,7 @@ void gru_unload_context(struct gru_threa* Load a GRU context by copying it from the thread data structure in memory * to the GRU. */ -static void gru_load_context (struct gru_thread_state *gts) +void gru_load_context (struct gru_thread_state *gts) {struct gru_state *gru = gts->ts_gru;struct gru_context_configuration_handle *cch;
@@ -600,8 +600,8 @@ int gru_update_cch(struct gru_thread_sta gts->ts_tlb_int_select =gru_cpu_fault_map_id (); cch->tlb_int_select =gru_cpu_fault_map_id (); cch->tfm_fault_bit_enable = - (gts->ts_user_options ==GRU_OPT_MISS_FMM_POLL - || gts->ts_user_options ==GRU_OPT_MISS_FMM_INTR ); + (gts->ts_user_options ==GRU_OPT_MISS_FMM_POLL + || gts->ts_user_options ==GRU_OPT_MISS_FMM_INTR ); }else {for (i =0 ; i <8 ; i++) cch->asid[i] =0 ;
@@ -645,7 +645,7 @@ static int gru_retarget_intr(struct gru_#define next_gru (b, g) (((g) < &(b)->bs_grus[GRU_CHIPLETS_PER_BLADE - 1]) ? \ ((g)+1) : &(b)->bs_grus[0]) -static void gru_steal_context (struct gru_thread_state *gts,int blade_id) +void gru_steal_context (struct gru_thread_state *gts,int blade_id) {struct gru_blade_state *blade;struct gru_state *gru, *gru0;
@@ -711,7 +711,7 @@ static void gru_steal_context(struct gru/* * Scan the GRUs on the local blade & assign a GRU context. */ -static struct gru_state *gru_assign_gru_context (struct gru_thread_state *gts, +struct gru_state *gru_assign_gru_context (struct gru_thread_state *gts,int blade) {struct gru_state *gru, *grux;
drivers/misc/sgi-gru/grutables.h +4 -0
@@ -611,6 +611,10 @@ extern struct gru_thread_state *gru_find *vma, int tsid);extern struct gru_thread_state *gru_alloc_thread_state (struct vm_area_struct *vma,int tsid); +extern struct gru_state *gru_assign_gru_context (struct gru_thread_state *gts, +int blade); +extern void gru_load_context (struct gru_thread_state *gts); +extern void gru_steal_context (struct gru_thread_state *gts,int blade_id);extern void gru_unload_context (struct gru_thread_state *gts,int savestate);extern int gru_update_cch (struct gru_thread_state *gts,int force_unload);extern void gts_drop (struct gru_thread_state *gts);
PATCH 5/13 GRU - support cch_allocate for kernel threads
In reply to [email protected]From: Jack Steiner <[email protected]>
Change the interface to cch_allocate so that it can be used to allocate GRU contexts for kernel threads. Kernel threads use the GRU in unmapped mode and do not require ASIDs for the GRU TLB.
--- drivers/misc/sgi-gru/gruhandles.c | 14 ++------------ drivers/misc/sgi-gru/gruhandles.h | 4 +--- drivers/misc/sgi-gru/grukservices.c | 5 ++++- drivers/misc/sgi-gru/grumain.c | 15 +++++++++++---- 4 files changed, 18 insertions(+), 20 deletions(-)
drivers/misc/sgi-gru/gruhandles.c +2 -12
@@ -72,18 +72,8 @@ static int wait_instruction_complete(voireturn status; } -int cch_allocate (struct gru_context_configuration_handle *cch, -int asidval,int sizeavail,unsigned long cbrmap, -unsigned long dsrmap) -{ -int i; - -for (i =0 ; i <8 ; i++) { - cch->asid[i] = (asidval++); - cch->sizeavail[i] = sizeavail; - } - cch->dsr_allocation_map = dsrmap; - cch->cbr_allocation_map = cbrmap; +int cch_allocate (struct gru_context_configuration_handle *cch) +{ cch->opc =CCHOP_ALLOCATE ;start_instruction (cch);return wait_instruction_complete (cch, cchop_allocate);
drivers/misc/sgi-gru/gruhandles.h +1 -3
@@ -480,9 +480,7 @@ enum gru_cbr_state {/* minimum TLB purge count to ensure a full purge */ #define GRUMAXINVAL 1024UL -int cch_allocate (struct gru_context_configuration_handle *cch, -int asidval,int sizeavail,unsigned long cbrmap,unsigned long dsrmap); - +int cch_allocate (struct gru_context_configuration_handle *cch);int cch_start (struct gru_context_configuration_handle *cch);int cch_interrupt (struct gru_context_configuration_handle *cch);int cch_deallocate (struct gru_context_configuration_handle *cch);
drivers/misc/sgi-gru/grukservices.c +4 -1
@@ -672,7 +672,10 @@ int gru_kservices_init(struct gru_state cch->tlb_int_enable =0 ; cch->tfm_done_bit_enable =0 ; cch->unmap_enable =1 ; - err =cch_allocate (cch,0 ,0 , cbr_map, dsr_map); + cch->dsr_allocation_map = dsr_map; + cch->cbr_allocation_map = cbr_map; + + err =cch_allocate (cch);if (err) { gru_dbg(grudev, "Unable to allocate kernel CCH: gid %d, err %d\n",
drivers/misc/sgi-gru/grumain.c +11 -4
@@ -537,13 +537,12 @@ void gru_load_context(struct gru_thread_ {struct gru_state *gru = gts->ts_gru;struct gru_context_configuration_handle *cch; -int err, asid, ctxnum = gts->ts_ctxnum; +int i, err, asid, ctxnum = gts->ts_ctxnum;gru_dbg (grudev,"gts %p\n" , gts); cch =get_cch (gru->gs_gru_base_vaddr, ctxnum);lock_cch_handle (cch); - asid =gru_load_mm_tracker (gru, gts); cch->tfm_fault_bit_enable = (gts->ts_user_options ==GRU_OPT_MISS_FMM_POLL || gts->ts_user_options ==GRU_OPT_MISS_FMM_INTR );
@@ -553,8 +552,16 @@ void gru_load_context(struct gru_thread_ cch->tlb_int_select = gts->ts_tlb_int_select; } cch->tfm_done_bit_enable =0 ; - err =cch_allocate (cch, asid, gts->ts_sizeavail, gts->ts_cbr_map, - gts->ts_dsr_map); + cch->dsr_allocation_map = gts->ts_dsr_map; + cch->cbr_allocation_map = gts->ts_cbr_map; + asid =gru_load_mm_tracker (gru, gts); + cch->unmap_enable =0 ; +for (i =0 ; i <8 ; i++) { + cch->asid[i] = asid + i; + cch->sizeavail[i] = gts->ts_sizeavail; + } + + err =cch_allocate (cch);if (err) { gru_dbg(grudev, "err %d: cch %p, gts %p, cbr 0x%lx, dsr 0x%lx\n",
PATCH 6/13 GRU - change resource assignment for kernel threads
In reply to [email protected]From: Jack Steiner <[email protected]>
Change the way GRU resources are assigned for kernel threads. GRU contexts for kernel threads are now allocated on demand and can be stolen by user processes when idle. This allows MPI jobs to use ALL of the GRU resources when the kernel is not using them.
--- drivers/misc/sgi-gru/gruhandles.c | 5 drivers/misc/sgi-gru/grukdump.c | 2 drivers/misc/sgi-gru/grukservices.c | 201 +++++++++++++++++++++--------------- drivers/misc/sgi-gru/grumain.c | 55 +++++++-- drivers/misc/sgi-gru/gruprocfs.c | 9 + drivers/misc/sgi-gru/grutables.h | 17 ++- 6 files changed, 184 insertions(+), 105 deletions(-)
drivers/misc/sgi-gru/gruhandles.c +3 -2
@@ -57,7 +57,7 @@ static void start_instruction(void *h)static int wait_instruction_complete (void *h,enum mcs_op opc) {int status; -cycles_t start_time =get_cycles (); +unsigned long start_time =get_cycles ();while (1 ) {cpu_relax ();
@@ -65,7 +65,8 @@ static int wait_instruction_complete(voiif (status !=CCHSTATUS_ACTIVE )break ;if (GRU_OPERATION_TIMEOUT < (get_cycles () - start_time)) -panic ("GRU %p is malfunctioning\n" , h); +panic ("GRU %p is malfunctioning: start %ld, end %ld\n" , + h, start_time, (unsigned long )get_cycles ()); }if (gru_options &OPT_STATS )update_mcs_stats (opc,get_cycles () - start_time);
drivers/misc/sgi-gru/grukdump.c +1 -1
@@ -130,7 +130,7 @@ static int gru_dump_context(struct gru_sif (cch_locked || !lock_cch) { gts = gru->gs_gts[ctxnum]; -if (gts) { +if (gts && gts->ts_vma) { hdr.pid = gts->ts_tgid_owner; hdr.vaddr = gts->ts_vma->vm_start; }
drivers/misc/sgi-gru/grukservices.c +120 -81
282 lines not on this page · raw message
drivers/misc/sgi-gru/grumain.c +40 -15
116 lines not on this page · raw message
drivers/misc/sgi-gru/gruprocfs.c +6 -3
@@ -51,9 +51,12 @@ static int statistics_show(struct seq_fiprintstat (s, assign_context);printstat (s, assign_context_failed);printstat (s, free_context); -printstat (s, load_context); -printstat (s, unload_context); -printstat (s, steal_context); +printstat (s, load_user_context); +printstat (s, load_kernel_context); +printstat (s, lock_kernel_context); +printstat (s, unlock_kernel_context); +printstat (s, steal_user_context); +printstat (s, steal_kernel_context);printstat (s, steal_context_failed);printstat (s, nopfn);printstat (s, break_cow);
drivers/misc/sgi-gru/grutables.h +14 -3
@@ -174,9 +174,12 @@ struct gru_stats_s {atomic_long_t assign_context;atomic_long_t assign_context_failed;atomic_long_t free_context; -atomic_long_t load_context; -atomic_long_t unload_context; -atomic_long_t steal_context; +atomic_long_t load_user_context; +atomic_long_t load_kernel_context; +atomic_long_t lock_kernel_context; +atomic_long_t unlock_kernel_context; +atomic_long_t steal_user_context; +atomic_long_t steal_kernel_context;atomic_long_t steal_context_failed;atomic_long_t nopfn;atomic_long_t break_cow;
@@ -454,6 +457,9 @@ struct gru_blade_state {reserved cb */ void *kernel_dsr;/* First kernel reserved DSR */ +struct rw_semaphore bs_kgts_sema;/* lock for kgts */ +struct gru_thread_state *bs_kgts;/* GTS for kernel use */ +/* ---- the following are protected by the bs_lock spinlock ---- */ spinlock_t bs_lock;/* lock used for stealing contexts */
@@ -597,6 +603,11 @@ static inline void unlock_tgh_handle(str__unlock_handle (tgh); } +static inline int is_kernel_context (struct gru_thread_state *gts) +{ +return !gts->ts_mm; +} +/*----------------------------------------------------------------------------- * Function prototypes & externs */
PATCH 7/13 GRU - support contexts with zero dsrs or cbrs
In reply to [email protected]From: Jack Steiner <[email protected]>
Support alocation of GRU contexts that contain zero DSR or CBR resources. Some instructions do not require DSR resources. Contexts without CBR resources are useful for diagnostics.
--- drivers/misc/sgi-gru/grufile.c | 6 ++---- drivers/misc/sgi-gru/grumain.c | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-)
drivers/misc/sgi-gru/grufile.c +2 -4
@@ -135,11 +135,9 @@ static int gru_create_new_context(unsignif (copy_from_user (&req, (void __user *)arg,sizeof (req)))return -EFAULT ; -if (req.data_segment_bytes ==0 || - req.data_segment_bytes > max_user_dsr_bytes) +if (req.data_segment_bytes > max_user_dsr_bytes)return -EINVAL ; -if (!req.control_blocks || !req.maximum_thread_count || - req.control_blocks > max_user_cbrs) +if (req.control_blocks > max_user_cbrs || !req.maximum_thread_count)return -EINVAL ;if (!(req.options &GRU_OPT_MISS_MASK ))
drivers/misc/sgi-gru/grumain.c +2 -2
@@ -150,7 +150,7 @@ static unsigned long reserve_resources(uunsigned long bits =0 ;int i; - do { +while (n--) { i =find_first_bit (p, mmax);if (i == mmax)BUG ();
@@ -158,7 +158,7 @@ static unsigned long reserve_resources(u__set_bit (i, &bits);if (idx) *idx++ = i; - }while (--n); + }return bits; }
PATCH 8/13 GRU - fix handling of mesq failures
In reply to [email protected]From: Jack Steiner <[email protected]>
Fix endcase in handling GRU message queue failures due to NACKs of PUT requests. Must ensure that the "present" bits are cleared before resending the message.
--- drivers/misc/sgi-gru/grukservices.c | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-)
drivers/misc/sgi-gru/grukservices.c +24 -9
@@ -503,6 +503,29 @@ static void send_message_queue_interrupt mqd->interrupt_vector); } +/* +* Handle a PUT failure. Note: if message was a 2-line message, one of the +* lines might have successfully have been written. Before sending the +* message, "present" must be cleared in BOTH lines to prevent the receiver +* from prematurely seeing the full message. +*/ +static int send_message_put_nacked (void *cb,struct gru_message_queue_desc *mqd, +void *mesg,int lines) +{ +unsigned long m; + + m = mqd->mq_gpa + (gru_get_amo_value_head (cb) <<6 ); +if (lines ==2 ) { +gru_vset (cb, m,0 ,XTYPE_CL , lines,1 ,IMA ); +if (gru_wait (cb) !=CBS_IDLE ) +return MQE_UNEXPECTED_CB_ERR ; + } +gru_vstore (cb, m,gru_get_tri (mesg),XTYPE_CL , lines,1 ,IMA ); +if (gru_wait (cb) !=CBS_IDLE ) +return MQE_UNEXPECTED_CB_ERR ; +send_message_queue_interrupt (mqd); +return MQE_OK ; +}/* * Handle a gru_mesq failure. Some of these failures are software recoverable
@@ -512,7 +535,6 @@ static int send_message_failure(void *cb void *mesg, int lines) {int substatus, ret =0 ; -unsigned long m; substatus =gru_get_cb_message_queue_substatus (cb);switch (substatus) {
@@ -534,14 +556,7 @@ static int send_message_failure(void *cbbreak ;case CBSS_PUT_NACKED :STAT (mesq_send_put_nacked); - m = mqd->mq_gpa + (gru_get_amo_value_head (cb) <<6 ); -gru_vstore (cb, m,gru_get_tri (mesg),XTYPE_CL , lines,1 ,IMA ); -if (gru_wait (cb) ==CBS_IDLE ) { - ret =MQE_OK ; -send_message_queue_interrupt (mqd); - }else { - ret =MQE_UNEXPECTED_CB_ERR ; - } + ret =send_message_put_nacked (cb, mqd, mesg, lines);break ;default :BUG ();
PATCH 9/13 GRU - check context state on reload
In reply to [email protected]From: Jack Steiner <[email protected]>
Check whether the gru state being loaded into a gru is from a new context or a previously unloaded context. If new, simply zero out the hardware context; if unloaded and valid, reload the old state.
This change is primarily for reloading kernel contexts where the previous is not required to be saved.
--- drivers/misc/sgi-gru/grumain.c | 32 +++++++++++++++++++++++--------- drivers/misc/sgi-gru/grutables.h | 2 ++ 2 files changed, 25 insertions(+), 9 deletions(-)
drivers/misc/sgi-gru/grumain.c +23 -9
@@ -307,11 +307,12 @@ struct gru_thread_state *gru_alloc_gts(s bytes =DSR_BYTES (dsr_au_count) +CBR_BYTES (cbr_au_count); bytes +=sizeof (struct gru_thread_state ); - gts =kzalloc (bytes,GFP_KERNEL ); + gts =kmalloc (bytes,GFP_KERNEL );if (!gts)return NULL ;STAT (gts_alloc); +memset (gts,0 ,sizeof (struct gru_thread_state ));/* zero out header */ atomic_set (>s->ts_refcnt,1 );mutex_init (>s->ts_ctxlock); gts->ts_cbr_au_count = cbr_au_count;
@@ -458,7 +459,8 @@ static void gru_prefetch_context(void *g }static void gru_load_context_data (void *save,void *grubase,int ctxnum, -unsigned long cbrmap,unsigned long dsrmap) +unsigned long cbrmap,unsigned long dsrmap, +int data_valid) {void *gseg, *cb, *cbe;unsigned long length;
@@ -471,12 +473,22 @@ static void gru_load_context_data(void *gru_prefetch_context (gseg, cb, cbe, cbrmap, length);for_each_cbr_in_allocation_map (i, &cbrmap, scr) { - save +=gru_copy_handle (cb, save); - save +=gru_copy_handle (cbe + i *GRU_HANDLE_STRIDE , save); +if (data_valid) { + save +=gru_copy_handle (cb, save); + save +=gru_copy_handle (cbe + i *GRU_HANDLE_STRIDE , + save); + }else { +memset (cb,0 ,GRU_CACHE_LINE_BYTES ); +memset (cbe + i *GRU_HANDLE_STRIDE ,0 , +GRU_CACHE_LINE_BYTES ); + } cb +=GRU_HANDLE_STRIDE ; } -memcpy (gseg +GRU_DS_BASE , save, length); +if (data_valid) +memcpy (gseg +GRU_DS_BASE , save, length); +else +memset (gseg +GRU_DS_BASE ,0 , length); } static void gru_unload_context_data(void *save, void *grubase, int ctxnum,
@@ -517,10 +529,12 @@ void gru_unload_context(struct gru_threaif (!is_kernel_context (gts))gru_unload_mm_tracker (gru, gts); -if (savestate) +if (savestate) {gru_unload_context_data (gts->ts_gdata, gru->gs_gru_base_vaddr, ctxnum, gts->ts_cbr_map, gts->ts_dsr_map); + gts->ts_data_valid =1 ; + }if (cch_deallocate (cch))BUG ();
@@ -576,7 +590,7 @@ void gru_load_context(struct gru_thread_ }gru_load_context_data (gts->ts_gdata, gru->gs_gru_base_vaddr, ctxnum, - gts->ts_cbr_map, gts->ts_dsr_map); + gts->ts_cbr_map, gts->ts_dsr_map, gts->ts_data_valid);if (cch_start (cch))BUG ();
@@ -611,8 +625,8 @@ int gru_update_cch(struct gru_thread_sta gts->ts_tlb_int_select =gru_cpu_fault_map_id (); cch->tlb_int_select =gru_cpu_fault_map_id (); cch->tfm_fault_bit_enable = - (gts->ts_user_options ==GRU_OPT_MISS_FMM_POLL - || gts->ts_user_options ==GRU_OPT_MISS_FMM_INTR ); + (gts->ts_user_options ==GRU_OPT_MISS_FMM_POLL + || gts->ts_user_options ==GRU_OPT_MISS_FMM_INTR ); }else {for (i =0 ; i <8 ; i++) cch->asid[i] =0 ;
drivers/misc/sgi-gru/grutables.h +2 -0
@@ -385,6 +385,8 @@ struct gru_thread_state {after migration */ char ts_cbr_idx[GRU_CBR_AU ];/* CBR numbers of each allocated CB */ +int ts_data_valid;/* Indicates if ts_gdata has +valid data */ unsigned long ts_gdata[0 ];/* save area for GRU data (CB, DS, CBE) */ };
PATCH 10/13 GRU - support instruction completion interrupts
In reply to [email protected]From: Jack Steiner <[email protected]>
Add support for interrupts generated by GRU instruction completion. Previously, the only interrupts were for TLB misses. The hardware also supports interrupts on instruction completion. This will be supported for instructions issued by the kernel.
--- drivers/misc/sgi-gru/grufault.c | 27 ++++++++++++++++++++------- drivers/misc/sgi-gru/grumain.c | 4 ++++ drivers/misc/sgi-gru/grutables.h | 5 +++++ 3 files changed, 29 insertions(+), 7 deletions(-)
drivers/misc/sgi-gru/grufault.c +20 -7
@@ -166,7 +166,8 @@ static inline struct gru_state *irq_to_g* the GRU, atomic operations must be used to clear bits. */ static void get_clear_fault_map (struct gru_state *gru, -struct gru_tlb_fault_map *map) +struct gru_tlb_fault_map *imap, +struct gru_tlb_fault_map *dmap) {unsigned long i, k;struct gru_tlb_fault_map *tfm;
@@ -177,7 +178,11 @@ static void get_clear_fault_map(struct g k = tfm->fault_bits[i];if (k) k =xchg (&tfm->fault_bits[i],0UL ); - map->fault_bits[i] = k; + imap->fault_bits[i] = k; + k = tfm->done_bits[i]; +if (k) + k =xchg (&tfm->done_bits[i],0UL ); + dmap->fault_bits[i] = k; }/*
@@ -449,7 +454,7 @@ failactive:irqreturn_t gru_intr (int irq,void *dev_id) {struct gru_state *gru; -struct gru_tlb_fault_map map; +struct gru_tlb_fault_map imap, dmap;struct gru_thread_state *gts;struct gru_tlb_fault_handle *tfh =NULL ;int cbrnum, ctxnum;
@@ -462,11 +467,19 @@ irqreturn_t gru_intr(int irq, void *dev_ raw_smp_processor_id(), irq);return IRQ_NONE ; } -get_clear_fault_map (gru, &map); -gru_dbg (grudev,"irq %d, gru %x, map 0x%lx\n" , irq, gru->gs_gid, - map.fault_bits[0 ]); +get_clear_fault_map (gru, &imap, &dmap); +gru_dbg (grudev, +"irq %d, gid %d, imap %016lx %016lx, dmap %016lx %016lx\n" , + irq, gru->gs_gid, dmap.fault_bits[0 ], dmap.fault_bits[1 ], + dmap.fault_bits[0 ], dmap.fault_bits[1 ]); + +for_each_cbr_in_tfm (cbrnum, dmap.fault_bits) { +complete (gru->gs_blade->bs_async_wq); +gru_dbg (grudev,"gid %d, cbr_done %d, done %d\n" , + gru->gs_gid, cbrnum, gru->gs_blade->bs_async_wq->done); + } -for_each_cbr_in_tfm (cbrnum, map.fault_bits) { +for_each_cbr_in_tfm (cbrnum, imap.fault_bits) { tfh =get_tfh_by_index (gru, cbrnum);prefetchw (tfh);/* Helps on hdw, required for emulator */
drivers/misc/sgi-gru/grumain.c +4 -0
@@ -572,8 +572,12 @@ void gru_load_context(struct gru_thread_if (is_kernel_context (gts)) { cch->unmap_enable =1 ; + cch->tfm_done_bit_enable =1 ; + cch->cb_int_enable =1 ; }else { cch->unmap_enable =0 ; + cch->tfm_done_bit_enable =0 ; + cch->cb_int_enable =0 ; asid =gru_load_mm_tracker (gru, gts);for (i =0 ; i <8 ; i++) { cch->asid[i] = asid + i;
drivers/misc/sgi-gru/grutables.h +5 -0
@@ -462,6 +462,11 @@ struct gru_blade_state {struct rw_semaphore bs_kgts_sema;/* lock for kgts */ struct gru_thread_state *bs_kgts;/* GTS for kernel use */ +/* ---- the following are used for managing kernel async GRU CBRs --- */ +int bs_async_dsr_bytes;/* DSRs for async */ +int bs_async_cbrs;/* CBRs AU for async */ +struct completion *bs_async_wq; +/* ---- the following are protected by the bs_lock spinlock ---- */ spinlock_t bs_lock;/* lock used for stealing contexts */
PATCH 11/13 GRU - support for asynchronous gru instructions
In reply to [email protected]From: Jack Steiner <[email protected]>
Add support for asynchronous GRU instructions. Currently, asynchronous instructions are supported only for GRU instructions issued by the kernel.
--- drivers/misc/sgi-gru/grufault.c | 4 drivers/misc/sgi-gru/grukservices.c | 178 ++++++++++++++++++++++++++++++++---- drivers/misc/sgi-gru/grukservices.h | 51 ++++++++++ 3 files changed, 215 insertions(+), 18 deletions(-)
drivers/misc/sgi-gru/grufault.c +2 -2
@@ -469,8 +469,8 @@ irqreturn_t gru_intr(int irq, void *dev_ }get_clear_fault_map (gru, &imap, &dmap);gru_dbg (grudev, -"irq %d, gid %d, imap %016lx %016lx, dmap %016lx %016lx\n" , - irq, gru->gs_gid, dmap.fault_bits[0 ], dmap.fault_bits[1 ], +"chiplet %d, gid %d, imap %016lx %016lx, dmap %016lx %016lx\n" , + chiplet, gru->gs_gid, imap.fault_bits[0 ], imap.fault_bits[1 ], dmap.fault_bits[0 ], dmap.fault_bits[1 ]);for_each_cbr_in_tfm (cbrnum, dmap.fault_bits) {
drivers/misc/sgi-gru/grukservices.c +162 -16
212 lines not on this page · raw message
drivers/misc/sgi-gru/grukservices.h +51 -0
55 lines not on this page · raw message
PATCH 12/13 GRU - update gru kernel self tests
In reply to [email protected]From: Jack Steiner <[email protected]>
Change the kernel self tests that can be optionally executed on GRU initialization. This is primarily for testing.
Eliminate the BUG statements on failure and return bad status. Add ioctl interface to execute the tests on demand.
--- drivers/misc/sgi-gru/grufile.c | 3 drivers/misc/sgi-gru/grukservices.c | 154 ++++++++++++++++++++++++++++++++---- drivers/misc/sgi-gru/grulib.h | 3 drivers/misc/sgi-gru/grutables.h | 2 4 files changed, 146 insertions(+), 16 deletions(-)
drivers/misc/sgi-gru/grufile.c +3 -0
@@ -250,6 +250,9 @@ static long gru_file_unlocked_ioctl(strucase GRU_USER_CALL_OS : err =gru_handle_user_call_os (arg);break ; +case GRU_KTEST : + err =gru_ktest (arg); +break ;case GRU_GET_CONFIG_INFO : err =gru_get_config_info (arg);break ;
drivers/misc/sgi-gru/grukservices.c +139 -15
187 lines not on this page · raw message
drivers/misc/sgi-gru/grulib.h +3 -0
@@ -56,6 +56,9 @@/* Get some config options (primarily for tests & emulator) */ #define GRU_GET_CONFIG_INFO _IOWR(GRU_IOCTL_NUM, 51, void *) +/* Various kernel self-tests */ +#define GRU_KTEST _IOWR(GRU_IOCTL_NUM, 52, void *) +#define CONTEXT_WINDOW_BYTES (th) (GRU_GSEG_PAGESIZE * (th))#define THREAD_POINTER (p, th) (p + GRU_GSEG_PAGESIZE * (th))
drivers/misc/sgi-gru/grutables.h +1 -1
@@ -258,7 +258,6 @@ extern struct mcs_op_statistic mcs_op_st#define OPT_DPRINT 1#define OPT_STATS 2 -#define GRU_QUICKLOOK 4#define IRQ_GRU 110/* Starting IRQ number for interrupts */
@@ -662,6 +661,7 @@ extern int gru_fault(struct vm_area_struextern struct gru_mm_struct *gru_register_mmu_notifier (void );extern void gru_drop_mmu_notifier (struct gru_mm_struct *gms); +extern int gru_ktest (unsigned long arg);extern void gru_flush_tlb_range (struct gru_mm_struct *gms,unsigned long start,unsigned long len);
Re: [patch 12/13] GRU - update gru kernel self tests
Quoted 20 lines · On Mon, 06 Apr 2009 11:08:21 -0500 [email protected] wrote:
From: Jack Steiner <[email protected]>
Change the kernel self tests that can be optionally executed on GRU initialization. This is primarily for testing.
Eliminate the BUG statements on failure and return bad status. Add ioctl interface to execute the tests on demand.
...
drivers/misc/sgi-gru/grukservices.c +10
-0+static int quicktest2 (unsigned long arg) +{ +static struct completion cmp; +static int inited; +unsigned long han; +int blade_id =0 ; +int numcb =4 ; +int ret =0 ; +unsigned long *buf; +void *cb0, *cb;
drivers/misc/sgi-gru/grukservices.c int quicktest(void) · line 953
Quoted 10 lines
drivers/misc/sgi-gru/grukservices.c +10
-0+int i, k, istatus, bytes; + + bytes = numcb *4 *8 ; + buf =kmalloc (bytes,GFP_KERNEL ); +if (!buf) +return -ENOMEM ; + + ret = -EBUSY ; +if (!inited) +init_completion (&cmp);
This could have been done at compile time?
Quoted 34 lines
drivers/misc/sgi-gru/grukservices.c +34
-0+ inited =1 ; + han =gru_reserve_async_resources (blade_id, numcb,0 , &cmp); +if (!han) + goto done; + +gru_lock_async_resource (han, &cb0,NULL ); +memset (buf,0xee , bytes); +for (i =0 ; i < numcb; i++) +gru_vset (cb0 + i *GRU_HANDLE_STRIDE ,uv_gpa (&buf[i *4 ]),0 , +XTYPE_DW ,4 ,1 ,IMA_INTERRUPT ); + + ret =0 ; +for (k =0 ; k < numcb; k++) { +gru_wait_async_cbr (han); +for (i =0 ; i < numcb; i++) { + cb = cb0 + i *GRU_HANDLE_STRIDE ; + istatus =gru_check_status (cb); +if (istatus ==CBS_ACTIVE ) +continue ; +if (istatus ==CBS_EXCEPTION ) + ret = -EFAULT ; +else if (buf[i] || buf[i +1 ] || buf[i +2 ] || + buf[i +3 ]) + ret = -EIO ; + } + } +BUG_ON (cmp.done); + +gru_unlock_async_resource (han); +gru_release_async_resources (han); +done: +kfree (buf); +return ret; +}
Re: [patch 12/13] GRU - update gru kernel self tests
Change the kernel self tests that can be optionally executed on GRU initialization. This is primarily for testing.
Eliminate the BUG statements on failure and return bad status. Add ioctl interface to execute the tests on demand.
---
Add fixes suggested by Andrew.
drivers/misc/sgi-gru/grufile.c | 3 drivers/misc/sgi-gru/grukservices.c | 150 ++++++++++++++++++++++++++++++++---- drivers/misc/sgi-gru/grulib.h | 3 drivers/misc/sgi-gru/grutables.h | 2 4 files changed, 142 insertions(+), 16 deletions(-)
drivers/misc/sgi-gru/grufile.c +3 -0
@@ -250,6 +250,9 @@ static long gru_file_unlocked_ioctl(strucase GRU_USER_CALL_OS : err =gru_handle_user_call_os (arg);break ; +case GRU_KTEST : + err =gru_ktest (arg); +break ;case GRU_GET_CONFIG_INFO : err =gru_get_config_info (arg);break ;
drivers/misc/sgi-gru/grukservices.c +135 -15
183 lines not on this page · raw message
drivers/misc/sgi-gru/grulib.h +3 -0
@@ -56,6 +56,9 @@/* Get some config options (primarily for tests & emulator) */ #define GRU_GET_CONFIG_INFO _IOWR(GRU_IOCTL_NUM, 51, void *) +/* Various kernel self-tests */ +#define GRU_KTEST _IOWR(GRU_IOCTL_NUM, 52, void *) +#define CONTEXT_WINDOW_BYTES (th) (GRU_GSEG_PAGESIZE * (th))#define THREAD_POINTER (p, th) (p + GRU_GSEG_PAGESIZE * (th))
drivers/misc/sgi-gru/grutables.h +1 -1
@@ -258,7 +258,6 @@ extern struct mcs_op_statistic mcs_op_st#define OPT_DPRINT 1#define OPT_STATS 2 -#define GRU_QUICKLOOK 4#define IRQ_GRU 110/* Starting IRQ number for interrupts */
@@ -662,6 +661,7 @@ extern int gru_fault(struct vm_area_struextern struct gru_mm_struct *gru_register_mmu_notifier (void );extern void gru_drop_mmu_notifier (struct gru_mm_struct *gms); +extern int gru_ktest (unsigned long arg);extern void gru_flush_tlb_range (struct gru_mm_struct *gms,unsigned long start,unsigned long len);
PATCH 13/13 GRU - update to rev 0.9 of gru spec
In reply to [email protected]From: Jack Steiner <[email protected]>
Update GRU driver to the latest version of the GRU spec. This consists of minor updates:
- changes & additions to error status bits
- new restriction on handling of TLB misses while in FMM mode
- new field (not used by software) in TFH
--- drivers/misc/sgi-gru/gru_instructions.h | 19 ++++++++++++------- drivers/misc/sgi-gru/grufault.c | 8 ++++++-- drivers/misc/sgi-gru/gruhandles.h | 3 ++- drivers/misc/sgi-gru/grukservices.c | 3 ++- drivers/misc/sgi-gru/gruprocfs.c | 1 + drivers/misc/sgi-gru/grutables.h | 1 + 6 files changed, 24 insertions(+), 11 deletions(-)
drivers/misc/sgi-gru/gru_instructions.h +12 -7
@@ -253,32 +253,37 @@ struct gru_instruction {#define CBE_CAUSE_HA_RESPONSE_FATAL (1 << 13)#define CBE_CAUSE_HA_RESPONSE_NON_FATAL (1 << 14)#define CBE_CAUSE_ADDRESS_SPACE_DECODE_ERROR (1 << 15) -#define CBE_CAUSE_RESPONSE_DATA_ERROR (1 << 16) -#define CBE_CAUSE_PROTOCOL_STATE_DATA_ERROR (1 << 17) +#define CBE_CAUSE_PROTOCOL_STATE_DATA_ERROR (1 << 16) +#define CBE_CAUSE_RA_RESPONSE_DATA_ERROR (1 << 17) +#define CBE_CAUSE_HA_RESPONSE_DATA_ERROR (1 << 18)/* CBE cbrexecstatus bits */ #define CBR_EXS_ABORT_OCC_BIT 0#define CBR_EXS_INT_OCC_BIT 1#define CBR_EXS_PENDING_BIT 2#define CBR_EXS_QUEUED_BIT 3 -#define CBR_EXS_TLBHW_BIT 4 +#define CBR_EXS_TLB_INVAL_BIT 4#define CBR_EXS_EXCEPTION_BIT 5#define CBR_EXS_ABORT_OCC (1 << CBR_EXS_ABORT_OCC_BIT)#define CBR_EXS_INT_OCC (1 << CBR_EXS_INT_OCC_BIT)#define CBR_EXS_PENDING (1 << CBR_EXS_PENDING_BIT)#define CBR_EXS_QUEUED (1 << CBR_EXS_QUEUED_BIT) -#define CBR_EXS_TLBHW (1 << CBR_EXS_TLBHW_BIT) +#define CBR_TLB_INVAL (1 << CBR_EXS_TLB_INVAL_BIT)#define CBR_EXS_EXCEPTION (1 << CBR_EXS_EXCEPTION_BIT)/* * Exceptions are retried for the following cases. If any OTHER bits are set * in ecause, the exception is not retryable. */ -#define EXCEPTION_RETRY_BITS (CBE_CAUSE_RESPONSE_DATA_ERROR | \ - CBE_CAUSE_RA_REQUEST_TIMEOUT | \ +#define EXCEPTION_RETRY_BITS (CBE_CAUSE_EXECUTION_HW_ERROR | \ CBE_CAUSE_TLBHW_ERROR | \ - CBE_CAUSE_HA_REQUEST_TIMEOUT) + CBE_CAUSE_RA_REQUEST_TIMEOUT | \ + CBE_CAUSE_RA_RESPONSE_NON_FATAL | \ + CBE_CAUSE_HA_RESPONSE_NON_FATAL | \ + CBE_CAUSE_RA_RESPONSE_DATA_ERROR | \ + CBE_CAUSE_HA_RESPONSE_DATA_ERROR \ + )/* Message queue head structure */ union gru_mesqhead {
drivers/misc/sgi-gru/grufault.c +6 -2
@@ -339,8 +339,12 @@ static int gru_try_dropin(struct gru_thr* Might be a hardware race OR a stupid user. Ignore FMM because FMM * is a transient state. */ -if (tfh->status !=TFHSTATUS_EXCEPTION ) - goto failnoexception; +if (tfh->status !=TFHSTATUS_EXCEPTION ) { +gru_flush_cache (tfh); +if (tfh->status !=TFHSTATUS_EXCEPTION ) + goto failnoexception; +STAT (tfh_stale_on_fault); + }if (tfh->state ==TFHSTATE_IDLE ) goto failidle;if (tfh->state ==TFHSTATE_MISS_FMM && cb)
drivers/misc/sgi-gru/gruhandles.h +2 -1
@@ -255,7 +255,8 @@ struct gru_tlb_fault_handle { unsigned int state:3; unsigned int fill3:1; - unsigned int cause:7; + unsigned int cause:6; + unsigned int cb_int:1; unsigned int fill4:1; unsigned int indexway:12; /* DW 0 - high 32 */
drivers/misc/sgi-gru/grukservices.c +2 -1
@@ -406,7 +406,8 @@ static int gru_retry_exception(void *cb)return CBS_IDLE ;gru_get_cb_exception_detail (cb, &excdet); -if (excdet.ecause & ~EXCEPTION_RETRY_BITS ) +if ((excdet.ecause & ~EXCEPTION_RETRY_BITS ) || + (excdet.cbrexecstatus &CBR_EXS_ABORT_OCC ))break ;if (retry-- ==0 )break ;
drivers/misc/sgi-gru/gruprocfs.c +1 -0
@@ -89,6 +89,7 @@ static int statistics_show(struct seq_fiprintstat (s, tlb_dropin_fail_fmm);printstat (s, tlb_dropin_fail_no_exception);printstat (s, tlb_dropin_fail_no_exception_war); +printstat (s, tfh_stale_on_fault);printstat (s, mmu_invalidate_range);printstat (s, mmu_invalidate_page);printstat (s, mmu_clear_flush_young);
drivers/misc/sgi-gru/grutables.h +1 -0
@@ -212,6 +212,7 @@ struct gru_stats_s {atomic_long_t tlb_dropin_fail_fmm;atomic_long_t tlb_dropin_fail_no_exception;atomic_long_t tlb_dropin_fail_no_exception_war; +atomic_long_t tfh_stale_on_fault;atomic_long_t mmu_invalidate_range;atomic_long_t mmu_invalidate_page;atomic_long_t mmu_clear_flush_young;
Quoted 4 lines · On Mon, 06 Apr 2009 11:08:09 -0500 [email protected] wrote:
This patchset is a collection of patches to the GRU driver. All changes are internal to the driver and have no effect on the core kernel or interfaces to/from the core kernel.
Do you believe that any of these should go into 2.6.30, or earlier?
Quoted 9 lines · Andrew Morton
Quoted 4 lines · On Mon, 06 Apr 2009 11:08:09 -0500 [email protected] wrote:
This patchset is a collection of patches to the GRU driver. All changes are internal to the driver and have no effect on the core kernel or interfaces to/from the core kernel.
Do you believe that any of these should go into 2.6.30, or earlier?
The patches are desirable for 2.6.30 but nothing earlier. Since all are internal to the GRU driver and do not affect anything outside of the core driver, they should be safe.
--- jack
Quoted 5 lines · On Fri, 10 Apr 2009 07:31:11 -0500 Jack Steiner <[email protected]> wrote:
Quoted 4 lines · Andrew Morton
Quoted 1 line · On Mon, 06 Apr 2009 11:08:09 -0500 [email protected] wrote:
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
This patchset is a collection of patches to the GRU driver. All changes are internal to the driver and have no effect on the core kernel or interfaces to/from the core kernel.
Do you believe that any of these should go into 2.6.30, or earlier?
The patches are desirable for 2.6.30 but nothing earlier.
Everyone "desires" that their patches be merged immediately ;)
After -rc1 we're really only looking for bugfixes and regression fixes. But afaict the only patch in this series which matches that guideline is gru-bug-fixes-for-gru-exception-handling.patch?