Revert "soundwire: stream: fix programming slave ports for non-continous port maps"

PATCH In review Peter Ujfalusi 4 participants 9 messages Sep 10, 2024 – Sep 16, 2024

Subsystems (2)

Stable branch Regressions

lore

Share & tools

lore

Peter Ujfalusi

author

2024-09-10 12:40 UTC #0 lore raw

PATCH 1/1 Revert "soundwire: stream: fix programming slave ports for non-continous port maps"

The prop->src_dpn_prop and prop.sink_dpn_prop is allocated for the _number_ of ports and it is forced as 0 index based.

The original code was correct while the change to walk the bits and use their position as index into the arrays is not correct.

For exmple we can have the prop.source_ports=0x2, which means we have one port, but the prop.src_dpn_prop[1] is accessing outside of the allocated memory.

This reverts commit 6fa78e9c41471fe43052cd6feba6eae1b0277ae3.

Cc [email protected] # 6.10.y

Signed-off-by Peter Ujfalusi <[email protected]>

---
Hi,

The reverted patch causes major regression on soundwire causing all audio to fail.
Interestingly the patch is only in 6.10.8 and 6.10.9, not in mainline or linux-next.

soundwire sdw-master-0-1: Program transport params failed: -22 soundwire sdw-master-0-1: Program params failed: -22
SDW1-Playback: ASoC: error at snd_soc_link_prepare on SDW1-Playback: -22

Regards,
Peter

 drivers/soundwire/stream.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

drivers/soundwire/stream.c +4 -4

index 00191b1d2260..4e9e7d2a942d 100644
@@ -1286,18 +1286,18 @@ struct sdw_dpn_prop *sdw_get_slave_dpn_prop(struct sdw_slave *slave,
 					    unsigned int port_num)
 {
 	struct sdw_dpn_prop *dpn_prop;
-	unsigned long mask;
+	u8 num_ports;
 	int i;
 
 	if (direction == SDW_DATA_DIR_TX) {
-		mask = slave->prop.source_ports;
+		num_ports = hweight32(slave->prop.source_ports);
 		dpn_prop = slave->prop.src_dpn_prop;
 	} else {
-		mask = slave->prop.sink_ports;
+		num_ports = hweight32(slave->prop.sink_ports);
 		dpn_prop = slave->prop.sink_dpn_prop;
 	}
 
-	for_each_set_bit(i, &mask, 32) {
+	for (i = 0; i < num_ports; i++) {
 		if (dpn_prop[i].num == port_num)
 			return &dpn_prop[i];
 	}

Signature · 1 line

2.46.0

Péter Ujfalusi

author

2024-09-10 13:02 UTC #1 lore raw

Hi,

Quoted 11 lines · Peter Ujfalusi

The prop->src_dpn_prop and prop.sink_dpn_prop is allocated for the _number_ of ports and it is forced as 0 index based.
The original code was correct while the change to walk the bits and use their position as index into the arrays is not correct.
For exmple we can have the prop.source_ports=0x2, which means we have one port, but the prop.src_dpn_prop[1] is accessing outside of the allocated memory.
This reverts commit 6fa78e9c41471fe43052cd6feba6eae1b0277ae3.

I just noticed that Krzysztof already sent the revert patch but it is not picked up for stable-6.10.y

https://lore.kernel.org/lkml/[email protected]/

Quoted 47 lines

Cc [email protected] # 6.10.y
Signed-off-by Peter Ujfalusi <[email protected]>
---
Hi,
The reverted patch causes major regression on soundwire causing all audio to fail.
Interestingly the patch is only in 6.10.8 and 6.10.9, not in mainline or linux-next.
soundwire sdw-master-0-1: Program transport params failed: -22 soundwire sdw-master-0-1: Program params failed: -22
SDW1-Playback: ASoC: error at snd_soc_link_prepare on SDW1-Playback: -22
Regards,
Peter
 drivers/soundwire/stream.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/soundwire/stream.c +4 -4
index 00191b1d2260..4e9e7d2a942d 100644
@@ -1286,18 +1286,18 @@ struct sdw_dpn_prop *sdw_get_slave_dpn_prop(struct sdw_slave *slave,
 					    unsigned int port_num)
 {
 	struct sdw_dpn_prop *dpn_prop;
-	unsigned long mask;
+	u8 num_ports;
 	int i;
 
 	if (direction == SDW_DATA_DIR_TX) {
-		mask = slave->prop.source_ports;
+		num_ports = hweight32(slave->prop.source_ports);
 		dpn_prop = slave->prop.src_dpn_prop;
 	} else {
-		mask = slave->prop.sink_ports;
+		num_ports = hweight32(slave->prop.sink_ports);
 		dpn_prop = slave->prop.sink_dpn_prop;
 	}
 
-	for_each_set_bit(i, &mask, 32) {
+	for (i = 0; i < num_ports; i++) {
 		if (dpn_prop[i].num == port_num)
 			return &dpn_prop[i];
 	}

Signature · 1 line

Péter

Greg KH

maintainer

2024-09-11 12:31 UTC #2 lore raw

Quoted 13 lines · Péter Ujfalusi

Hi,
Quoted 10 lines · Peter Ujfalusi
The prop->src_dpn_prop and prop.sink_dpn_prop is allocated for the _number_ of ports and it is forced as 0 index based.
The original code was correct while the change to walk the bits and use their position as index into the arrays is not correct.
For exmple we can have the prop.source_ports=0x2, which means we have one port, but the prop.src_dpn_prop[1] is accessing outside of the allocated memory.

Quoted 6 lines

Quoted 1 line
This reverts commit 6fa78e9c41471fe43052cd6feba6eae1b0277ae3.
I just noticed that Krzysztof already sent the revert patch but it is not picked up for stable-6.10.y
https://lore.kernel.org/lkml/[email protected]/

Is this in Linus's tree yet? That's what we are waiting for.

Quoted 8 lines

Quoted 8 lines
Cc [email protected] # 6.10.y
Signed-off-by Peter Ujfalusi <[email protected]>
---
Hi,
The reverted patch causes major regression on soundwire causing all audio to fail.
Interestingly the patch is only in 6.10.8 and 6.10.9, not in mainline or linux-next.

Really? Commit ab8d66d132bc ("soundwire: stream: fix programming slave ports for non-continous port maps") is in Linus's tree, why isn't it being reverted there first?

confused,

greg k-h

Linux regression tracking (Thorsten Leemhuis)

2024-09-11 14:31 UTC #3 lore raw

Quoted 8 lines · Greg KH

Quoted 3 lines · Péter Ujfalusi
Quoted 3 lines
The reverted patch causes major regression on soundwire causing all audio to fail.
Interestingly the patch is only in 6.10.8 and 6.10.9, not in mainline or linux-next.
Really? Commit ab8d66d132bc ("soundwire: stream: fix programming slave ports for non-continous port maps") is in Linus's tree, why isn't it being reverted there first?

FWIW, the revert should land in mainline tomorrow afaics:
https://lore.kernel.org/all/ZuFcBcJztAgicjNt@vaman/

BTW, in case anyone cares: I think this is another report about the problem, this time with 6.6.y:
https://bugzilla.kernel.org/show_bug.cgi?id=219256

Ciao, Thorsten

Vinod Koul

2024-09-16 07:50 UTC #4 lore raw

Quoted 10 lines · Linux regression tracking (Thorsten Leemhuis)

Quoted 8 lines · Greg KH
Quoted 3 lines · Péter Ujfalusi
Quoted 3 lines
The reverted patch causes major regression on soundwire causing all audio to fail.
Interestingly the patch is only in 6.10.8 and 6.10.9, not in mainline or linux-next.
Really? Commit ab8d66d132bc ("soundwire: stream: fix programming slave ports for non-continous port maps") is in Linus's tree, why isn't it being reverted there first?

Quoted 6 lines

FWIW, the revert should land in mainline tomorrow afaics:
https://lore.kernel.org/all/ZuFcBcJztAgicjNt@vaman/
BTW, in case anyone cares: I think this is another report about the problem, this time with 6.6.y:
https://bugzilla.kernel.org/show_bug.cgi?id=219256

Revert has been applied to 6.6 and other stable kernel so this should be fixed now

Signature · 1 line

~Vinod

Vinod Koul

2024-09-13 11:51 UTC #5 lore raw

In reply to Greg KH

Quoted 14 lines · Greg KH

Quoted 13 lines · Péter Ujfalusi
Hi,
Quoted 10 lines · Peter Ujfalusi
The prop->src_dpn_prop and prop.sink_dpn_prop is allocated for the _number_ of ports and it is forced as 0 index based.
The original code was correct while the change to walk the bits and use their position as index into the arrays is not correct.
For exmple we can have the prop.source_ports=0x2, which means we have one port, but the prop.src_dpn_prop[1] is accessing outside of the allocated memory.

Quoted 8 lines

Quoted 6 lines
Quoted 1 line
This reverts commit 6fa78e9c41471fe43052cd6feba6eae1b0277ae3.
I just noticed that Krzysztof already sent the revert patch but it is not picked up for stable-6.10.y
https://lore.kernel.org/lkml/[email protected]/
Is this in Linus's tree yet? That's what we are waiting for.

Yes I was waiting for that as well, the pull request has been sent to Linus, this should be in his tree, hopefully tomorow..

Quoted 6 lines

Quoted 6 lines
Quoted 6 lines
Cc [email protected] # 6.10.y
Signed-off-by Peter Ujfalusi <[email protected]>
---
Hi,

Quoted 7 lines

Quoted 3 lines
Quoted 3 lines
The reverted patch causes major regression on soundwire causing all audio to fail.
Interestingly the patch is only in 6.10.8 and 6.10.9, not in mainline or linux-next.
Really? Commit ab8d66d132bc ("soundwire: stream: fix programming slave ports for non-continous port maps") is in Linus's tree, why isn't it being reverted there first?

I guess Peter jumped the gun, I was planning to ask you once this is picked up Linus

Signature · 1 line

~Vinod

Vinod Koul

2024-09-14 19:15 UTC #6 lore raw

Quoted 20 lines · Vinod Koul

Quoted 19 lines · Greg KH
Quoted 18 lines · Péter Ujfalusi
Hi,
Quoted 11 lines · Peter Ujfalusi
The prop->src_dpn_prop and prop.sink_dpn_prop is allocated for the _number_ of ports and it is forced as 0 index based.
The original code was correct while the change to walk the bits and use their position as index into the arrays is not correct.
For exmple we can have the prop.source_ports=0x2, which means we have one port, but the prop.src_dpn_prop[1] is accessing outside of the allocated memory.
This reverts commit 6fa78e9c41471fe43052cd6feba6eae1b0277ae3.
I just noticed that Krzysztof already sent the revert patch but it is not picked up for stable-6.10.y

Quoted 6 lines

Quoted 3 lines
Quoted 1 line
https://lore.kernel.org/lkml/[email protected]/
Is this in Linus's tree yet? That's what we are waiting for.
Yes I was waiting for that as well, the pull request has been sent to Linus, this should be in his tree, hopefully tomorow..

It is in Linus's tree now. Greg would you like to drop commit 6fa78e9c41471fe43052cd6feba6eae1b0277ae3 or carry it and the revert...?

What is the usual process for you to handle reverts?

Signature · 1 line

~Vinod

Greg KH

maintainer

2024-09-15 13:23 UTC #7 lore raw

Quoted 23 lines · Vinod Koul

Quoted 22 lines · Vinod Koul
Quoted 21 lines · Greg KH
Quoted 19 lines · Péter Ujfalusi
Hi,
Quoted 11 lines · Peter Ujfalusi
The prop->src_dpn_prop and prop.sink_dpn_prop is allocated for the _number_ of ports and it is forced as 0 index based.
The original code was correct while the change to walk the bits and use their position as index into the arrays is not correct.
For exmple we can have the prop.source_ports=0x2, which means we have one port, but the prop.src_dpn_prop[1] is accessing outside of the allocated memory.
This reverts commit 6fa78e9c41471fe43052cd6feba6eae1b0277ae3.
I just noticed that Krzysztof already sent the revert patch but it is not picked up for stable-6.10.y
https://lore.kernel.org/lkml/[email protected]/

Quoted 8 lines

Quoted 4 lines
Quoted 1 line
Is this in Linus's tree yet? That's what we are waiting for.
Yes I was waiting for that as well, the pull request has been sent to Linus, this should be in his tree, hopefully tomorow..
It is in Linus's tree now. Greg would you like to drop commit 6fa78e9c41471fe43052cd6feba6eae1b0277ae3 or carry it and the revert...?

I can not "drop" a commit that is already in a realease for obvious reasons :(

Quoted 1 line

What is the usual process for you to handle reverts?

We just take them like normal. What is the git id of the revert in Linus's tree?

thanks,

greg k-h

Vinod Koul

2024-09-16 07:49 UTC #8 lore raw

Quoted 11 lines · Greg KH

Quoted 9 lines · Vinod Koul
Quoted 5 lines
Quoted 2 lines
Is this in Linus's tree yet? That's what we are waiting for.
Yes I was waiting for that as well, the pull request has been sent to Linus, this should be in his tree, hopefully tomorow..
It is in Linus's tree now. Greg would you like to drop commit 6fa78e9c41471fe43052cd6feba6eae1b0277ae3 or carry it and the revert...?

Quoted 7 lines

I can not "drop" a commit that is already in a realease for obvious reasons :(
Quoted 1 line
What is the usual process for you to handle reverts?
We just take them like normal. What is the git id of the revert in Linus's tree?

Sure, makes sense. It has been auto-picked so this is fine.

fwiw:
ab8d66d132bc: soundwire: stream: fix programming slave ports for non-continous port maps

Thanks

Signature · 1 line

~Vinod