The patch titled gru: add test for gru_copy_gpa has been added to the -mm tree. Its filename is gru-add-test-for-gru_copy_gpa.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: gru: add test for gru_copy_gpa From: Jack Steiner <steiner@xxxxxxx> Improve existing driver self-tests. Add a new debugging test to the SGI GRU driver for verifying the global GRU copy function. Signed-off-by: Jack Steiner <steiner@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/misc/sgi-gru/grukservices.c | 48 +++++++++++++++++++++----- 1 file changed, 39 insertions(+), 9 deletions(-) diff -puN drivers/misc/sgi-gru/grukservices.c~gru-add-test-for-gru_copy_gpa drivers/misc/sgi-gru/grukservices.c --- a/drivers/misc/sgi-gru/grukservices.c~gru-add-test-for-gru_copy_gpa +++ a/drivers/misc/sgi-gru/grukservices.c @@ -1004,6 +1004,7 @@ static int quicktest2(unsigned long arg) int ret = 0; unsigned long *buf; void *cb0, *cb; + struct gru_control_block_status *gen; int i, k, istatus, bytes; bytes = numcb * 4 * 8; @@ -1023,20 +1024,30 @@ static int quicktest2(unsigned long arg) XTYPE_DW, 4, 1, IMA_INTERRUPT); ret = 0; - for (k = 0; k < numcb; k++) { + k = numcb; + do { 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; + if (istatus != CBS_ACTIVE && istatus != CBS_CALL_OS) + break; } - } + if (i == numcb) + continue; + if (istatus != CBS_IDLE) { + printk(KERN_DEBUG "GRU:%d quicktest2: cb %d, exception\n", smp_processor_id(), i); + ret = -EFAULT; + } else if (buf[4 * i] || buf[4 * i + 1] || buf[4 * i + 2] || + buf[4 * i + 3]) { + printk(KERN_DEBUG "GRU:%d quicktest2:cb %d, buf 0x%lx, 0x%lx, 0x%lx, 0x%lx\n", + smp_processor_id(), i, buf[4 * i], buf[4 * i + 1], buf[4 * i + 2], buf[4 * i + 3]); + ret = -EIO; + } + k--; + gen = cb; + gen->istatus = CBS_CALL_OS; /* don't handle this CBR again */ + } while (k); BUG_ON(cmp.done); gru_unlock_async_resource(han); @@ -1046,6 +1057,22 @@ done: return ret; } +#define BUFSIZE 200 +static int quicktest3(unsigned long arg) +{ + char buf1[BUFSIZE], buf2[BUFSIZE]; + int ret = 0; + + memset(buf2, 0, sizeof(buf2)); + memset(buf1, get_cycles() & 255, sizeof(buf1)); + gru_copy_gpa(uv_gpa(buf2), uv_gpa(buf1), BUFSIZE); + if (memcmp(buf1, buf2, BUFSIZE)) { + printk(KERN_DEBUG "GRU quicktest3 error\n"); + ret = -EIO; + } + return ret; +} + /* * Debugging only. User hook for various kernel tests * of driver & gru. @@ -1064,6 +1091,9 @@ int gru_ktest(unsigned long arg) case 2: ret = quicktest2(arg); break; + case 3: + ret = quicktest3(arg); + break; case 99: ret = gru_free_kernel_contexts(); break; _ Patches currently in -mm which might be from steiner@xxxxxxx are linux-next.patch x86-uv-introduce-a-means-to-translate-from-gpa-socket_paddr.patch x86-uv-xpc-needs-to-provide-an-abstraction-for-uv_gpa.patch x86-uv-introduce-uv_gpa_is_mmr.patch x86-uv-implement-a-gru_read_gpa-kernel-function.patch x86-uv-update-xpc-to-handle-updated-bios-interface.patch x86-uv-xpc-null-deref-when-mesq-becomes-empty.patch x86-uv-xpc_make_first_contact-hang-due-to-not-accepting-active-state.patch x86-uv-xpc-receive-message-reuse-triggers-invalid-bug_on.patch gru-initial-gru-based-on-blade-topology.patch gru-add-comments-raised-in-previous-code-reviews.patch gru-fix-istatus-race-in-gru-tlb-dropin.patch gru-handle-blades-without-memory.patch gru-allow-users-to-specify-gru-chiplet-1.patch gru-allow-users-to-specify-gru-chiplet-2.patch gru-allow-users-to-specify-gru-chiplet-3.patch gru-fix-bug-in-module-unload.patch gru-improve-messages-for-malfunctioning-grus.patch gru-support-64-bit-gru-addresses.patch gru-handle-failures-to-mmu_notifier_register.patch gru-add-debug-option-for-cache-flushing.patch gru-add-test-for-gru_copy_gpa.patch gru-check-for-valid-vma.patch gru-fix-prefetch-and-speculation-bugs.patch gru-update-irq-infrastructure.patch gru-add-additional-gru-statistics.patch gru-expicitly-set-instruction-status-to-active.patch gru-preload-tlb-for-bcopy-instructions.patch gru-fix-bug-in-exception-handling.patch gru-add-symbolic-names-for-gru-error-code.patch gru-remove-stray-local_irq_enable.patch gru-check-for-correct-gru-chiplet-assignment.patch gru-update-gru-structures-to-match-latest-hardware-spec.patch gru-fix-bug-in-allocation-of-kernel-contexts.patch gru-add-hugepage-support.patch gru-fix-gru-interrupt-race-at-deallocate.patch gru-improve-gru-tlb-dropin-statistics.patch gru-update-driver-version-number.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html