Synchronize kernel buffers during the read-kernel-memory and while accessing via sysfs

3 files changed, 24 insertions, 11 deletions

diff --git a/driver/kmem.c b/driver/kmem.c
index acf1263..37a7368 100644
--- a/driver/kmem.c
+++ b/driver/kmem.c
@@ -323,24 +323,19 @@ int pcidriver_kmem_free_all(pcidriver_privdata_t *privdata)
 	return 0;
 }
 
+
 /**
  *
  * Synchronize memory to/from the device (or in both directions).
  *
  */
-int pcidriver_kmem_sync( pcidriver_privdata_t *privdata, kmem_sync_t *kmem_sync )
+int pcidriver_kmem_sync_entry( pcidriver_privdata_t *privdata, pcidriver_kmem_entry_t *kmem_entry, int direction)
 {
-	pcidriver_kmem_entry_t *kmem_entry;
-
-	/* Find the associated kmem_entry for this buffer */
-	if ((kmem_entry = pcidriver_kmem_find_entry(privdata, &(kmem_sync->handle))) == NULL)
-		return -EINVAL;					/* kmem_handle is not valid */
-
 	if (kmem_entry->direction == PCI_DMA_NONE)
 		return -EINVAL;
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,11)
-	switch (kmem_sync->dir) {
+	switch (direction) {
 		case PCILIB_KMEM_SYNC_TODEVICE:
 			pci_dma_sync_single_for_device( privdata->pdev, kmem_entry->dma_handle, kmem_entry->size, kmem_entry->direction );
 			break;
@@ -355,7 +350,7 @@ int pcidriver_kmem_sync( pcidriver_privdata_t *privdata, kmem_sync_t *kmem_sync
 			return -EINVAL;				/* wrong direction parameter */
 	}
 #else
-	switch (kmem_sync->dir) {
+	switch (direction) {
 		case PCILIB_KMEM_SYNC_TODEVICE:
 			pci_dma_sync_single( privdata->pdev, kmem_entry->dma_handle, kmem_entry->size, kmem_entry->direction );
 			break;
@@ -375,6 +370,22 @@ int pcidriver_kmem_sync( pcidriver_privdata_t *privdata, kmem_sync_t *kmem_sync
 
 /**
  *
+ * Synchronize memory to/from the device (or in both directions).
+ *
+ */
+int pcidriver_kmem_sync( pcidriver_privdata_t *privdata, kmem_sync_t *kmem_sync )
+{
+	pcidriver_kmem_entry_t *kmem_entry;
+
+	/* Find the associated kmem_entry for this buffer */
+	if ((kmem_entry = pcidriver_kmem_find_entry(privdata, &(kmem_sync->handle))) == NULL)
+		return -EINVAL;					/* kmem_handle is not valid */
+
+	return pcidriver_kmem_sync_entry(privdata, kmem_entry, kmem_sync->dir);
+}
+
+/**
+ *
  * Free the given kmem_entry and its memory.
  *
  */
diff --git a/driver/kmem.h b/driver/kmem.h
index ee12855..503620e 100644
--- a/driver/kmem.h
+++ b/driver/kmem.h
@@ -1,5 +1,6 @@
 int pcidriver_kmem_alloc( pcidriver_privdata_t *privdata, kmem_handle_t *kmem_handle );
 int pcidriver_kmem_free(  pcidriver_privdata_t *privdata, kmem_handle_t *kmem_handle );
+int pcidriver_kmem_sync_entry( pcidriver_privdata_t *privdata, pcidriver_kmem_entry_t *kmem_entry, int direction );
 int pcidriver_kmem_sync(  pcidriver_privdata_t *privdata, kmem_sync_t *kmem_sync );
 int pcidriver_kmem_free_all(  pcidriver_privdata_t *privdata );
 pcidriver_kmem_entry_t *pcidriver_kmem_find_entry( pcidriver_privdata_t *privdata, kmem_handle_t *kmem_handle );
diff --git a/driver/sysfs.c b/driver/sysfs.c
index be6f7d9..37cf362 100644
--- a/driver/sysfs.c
+++ b/driver/sysfs.c
@@ -101,9 +101,10 @@ static SYSFS_GET_FUNCTION(pcidriver_show_kmem_entry)
         int id = simple_strtol(attr->attr.name + strlen("kbuf"), NULL, 10);
 	pcidriver_kmem_entry_t *entry = pcidriver_kmem_find_entry_id(privdata, id);
 	if (entry)
-	    if (entry->size >= 16)
+	    if (entry->size >= 16) {
+		pcidriver_kmem_sync_entry(privdata, entry, PCILIB_KMEM_SYNC_FROMDEVICE);
 		return snprintf(buf, PAGE_SIZE, "buffer: %d\ntype: %lx\nuse: 0x%lx\nitem: %lu\nsize: %lu\nrefs: %lu\nhw ref: %i\nmode: 0x%lx\ndata: %8x %8x %8x %8x\n", id, entry->type, entry->use, entry->item, entry->size, entry->refs&KMEM_REF_COUNT, (entry->refs&KMEM_REF_HW)?1:0, entry->mode, *(u32*)(entry->cpua), *(u32*)(entry->cpua + 4),  *(u32*)(entry->cpua + 8), *(u32*)(entry->cpua + 12));
-	    else
+	    } else
 		return snprintf(buf, PAGE_SIZE, "buffer: %d\ntype: %lx\nuse: 0x%lx\nitem: %lu\nsize: %lu\nrefs: %lu\nhw ref: %i\nmode: 0x%lx\n", id, entry->type, entry->use, entry->item, entry->size, entry->refs&KMEM_REF_COUNT, (entry->refs&KMEM_REF_HW)?1:0, entry->mode);
 	else
 	    return snprintf(buf, PAGE_SIZE, "I am in the kmem_entry show function for buffer %d\n", id);