The lock protecting the data structure does not need to be an rwlock. The only read access to the lock is in an error path, and if that's limiting your scalability, you have bigger performance problems. Eliminate mlx5_mkey_table in favour of using the xarray directly. reg_mr_callback must use GFP_ATOMIC for allocating XArray nodes as it may be called in interrupt context. This also fixes a minor bug where SRCU locking was being used on the radix tree read side, when RCU was needed too.
Showing the changes to include/linux (2 of 7 files). Show all
Unified · Split
| @@ -41,7 +41,7 @@ · 40 unmodified lines | ||
| 41 | 41 | #include <linux/semaphore.h> |
| 42 | 42 | #include <linux/slab.h> |
| 43 | 43 | #include <linux/vmalloc.h> |
| 44 | −#include <linux/radix-tree.h> | |
| 44 | +#include <linux/xarray.h> | |
| 45 | 45 | #include <linux/workqueue.h> |
| 46 | 46 | #include <linux/mempool.h> |
| 47 | 47 | #include <linux/interrupt.h> |
| @@ -452,13 +452,6 @@ struct mlx5_qp_table { · 404 unmodified lines | ||
| 452 | 452 | struct radix_tree_root tree; |
| 453 | 453 | }; |
| 454 | 454 | |
| 455 | −struct mlx5_mkey_table { | |
| 456 | − /* protect radix tree | |
| 457 | − */ | |
| 458 | − rwlock_t lock; | |
| 459 | − struct radix_tree_root tree; | |
| 460 | −}; | |
| 461 | − | |
| 462 | 455 | struct mlx5_vf_context { |
| 463 | 456 | int enabled; |
| 464 | 457 | u64 port_guid; |
| @@ -546,9 +539,7 @@ struct mlx5_priv { · 81 unmodified lines | ||
| 546 | 539 | struct dentry *cmdif_debugfs; |
| 547 | 540 | /* end: qp staff */ |
| 548 | 541 | |
| 549 | − /* start: mkey staff */ | |
| 550 | − struct mlx5_mkey_table mkey_table; | |
| 551 | − /* end: mkey staff */ | |
| 542 | + struct xarray mkey_table; | |
| 552 | 543 | |
| 553 | 544 | /* start: alloc staff */ |
| 554 | 545 | /* protect buffer alocation according to numa node */ |
| @@ -551,11 +551,6 @@ static inline struct mlx5_core_qp *__mlx5_qp_lookup(struct mlx5_core_dev *dev, u · 550 unmodified lines | ||
| 551 | 551 | return radix_tree_lookup(&dev->priv.qp_table.tree, qpn); |
| 552 | 552 | } |
| 553 | 553 | |
| 554 | −static inline struct mlx5_core_mkey *__mlx5_mr_lookup(struct mlx5_core_dev *dev, u32 key) | |
| 555 | −{ | |
| 556 | − return radix_tree_lookup(&dev->priv.mkey_table.tree, key); | |
| 557 | −} | |
| 558 | − | |
| 559 | 554 | int mlx5_core_create_dct(struct mlx5_core_dev *dev, |
| 560 | 555 | struct mlx5_core_dct *qp, |
| 561 | 556 | u32 *in, int inlen, |