[PATCH i-g-t 1/2] runner/executor: Check for error at writing dmesg dump

Kamil Konieczny kamil.konieczny at linux.intel.com
Wed Nov 13 15:15:39 UTC 2024


Hi Krzysztof,
On 2024-10-24 at 13:45:48 +0000, Krzysztof Karas wrote:
> Hi Kamil,
> 
> I looked through the change and found only one thing that could be
> added, the rest looks good to me.
> 
> On 2024-10-18 at 18:18:19 +0200, Kamil Konieczny wrote:
> > In processing kernel dmesg there are checks for error at reading
> > so add also one for writing.
> > 
> > Signed-off-by: Kamil Konieczny <kamil.konieczny at linux.intel.com>
> > ---
> >  runner/executor.c | 29 ++++++++++++++++++++++++++---
> >  1 file changed, 26 insertions(+), 3 deletions(-)
> > 
> > diff --git a/runner/executor.c b/runner/executor.c
> > index ac73e1dde..3939f92f1 100644
> > --- a/runner/executor.c
> > +++ b/runner/executor.c
> > @@ -600,7 +600,7 @@ static long dump_dmesg(int kmsgfd, int outfd)
> >  	bool underflow_once = false;
> >  	char cont;
> >  	char buf[2048];
> > -	ssize_t r;
> > +	ssize_t r, w;
> >  	long written = 0;
> >  
> >  	if (kmsgfd < 0)
> > @@ -654,9 +654,32 @@ static long dump_dmesg(int kmsgfd, int outfd)
> >  			return written;
> >  		}
> >  
> > -		write(outfd, buf, r);
> > -		written += r;
> > +		w = write(outfd, buf, r);
> > +		if (w < r) {
> > +			if (w == -1 && errno == EINTR)
> > +				w = write(outfd, buf, r);
> > +
> > +			if (w < r && w >= 0)
> > +				w += write(outfd, buf + w, r - w);
> > +
> > +			if (w < r) {
> > +				long err = -errno;
> > +
> > +				if (err) {
> > +					errf("Write error while processing dmesg, errno=%d\n", errno);
> You could include `w` and `r` values into this log as well.

Done.

Regards,
Kamil

> Reviewed-by: Krzysztof Karas <krzysztof.karas at intel.com>
> > +				} else {
> > +					errf("Cannot write dmesg chunk: %ld < %ld\n", w, r);
> > +					err = -1;
> > +				}
> >  
> > +				if (comparefd >= 0)
> > +					close(comparefd);
> > +
> > +				return err;
> > +			}
> > +		}
> > +
> > +		written += r;
> >  		if (comparefd < 0 && sscanf(buf, "%u,%llu,%llu,%c;",
> >  					    &flags, &seq, &usec, &cont) == 4) {
> >  			/*
> > -- 
> > 2.47.0
> > 
> 
> Best Regards,
> Krzysztof K


More information about the igt-dev mailing list