Skip to contentSkip to conversation

cxl/region: Add decoder check to check_commit_order()

PATCH Superseded Dave Jiang 4 participants 5 messages Apr 30, 2025 – May 1, 2025 CXL

v1 of 9 Superseded Latest is v9 →

lore
Share & tools
lore

Dave Jiang

author maintainer
#0 lore raw

PATCH 1/1 cxl/region: Add decoder check to check_commit_order()

check_commit_order() attempts to convert a device to a decoder without making sure the device is a decoder. So far this has been working due to pure luck. Issue discovered while doing deferred dport probing when child ports are now in the midst of decoders due to ordering change of child port additions. Add a check before attempting to do decoder conversion.

Fixes 105b6235ad0f ("cxl/port: Prevent out-of-order decoder allocation")
---
 drivers/cxl/core/region.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/cxl/core/region.c +6 -1
index c3f4dc244df7..a91d4eb061e4 100644
@@ -788,7 +788,12 @@ static size_t show_targetN(struct cxl_region *cxlr, char *buf, int pos)
 
 static int check_commit_order(struct device *dev, void *data)
 {
-	struct cxl_decoder *cxld = to_cxl_decoder(dev);
+	struct cxl_decoder *cxld;
+
+	if (!is_switch_decoder(dev))
+		return 0;
+
+	cxld = to_cxl_decoder(dev);
 
 	/*
 	 * if port->commit_end is not the only free decoder, then out of
Signature · 1 line
2.49.0
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 9 lines · Dave Jiang

check_commit_order() attempts to convert a device to a decoder without making sure the device is a decoder. So far this has been working due to pure luck. Issue discovered while doing deferred dport probing when child ports are now in the midst of decoders due to ordering change of child port additions. Add a check before attempting to do decoder conversion.

Fixes 105b6235ad0f ("cxl/port: Prevent out-of-order decoder allocation")

Update the commit message to mention and paste in the ensuing NULL ptr dereference so other unlucky folks can find this.

with that -

reviewer Reviewed-by on v1 1/1
#2 lore raw
In reply to Dave Jiang
Quoted 9 lines · Dave Jiang

check_commit_order() attempts to convert a device to a decoder without making sure the device is a decoder. So far this has been working due to pure luck. Issue discovered while doing deferred dport probing when child ports are now in the midst of decoders due to ordering change of child port additions. Add a check before attempting to do decoder conversion.

Fixes 105b6235ad0f ("cxl/port: Prevent out-of-order decoder allocation")

I also have a patch for this issue during I worked on deferred dport probing.

https://lore.kernel.org/linux-cxl/[email protected]/

I am not sure if we should define it as a bug, my understanding is that it will never happen with current implementation, it only happens when we are trying to delay the switch decoders initialization.

Because current CXL subsystem always initialize switch decoders during switch port probing and child ports are always added after the switch decoders initialization done, so the sequence of children device list of switch port device always like that:

child dev list head - decoder 0 - decoder 1 - decoder 2 ..... - child port dev 0 - child port dev 1.....

Using device_for_each_child_reverse_from(switch_port_dev, current_decoder, NULL, check_commit_order) is not problem for this sequence.

But when have deferred dport probing implementation, the first child port attaching is responsible for triggering switch decoders initialization, the sequence will be changed like that:

child dev list head - child port dev 0 - decoder 0 - decoder 1 - decoder 2 ..... - child port dev 1.....

Always have a child port device ahead of all decoders, it causes the problem.

Anyhow, it is also OK to me if it should be considered as a bug.

#3 lore raw
Quoted 11 lines · Li Ming
Quoted 9 lines · Dave Jiang

check_commit_order() attempts to convert a device to a decoder without making sure the device is a decoder. So far this has been working due to pure luck. Issue discovered while doing deferred dport probing when child ports are now in the midst of decoders due to ordering change of child port additions. Add a check before attempting to do decoder conversion.

Fixes 105b6235ad0f ("cxl/port: Prevent out-of-order decoder allocation")
Quoted 7 lines

I also have a patch for this issue during I worked on deferred dport probing.

https://lore.kernel.org/linux-cxl/[email protected]/

I am not sure if we should define it as a bug, my understanding is that it will never happen with current implementation, it only happens when we are trying to delay the switch decoders initialization.

Agree. This is not a fix. The current implementation is lucky that ports are always registered after decoders. So there is zero exposure to this issue for current kernels.

Dave, please just include this as a prep patch in the same series that invalidates the port child device ordering assumption.

author maintainer
#4 lore raw
Quoted 20 lines · On 4/30/25 10:29 PM, [email protected] wrote:
Quoted 11 lines · Li Ming
Quoted 9 lines · Dave Jiang

check_commit_order() attempts to convert a device to a decoder without making sure the device is a decoder. So far this has been working due to pure luck. Issue discovered while doing deferred dport probing when child ports are now in the midst of decoders due to ordering change of child port additions. Add a check before attempting to do decoder conversion.

Fixes 105b6235ad0f ("cxl/port: Prevent out-of-order decoder allocation")
Quoted 7 lines

I also have a patch for this issue during I worked on deferred dport probing.

https://lore.kernel.org/linux-cxl/[email protected]/

I am not sure if we should define it as a bug, my understanding is that it will never happen with current implementation, it only happens when we are trying to delay the switch decoders initialization.

Quoted 6 lines

Agree. This is not a fix. The current implementation is lucky that ports are always registered after decoders. So there is zero exposure to this issue for current kernels.

Dave, please just include this as a prep patch in the same series that invalidates the port child device ordering assumption.

will do