Merge pull request #6 from sy-c/master

update from upstream v11.8.7

Author: sy-c

.gitignore

@@ -2,4 +2,6 @@
 /build_linux_x86_uio/
 /doxygen/
 /patches/linux_uio/uio_pci_dma.ko
+/patches/pda-kernel-dkms_*
+/*.deb
 /build*/

CMakeLists.txt

@@ -24,7 +24,11 @@ execute_process(
 endforeach()
 
 # build userspace library
-add_compile_options(-std=gnu99 -Wall -Wunused-result -fno-tree-vectorize)
+add_compile_options(-std=gnu99 -Wall -Wunused-result -fno-tree-vectorize
+                               -Wno-format-truncation)
+set(PDA_DEBUG_OPTIONS "-DDEBUG")
+add_compile_options("$<$<CONFIG:DEBUG>:${PDA_DEBUG_OPTIONS}>")
+
 file(GLOB LIB_SOURCES src/*.c)
 add_library(pda-static STATIC ${LIB_SOURCES})
 add_library(pda-shared SHARED ${LIB_SOURCES})
@@ -51,23 +55,31 @@ if (${KMOD_AVAIL})
 endif()
 
 # specify files to install
+set(CMAKE_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS
+     OWNER_READ OWNER_WRITE OWNER_EXECUTE
+     GROUP_READ GROUP_EXECUTE
+     WORLD_READ WORLD_EXECUTE)
 install(TARGETS pda-static ARCHIVE DESTINATION lib)
 install(TARGETS pda-shared LIBRARY DESTINATION lib)
 install(DIRECTORY include/ DESTINATION include)
 
-# build debian package - experimental
+# build debian package
 set(CPACK_GENERATOR DEB)
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY
-  "CBM FLES FLIB low-level user space access library")
-set(CPACK_PACKAGE_NAME libpda)
-set(CPACK_PACKAGE_CONTACT
-  "Jan de Cuveland <[email protected]>")
+set(CPACK_PACKAGE_NAME libpda${SO_VERSION})
 set(CPACK_PACKAGE_VERSION_MAJOR ${pda_VERSION_MAJOR})
 set(CPACK_PACKAGE_VERSION_MINOR ${pda_VERSION_MINOR})
 set(CPACK_PACKAGE_VERSION_PATCH ${pda_VERSION_PATCH})
-set(CPACK_STRIP_FILES TRUE)
-set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE amd64)
-set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.15)")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY
+  "Portable Driver Architecture (PDA) low-level user space library")
+set(CPACK_PACKAGE_CONTACT
+  "Jan de Cuveland <[email protected]>")
+set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/cbm-fles/pda")
+set(CPACK_DEBIAN_PACKAGE_SECTION libdevel)
 set(CPACK_DEBIAN_PACKAGE_PRIORITY optional)
-set(CPACK_DEBIAN_PACKAGE_SECTION libs)
+set(CPACK_DEBIAN_PACKAGE_RELEASE 1)
+set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE amd64)
+set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
+set(CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS ON)
+set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)
+set(CPACK_STRIP_FILES TRUE)
 include(CPack)

Makefile

@@ -39,6 +39,10 @@ rpm: tarball
 	make -C patches/linux_uio rpm
 	cp ${HOME}/rpmbuild/RPMS/x86_64/pda_kadapter-`uname -r`*.rpm .
 
+deb:
+	make -C patches/linux_uio deb
+	cp patches/pda-kernel-dkms_*.deb .
+
 tarball: mrproper
 	rm -rf libpda-`cat VERSION`.tar.gz
 	tar -cf libpda-`cat VERSION`.tar *
@@ -68,9 +72,10 @@ clean:
 	find . -iname 'build_*' -exec make -C {} clean \;
 	rm -rf libpda*.tar.gz libpda*.rpm package/rpm/*.tar.gz
 	rm -rf pda_kadapter*.rpm
+	rm -rf pda-kernel-dkms_*.deb
 
 count: mrproper
-	wc -l `find . -iname '*.c' && find . -iname '*.h' && find . -iname '*.inc'`	
+	wc -l `find . -iname '*.c' && find . -iname '*.h' && find . -iname '*.inc'`
 
 doc:
 	doxygen doxyfile.in

VERSION

@@ -1 +1 @@
-11.2.7
+11.8.7

arch/linux_x86_uio/bar_inc.c

@@ -129,7 +129,7 @@ Bar_new
     }
 
     snprintf( workp.uio_file_path, PDA_STRING_LIMIT,
-              "%s/%04x:%02x:%02x.%1x/bar%d",
+              "%s/"UIO_PATH_FORMAT"/bar%d",
               UIO_BAR_PATH, domain_id, bus_id,
               device_id, function_id, number );
 

arch/linux_x86_uio/device_operator_inc.c

@@ -187,7 +187,7 @@ PDAInit()
 
     if(!isCorrectVersion("uio_pci_dma", UIO_PCI_DMA_VERSION))
     {
-        DEBUG_PRINTF( PDADEBUG_ERROR, "Kernel adapter (uio_pci_dma.ko) version missmatch!\n");
+        DEBUG_PRINTF( PDADEBUG_ERROR, "Kernel adapter (uio_pci_dma.ko) version mismatch!\n");
         RETURN(!PDA_SUCCESS);
     }
 
@@ -223,7 +223,11 @@ DeviceOperator_new
 {
     DEBUG_PRINTF(PDADEBUG_ENTER, "");
 
-    PDAInit();
+    if(PDA_SUCCESS != PDAInit())
+    {
+        DEBUG_PRINTF( PDADEBUG_ERROR, "PDA initialization failed!\n");
+        RETURN(NULL);
+    }
 
     DIR *directory = NULL;
 
@@ -317,6 +321,7 @@ DeviceOperator_new
                 fp_vendor = NULL;
                 if(read_chars != 6)
                 {
+                    // TODO: This looks broken. DeviceOperator_delete -> read_chars?
                     ERROR_EXIT( EINVAL, deviceoperatornew_return,
                                 "Read failed! (only %llu chars read)\n", DeviceOperator_delete);
                 }
@@ -336,8 +341,10 @@ DeviceOperator_new
                 uint8_t  bus_id      = 0;
                 uint8_t  device_id   = 0;
                 uint8_t  function_id = 0;
-                sscanf (directory_entry->d_name,"%4hx:%2hhx:%2hhx.%2hhx",
-                        &domain_id, &bus_id, &device_id, &function_id);
+                if(sscanf (directory_entry->d_name,"%4hx:%2hhx:%2hhx.%1hhx",
+                           &domain_id, &bus_id, &device_id, &function_id) != 4)
+                { ERROR_EXIT( EINVAL, deviceoperatornew_return, "Parsing sysfs d_name failed!\n" ); }
+
 
                 dev_operator->pci_devices[dev_operator->pci_devices_number] =
                     PciDevice_new_op(directory_entry->d_name, vendor, device,

arch/linux_x86_uio/dma_buffer_inc.c

@@ -1,9 +1,11 @@
 /**
  * @author Dominic Eschweiler <[email protected]>
+ * @author Dirk Hutter <[email protected]>
  *
  * @section LICENSE
  *
  * Copyright (c) 2015, Dominic Eschweiler
+ * Copyright (c) 2017, Dirk Hutter
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -216,7 +218,7 @@ DMABuffer_loadSGList
     { ERROR_EXIT( errno, exit, "Lookup failed!\n" ); }
 
     snprintf(buffer->internal->uio_filepath_sg, PDA_STRING_LIMIT,
-             "%s/%04x:%02x:%02x.%1x/dma/%s/sg",
+             "%s/"UIO_PATH_FORMAT"/dma/%s/sg",
              UIO_BAR_PATH, domain_id, bus_id, device_id, function_id,
              buffer->internal->name);
 
@@ -369,20 +371,20 @@ DMABuffer_generatePaths
 
 
     snprintf(buffer->internal->uio_filepath_request, PDA_STRING_LIMIT,
-             "%s/%04x:%02x:%02x.%1x/dma/request",
+             "%s/"UIO_PATH_FORMAT"/dma/request",
              UIO_BAR_PATH, domain_id, bus_id, device_id, function_id);
 
     snprintf(buffer->internal->uio_filepath_delete, PDA_STRING_LIMIT,
-             "%s/%04x:%02x:%02x.%1x/dma/free",
+             "%s/"UIO_PATH_FORMAT"/dma/free",
              UIO_BAR_PATH, domain_id, bus_id, device_id, function_id);
 
     snprintf(buffer->internal->uio_filepath_map, PDA_STRING_LIMIT,
-             "%s/%04x:%02x:%02x.%1x/dma/%s/map",
+             "%s/"UIO_PATH_FORMAT"/dma/%s/map",
              UIO_BAR_PATH, domain_id, bus_id, device_id, function_id,
              buffer->internal->name);
 
     snprintf(buffer->internal->uio_filepath_folder, PDA_STRING_LIMIT,
-             "%s/%04x:%02x:%02x.%1x/dma/%s/",
+             "%s/"UIO_PATH_FORMAT"/dma/%s/",
              UIO_BAR_PATH, domain_id, bus_id, device_id, function_id,
              buffer->internal->name);
 
@@ -442,21 +444,6 @@ DMABuffer_lockUserBuffer
 {
     DEBUG_PRINTF(PDADEBUG_ENTER, "");
 
-    volatile uint64_t  tmp          = 0;
-    volatile uint64_t *page_pointer = 0;
-    for
-    (
-        page_pointer = (uint64_t*) start;
-        page_pointer < (uint64_t*) (start + buffer->length);
-        page_pointer = (page_pointer + PAGE_SIZE)
-    )
-    {
-        tmp = *page_pointer;
-        *page_pointer = tmp;
-    }
-
-    mlock(start, buffer->length);
-
     if(mlock(start, buffer->length) != 0)
     { RETURN(ERROR( errno, "Buffer locking failed!\n")); }
 
@@ -497,7 +484,7 @@ DMABuffer_requestMemory
         #endif /* NUMA_AVAIL */
     };
 
-    snprintf(request.name, 1024, "%s", buffer->internal->name);
+    snprintf(request.name, UIO_PCI_DMA_BUFFER_NAME_SIZE, "%s", buffer->internal->name);
 
     buffer->internal->alloc_fd =
         pda_spinOpen
@@ -589,10 +576,14 @@ DMABuffer_new
             if( ((long unsigned int)start)%PAGE_SIZE != 0 )
             { ERROR_EXIT( EINVAL, exit, "Input buffer is not page aligned!\n" ); }
 
-            ret += DMABuffer_generatePaths(buffer, device);
-            ret += DMABuffer_lockUserBuffer(start, buffer);
-            ret += DMABuffer_requestMemory(device, buffer, start);
-            ret += DMABuffer_mapUser(buffer, start);
+            if(DMABuffer_generatePaths(buffer, device) != PDA_SUCCESS)
+            { ERROR_EXIT( errno, exit, "Buffer registration generate paths failed!\n" ); }
+            if(DMABuffer_lockUserBuffer(start, buffer) != PDA_SUCCESS)
+            { ERROR_EXIT( errno, exit, "Buffer registration lock buffer failed!\n" ); }
+            if(DMABuffer_requestMemory(device, buffer, start) != PDA_SUCCESS)
+            { ERROR_EXIT( errno, exit, "Buffer registration request memory failed!\n" ); }
+            if(DMABuffer_mapUser(buffer, start) != PDA_SUCCESS)
+            { ERROR_EXIT( errno, exit, "Buffer registration map failed!\n" ); }
         }
         break;
 
@@ -641,12 +632,12 @@ DMABuffer_delete_not_attached_buffers(PciDevice *device)
 
     char uio_file_path[PDA_STRING_LIMIT];
     memset(uio_file_path, 0, PDA_STRING_LIMIT);
-    snprintf(uio_file_path, PDA_STRING_LIMIT, "%s/%04x:%02x:%02x.%1x/dma/",
+    snprintf(uio_file_path, PDA_STRING_LIMIT, "%s/"UIO_PATH_FORMAT"/dma/",
             UIO_BAR_PATH, domain_id, bus_id, device_id, function_id);
 
     char uio_delete_path[PDA_STRING_LIMIT];
     memset(uio_delete_path, 0, PDA_STRING_LIMIT);
-    snprintf(uio_delete_path, PDA_STRING_LIMIT, "%s/%04x:%02x:%02x.%1x/dma/free",
+    snprintf(uio_delete_path, PDA_STRING_LIMIT, "%s/"UIO_PATH_FORMAT"/dma/free",
             UIO_BAR_PATH, domain_id, bus_id, device_id, function_id);
 
     /** Iterate over all directories inside the dma directory */
@@ -718,7 +709,7 @@ DMABuffer_check_persistant(PciDevice *device)
 
     char uio_file_path[PDA_STRING_LIMIT];
     memset(uio_file_path, 0, PDA_STRING_LIMIT);
-    snprintf(uio_file_path, PDA_STRING_LIMIT, "%s/%04x:%02x:%02x.%1x/dma/",
+    snprintf(uio_file_path, PDA_STRING_LIMIT, "%s/"UIO_PATH_FORMAT"/dma/",
             UIO_BAR_PATH, domain_id, bus_id, device_id, function_id);
 
     /** Return pointer */
@@ -1087,9 +1078,12 @@ DMABuffer_wrapMap(DMABuffer *buffer)
     { ERROR_EXIT( errno, exit, "Base allocation failed\n" ); }
     else
     {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wuse-after-free"
         uint8_t *buffer_area_tmp = buffer_area;
         free(buffer_area);
         buffer_area = buffer_area_tmp;
+#pragma GCC diagnostic pop
     }
 
     if(buffer->type == PDA_BUFFER_KERNEL)

arch/linux_x86_uio/pci_inc.c

@@ -211,7 +211,7 @@ PciDevice_new
     snprintf( uio_sysfs_dir, PDA_STRING_LIMIT, "%s", UIO_DMA_SYSFS_DIR);
 
     char uio_sysfs_entry[PDA_STRING_LIMIT];
-    snprintf(uio_sysfs_entry, PDA_STRING_LIMIT, "%04d:%02d:%02d.%d",
+    snprintf(uio_sysfs_entry, PDA_STRING_LIMIT, UIO_PATH_FORMAT,
              domain_id, bus_id, device_id, function_id);
 
     RETURN(PciDevice_new_op(uio_sysfs_entry, "0000", "0000", domain_id, bus_id, device_id, function_id));
@@ -602,7 +602,7 @@ PciDevice_getListOfBuffers
 
     char uio_file_path[PDA_STRING_LIMIT];
     memset(uio_file_path, 0, PDA_STRING_LIMIT);
-    snprintf(uio_file_path, PDA_STRING_LIMIT, "%s/%04x:%02x:%02x.%1x/dma/",
+    snprintf(uio_file_path, PDA_STRING_LIMIT, "%s/"UIO_PATH_FORMAT"/dma/",
             UIO_BAR_PATH, device->domain_id, device->bus_id, device->device_id, device->function_id);
 
     DIR *directory = NULL;

include/pda/debug.h

@@ -88,16 +88,16 @@ typedef enum PdaDebugTypes_enum PdaDebugTypes;
 #ifdef DEBUG
 
 #define DEBUG_PRINTF( mask, ... ) {                                     \
-        DebugPrintf( mask, __FILE__, __LINE__, __func__, __VA_ARGS__ ); \
+        PdaDebugPrintf( mask, __FILE__, __LINE__, __func__, __VA_ARGS__ ); \
 }
 
 #define RETURN( errorcode ) {                                      \
-        DebugPrintf(PDADEBUG_EXIT, __FILE__, __LINE__, __func__, "" ); \
+        PdaDebugPrintf(PDADEBUG_EXIT, __FILE__, __LINE__, __func__, "" ); \
         return errorcode;                                              \
 }
 
 void
-DebugPrintf
+PdaDebugPrintf
 (
     const PdaDebugTypes mask,
     const char         *file,
@@ -107,10 +107,10 @@ DebugPrintf
     ...
 );
 
-#define WARN( ... ) PDA_WarningHandler( __FILE__, __LINE__, __VA_ARGS__ );
+#define WARN( ... ) PdaWarningHandler( __FILE__, __LINE__, __VA_ARGS__ );
 
 void
-PDA_WarningHandler
+PdaWarningHandler
 (
     const char    *file,
     const uint64_t line,
@@ -129,17 +129,17 @@ PDA_WarningHandler
 #endif /*DEBUG*/
 
 /*! Can be called if an unrecoverable error appeared. **/
-#define ERROR( errorcode, ... ) PDA_ErrorHandler( errorcode, __FILE__, __LINE__, __VA_ARGS__ );
+#define ERROR( errorcode, ... ) PdaErrorHandler( errorcode, __FILE__, __LINE__, __VA_ARGS__ );
 
 /*! Issue an error to the debug output and jump to the goto label. **/
 #define ERROR_EXIT( errorcode, gotolabel, ... ) {                     \
-        PDA_ErrorHandler( errorcode, __FILE__, __LINE__, __VA_ARGS__ );   \
+        PdaErrorHandler( errorcode, __FILE__, __LINE__, __VA_ARGS__ );   \
         goto gotolabel;                                               \
 }
 
 /* @cond SHOWHIDDEN */
 int64_t
-PDA_ErrorHandler
+PdaErrorHandler
 (
     const int64_t  errorcode,
     const char    *file,

mk/Makefile

@@ -30,7 +30,7 @@ install: libpda.so gendirs
 	echo "CC=\"$(CC)\" "                              >  $(DESTDIR)/bin/pda-config.inc
 	echo "LDFLAGS=\"$(LDFLAGS)\" "                    >> $(DESTDIR)/bin/pda-config.inc
 	echo "CFLAGS=\"$(CFLAGS)\" "                      >> $(DESTDIR)/bin/pda-config.inc
-	echo "VERSION=\"$(LD_CUR):$(LD_REV):$(LD_AGE)\" " >> $(DESTDIR)/bin/pda-config.inc
+	echo "VERSION=\"$(LD_CUR).$(LD_REV).$(LD_AGE)\" " >> $(DESTDIR)/bin/pda-config.inc
 	@echo -= install shared stuff =-
 	cp -r -L share/pda/* $(DESTDIR)/share/pda