Merge pull request #44 from pkoutoupis/staging/release_6.1

Staging/release 6.1

.gitignore

@@ -1,3 +1,4 @@
+*.a
 *.o
 *.o.*
 *.mod
@@ -7,6 +8,7 @@
 *.mk
 *.symvers
 *.order
+*.swp
 src/rapiddisk
 test/rxflush
 test/rxio

AUTHORS

@@ -0,0 +1,16 @@
+AUTHOR / MAINTAINER
+Petros Koutoupis <[email protected]>
+
+CONTRIBUTORS
+
+James Plummer
+Gustaf Ullberg
+Dmitry Trikoz
+Neo
+Efstathiou Efstathios
+Marcel Huber
+Steven Rudolph
+Oliver Rath
+Scott McGillivray
+Boian Berberov
+Shub77

CHANGELOG.md

@@ -1,3 +1,14 @@
+### Release 6.1 ###
+
+- kernel: added support for 5.7 kernel
+- utility: fixed GCC compilation warnings
+- utility: code style cleanup
+- installer: additional dkms installation/removal cleanup (thank you Shub77)
+- documentation: fixed / updated README to reflect newer dkms installation/removal instructions
+- documentation: updated copyright dates
+- documentation: added AUTHORS file
+- misc: added experimental scripts to enable rapiddisk/cache on root device during boot (thank you Shub77)
+
 ### Release 6.0-1 ###
 
 - kernel: Fix dkms version in module/Makefile.

README.md

@@ -95,10 +95,3 @@ Uninstalling modules for DKMS support
 ```console
 # make dkms-uninstall
 ```
-
-Contact
--------
-
-If you have any questions or concerns, do not contact
-Petros Koutoupis (<[email protected]>). Instead, contact your
-congressman or congresswoman. I am trying to be politically correct here.

conf/rapiddisk.sh.pacemaker

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (C) 2015-2018 Petros Koutoupis. All rights reserved.
+# Copyright (C) 2015-2020 Petros Koutoupis. All rights reserved.
 #
 
 PATH=/bin:/sbin:/usr/bin:/usr/sbin

conf/rapiddisk.sh.rgmanager

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (C) 2015 - 2018 Petros Koutoupis. All rights reserved.
+# Copyright (C) 2015 - 2020 Petros Koutoupis. All rights reserved.
 #
 
 PATH=/bin:/sbin:/usr/bin:/usr/sbin

module/Makefile

@@ -1,4 +1,4 @@
-# Copyright © 2011-2018 Petros Koutoupis
+# Copyright © 2011-2020 Petros Koutoupis
 # All rights reserved.
 #
 # This program is free software: you can redistribute it and/or modify
@@ -15,7 +15,7 @@
 #
 # SPDX-License-Identifier: GPL-2.0-only
 
-VERSION = 6.0
+VERSION = 6.1
 
 ifeq ($(KSRC),)
 	KSRC := /lib/modules/$(shell uname -r)/build
@@ -49,7 +49,7 @@ uninstall:
 
 clean:
 	rm -rf *.o *.ko *.symvers *.mod.c .*.cmd Module.markers modules.order *.o.* built-in*
-	rm -rf .tmp_versions .rapiddisk.o.d *.unsigned *.sdtinfo.c .ctf/ .cache.mk
+	rm -rf .tmp_versions .rapiddisk.o.d *.unsigned *.sdtinfo.c .ctf/ .cache.mk *.mod
 
 dkms-install:
 ifeq ($(shell which dkms >/dev/null 2>/dev/null; echo $$?),1)

module/dkms.conf

@@ -1,5 +1,5 @@
 PACKAGE_NAME="rapiddisk"
-PACKAGE_VERSION="6.0"
+PACKAGE_VERSION="6.1"
 BUILT_MODULE_NAME[0]="rapiddisk"
 BUILT_MODULE_NAME[1]="rapiddisk-cache"
 DEST_MODULE_LOCATION[0]="/kernel/rapiddisk/"

module/rapiddisk-cache.c

@@ -1,5 +1,5 @@
 /*******************************************************************************
- ** Copyright © 2011-2019 Petros Koutoupis
+ ** Copyright © 2011 - 2020 Petros Koutoupis
  ** All rights reserved.
  **
  ** This program is free software: you can redistribute it and/or modify
@@ -59,7 +59,7 @@
 	} \
 } while (0)
 
-#define VERSION_STR	"6.0"
+#define VERSION_STR	"6.1"
 #define DM_MSG_PREFIX	"rapiddisk-cache"
 
 #define READCACHE	1
@@ -1239,7 +1239,7 @@ cache_status(struct dm_target *ti, status_type_t type, unsigned status_flags,
 
 static struct target_type cache_target = {
 	.name    = "rapiddisk-cache",
-	.version = {6, 0, 0},
+	.version = {6, 1, 0},
 	.module  = THIS_MODULE,
 	.ctr	 = cache_ctr,
 	.dtr	 = cache_dtr,
@@ -1281,4 +1281,4 @@ MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Petros Koutoupis <[email protected]>");
 MODULE_DESCRIPTION("RapidDisk-Cache DM target is a write-through caching target with RapidDisk volumes.");
 MODULE_VERSION(VERSION_STR);
-MODULE_INFO(Copyright, "Copyright 2010 - 2019 Petros Koutoupis");
+MODULE_INFO(Copyright, "Copyright 2010 - 2020 Petros Koutoupis");

module/rapiddisk.c

@@ -1,5 +1,5 @@
 /*******************************************************************************
- ** Copyright © 2011-2019 Petros Koutoupis
+ ** Copyright © 2011 - 2020 Petros Koutoupis
  ** All rights reserved.
  **
  ** This program is free software: you can redistribute it and/or modify
@@ -41,7 +41,7 @@
 #include <linux/radix-tree.h>
 #include <linux/io.h>
 
-#define VERSION_STR		"6.0"
+#define VERSION_STR		"6.1"
 #define PREFIX			"rapiddisk"
 #define BYTES_PER_SECTOR	512
 #define MAX_RDSKS		128
@@ -703,10 +703,16 @@ static int attach_device(int size)
 	spin_lock_init(&rdsk->rdsk_lock);
 	INIT_RADIX_TREE(&rdsk->rdsk_pages, GFP_ATOMIC);
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,7,0)
+	rdsk->rdsk_queue = blk_alloc_queue(rdsk_make_request, NUMA_NO_NODE);
+	if (!rdsk->rdsk_queue)
+		goto out_free_dev;
+#else
 	rdsk->rdsk_queue = blk_alloc_queue(GFP_KERNEL);
 	if (!rdsk->rdsk_queue)
 		goto out_free_dev;
 	blk_queue_make_request(rdsk->rdsk_queue, rdsk_make_request);
+#endif
 	blk_queue_logical_block_size(rdsk->rdsk_queue, BYTES_PER_SECTOR);
 	blk_queue_physical_block_size(rdsk->rdsk_queue, PAGE_SIZE);
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0)
@@ -857,4 +863,4 @@ MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Petros Koutoupis <[email protected]>");
 MODULE_DESCRIPTION("RapidDisk is an enhanced RAM disk block device driver.");
 MODULE_VERSION(VERSION_STR);
-MODULE_INFO(Copyright, "Copyright 2010 - 2019 Petros Koutoupis");
+MODULE_INFO(Copyright, "Copyright 2010 - 2020 Petros Koutoupis");

pkg-mgmt/debian/changelog

@@ -1,3 +1,13 @@
+rapiddisk (6.1-1) released; urgency=medium
+* kernel: added support for 5.7 kernel
+* utility: fixed GCC compilation warnings
+* utility: code style cleanup
+* installer: additional dkms installation/removal cleanup (thank you Shub77)
+* documentation: fixed / updated README to reflect newer dkms installation/removal instructions
+* documentation: updated copyright dates
+* documentation: added AUTHORS file
+* misc: added experimental scripts to enable rapiddisk/cache on root device during boot (thank you Shub77)
+
 rapiddisk (6.0-1) released; urgency=medium
 
 * kernel: Fixed module compilation error with modern version of GCC.

pkg-mgmt/debian/control

@@ -1,5 +1,5 @@
 Package: rapiddisk
-Version: 6.0-1
+Version: 6.1-1
 Section: base
 Priority: optional
 Architecture: amd64

pkg-mgmt/debian/postinst

@@ -16,9 +16,9 @@ fi
 case "$1" in
 
   configure)
-    dkms add -m rapiddisk -v 6.0
-    dkms build -m rapiddisk -v 6.0
-    dkms install -m rapiddisk -v 6.0
+    dkms add -m rapiddisk -v 6.1
+    dkms build -m rapiddisk -v 6.1
+    dkms install -m rapiddisk -v 6.1
     echo "rapiddisk max_sectors=2048 nr_requests=1024" >> /etc/modules
     echo "rapiddisk-cache" >> /etc/modules
     echo "dm_mod" >> /etc/modules

pkg-mgmt/debian/prerm

@@ -14,7 +14,7 @@ fi
 
 case "$1" in
   remove|upgrade|deconfigure)
-    dkms remove -m rapiddisk -v 5.2 --all
+    dkms remove -m rapiddisk -v 6.0 --all
   ;;
 
   failed-upgrade)

pkg-mgmt/spec/rapiddisk.spec.opensuse

@@ -1,6 +1,6 @@
 Summary: The RapidDisk software defined advanced RAM drive and storage caching solution.
 Name: rapiddisk
-Version: 6.0
+Version: 6.1
 Release: 1
 License: General Public License Version 2
 Group: Applications/System
@@ -79,6 +79,15 @@ rm -rf %{buildroot}
 %doc %attr(0444,root,root) /usr/share/man/man1/*
 
 %changelog
+* Thu May 26 2020 Petros Koutoupis <[email protected]>
+- kernel: added support for 5.7 kernel
+- utility: fixed GCC compilation warnings
+- utility: code style cleanup
+- installer: additional dkms installation/removal cleanup (thank you Shub77)
+- documentation: fixed / updated README to reflect newer dkms installation/removal instructions
+- documentation: updated copyright dates
+- documentation: added AUTHORS file
+- misc: added experimental scripts to enable rapiddisk/cache on root device during boot (thank you Shub77)
 * Thu May 2 2019 Petros Koutoupis <[email protected]>
 - kernel: Fixed module compilation error with modern version of GCC.
 - utility: Remove dm-crypt code; Not sure why i had it in the first place. Doesn't really belong. Just use cryptsetup.

pkg-mgmt/spec/rapiddisk.spec.rhel6

@@ -1,6 +1,6 @@
 Summary: The RapidDisk software defined advanced RAM drive and storage caching solution.
 Name: rapiddisk
-Version: 6.0
+Version: 6.1
 Release: 1
 License: General Public License Version 2
 Group: Applications/System
@@ -78,6 +78,15 @@ rm -rf %{buildroot}
 %doc %attr(0444,root,root) /usr/share/man/man1/*
 
 %changelog
+* Thu May 26 2020 Petros Koutoupis <[email protected]>
+- kernel: added support for 5.7 kernel
+- utility: fixed GCC compilation warnings
+- utility: code style cleanup
+- installer: additional dkms installation/removal cleanup (thank you Shub77)
+- documentation: fixed / updated README to reflect newer dkms installation/removal instructions
+- documentation: updated copyright dates
+- documentation: added AUTHORS file
+- misc: added experimental scripts to enable rapiddisk/cache on root device during boot (thank you Shub77)
 * Thu May 2 2019 Petros Koutoupis <[email protected]>
 - kernel: Fixed module compilation error with modern version of GCC.
 - utility: Remove dm-crypt code; Not sure why i had it in the first place. Doesn't really belong. Just use cryptsetup.

pkg-mgmt/spec/rapiddisk.spec.rhel7+

@@ -1,6 +1,6 @@
 Summary: The RapidDisk software defined advanced RAM drive and storage caching solution.
 Name: rapiddisk
-Version: 6.0
+Version: 6.1
 Release: 1
 License: General Public License Version 2
 Group: Applications/System
@@ -78,6 +78,15 @@ rm -rf %{buildroot}
 %doc %attr(0444,root,root) /usr/share/man/man1/*
 
 %changelog
+* Thu May 26 2020 Petros Koutoupis <[email protected]>
+- kernel: added support for 5.7 kernel
+- utility: fixed GCC compilation warnings
+- utility: code style cleanup
+- installer: additional dkms installation/removal cleanup (thank you Shub77)
+- documentation: fixed / updated README to reflect newer dkms installation/removal instructions
+- documentation: updated copyright dates
+- documentation: added AUTHORS file
+- misc: added experimental scripts to enable rapiddisk/cache on root device during boot (thank you Shub77)
 * Thu May 2 2019 Petros Koutoupis <[email protected]>
 - kernel: Fixed module compilation error with modern version of GCC.
 - utility: Remove dm-crypt code; Not sure why i had it in the first place. Doesn't really belong. Just use cryptsetup.

src/Makefile

@@ -1,4 +1,4 @@
-# Copyright © 2011 - 2018 Petros Koutoupis
+# Copyright © 2011 - 2020 Petros Koutoupis
 # All rights reserved.
 #
 # This file is part of RapidDisk.

src/common.h

@@ -1,5 +1,5 @@
 /*********************************************************************************
- ** Copyright © 2011 - 2019 Petros Koutoupis
+ ** Copyright © 2011 - 2020 Petros Koutoupis
  ** All rights reserved.
  **
  ** This file is part of RapidDisk.
@@ -39,17 +39,15 @@
 #include <ctype.h>
 #include <errno.h>
 #include <unistd.h>
-#include <syslog.h>
 
 #define UTIL			"rapiddisk"
-#define COPYRIGHT		"Copyright 2011 - 2019 Petros Koutoupis"
-#define VERSION_NUM	  	"6.0"
-#define SUCCESS			0x0
+#define COPYRIGHT		"Copyright 2011 - 2020 Petros Koutoupis"
+#define VERSION_NUM	  	"6.1"
+#define SUCCESS			0
+#define INVALID_VALUE		-1
 #define NAMELEN			0x200
-#define BYTES_PER_SECTOR	0x200
 #define BUFSZ			0x10000
 #define SYS_RDSK		"/sys/kernel/rapiddisk/mgmt"
-#define KEY_FILE		"/etc/rapiddisk/key"
 #define WRITETHROUGH		0
 #define WRITEAROUND		1