[Patch] fix

[Patch] fix

[Martin Peschke]

Jens,

Tom fixed my "boken trace magic" issue. Please apply.

Thanks,
Martin


From: Tom Zanussi <tzanussi@gmail.com>

Blktrace failed to lock reader threads on the cpu used by the corresponding
writer. This resulted in stale data being consumed when blktrace accidently
read at a position that was being written to at the same time. This issue
surfaced as "bad trace magic" warnings emitted by blktrace tools.

The problem occured on an SMP System z machine. The patch fixes the issue.

Signed-off-by: Martin Peschke <mpeschke@linux.vnet.ibm.com>

---
 blktrace.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/blktrace.c
+++ b/blktrace.c
@@ -610,7 +610,7 @@ static int lock_on_cpu(int cpu)
 
 	CPU_ZERO(&cpu_mask);
 	CPU_SET(cpu, &cpu_mask);
-	if (sched_setaffinity(getpid(), sizeof(cpu_mask), &cpu_mask) < 0)
+	if (sched_setaffinity(0, sizeof(cpu_mask), &cpu_mask) < 0)
 		return errno;
 
 	return 0;

Re: [Patch] fix

[Jens Axboe]

On Mon, Mar 23 2009, Martin Peschke wrote:
> Jens,
> 
> Tom fixed my "boken trace magic" issue. Please apply.

Heh well, not sure I'd call that a real fix, but if it makes things,
that is fine. I'll apply it.

> 
> Thanks,
> Martin
> 
> 
> From: Tom Zanussi <tzanussi@gmail.com>
> 
> Blktrace failed to lock reader threads on the cpu used by the corresponding
> writer. This resulted in stale data being consumed when blktrace accidently
> read at a position that was being written to at the same time. This issue
> surfaced as "bad trace magic" warnings emitted by blktrace tools.
> 
> The problem occured on an SMP System z machine. The patch fixes the issue.
> 
> Signed-off-by: Martin Peschke <mpeschke@linux.vnet.ibm.com>
> 
> ---
>  blktrace.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> --- a/blktrace.c
> +++ b/blktrace.c
> @@ -610,7 +610,7 @@ static int lock_on_cpu(int cpu)
>  
>  	CPU_ZERO(&cpu_mask);
>  	CPU_SET(cpu, &cpu_mask);
> -	if (sched_setaffinity(getpid(), sizeof(cpu_mask), &cpu_mask) < 0)
> +	if (sched_setaffinity(0, sizeof(cpu_mask), &cpu_mask) < 0)
>  		return errno;
>  
>  	return 0;
> 
> 

-- 
Jens Axboe

[PATCH] fix

[Alisa-Dariana Roman]

---

Would this fix be alright, since writing something like if(!ret) may be
confusing?

And regarding the comment, my bad, there is nothing wrong there.

 drivers/iio/adc/ad7192.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/iio/adc/ad7192.c b/drivers/iio/adc/ad7192.c
index 101afce49378..0789121236d6 100644
--- a/drivers/iio/adc/ad7192.c
+++ b/drivers/iio/adc/ad7192.c
@@ -1101,14 +1101,12 @@ static int ad7194_parse_channels(struct iio_dev *indio_dev)
 		ret = fwnode_property_read_u32_array(child, "diff-channels",
 						     ain, ARRAY_SIZE(ain));
 		if (ret == 0) {
-			ret = ad7194_validate_ain_channel(dev, ain[0]);
-			if (ret)
+			if (!ad7194_validate_ain_channel(dev, ain[0]))
 				return dev_err_probe(dev, -EINVAL,
 						     "Invalid AIN channel: %u\n",
 						     ain[0]);
 
-			ret = ad7194_validate_ain_channel(dev, ain[1]);
-			if (ret)
+			if (!ad7194_validate_ain_channel(dev, ain[1]))
 				return dev_err_probe(dev, -EINVAL,
 						     "Invalid AIN channel: %u\n",
 						     ain[1]);
@@ -1125,8 +1123,7 @@ static int ad7194_parse_channels(struct iio_dev *indio_dev)
 				return dev_err_probe(dev, ret,
 						     "Missing channel property\n");
 
-			ret = ad7194_validate_ain_channel(dev, ain[0]);
-			if (ret)
+			if (!ad7194_validate_ain_channel(dev, ain[0]))
 				return dev_err_probe(dev, -EINVAL,
 						     "Invalid AIN channel: %u\n",
 						     ain[0]);
-- 
2.34.1

Re: [PATCH] fix

[Jonathan Cameron]

On Wed, 22 May 2024 12:50:23 +0300
Alisa-Dariana Roman <alisadariana@gmail.com> wrote:

> ---
> 
> Would this fix be alright, since writing something like if(!ret) may be
> confusing?
> 
Looks fine to me. Squashed into original commit that I messed up.

Thanks for sorting this out.

Jonathan

> And regarding the comment, my bad, there is nothing wrong there.
> 
>  drivers/iio/adc/ad7192.c | 9 +++------
>  1 file changed, 3 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/iio/adc/ad7192.c b/drivers/iio/adc/ad7192.c
> index 101afce49378..0789121236d6 100644
> --- a/drivers/iio/adc/ad7192.c
> +++ b/drivers/iio/adc/ad7192.c
> @@ -1101,14 +1101,12 @@ static int ad7194_parse_channels(struct iio_dev *indio_dev)
>  		ret = fwnode_property_read_u32_array(child, "diff-channels",
>  						     ain, ARRAY_SIZE(ain));
>  		if (ret == 0) {
> -			ret = ad7194_validate_ain_channel(dev, ain[0]);
> -			if (ret)
> +			if (!ad7194_validate_ain_channel(dev, ain[0]))
>  				return dev_err_probe(dev, -EINVAL,
>  						     "Invalid AIN channel: %u\n",
>  						     ain[0]);
>  
> -			ret = ad7194_validate_ain_channel(dev, ain[1]);
> -			if (ret)
> +			if (!ad7194_validate_ain_channel(dev, ain[1]))
>  				return dev_err_probe(dev, -EINVAL,
>  						     "Invalid AIN channel: %u\n",
>  						     ain[1]);
> @@ -1125,8 +1123,7 @@ static int ad7194_parse_channels(struct iio_dev *indio_dev)
>  				return dev_err_probe(dev, ret,
>  						     "Missing channel property\n");
>  
> -			ret = ad7194_validate_ain_channel(dev, ain[0]);
> -			if (ret)
> +			if (!ad7194_validate_ain_channel(dev, ain[0]))
>  				return dev_err_probe(dev, -EINVAL,
>  						     "Invalid AIN channel: %u\n",
>  						     ain[0]);