Pull rdma updates from Jason Gunthorpe: "This has been a slightly more active cycle than normal with ongoing core changes and quite a lot of collected driver updates. - Various driver fixes for bnxt_re, cxgb4, hns, mlx5, pvrdma, rxe - A new data transfer mode for HFI1 giving higher performance - Significant functional and bug fix update to the mlx5 On-Demand-Paging MR feature - A chip hang reset recovery system for hns - Change mm->pinned_vm to an atomic64 - Update bnxt_re to support a new 57500 chip - A sane netlink 'rdma link add' method for creating rxe devices and fixing the various unregistration race conditions in rxe's unregister flow - Allow lookup up objects by an ID over netlink - Various reworking of the core to driver interface: - drivers should not assume umem SGLs are in PAGE_SIZE chunks - ucontext is accessed via udata not other means - start to make the core code responsible for object memory allocation - drivers should convert struct device to struct ib_device via a helper - drivers have more tools to avoid use after unregister problems" * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma: (280 commits) net/mlx5: ODP support for XRC transport is not enabled by default in FW IB/hfi1: Close race condition on user context disable and close RDMA/umem: Revert broken 'off by one' fix RDMA/umem: minor bug fix in error handling path RDMA/hns: Use GFP_ATOMIC in hns_roce_v2_modify_qp cxgb4: kfree mhp after the debug print IB/rdmavt: Fix concurrency panics in QP post_send and modify to error IB/rdmavt: Fix loopback send with invalidate ordering IB/iser: Fix dma_nents type definition IB/mlx5: Set correct write permissions for implicit ODP MR bnxt_re: Clean cq for kernel consumers only RDMA/uverbs: Don't do double free of allocated PD RDMA: Handle ucontext allocations by IB/core RDMA/core: Fix a WARN() message bnxt_re: fix the regression due to changes in alloc_pbl IB/mlx4: Increase the timeout for CM cache IB/core: Abort page fault handler silently during owning process exit IB/mlx5: Validate correct PD before prefetch MR IB/mlx5: Protect against prefetch of invalid MR RDMA/uverbs: Store PR pointer before it is overwritten ...
Showing the changes to include/linux (4 of 264 files). Show all
Unified · Split
| @@ -39,7 +39,7 @@ struct rdmacg_device { · 38 unmodified lines | |||
| 39 | * APIs for RDMA/IB stack to publish when a device wants to | 39 | * APIs for RDMA/IB stack to publish when a device wants to |
| 40 | * participate in resource accounting | 40 | * participate in resource accounting |
| 41 | */ | 41 | */ |
| 42 | int rdmacg_register_device(struct rdmacg_device *device); | 42 | void rdmacg_register_device(struct rdmacg_device *device); |
| 43 | void rdmacg_unregister_device(struct rdmacg_device *device); | 43 | void rdmacg_unregister_device(struct rdmacg_device *device); |
| 44 | 44 | ||
| 45 | /* APIs for RDMA/IB stack to charge/uncharge pool specific resources */ | 45 | /* APIs for RDMA/IB stack to charge/uncharge pool specific resources */ |
| @@ -365,6 +365,7 @@ struct mlx5_core_sig_ctx { · 364 unmodified lines | |||
| 365 | enum { | 365 | enum { |
| 366 | MLX5_MKEY_MR = 1, | 366 | MLX5_MKEY_MR = 1, |
| 367 | MLX5_MKEY_MW, | 367 | MLX5_MKEY_MW, |
| 368 | MLX5_MKEY_INDIRECT_DEVX, | ||
| 368 | }; | 369 | }; |
| 369 | 370 | ||
| 370 | struct mlx5_core_mkey { | 371 | struct mlx5_core_mkey { |
| @@ -960,10 +961,6 @@ int mlx5_query_odp_caps(struct mlx5_core_dev *dev, · 589 unmodified lines | |||
| 960 | struct mlx5_odp_caps *odp_caps); | 961 | struct mlx5_odp_caps *odp_caps); |
| 961 | int mlx5_core_query_ib_ppcnt(struct mlx5_core_dev *dev, | 962 | int mlx5_core_query_ib_ppcnt(struct mlx5_core_dev *dev, |
| 962 | u8 port_num, void *out, size_t sz); | 963 | u8 port_num, void *out, size_t sz); |
| 963 | #ifdef CONFIG_INFINIBAND_ON_DEMAND_PAGING | ||
| 964 | int mlx5_core_page_fault_resume(struct mlx5_core_dev *dev, u32 token, | ||
| 965 | u32 wq_num, u8 type, int error); | ||
| 966 | #endif | ||
| 967 | 964 | ||
| 968 | int mlx5_init_rl_table(struct mlx5_core_dev *dev); | 965 | int mlx5_init_rl_table(struct mlx5_core_dev *dev); |
| 969 | void mlx5_cleanup_rl_table(struct mlx5_core_dev *dev); | 966 | void mlx5_cleanup_rl_table(struct mlx5_core_dev *dev); |
| @@ -411,7 +411,7 @@ struct mm_struct { · 410 unmodified lines | |||
| 411 | 411 | ||
| 412 | unsigned long total_vm; /* Total pages mapped */ | 412 | unsigned long total_vm; /* Total pages mapped */ |
| 413 | unsigned long locked_vm; /* Pages that have PG_mlocked set */ | 413 | unsigned long locked_vm; /* Pages that have PG_mlocked set */ |
| 414 | unsigned long pinned_vm; /* Refcount permanently increased */ | 414 | atomic64_t pinned_vm; /* Refcount permanently increased */ |
| 415 | unsigned long data_vm; /* VM_WRITE & ~VM_SHARED & ~VM_STACK */ | 415 | unsigned long data_vm; /* VM_WRITE & ~VM_SHARED & ~VM_STACK */ |
| 416 | unsigned long exec_vm; /* VM_EXEC & ~VM_WRITE & ~VM_STACK */ | 416 | unsigned long exec_vm; /* VM_EXEC & ~VM_WRITE & ~VM_STACK */ |
| 417 | unsigned long stack_vm; /* VM_STACK */ | 417 | unsigned long stack_vm; /* VM_STACK */ |
| @@ -339,12 +339,12 @@ int sg_alloc_table_chained(struct sg_table *table, int nents, · 338 unmodified lines | |||
| 339 | /* | 339 | /* |
| 340 | * sg page iterator | 340 | * sg page iterator |
| 341 | * | 341 | * |
| 342 | * Iterates over sg entries page-by-page. On each successful iteration, | 342 | * Iterates over sg entries page-by-page. On each successful iteration, you |
| 343 | * you can call sg_page_iter_page(@piter) and sg_page_iter_dma_address(@piter) | 343 | * can call sg_page_iter_page(@piter) to get the current page and its dma |
| 344 | * to get the current page and its dma address. @piter->sg will point to the | 344 | * address. @piter->sg will point to the sg holding this page and |
| 345 | * sg holding this page and @piter->sg_pgoffset to the page's page offset | 345 | * @piter->sg_pgoffset to the page's page offset within the sg. The iteration |
| 346 | * within the sg. The iteration will stop either when a maximum number of sg | 346 | * will stop either when a maximum number of sg entries was reached or a |
| 347 | * entries was reached or a terminating sg (sg_last(sg) == true) was reached. | 347 | * terminating sg (sg_last(sg) == true) was reached. |
| 348 | */ | 348 | */ |
| 349 | struct sg_page_iter { | 349 | struct sg_page_iter { |
| 350 | struct scatterlist *sg; /* sg holding the page */ | 350 | struct scatterlist *sg; /* sg holding the page */ |
| @@ -356,7 +356,19 @@ struct sg_page_iter { · 5 unmodified lines | |||
| 356 | * next step */ | 356 | * next step */ |
| 357 | }; | 357 | }; |
| 358 | 358 | ||
| 359 | /* | ||
| 360 | * sg page iterator for DMA addresses | ||
| 361 | * | ||
| 362 | * This is the same as sg_page_iter however you can call | ||
| 363 | * sg_page_iter_dma_address(@dma_iter) to get the page's DMA | ||
| 364 | * address. sg_page_iter_page() cannot be called on this iterator. | ||
| 365 | */ | ||
| 366 | struct sg_dma_page_iter { | ||
| 367 | struct sg_page_iter base; | ||
| 368 | }; | ||
| 369 | |||
| 359 | bool __sg_page_iter_next(struct sg_page_iter *piter); | 370 | bool __sg_page_iter_next(struct sg_page_iter *piter); |
| 371 | bool __sg_page_iter_dma_next(struct sg_dma_page_iter *dma_iter); | ||
| 360 | void __sg_page_iter_start(struct sg_page_iter *piter, | 372 | void __sg_page_iter_start(struct sg_page_iter *piter, |
| 361 | struct scatterlist *sglist, unsigned int nents, | 373 | struct scatterlist *sglist, unsigned int nents, |
| 362 | unsigned long pgoffset); | 374 | unsigned long pgoffset); |
| @@ -372,11 +384,13 @@ static inline struct page *sg_page_iter_page(struct sg_page_iter *piter) · 9 unmodified lines | |||
| 372 | /** | 384 | /** |
| 373 | * sg_page_iter_dma_address - get the dma address of the current page held by | 385 | * sg_page_iter_dma_address - get the dma address of the current page held by |
| 374 | * the page iterator. | 386 | * the page iterator. |
| 375 | * @piter: page iterator holding the page | 387 | * @dma_iter: page iterator holding the page |
| 376 | */ | 388 | */ |
| 377 | static inline dma_addr_t sg_page_iter_dma_address(struct sg_page_iter *piter) | 389 | static inline dma_addr_t |
| 390 | sg_page_iter_dma_address(struct sg_dma_page_iter *dma_iter) | ||
| 378 | { | 391 | { |
| 379 | return sg_dma_address(piter->sg) + (piter->sg_pgoffset << PAGE_SHIFT); | 392 | return sg_dma_address(dma_iter->base.sg) + |
| 393 | (dma_iter->base.sg_pgoffset << PAGE_SHIFT); | ||
| 380 | } | 394 | } |
| 381 | 395 | ||
| 382 | /** | 396 | /** |
| @@ -385,11 +399,28 @@ static inline dma_addr_t sg_page_iter_dma_address(struct sg_page_iter *piter) · 2 unmodified lines | |||
| 385 | * @piter: page iterator to hold current page, sg, sg_pgoffset | 399 | * @piter: page iterator to hold current page, sg, sg_pgoffset |
| 386 | * @nents: maximum number of sg entries to iterate over | 400 | * @nents: maximum number of sg entries to iterate over |
| 387 | * @pgoffset: starting page offset | 401 | * @pgoffset: starting page offset |
| 402 | * | ||
| 403 | * Callers may use sg_page_iter_page() to get each page pointer. | ||
| 388 | */ | 404 | */ |
| 389 | #define for_each_sg_page(sglist, piter, nents, pgoffset) \ | 405 | #define for_each_sg_page(sglist, piter, nents, pgoffset) \ |
| 390 | for (__sg_page_iter_start((piter), (sglist), (nents), (pgoffset)); \ | 406 | for (__sg_page_iter_start((piter), (sglist), (nents), (pgoffset)); \ |
| 391 | __sg_page_iter_next(piter);) | 407 | __sg_page_iter_next(piter);) |
| 392 | 408 | ||
| 409 | /** | ||
| 410 | * for_each_sg_dma_page - iterate over the pages of the given sg list | ||
| 411 | * @sglist: sglist to iterate over | ||
| 412 | * @dma_iter: page iterator to hold current page | ||
| 413 | * @dma_nents: maximum number of sg entries to iterate over, this is the value | ||
| 414 | * returned from dma_map_sg | ||
| 415 | * @pgoffset: starting page offset | ||
| 416 | * | ||
| 417 | * Callers may use sg_page_iter_dma_address() to get each page's DMA address. | ||
| 418 | */ | ||
| 419 | #define for_each_sg_dma_page(sglist, dma_iter, dma_nents, pgoffset) \ | ||
| 420 | for (__sg_page_iter_start(&(dma_iter)->base, sglist, dma_nents, \ | ||
| 421 | pgoffset); \ | ||
| 422 | __sg_page_iter_dma_next(dma_iter);) | ||
| 423 | |||
| 393 | /* | 424 | /* |
| 394 | * Mapping sg iterator | 425 | * Mapping sg iterator |
| 395 | * | 426 | * |