input/input06: Ignore auto-repeat config events
PATCH v2 1/1 input/input06: Ignore auto-repeat config events
The test currently fails on some android devices because the kernel sends the EV_REP event with the codes REP_DELAY and REP_PERIOD and their corresponding values for the uinput device the test creates.
This results in incorrect test failure as follows:
input06 0 TINFO : Didn't receive EV_KEY KEY_X with value 2 input06 1 TFAIL : external/ltp/testcases/kernel/input/input06.c:64: Wrong data received in
eventX
--- testcases/kernel/input/input06.c | 118 ++++++++++++++++++++++++++++++--------- 1 file changed, 91 insertions(+), 27 deletions(-)
testcases/kernel/input/input06.c +91 -27
@@ -37,6 +37,9 @@ static void cleanup(void);static int fd;static int fd2; +struct input_event events[64 ]; +static int num_events; +static int ev_iter;char *TCID ="input06" ;
@@ -107,9 +110,9 @@ static int check_event(struct input_event *iev, int event, int code, int value)return iev->type == event && iev->code == code && iev->value == value; } -static int check_bound (unsigned int i,unsigned int rd) +static int check_config_event (struct input_event *iev,int event,int code) { -return i <= rd /sizeof (struct input_event ); +return iev->type == event && iev->code == code; }static void check_size (int rd)
@@ -123,43 +126,104 @@ static void check_size(int rd) } } -static int check_events (void ) +static void read_events (void ) { -struct input_event iev[64 ]; -unsigned int i; -int nb; -int rd; +int rd =read (fd2, events,sizeof (events)); - i =0 ; - nb =0 ; +check_size (rd); - rd =read (fd2, iev,sizeof (iev)); + ev_iter =0 ; + num_events = rd /sizeof (struct input_event ); +} -check_size (rd); +static int have_events (void ) +{ +return num_events !=0 && ev_iter < num_events; +} -if (rd >0 &&check_event (&iev[i],EV_KEY ,KEY_X ,1 )) - i++; +static struct input_event *next_event () +{ +struct input_event *ev =NULL ; -while (check_bound (i, rd) && !check_event (&iev[i],EV_KEY ,KEY_X ,0 )) { +if (!have_events ()) { +read_events (); + } -if (iev[i].type !=EV_SYN - && !check_event (&iev[i],EV_KEY ,KEY_X ,2 )) { -tst_resm (TINFO , -"Didn't receive EV_KEY KEY_X with value 2" ); + ev = &events[ev_iter++]; + +return ev; +} + +static int check_sync_event (void ) { +return check_event (next_event (),EV_SYN ,0 ,0 ); +} + +static int parse_autorepeat_config (struct input_event *iev) +{ +if (!check_config_event (iev,EV_REP ,REP_DELAY )) { +tst_resm (TFAIL , +"Didn't get EV_REP configuration with code REP_DELAY" ); +return 0 ; + } + +if (!check_config_event (next_event (),EV_REP ,REP_PERIOD )) { +tst_resm (TFAIL , +"Didn't get EV_REP configuration with code REP_PERIOD" ); +return 0 ; + } + +return 1 ; +} + +static int parse_key (struct input_event *iev) +{ +if (!check_event (iev,EV_KEY ,KEY_X ,1 ) || !check_sync_event ()) { +tst_resm (TFAIL ,"Didn't get expected key press for KEY_X" ); +return 0 ; + } + + iev =next_event (); +while (check_event (iev,EV_KEY ,KEY_X ,2 )) + iev =next_event (); + +if (!check_event (iev,EV_KEY ,KEY_X ,0 ) || !check_sync_event ()) { +tst_resm (TFAIL , +"Didn't get expected key release for KEY_X" ); +return 0 ; + } + +return 1 ; +} + +static int check_events (void ) +{ +struct input_event *iev; +int ret; + +read_events (); + +while (have_events ()) { + iev =next_event (); +switch (iev->type) { +case EV_REP : + ret =parse_autorepeat_config (iev); +break ; +case EV_KEY : + ret =parse_key (iev); +break ; +default : +tst_resm (TFAIL , +"Unexpected event type '0x%04x' received" , + iev->type); + ret =0 ;break ; } - i++; - nb++; -if (i == rd /sizeof (struct input_event )) { - i =0 ; - rd =read (fd2, iev,sizeof (iev)); -check_size (rd); - } +if (!ret) +break ; } -return (nb >0 &&check_bound (i, rd) - &&check_event (&iev[i],EV_KEY ,KEY_X ,0 )); +return ret; }static void cleanup (void )
Signature · 1 line
2.14.1.480.gb18f417b89-goog
PATCH v2 1/1 input/input06: Ignore auto-repeat config events
Hi!
Quoted 3 lines
The test currently fails on some android devices because the kernel sends the
EV_REPevent with the codesREP_DELAYandREP_PERIODand their corresponding values for the uinput device the test creates.
Minor note, the patch has coding style violations, we do follow LKML coding style in LTP. You can use checkpatch.pl (from kernel source tree) to check for these.
Quoted 37 lines
Signed-off-by Sandeep Patil <[email protected]>--- testcases/kernel/input/input06.c | 118 ++++++++++++++++++++++++++++++--------- 1 file changed, 91 insertions(+), 27 deletions(-)testcases/kernel/input/input06.c +6
-3@@ -37,6 +37,9 @@ static void cleanup(void);static int fd;static int fd2; +struct input_event events[64 ]; +static int num_events; +static int ev_iter;char *TCID ="input06" ;@@ -107,9 +110,9 @@ static int check_event(struct input_event *iev, int event, int code, int value)return iev->type == event && iev->code == code && iev->value == value; } -static int check_bound (unsigned int i,unsigned int rd) +static int check_config_event (struct input_event *iev,int event,int code) { -return i <= rd /sizeof (struct input_event ); +return iev->type == event && iev->code == code; }static void check_size (int rd)@@ -123,43 +126,104 @@ static void check_size(int rd) } } -static int check_events (void ) +static void read_events (void )
testcases/kernel/input/input06.c static void check_size(int rd) · line 133
Quoted 10 lines
testcases/kernel/input/input06.c +2
-6{ -struct input_event iev[64 ]; -unsigned int i; -int nb; -int rd; +int rd =read (fd2, events,sizeof (events)); - i =0 ; - nb =0 ; +check_size (rd);
The check_size() seems to be called only from this place now, hence there is no need to keep these two if conditions in a separate function anymore.
Quoted 52 lines
testcases/kernel/input/input06.c +39
-9- rd =read (fd2, iev,sizeof (iev)); + ev_iter =0 ; + num_events = rd /sizeof (struct input_event ); +} -check_size (rd); +static int have_events (void ) +{ +return num_events !=0 && ev_iter < num_events; +} -if (rd >0 &&check_event (&iev[i],EV_KEY ,KEY_X ,1 )) - i++; +static struct input_event *next_event () +{ +struct input_event *ev =NULL ; -while (check_bound (i, rd) && !check_event (&iev[i],EV_KEY ,KEY_X ,0 )) { +if (!have_events ()) { +read_events (); + } -if (iev[i].type !=EV_SYN - && !check_event (&iev[i],EV_KEY ,KEY_X ,2 )) { -tst_resm (TINFO , -"Didn't receive EV_KEY KEY_X with value 2" ); + ev = &events[ev_iter++]; + +return ev; +} + +static int check_sync_event (void ) { +return check_event (next_event (),EV_SYN ,0 ,0 ); +} + +static int parse_autorepeat_config (struct input_event *iev) +{ +if (!check_config_event (iev,EV_REP ,REP_DELAY )) { +tst_resm (TFAIL , +"Didn't get EV_REP configuration with code REP_DELAY" ); +return 0 ; + } + +if (!check_config_event (next_event (),EV_REP ,REP_PERIOD )) { +tst_resm (TFAIL , +"Didn't get EV_REP configuration with code REP_PERIOD" ); +return 0 ; + } + +return 1 ; +} +
testcases/kernel/input/input06.c static void check_size(int rd) · line 187
Quoted 10 lines
testcases/kernel/input/input06.c +10
-0+static int parse_key (struct input_event *iev) +{ +if (!check_event (iev,EV_KEY ,KEY_X ,1 ) || !check_sync_event ()) { +tst_resm (TFAIL ,"Didn't get expected key press for KEY_X" ); +return 0 ; + } + + iev =next_event (); +while (check_event (iev,EV_KEY ,KEY_X ,2 )) + iev =next_event ();
I guess that we should check here that we got at least one autorepeat, since as it is the test would pass even for just key_down + key_up events.
Quoted 15 lines
testcases/kernel/input/input06.c +15
-0+if (!check_event (iev,EV_KEY ,KEY_X ,0 ) || !check_sync_event ()) { +tst_resm (TFAIL , +"Didn't get expected key release for KEY_X" ); +return 0 ; + } + +return 1 ; +} + +static int check_events (void ) +{ +struct input_event *iev; +int ret; + +read_events ();
testcases/kernel/input/input06.c static void check_size(int rd) · line 213
Quoted 10 lines
testcases/kernel/input/input06.c +10
-0+ +while (have_events ()) { + iev =next_event (); +switch (iev->type) { +case EV_REP : + ret =parse_autorepeat_config (iev); +break ; +case EV_KEY : + ret =parse_key (iev); +break ;
Here as well, we should make sure that we got here once before we exit the function.
So we should add a counter here and check that it's value == 1 before we exit this function.
Quoted 28 lines
testcases/kernel/input/input06.c +8
-9+default : +tst_resm (TFAIL , +"Unexpected event type '0x%04x' received" , + iev->type); + ret =0 ;break ; } - i++; - nb++; -if (i == rd /sizeof (struct input_event )) { - i =0 ; - rd =read (fd2, iev,sizeof (iev)); -check_size (rd); - } +if (!ret) +break ; } -return (nb >0 &&check_bound (i, rd) - &&check_event (&iev[i],EV_KEY ,KEY_X ,0 )); +return ret; }static void cleanup (void )Signature · 1 line
2.14.1.480.gb18f417b89-goog
Signature · 2 lines
Cyril Hrubis [email protected]
PATCH v2 1/1 input/input06: Ignore auto-repeat config events
Quoted 8 lines · Cyril Hrubis
Hi!
Quoted 3 lines
The test currently fails on some android devices because the kernel sends the
EV_REPevent with the codesREP_DELAYandREP_PERIODand their corresponding values for the uinput device the test creates.Minor note, the patch has coding style violations, we do follow LKML coding style in LTP. You can use checkpatch.pl (from kernel source tree) to check for these.
Yes, will do, sorry for the noise.
Quoted 45 lines
Quoted 45 lines
Signed-off-by Sandeep Patil <[email protected]>--- testcases/kernel/input/input06.c | 118 ++++++++++++++++++++++++++++++--------- 1 file changed, 91 insertions(+), 27 deletions(-)testcases/kernel/input/input06.c +7
-7@@ -37,6 +37,9 @@ static void cleanup(void);static int fd;static int fd2; +struct input_event events[64 ]; +static int num_events; +static int ev_iter;char *TCID ="input06" ;@@ -107,9 +110,9 @@ static int check_event(struct input_event *iev, int event, int code, int value)return iev->type == event && iev->code == code && iev->value == value; } -static int check_bound (unsigned int i,unsigned int rd) +static int check_config_event (struct input_event *iev,int event,int code) { -return i <= rd /sizeof (struct input_event ); +return iev->type == event && iev->code == code; }static void check_size (int rd)@@ -123,43 +126,104 @@ static void check_size(int rd) } } -static int check_events (void ) +static void read_events (void ) { -struct input_event iev[64 ]; -unsigned int i; -int nb; -int rd; +int rd =read (fd2, events,sizeof (events));
Quoted 7 lines
testcases/kernel/input/input06.c static void check_size(int rd) · line 133
Quoted 3 lines
testcases/kernel/input/input06.c +1
-2- i =0 ; - nb =0 ; +check_size (rd);The
check_size()seems to be called only from this place now, hence there is no need to keep these two if conditions in a separate function anymore.
will do
Quoted 59 lines
Quoted 59 lines
testcases/kernel/input/input06.c +45
-9- rd =read (fd2, iev,sizeof (iev)); + ev_iter =0 ; + num_events = rd /sizeof (struct input_event ); +} -check_size (rd); +static int have_events (void ) +{ +return num_events !=0 && ev_iter < num_events; +} -if (rd >0 &&check_event (&iev[i],EV_KEY ,KEY_X ,1 )) - i++; +static struct input_event *next_event () +{ +struct input_event *ev =NULL ; -while (check_bound (i, rd) && !check_event (&iev[i],EV_KEY ,KEY_X ,0 )) { +if (!have_events ()) { +read_events (); + } -if (iev[i].type !=EV_SYN - && !check_event (&iev[i],EV_KEY ,KEY_X ,2 )) { -tst_resm (TINFO , -"Didn't receive EV_KEY KEY_X with value 2" ); + ev = &events[ev_iter++]; + +return ev; +} + +static int check_sync_event (void ) { +return check_event (next_event (),EV_SYN ,0 ,0 ); +} + +static int parse_autorepeat_config (struct input_event *iev) +{ +if (!check_config_event (iev,EV_REP ,REP_DELAY )) { +tst_resm (TFAIL , +"Didn't get EV_REP configuration with code REP_DELAY" ); +return 0 ; + } + +if (!check_config_event (next_event (),EV_REP ,REP_PERIOD )) { +tst_resm (TFAIL , +"Didn't get EV_REP configuration with code REP_PERIOD" ); +return 0 ; + } + +return 1 ; +} + +static int parse_key (struct input_event *iev) +{ +if (!check_event (iev,EV_KEY ,KEY_X ,1 ) || !check_sync_event ()) { +tst_resm (TFAIL ,"Didn't get expected key press for KEY_X" ); +return 0 ; + }
Quoted 8 lines
testcases/kernel/input/input06.c static void check_size(int rd) · line 187
Quoted 4 lines
testcases/kernel/input/input06.c +4
-0+ + iev =next_event (); +while (check_event (iev,EV_KEY ,KEY_X ,2 )) + iev =next_event ();I guess that we should check here that we got at least one autorepeat, since as it is the test would pass even for just
key_down+key_upevents.
In this case, we should also be setting the REP_DELAY and REP_PERIOD to ensure we will definitely get autorepeated events. I'll see if I can do that or may be just wait a little longer than just 1ms we are waiting right now.
Quoted 30 lines
Quoted 16 lines
testcases/kernel/input/input06.c +15
-0+if (!check_event (iev,EV_KEY ,KEY_X ,0 ) || !check_sync_event ()) { +tst_resm (TFAIL , +"Didn't get expected key release for KEY_X" ); +return 0 ; + } + +return 1 ; +} + +static int check_events (void ) +{ +struct input_event *iev; +int ret; + +read_events ();testcases/kernel/input/input06.c static void check_size(int rd) · line 213
Quoted 10 lines
testcases/kernel/input/input06.c +10
-0+ +while (have_events ()) { + iev =next_event (); +switch (iev->type) { +case EV_REP : + ret =parse_autorepeat_config (iev); +break ; +case EV_KEY : + ret =parse_key (iev); +break ;Here as well, we should make sure that we got here once before we exit the function.
Quoted 2 lines
So we should add a counter here and check that it's value == 1 before we exit this function.
Agree, the count should make sure we've had both auto-repeated and the key press+release events. Will do this too.
<snip>
- ssp