Patch to add support for lz4hc and deflate optimization algorithms in zramctl.

Patch to add support for lz4hc and deflate optimization algorithms in zramctl.

[Libor Bukata]

[-- Attachment #1: Type: text/plain, Size: 216 bytes --]

Dear developers of Linux utils,

I extended the zramctl utility to handle also lz4hc and deflate formats.
The patch is included in the attachment. Thank you in advance for your
comments.

Kind regards,
Libor Bukata.

[-- Attachment #2: new_comp_alg.patch --]
[-- Type: text/x-patch, Size: 2186 bytes --]

diff --git a/sys-utils/zramctl.8 b/sys-utils/zramctl.8
index 9ca2983b9..ef44435ed 100644
--- a/sys-utils/zramctl.8
+++ b/sys-utils/zramctl.8
@@ -44,7 +44,7 @@ query the status of used zram devices.
 If no option is given, all non-zero size zram devices are shown.
 .SH OPTIONS
 .TP
-.BR \-a , " \-\-algorithm lzo" | lz4
+.BR \-a , " \-\-algorithm lzo" | lz4 | lz4hc | deflate
 Set the compression algorithm to be used for compressing data in the zram device.
 .TP
 .BR \-f , " \-\-find"
diff --git a/sys-utils/zramctl.c b/sys-utils/zramctl.c
index fb64150d6..9117ddce3 100644
--- a/sys-utils/zramctl.c
+++ b/sys-utils/zramctl.c
@@ -424,13 +424,16 @@ static void fill_table_row(struct libscols_table *tb, struct zram *z)
 			char *alg = sysfs_strdup(sysfs, "comp_algorithm");
 			if (!alg)
 				break;
-			if (strstr(alg, "[lzo]") == NULL) {
-				if (strstr(alg, "[lz4]") == NULL)
-					;
-				else
-					str = xstrdup("lz4");
-			} else
+
+			if (strstr(alg, "[lzo]") != NULL)
 				str = xstrdup("lzo");
+			else if (strstr(alg, "[lz4]") != NULL)
+				str = xstrdup("lz4");
+			else if (strstr(alg, "[lz4hc]") != NULL)
+				str = xstrdup("lz4hc");
+			else if (strstr(alg, "[deflate]") != NULL)
+				str = xstrdup("deflate");
+
 			free(alg);
 			break;
 		}
@@ -539,7 +542,7 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_("Set up and control zram devices.\n"), out);
 
 	fputs(USAGE_OPTIONS, out);
-	fputs(_(" -a, --algorithm lzo|lz4   compression algorithm to use\n"), out);
+	fputs(_(" -a, --algorithm lzo|lz4|lz4hc|deflate   compression algorithm to use\n"), out);
 	fputs(_(" -b, --bytes               print sizes in bytes rather than in human readable format\n"), out);
 	fputs(_(" -f, --find                find a free device\n"), out);
 	fputs(_(" -n, --noheadings          don't print headings\n"), out);
@@ -611,7 +614,8 @@ int main(int argc, char **argv)
 
 		switch (c) {
 		case 'a':
-			if (strcmp(optarg,"lzo") && strcmp(optarg,"lz4"))
+			if (strcmp(optarg,"lzo") && strcmp(optarg,"lz4")
+					&& strcmp(optarg,"lz4hc") && strcmp(optarg, "deflate"))
 				errx(EXIT_FAILURE, _("unsupported algorithm: %s"),
 					     optarg);
 			algorithm = optarg;

Re: Patch to add support for lz4hc and deflate optimization algorithms in zramctl.

[Timofey Titovets]

https://patchwork.kernel.org/patch/9144717/

I think your patch miss support of 842 algo

2018-01-22 23:45 GMT+03:00 Libor Bukata <lbukata@gmail.com>:
> Dear developers of Linux utils,
>
> I extended the zramctl utility to handle also lz4hc and deflate formats.
> The patch is included in the attachment. Thank you in advance for your
> comments.
>
> Kind regards,
> Libor Bukata.



-- 
Have a nice day,
Timofey.

Re: Patch to add support for lz4hc and deflate optimization algorithms in zramctl.

[Timofey Titovets]

Also, use https://github.com/karelzak/util-linux and PR,
also add comment + Signed-off-by to patch.

2018-01-23 11:08 GMT+03:00 Timofey Titovets <nefelim4ag@gmail.com>:
> https://patchwork.kernel.org/patch/9144717/
>
> I think your patch miss support of 842 algo
>
> 2018-01-22 23:45 GMT+03:00 Libor Bukata <lbukata@gmail.com>:
>> Dear developers of Linux utils,
>>
>> I extended the zramctl utility to handle also lz4hc and deflate formats.
>> The patch is included in the attachment. Thank you in advance for your
>> comments.
>>
>> Kind regards,
>> Libor Bukata.
>
>
>
> --
> Have a nice day,
> Timofey.



-- 
Have a nice day,
Timofey.

Re: Patch to add support for lz4hc and deflate optimization algorithms in zramctl.

[Libor Bukata]

[-- Attachment #1: Type: text/plain, Size: 1173 bytes --]

Thank you for your comments. I added the support for 842 compression
algorithm. The included patch is signed and tested on the latest
versions of both Git repositories:

git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git
git://github.com/karelzak/util-linux.git

I am not sure what you meant by: "Also, use
https://github.com/karelzak/util-linux and PR, .."
If it is important, please do not hesitate to provide me more
information in order to fix it.

Have a nice day,
Libor.

Dne 23.1.2018 v 14:21 Timofey Titovets napsal(a):
> Also, use https://github.com/karelzak/util-linux and PR,
> also add comment + Signed-off-by to patch.
>
> 2018-01-23 11:08 GMT+03:00 Timofey Titovets <nefelim4ag@gmail.com>:
>> https://patchwork.kernel.org/patch/9144717/
>>
>> I think your patch miss support of 842 algo
>>
>> 2018-01-22 23:45 GMT+03:00 Libor Bukata <lbukata@gmail.com>:
>>> Dear developers of Linux utils,
>>>
>>> I extended the zramctl utility to handle also lz4hc and deflate formats.
>>> The patch is included in the attachment. Thank you in advance for your
>>> comments.
>>>
>>> Kind regards,
>>> Libor Bukata.
>>
>>
>> --
>> Have a nice day,
>> Timofey.
>
>


[-- Attachment #2: 0001-Added-the-support-for-lz4hc-deflate-and-842.patch --]
[-- Type: text/x-patch, Size: 2740 bytes --]

>From 9b48fba08a630bd90c29078a621e2725fb0c940e Mon Sep 17 00:00:00 2001
From: Libor Bukata <lbukata@gmail.com>
Date: Tue, 23 Jan 2018 18:34:01 +0100
Subject: [PATCH] Added the support for lz4hc, deflate, and 842 compression
 algorithms in zramctl utility.

Signed-off-by: Libor Bukata <lbukata@gmail.com>
---
 sys-utils/zramctl.8 |  2 +-
 sys-utils/zramctl.c | 22 ++++++++++++++--------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/sys-utils/zramctl.8 b/sys-utils/zramctl.8
index 9ca2983b9..679a8a175 100644
--- a/sys-utils/zramctl.8
+++ b/sys-utils/zramctl.8
@@ -44,7 +44,7 @@ query the status of used zram devices.
 If no option is given, all non-zero size zram devices are shown.
 .SH OPTIONS
 .TP
-.BR \-a , " \-\-algorithm lzo" | lz4
+.BR \-a , " \-\-algorithm lzo" | lz4 | lz4hc | deflate | 842
 Set the compression algorithm to be used for compressing data in the zram device.
 .TP
 .BR \-f , " \-\-find"
diff --git a/sys-utils/zramctl.c b/sys-utils/zramctl.c
index fb64150d6..0331045c8 100644
--- a/sys-utils/zramctl.c
+++ b/sys-utils/zramctl.c
@@ -424,13 +424,18 @@ static void fill_table_row(struct libscols_table *tb, struct zram *z)
 			char *alg = sysfs_strdup(sysfs, "comp_algorithm");
 			if (!alg)
 				break;
-			if (strstr(alg, "[lzo]") == NULL) {
-				if (strstr(alg, "[lz4]") == NULL)
-					;
-				else
-					str = xstrdup("lz4");
-			} else
+
+			if (strstr(alg, "[lzo]") != NULL)
 				str = xstrdup("lzo");
+			else if (strstr(alg, "[lz4]") != NULL)
+				str = xstrdup("lz4");
+			else if (strstr(alg, "[lz4hc]") != NULL)
+				str = xstrdup("lz4hc");
+			else if (strstr(alg, "[deflate]") != NULL)
+				str = xstrdup("deflate");
+			else if (strstr(alg, "[842]") != NULL)
+				str = xstrdup("842");
+
 			free(alg);
 			break;
 		}
@@ -539,7 +544,7 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_("Set up and control zram devices.\n"), out);
 
 	fputs(USAGE_OPTIONS, out);
-	fputs(_(" -a, --algorithm lzo|lz4   compression algorithm to use\n"), out);
+	fputs(_(" -a, --algorithm lzo|lz4|lz4hc|deflate|842   compression algorithm to use\n"), out);
 	fputs(_(" -b, --bytes               print sizes in bytes rather than in human readable format\n"), out);
 	fputs(_(" -f, --find                find a free device\n"), out);
 	fputs(_(" -n, --noheadings          don't print headings\n"), out);
@@ -611,7 +616,8 @@ int main(int argc, char **argv)
 
 		switch (c) {
 		case 'a':
-			if (strcmp(optarg,"lzo") && strcmp(optarg,"lz4"))
+			if (strcmp(optarg,"lzo") && strcmp(optarg,"lz4") && strcmp(optarg,"lz4hc")
+					&& strcmp(optarg,"deflate") && strcmp(optarg,"842"))
 				errx(EXIT_FAILURE, _("unsupported algorithm: %s"),
 					     optarg);
 			algorithm = optarg;
-- 
2.13.6

Re: Patch to add support for lz4hc and deflate optimization algorithms in zramctl.

[Timofey Titovets]

I mean, that you can use GitHub and pull request for that change =)
Instead of mail and patch in attachment

2018-01-23 20:57 GMT+03:00 Libor Bukata <lbukata@gmail.com>:
> Thank you for your comments. I added the support for 842 compression
> algorithm. The included patch is signed and tested on the latest
> versions of both Git repositories:
>
> git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git
> git://github.com/karelzak/util-linux.git
>
> I am not sure what you meant by: "Also, use
> https://github.com/karelzak/util-linux and PR, .."
> If it is important, please do not hesitate to provide me more
> information in order to fix it.
>
> Have a nice day,
> Libor.
>
> Dne 23.1.2018 v 14:21 Timofey Titovets napsal(a):
>> Also, use https://github.com/karelzak/util-linux and PR,
>> also add comment + Signed-off-by to patch.
>>
>> 2018-01-23 11:08 GMT+03:00 Timofey Titovets <nefelim4ag@gmail.com>:
>>> https://patchwork.kernel.org/patch/9144717/
>>>
>>> I think your patch miss support of 842 algo
>>>
>>> 2018-01-22 23:45 GMT+03:00 Libor Bukata <lbukata@gmail.com>:
>>>> Dear developers of Linux utils,
>>>>
>>>> I extended the zramctl utility to handle also lz4hc and deflate formats.
>>>> The patch is included in the attachment. Thank you in advance for your
>>>> comments.
>>>>
>>>> Kind regards,
>>>> Libor Bukata.
>>>
>>>
>>> --
>>> Have a nice day,
>>> Timofey.
>>
>>
>



-- 
Have a nice day,
Timofey.

Re: Patch to add support for lz4hc and deflate optimization algorithms in zramctl.

[Karel Zak]

On Tue, Jan 23, 2018 at 06:57:06PM +0100, Libor Bukata wrote:
> Thank you for your comments. I added the support for 842 compression
> algorithm.

@@ -424,13 +424,18 @@ static void fill_table_row(struct libscols_table *tb, struct zram *z)
 			char *alg = sysfs_strdup(sysfs, "comp_algorithm");
 			if (!alg)
 				break;
-			if (strstr(alg, "[lzo]") == NULL) {
-				if (strstr(alg, "[lz4]") == NULL)
-					;
-				else
-					str = xstrdup("lz4");
-			} else
+
+			if (strstr(alg, "[lzo]") != NULL)
 				str = xstrdup("lzo");
+			else if (strstr(alg, "[lz4]") != NULL)
+				str = xstrdup("lz4");
+			else if (strstr(alg, "[lz4hc]") != NULL)
+				str = xstrdup("lz4hc");
+			else if (strstr(alg, "[deflate]") != NULL)
+				str = xstrdup("deflate");
+			else if (strstr(alg, "[842]") != NULL)
+				str = xstrdup("842");
+

The question is if we really need to care about the algorithm string
at all. I think it would be better to accept arbitrary string from
sysfs and just remove "[" and "]" from the string only.

 		switch (c) {
 		case 'a':
-			if (strcmp(optarg,"lzo") && strcmp(optarg,"lz4"))
+			if (strcmp(optarg,"lzo") && strcmp(optarg,"lz4") && strcmp(optarg,"lz4hc")
+					&& strcmp(optarg,"deflate") && strcmp(optarg,"842"))
 				errx(EXIT_FAILURE, _("unsupported algorithm: %s"),

The same situation. I guess we can accept arbitrary string here and
assume that kernel is smart enough to reject requests to use wrong
algorithm name.

    Karel

-- 
2.13.6



-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com

Re: Patch to add support for lz4hc and deflate optimization algorithms in zramctl.

[Mike Frysinger]

[-- Attachment #1: Type: text/plain, Size: 248 bytes --]

On 22 Jan 2018 21:45, Libor Bukata wrote:
> +			if (strcmp(optarg,"lzo") && strcmp(optarg,"lz4")
> +					&& strcmp(optarg,"lz4hc") && strcmp(optarg, "deflate"))

not exactly a new issue, but there should be a space after each of those commas
-mike

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]