Skip to contentSkip to conversation

Add tests for a group of real time clock ioctls

PATCH Superseded Filip Bozuta 3 participants 10 messages Apr 23, 2020 – Apr 30, 2020

lore
Share & tools
lore
#0 lore raw

v2 cover Add tests for a group of real time clock ioctls

This series covers tests for following RTC ioctls:

    *RTC_RD_TIME    *RTC_UIE_ON
    *RTC_SET_TIME   *RTC_UIE_OFF
    *RTC_ALM_READ   *RTC_PIE_ON
    *RTC_ALM_SET    *RTC_PIE_OFF
    *RTC_AIE_ON     *RTC_WIE_ON
    *RTC_AIE_OFF    *RTC_WIE_OFF

The functionalities of individual ioctls were described in this series patch commit messages.

The testing method for these ioctls is described in the upper comment sections of test programs.

v2:
* changed patches so that they are not sent as attachments but as "inline" mails

* changed structure initialization style in first and second test to designated initialization

* corrected the first and second test to avoid corruption of /dev/rtc device driver file (RTC time and alarm are set back to current values at the end of the test)

Filip Bozuta (3):
testcases/kernel/syscalls/ioctl: Add test for RTC ioctls used to read
and set RTC time
testcases/kernel/syscalls/ioctl: Add test for RTC ioctls used to read
and set RTC alarm time
testcases/kernel/syscalls/ioctl: Add test for RTC ioctls used to turn
on/off RTC interrupts

 runtest/syscalls                              |   4 +
 testcases/kernel/syscalls/ioctl/.gitignore    |   3 +
 testcases/kernel/syscalls/ioctl/ioctl_rtc01.c | 121 ++++++++++++++++++
 testcases/kernel/syscalls/ioctl/ioctl_rtc02.c | 115 +++++++++++++++++
 testcases/kernel/syscalls/ioctl/ioctl_rtc03.c |  86 +++++++++++++
 5 files changed, 329 insertions(+)
 create mode 100644 testcases/kernel/syscalls/ioctl/ioctl_rtc01.c
 create mode 100644 testcases/kernel/syscalls/ioctl/ioctl_rtc02.c
 create mode 100644 testcases/kernel/syscalls/ioctl/ioctl_rtc03.c
Signature · 1 line
2.17.1
#1 lore raw

PATCH v2 1/3 testcases/kernel/syscalls/ioctl: Add test for RTC ioctls used to read and set RTC time

From: Filip Bozuta <[email protected]>

This patch tests functionalities of following ioctls:

RTC_RD_TIME - Getting RTC time

    Returns this RTC's time in the following structure:

        struct rtc_time {
            int tm_sec;
            int tm_min;
            int tm_hour;
            int tm_mday;
            int tm_mon;
            int tm_year;
            int tm_wday;     /* unused */
            int tm_yday;     /* unused */
            int tm_isdst;    /* unused */
        };

    The fields in this structure have the same meaning and
    ranges as the tm structure described in gmtime man page.
    A pointer to this structure should be passed as the third
    ioctl argument.

RTC_SET_TIME - Setting RTC time

Sets this RTC's time to the time specified by the rtc_time structure pointed to by the third ioctl argument. To set the RTC's time the process must be privileged (i.e., have the CAP_SYS_TIME capability).

---
 runtest/syscalls                              |   2 +
 testcases/kernel/syscalls/ioctl/.gitignore    |   1 +
 testcases/kernel/syscalls/ioctl/ioctl_rtc01.c | 121 ++++++++++++++++++
 3 files changed, 124 insertions(+)
 create mode 100644 testcases/kernel/syscalls/ioctl/ioctl_rtc01.c
runtest/syscalls +2 -0
index 44254d7da..c6b8a85ad 100644
@@ -539,6 +539,8 @@ ioctl_ns07 ioctl_ns07
 
 ioctl_sg01 ioctl_sg01
 
+ioctl_rtc01 ioctl_rtc01
+
 inotify_init1_01 inotify_init1_01
 inotify_init1_02 inotify_init1_02
 
testcases/kernel/syscalls/ioctl/.gitignore +1 -0
index 97fbb9681..b297407bd 100644
@@ -14,3 +14,4 @@
 /ioctl_ns06
 /ioctl_ns07
 /ioctl_sg01
+/ioctl_rtc01
testcases/kernel/syscalls/ioctl/ioctl_rtc01.c new file +121 -0

121 lines not on this page · raw message

Signature · 1 line
2.17.1
#2 lore raw

PATCH v2 1/3 testcases/kernel/syscalls/ioctl: Add test for RTC ioctls used to read and set RTC time

Hi!

Quoted 91 lines

This patch tests functionalities of following ioctls:

RTC_RD_TIME - Getting RTC time

    Returns this RTC's time in the following structure:

        struct rtc_time {
            int tm_sec;
            int tm_min;
            int tm_hour;
            int tm_mday;
            int tm_mon;
            int tm_year;
            int tm_wday;     /* unused */
            int tm_yday;     /* unused */
            int tm_isdst;    /* unused */
        };

    The fields in this structure have the same meaning and
    ranges as the tm structure described in gmtime man page.
    A pointer to this structure should be passed as the third
    ioctl argument.

RTC_SET_TIME - Setting RTC time

Sets this RTC's time to the time specified by the rtc_time structure pointed to by the third ioctl argument. To set the RTC's time the process must be privileged (i.e., have the CAP_SYS_TIME capability).

---
 runtest/syscalls                              |   2 +
 testcases/kernel/syscalls/ioctl/.gitignore    |   1 +
 testcases/kernel/syscalls/ioctl/ioctl_rtc01.c | 121 ++++++++++++++++++
 3 files changed, 124 insertions(+)
 create mode 100644 testcases/kernel/syscalls/ioctl/ioctl_rtc01.c
runtest/syscalls +2 -0
index 44254d7da..c6b8a85ad 100644
@@ -539,6 +539,8 @@ ioctl_ns07 ioctl_ns07
 
 ioctl_sg01 ioctl_sg01
 
+ioctl_rtc01 ioctl_rtc01
+
 inotify_init1_01 inotify_init1_01
 inotify_init1_02 inotify_init1_02
 
testcases/kernel/syscalls/ioctl/.gitignore +1 -0
index 97fbb9681..b297407bd 100644
@@ -14,3 +14,4 @@
 /ioctl_ns06
 /ioctl_ns07
 /ioctl_sg01
+/ioctl_rtc01
testcases/kernel/syscalls/ioctl/ioctl_rtc01.c new file +25 -0
new file mode 100644
index 000000000..e097f8f65
@@ -0,0 +1,121 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) 2020 Filip Bozuta [email protected]
+ */
+
+/*
+ * Test RTC ioctls with RTC_RD_TIME and RTC_SET_TIME requests
+ *
+ * Reads the current time from RTC device using RTC_RD_TIME
+ * request and displays the time information as follows:
+ * hour:minute, month day.month.year
+ *
+ * Sets a new time in RTC device using RTC_SET_TIME request
+ * and displays the new time information as follws:
+ * hour:minute, month day.month.year
+ *
+ * Reads the new time from RTC device using RTC_RD_TIME
+ * request and checks whether the read time information
+ * is same as the one set by RTC_SET_TIME
+
+ * Runs RTC_SET_TIME to set back the current time read by
+ * RTC_RD_TIME at the beginning of the test
+ */
+
+#include <stdint.h>

testcases/kernel/syscalls/ioctl/ioctl_rtc01.c line 35

Quoted 10 lines
testcases/kernel/syscalls/ioctl/ioctl_rtc01.c new file +10 -0
+#include <errno.h>
+#include <linux/rtc.h>
+#include "tst_test.h"
+
+static void setup(void)
+{
+	int exists = access("/dev/rtc", O_RDONLY);
+
+	if (exists < 0)
+		tst_brk(TCONF, "RTC device driver file not found");

The old LTP test allowed an RTC device to be passed to the test, I wonder what should we do here. Should we loop over all rtcX devices under /dev/ by default?

Also the same interface seems to be exported via proc and sysfs, it may make sense to check that /sys/class/rtc/rtcX/time and date matches the results from ioctl commands. We do have SAFE_FILE_SCANF() so reading these should be simple enough.

Quoted 11 lines
testcases/kernel/syscalls/ioctl/ioctl_rtc01.c new file +11 -0
+}
+
+char *read_time_request = "RTC_RD_TIME";
+char *set_time_request = "RTC_SET_TIME";
+
+static void run(void)
+{
+	int fd;
+
+	struct rtc_time rtc_read_time;
+	struct rtc_time rtc_cur_time;

testcases/kernel/syscalls/ioctl/ioctl_rtc01.c line 56

Quoted 10 lines
testcases/kernel/syscalls/ioctl/ioctl_rtc01.c new file +10 -0
+	struct rtc_time rtc_set_time = {
+		.tm_sec = 0, .tm_min = 15, .tm_hour = 13,
+		.tm_mday = 26, .tm_mon = 8, .tm_year = 119};
+
+	int time_read_supported, time_set_supported = 0;
+
+	fd = SAFE_OPEN("/dev/rtc", O_RDONLY);
+
+	if (fd == -1)
+		tst_brk(TCONF, "RTC device driver file could not be opened");

You are using SAFE_OPEN() the return value will never be -1, SAFE_OPEN() either succeeds or exits the test.

You have to use raw open() call if you want to handle the errors yourself. Also you should really check for errno here, I guess that we should TCONF only or ENOENT?

And lastly but not least we should open the device once in the test setup and close it once in test cleanup, there is no point in opening it for each test iteration (the test -i parameter).

testcases/kernel/syscalls/ioctl/ioctl_rtc01.c line 58

Quoted 1 line
testcases/kernel/syscalls/ioctl/ioctl_rtc01.c new file +1 -0
+	if (ioctl(fd, RTC_RD_TIME, &rtc_cur_time) == -1) {

Just for the sake of being pedantic we should test that the retuned value here is exactly the one that describes success, so we should do:

	ioctl(fd, RTC_RD_TIME, &foo) != 0

There have been cases where wrongly applied patch caused random values to be returned from a syscall which would not be caught here.

Quoted 8 lines
testcases/kernel/syscalls/ioctl/ioctl_rtc01.c new file +8 -0
+		if (errno == ENOTTY)
+			tst_res(TCONF, "ioctl %s not supported on RTC device",
+				read_time_request);
+		else
+			tst_res(TFAIL | TERRNO, "unexpected ioctl error");
+	} else {
+		tst_res(TPASS, "time successfully read from RTC device");
+		tst_res(TINFO, "current RTC time: %d:%d, %d.%d.%d",

testcases/kernel/syscalls/ioctl/ioctl_rtc01.c line 76

Quoted 10 lines
testcases/kernel/syscalls/ioctl/ioctl_rtc01.c new file +10 -0
+			rtc_cur_time.tm_hour, rtc_cur_time.tm_min,
+			rtc_cur_time.tm_mday, rtc_cur_time.tm_mon,
+			rtc_cur_time.tm_year);
+		time_read_supported = 1;
+	}
+
+	if (ioctl(fd, RTC_SET_TIME, &rtc_set_time) == -1) {
+		if (errno == ENOTTY)
+			tst_res(TCONF, "ioctl %s not supported on RTC device",
+				set_time_request);

Huh, why do we pass static string as %s? Why can't we just simply put it verbatim into the string?

Quoted 6 lines
testcases/kernel/syscalls/ioctl/ioctl_rtc01.c new file +6 -0
+		else
+			tst_res(TFAIL | TERRNO, "unexpected ioctl error");
+	} else {
+		tst_res(TPASS, "time successfully set to RTC device");
+		tst_res(TINFO, "new RTC time: %d:%d, %d.%d.%d",
+			rtc_set_time.tm_hour, rtc_set_time.tm_min,

testcases/kernel/syscalls/ioctl/ioctl_rtc01.c line 92

Quoted 10 lines
testcases/kernel/syscalls/ioctl/ioctl_rtc01.c new file +10 -0
+			rtc_set_time.tm_mday, rtc_set_time.tm_mon,
+			rtc_set_time.tm_year);
+		time_set_supported = 1;
+	}
+
+	if (time_read_supported && time_set_supported) {
+		ioctl(fd, RTC_RD_TIME, &rtc_read_time);
+
+		char time_data[][10] = {"minute", "hour", "month",
+			"month day", "year"};

This can be just const char *time_data[] = {...};

Quoted 5 lines
testcases/kernel/syscalls/ioctl/ioctl_rtc01.c new file +5 -0
+		int read_time_data[] = {
+			rtc_read_time.tm_min, rtc_read_time.tm_hour,
+			rtc_read_time.tm_mday, rtc_read_time.tm_mon,
+			rtc_read_time.tm_year};
+		int set_time_data[] = {

testcases/kernel/syscalls/ioctl/ioctl_rtc01.c line 107

Quoted 10 lines
testcases/kernel/syscalls/ioctl/ioctl_rtc01.c new file +10 -0
+			rtc_set_time.tm_min, rtc_set_time.tm_hour,
+			rtc_set_time.tm_mday, rtc_set_time.tm_mon,
+			rtc_set_time.tm_year};
+		for (int i = 0; i < 5; i++)
+			if (read_time_data[i] == set_time_data[i])
+				tst_res(TPASS, "%s reads new %s as expected",
+					read_time_request, time_data[i]);
+			else
+				tst_res(TFAIL, "%s reads different %s than set",
+					read_time_request, time_data[i]);

Here as well, why do we pass static string as a parameter?

testcases/kernel/syscalls/ioctl/ioctl_rtc01.c line 111

Quoted 4 lines
testcases/kernel/syscalls/ioctl/ioctl_rtc01.c new file +4 -0
+	}
+
+	if (time_set_supported)
+		ioctl(fd, RTC_SET_TIME, &rtc_cur_time);

If we are allowed to set the time but not read it we will not restore the value at the end. Also does having write-only RTC even make sense? Shouldn't we just drop the time_read_supported flag and exit the test if we can't read it?

testcases/kernel/syscalls/ioctl/ioctl_rtc01.c line 121

Quoted 9 lines
testcases/kernel/syscalls/ioctl/ioctl_rtc01.c new file +9 -0
+	SAFE_CLOSE(fd);
+}
+
+static struct tst_test test = {
+	.test_all = run,
+	.needs_root = 1,
+	.needs_device = 1,
+	.setup = setup,
+};

Lastly there are some minor coding style violations, LTP uses LKML coding style, and there is a script packed along with the Linux kernel that can check your patches before sending them, see linux/scripts/checkpatch.pl.

Signature · 2 lines
Cyril Hrubis
[email protected]
#3 lore raw

PATCH v2 1/3 testcases/kernel/syscalls/ioctl: Add test for RTC ioctls used to read and set RTC time

Quoted 99 lines · Cyril Hrubis

Hi!

Quoted 97 lines

This patch tests functionalities of following ioctls:

RTC_RD_TIME - Getting RTC time

    Returns this RTC's time in the following structure:

        struct rtc_time {
            int tm_sec;
            int tm_min;
            int tm_hour;
            int tm_mday;
            int tm_mon;
            int tm_year;
            int tm_wday;     /* unused */
            int tm_yday;     /* unused */
            int tm_isdst;    /* unused */
        };

    The fields in this structure have the same meaning and
    ranges as the tm structure described in gmtime man page.
    A pointer to this structure should be passed as the third
    ioctl argument.

RTC_SET_TIME - Setting RTC time

Sets this RTC's time to the time specified by the rtc_time structure pointed to by the third ioctl argument. To set the RTC's time the process must be privileged (i.e., have the CAP_SYS_TIME capability).

---
 runtest/syscalls                              |   2 +
 testcases/kernel/syscalls/ioctl/.gitignore    |   1 +
 testcases/kernel/syscalls/ioctl/ioctl_rtc01.c | 121 ++++++++++++++++++
 3 files changed, 124 insertions(+)
 create mode 100644 testcases/kernel/syscalls/ioctl/ioctl_rtc01.c
runtest/syscalls +2 -0
index 44254d7da..c6b8a85ad 100644
@@ -539,6 +539,8 @@ ioctl_ns07 ioctl_ns07
 
 ioctl_sg01 ioctl_sg01
 
+ioctl_rtc01 ioctl_rtc01
+
 inotify_init1_01 inotify_init1_01
 inotify_init1_02 inotify_init1_02
 
testcases/kernel/syscalls/ioctl/.gitignore +1 -0
index 97fbb9681..b297407bd 100644
@@ -14,3 +14,4 @@
 /ioctl_ns06
 /ioctl_ns07
 /ioctl_sg01
+/ioctl_rtc01
testcases/kernel/syscalls/ioctl/ioctl_rtc01.c new file +31 -0
new file mode 100644
index 000000000..e097f8f65
@@ -0,0 +1,121 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) 2020 Filip Bozuta [email protected]
+ */
+
+/*
+ * Test RTC ioctls with RTC_RD_TIME and RTC_SET_TIME requests
+ *
+ * Reads the current time from RTC device using RTC_RD_TIME
+ * request and displays the time information as follows:
+ * hour:minute, month day.month.year
+ *
+ * Sets a new time in RTC device using RTC_SET_TIME request
+ * and displays the new time information as follws:
+ * hour:minute, month day.month.year
+ *
+ * Reads the new time from RTC device using RTC_RD_TIME
+ * request and checks whether the read time information
+ * is same as the one set by RTC_SET_TIME
+
+ * Runs RTC_SET_TIME to set back the current time read by
+ * RTC_RD_TIME at the beginning of the test
+ */
+
+#include <stdint.h>
+#include <errno.h>
+#include <linux/rtc.h>
+#include "tst_test.h"
+
+static void setup(void)
+{
Quoted 9 lines

testcases/kernel/syscalls/ioctl/ioctl_rtc01.c line 35

Quoted 4 lines
testcases/kernel/syscalls/ioctl/ioctl_rtc01.c new file +4 -0
+     int exists = access("/dev/rtc", O_RDONLY);
+
+     if (exists < 0)
+             tst_brk(TCONF, "RTC device driver file not found");

The old LTP test allowed an RTC device to be passed to the test, I wonder what should we do here. Should we loop over all rtcX devices under /dev/ by default?

Thank you for your review!
I will see to it that I correct all of the mistakes you have pointed out to me in the v3 series of these patches.

I agree with this. I shall create a mechanism to run the test for all /dev/rtcX devices that are available on the system.

Quoted 5 lines

Also the same interface seems to be exported via proc and sysfs, it may make sense to check that /sys/class/rtc/rtcX/time and date matches the results from ioctl commands. We do have SAFE_FILE_SCANF() so reading these should be simple enough.

Yes you are right, this would be a good addition to the test. Should I read the time using both the ioctl command and SAFE_FILE_SCANF() or should I use just one of these two?

Quoted 25 lines
Quoted 11 lines
testcases/kernel/syscalls/ioctl/ioctl_rtc01.c new file +11 -0
+}
+
+char *read_time_request = "RTC_RD_TIME";
+char *set_time_request = "RTC_SET_TIME";
+
+static void run(void)
+{
+     int fd;
+
+     struct rtc_time rtc_read_time;
+     struct rtc_time rtc_cur_time;

testcases/kernel/syscalls/ioctl/ioctl_rtc01.c line 56

Quoted 10 lines
testcases/kernel/syscalls/ioctl/ioctl_rtc01.c new file +10 -0
+     struct rtc_time rtc_set_time = {
+             .tm_sec = 0, .tm_min = 15, .tm_hour = 13,
+             .tm_mday = 26, .tm_mon = 8, .tm_year = 119};
+
+     int time_read_supported, time_set_supported = 0;
+
+     fd = SAFE_OPEN("/dev/rtc", O_RDONLY);
+
+     if (fd == -1)
+             tst_brk(TCONF, "RTC device driver file could not be opened");

You are using SAFE_OPEN() the return value will never be -1, SAFE_OPEN() either succeeds or exits the test.

Quoted 8 lines

You have to use raw open() call if you want to handle the errors yourself. Also you should really check for errno here, I guess that we should TCONF only or ENOENT?

And lastly but not least we should open the device once in the test setup and close it once in test cleanup, there is no point in opening it for each test iteration (the test -i parameter).

Thank you for pointing this out to me. I will consider both options:
using SAFE_OPEN() and remove the error check or use raw open() with appropriate error handling. In any case, I will move this opening of the device file in the setup() function
and create a cleanup() function where the file will be closed.

Quoted 10 lines

testcases/kernel/syscalls/ioctl/ioctl_rtc01.c line 58

Quoted 1 line
testcases/kernel/syscalls/ioctl/ioctl_rtc01.c new file +1 -0
+     if (ioctl(fd, RTC_RD_TIME, &rtc_cur_time) == -1) {

Just for the sake of being pedantic we should test that the retuned value here is exactly the one that describes success, so we should do:

        ioctl(fd, RTC_RD_TIME, &foo) != 0

There have been cases where wrongly applied patch caused random values to be returned from a syscall which would not be caught here.

I will change this in every part of the test where the ioctl() call is checked.

Quoted 57 lines
Quoted 8 lines
testcases/kernel/syscalls/ioctl/ioctl_rtc01.c new file +8 -0
+             if (errno == ENOTTY)
+                     tst_res(TCONF, "ioctl %s not supported on RTC device",
+                             read_time_request);
+             else
+                     tst_res(TFAIL | TERRNO, "unexpected ioctl error");
+     } else {
+             tst_res(TPASS, "time successfully read from RTC device");
+             tst_res(TINFO, "current RTC time: %d:%d, %d.%d.%d",

testcases/kernel/syscalls/ioctl/ioctl_rtc01.c line 76

Quoted 10 lines
testcases/kernel/syscalls/ioctl/ioctl_rtc01.c new file +10 -0
+                     rtc_cur_time.tm_hour, rtc_cur_time.tm_min,
+                     rtc_cur_time.tm_mday, rtc_cur_time.tm_mon,
+                     rtc_cur_time.tm_year);
+             time_read_supported = 1;
+     }
+
+     if (ioctl(fd, RTC_SET_TIME, &rtc_set_time) == -1) {
+             if (errno == ENOTTY)
+                     tst_res(TCONF, "ioctl %s not supported on RTC device",
+                             set_time_request);

Huh, why do we pass static string as %s? Why can't we just simply put it verbatim into the string?

Quoted 6 lines
testcases/kernel/syscalls/ioctl/ioctl_rtc01.c new file +6 -0
+             else
+                     tst_res(TFAIL | TERRNO, "unexpected ioctl error");
+     } else {
+             tst_res(TPASS, "time successfully set to RTC device");
+             tst_res(TINFO, "new RTC time: %d:%d, %d.%d.%d",
+                     rtc_set_time.tm_hour, rtc_set_time.tm_min,

testcases/kernel/syscalls/ioctl/ioctl_rtc01.c line 92

Quoted 10 lines
testcases/kernel/syscalls/ioctl/ioctl_rtc01.c new file +10 -0
+                     rtc_set_time.tm_mday, rtc_set_time.tm_mon,
+                     rtc_set_time.tm_year);
+             time_set_supported = 1;
+     }
+
+     if (time_read_supported && time_set_supported) {
+             ioctl(fd, RTC_RD_TIME, &rtc_read_time);
+
+             char time_data[][10] = {"minute", "hour", "month",
+                     "month day", "year"};

This can be just const char *time_data[] = {...};

Quoted 5 lines
testcases/kernel/syscalls/ioctl/ioctl_rtc01.c new file +5 -0
+             int read_time_data[] = {
+                     rtc_read_time.tm_min, rtc_read_time.tm_hour,
+                     rtc_read_time.tm_mday, rtc_read_time.tm_mon,
+                     rtc_read_time.tm_year};
+             int set_time_data[] = {

testcases/kernel/syscalls/ioctl/ioctl_rtc01.c line 107

Quoted 10 lines
testcases/kernel/syscalls/ioctl/ioctl_rtc01.c new file +10 -0
+                     rtc_set_time.tm_min, rtc_set_time.tm_hour,
+                     rtc_set_time.tm_mday, rtc_set_time.tm_mon,
+                     rtc_set_time.tm_year};
+             for (int i = 0; i < 5; i++)
+                     if (read_time_data[i] == set_time_data[i])
+                             tst_res(TPASS, "%s reads new %s as expected",
+                                     read_time_request, time_data[i]);
+                     else
+                             tst_res(TFAIL, "%s reads different %s than set",
+                                     read_time_request, time_data[i]);
Quoted 2 lines

Here as well, why do we pass static string as a parameter?

I am sorry. I got confused when writting this part of the test (last 20 lines). I will
change this whole time comparing section in v3 and remove all static strings.

Quoted 10 lines

testcases/kernel/syscalls/ioctl/ioctl_rtc01.c line 111

Quoted 4 lines
testcases/kernel/syscalls/ioctl/ioctl_rtc01.c new file +4 -0
+     }
+
+     if (time_set_supported)
+             ioctl(fd, RTC_SET_TIME, &rtc_cur_time);

If we are allowed to set the time but not read it we will not restore the value at the end. Also does having write-only RTC even make sense? Shouldn't we just drop the time_read_supported flag and exit the test if we can't read it?

I will drop both time_read_supported and time_set_supported flags as they are unnecessary. Instead, I shall just use tst_brk() to exit the test in the beginning part if RTC_RD_TIME or RTC_SET_TIME request fails (as there is no need to move forward with the test if any of these requests fail at the beginning).

Quoted 6 lines
Quoted 6 lines
testcases/kernel/syscalls/ioctl/ioctl_rtc01.c new file +6 -0
+     SAFE_CLOSE(fd);
+}
+
+static struct tst_test test = {
+     .test_all = run,
+     .needs_root = 1,
Quoted 9 lines

testcases/kernel/syscalls/ioctl/ioctl_rtc01.c line 121

Quoted 3 lines
testcases/kernel/syscalls/ioctl/ioctl_rtc01.c new file +3 -0
+     .needs_device = 1,
+     .setup = setup,
+};

Lastly there are some minor coding style violations, LTP uses LKML coding style, and there is a script packed along with the Linux kernel that can check your patches before sending them, see linux/scripts/checkpatch.pl.

I will check all future patches with checkpatch.pl script from the Linux kernel.

I would just like to inform you that I am going on a short holiday in the next three days after which I will have some other tasks that I have to attend to. For that reason, I won't be able to complete the v3 series with the corrected flaws of this patch in the near future. However, I am looking forward to getting back at work on these tests and correcting all of the mistakes that you have pointed out to me as soon as possible. I am also looking forward to your reviews of my future patches.

Thanks again for all of your comments!

Best regards,
Filip

Quoted 3 lines

--
Cyril Hrubis
[email protected]

#4 lore raw

PATCH v2 2/3 testcases/kernel/syscalls/ioctl: Add test for RTC ioctls used to read and set RTC alarm time

In reply to Filip Bozuta

From: Filip Bozuta <[email protected]>

This patch tests functionalities of following ioctls:

RTC_ALM_READ, RTC_ALM_SET - Getting/Setting alarm time

Read and set the alarm time, for RTCs that support alarms. The alarm interrupt must be separately enabled or disabled using the RTC_AIE_ON, RTC_AIE_OFF requests. The third ioctl's argument is a pointer to a rtc_time structure. Only the tm_sec, tm_min, and tm_hour fields of this structure are used.

---
 runtest/syscalls                              |   1 +
 testcases/kernel/syscalls/ioctl/.gitignore    |   1 +
 testcases/kernel/syscalls/ioctl/ioctl_rtc02.c | 115 ++++++++++++++++++
 3 files changed, 117 insertions(+)
 create mode 100644 testcases/kernel/syscalls/ioctl/ioctl_rtc02.c
runtest/syscalls +1 -0
index c6b8a85ad..0e358337f 100644
@@ -540,6 +540,7 @@ ioctl_ns07 ioctl_ns07
 ioctl_sg01 ioctl_sg01
 
 ioctl_rtc01 ioctl_rtc01
+ioctl_rtc02 ioctl_rtc02
 
 inotify_init1_01 inotify_init1_01
 inotify_init1_02 inotify_init1_02
testcases/kernel/syscalls/ioctl/.gitignore +1 -0
index b297407bd..b9ed19724 100644
@@ -15,3 +15,4 @@
 /ioctl_ns07
 /ioctl_sg01
 /ioctl_rtc01
+/ioctl_rtc02
testcases/kernel/syscalls/ioctl/ioctl_rtc02.c new file +115 -0

115 lines not on this page · raw message

Signature · 1 line
2.17.1
#5 lore raw

PATCH v2 2/3 testcases/kernel/syscalls/ioctl: Add test for RTC ioctls used to read and set RTC alarm time

Hi Filip,

testcases/kernel/syscalls/ioctl/ioctl_rtc02.c line 95

Quoted 1 line
testcases/kernel/syscalls/ioctl/ioctl_rtc02.c new file +1 -0
+		for (int i = 0; i < 3; i++)

Minor nit: we still support old gcc 4 in centOS 6 build, which doesn't use C99 by default, thus it fails when int is defined inside loop. Trivial fix (in case there is no v2 needed it could be changed by person who merges):
int i;
for (i = 0; i < 3; i++)
...

https://api.travis-ci.org/v3/job/680146814/log.txt
/usr/src/ltp/testcases/kernel/syscalls/ioctl/ioctl_rtc02.c: In function 'setup':
/usr/src/ltp/testcases/kernel/syscalls/ioctl/ioctl_rtc02.c:32: warning: left-hand operand of comma expression has no effect /usr/src/ltp/testcases/kernel/syscalls/ioctl/ioctl_rtc02.c: In function 'run':
/usr/src/ltp/testcases/kernel/syscalls/ioctl/ioctl_rtc02.c:95: error: 'for' loop initial declarations are only allowed in C99 mode /usr/src/ltp/testcases/kernel/syscalls/ioctl/ioctl_rtc02.c:95: note: use option -std=c99 or -std=gnu99 to compile your code

https://travis-ci.org/github/pevik/ltp/builds/680146805

Kind regards,
Petr

#6 lore raw

PATCH v2 3/3 testcases/kernel/syscalls/ioctl: Add test for RTC ioctls used to turn on/off RTC interrupts

In reply to Filip Bozuta

From: Filip Bozuta <[email protected]>

This patch tests functionalities of following ioctls:

RTC_AIE_ON, RTC_AIE_OFF - Alarm interrupt enabling on/off

Enable or disable the alarm interrupt, for RTCs that support alarms. The third ioctl's argument is ignored.

RTC_UIE_ON, RTC_UIE_OFF - Update interrupt enabling on/off

Enable or disable the interrupt on every clock update, for RTCs that support this once-per-second interrupt. The third ioctl's argument is ignored.

RTC_PIE_ON, RTC_PIE_OFF - Periodic interrupt enabling on/off

Enable or disable the periodic interrupt, for RTCs that sup? port these periodic interrupts. The third ioctl's argument is ignored. Only a privileged process (i.e., one having the CAP_SYS_RESOURCE capability) can enable the periodic interrupt if the frequency is currently set above the value specified in /proc/sys/dev/rtc/max-user-freq.

RTC_WIE_ON, RTC_WIE_OFF - Watchdog interrupt enabling on/off

Enable or disable the Watchdog interrupt, for RTCs that sup- port this Watchdog interrupt. The third ioctl's argument is ignored.

---
 runtest/syscalls                              |  1 +
 testcases/kernel/syscalls/ioctl/.gitignore    |  1 +
 testcases/kernel/syscalls/ioctl/ioctl_rtc03.c | 86 +++++++++++++++++++
 3 files changed, 88 insertions(+)
 create mode 100644 testcases/kernel/syscalls/ioctl/ioctl_rtc03.c
runtest/syscalls +1 -0
index 0e358337f..d5b9789d3 100644
@@ -541,6 +541,7 @@ ioctl_sg01 ioctl_sg01
 
 ioctl_rtc01 ioctl_rtc01
 ioctl_rtc02 ioctl_rtc02
+ioctl_rtc03 ioctl_rtc03
 
 inotify_init1_01 inotify_init1_01
 inotify_init1_02 inotify_init1_02
testcases/kernel/syscalls/ioctl/.gitignore +1 -0
index b9ed19724..f16c11f58 100644
@@ -16,3 +16,4 @@
 /ioctl_sg01
 /ioctl_rtc01
 /ioctl_rtc02
+/ioctl_rtc03
testcases/kernel/syscalls/ioctl/ioctl_rtc03.c new file +86 -0

86 lines not on this page · raw message

Signature · 1 line
2.17.1
#7 lore raw

PATCH v2 3/3 testcases/kernel/syscalls/ioctl: Add test for RTC ioctls used to turn on/off RTC interrupts

Hi!
The same comments apply for the next two tests as well.

Also looking closer what these tests do miss compared to the old rtc01.c tests are checks that alarm actuall fires and that the update interrupts are propagated as well. Can we please implement these two cases in these tests as well and get rid of the old test after that?

Signature · 2 lines
Cyril Hrubis
[email protected]
#8 lore raw

v2 cover Add tests for a group of real time clock ioctls

In reply to Filip Bozuta

Hi!
Looking at these I guess that we should also delete the testcases/kernel/device-drivers/rtc/ as a last patch in this series since these tests seems to cover a bit more than the original test.

I will have a closer look at the patchset next week.

Signature · 2 lines
Cyril Hrubis
[email protected]
#9 lore raw

v2 cover Add tests for a group of real time clock ioctls

Hello Cyrill,

Thank you for your response!

I didn't take a look at the file testcases/kernel/device-drivers/rtc/rtc01.c when writing rtc ioctl tests. I see that it runs tests for certain ioctls that are covered in the patches I sent (i.e. RTC_RD_TIME, RTC_SET_TIME, RTC_AIE_ON,...).

As I see, this file runs tests for certain ioctls more thoroughly than my test since it is meant to test the functionality of the rtc driver. My tests are only meant to test the functionalities of rtc ioctls without testing whether the driver works correctly. For instance, when running tests for ioctls used for interrupts (RTC_AIE_ON, RTC_AIE_OFF, RTC_PIE_ON,...), I only check whether these ioctls work to turn on/off rtc interrupts (alarm, periodic, update, watchdog). I don't check whether the interrupts work on the driver correctly.

Anyway, I am new to LTP so I am not that familiar with the scope of functionalities ioctl tests should cover. Any feedback you can give me on this would be greatly appreciated.

I am looking forward to your review of my patches.

Best regards,
Filip

Quoted 11 lines · Cyril Hrubis

Hi!
Looking at these I guess that we should also delete the testcases/kernel/device-drivers/rtc/ as a last patch in this series since these tests seems to cover a bit more than the original test.

I will have a closer look at the patchset next week.

--
Cyril Hrubis
[email protected]

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.linux.it/pipermail/ltp/attachments/20200424/2a05c03b/attachment.htm>