Merge branch 'pci/p2pdma'

bjorn-helgaas · bjorn-helgaas · commit 3dfd8247969a · 2024-03-12T12:14:22.000-05:00
- Fix a sleeping issue in a RCU read section (Christophe JAILLET)

* pci/p2pdma:
  PCI/P2PDMA: Fix a sleeping issue in a RCU read section
diff --git a/drivers/pci/p2pdma.c b/drivers/pci/p2pdma.c
@@ -661,7 +661,7 @@ calc_map_type_and_dist(struct pci_dev *provider, struct pci_dev *client,
 	p2pdma = rcu_dereference(provider->p2pdma);
 	if (p2pdma)
 		xa_store(&p2pdma->map_types, map_types_idx(client),
-			 xa_mk_value(map_type), GFP_KERNEL);
+			 xa_mk_value(map_type), GFP_ATOMIC);
 	rcu_read_unlock();
 	return map_type;
 }

Original file line number	Diff line number	Diff line change
`@@ -661,7 +661,7 @@ calc_map_type_and_dist(struct pci_dev provider, struct pci_dev client,`
`661`	`661`	`p2pdma = rcu_dereference(provider->p2pdma);`
`662`	`662`	`if (p2pdma)`
`663`	`663`	`xa_store(&p2pdma->map_types, map_types_idx(client),`
`664`		`- xa_mk_value(map_type), GFP_KERNEL);`
	`664`	`+ xa_mk_value(map_type), GFP_ATOMIC);`
`665`	`665`	`rcu_read_unlock();`
`666`	`666`	`return map_type;`
`667`	`667`	`}`