On Tue, Oct 05, 2021 at 08:58:09PM -0500, Bob Pearson wrote: > Currently the rdma_rxe driver and its user space provider exchange > addressing information for UD sends by having the provider compute an > address vector (AV) and send it with each WQE. This is not the way > that the RDMA verbs API was intended to operate. > > This series of patches modifies the way UD send WQEs work by exchanging > an index identifying the AH replacing the 88 byte AV by a 4 byte AH > index. In order to not break compatibility with the existing API the > rdma_rxe driver will recognise when an older version of the provider > is not sending an index (i.e. it is 0) and will use the AV instead. > > This series of patches is identical to the previous version > but rebased to 5.15.0-rc2+. It applies cleanly to > > commit: d30ef6d5c013c19e907f2a3a3d6eee04fcd3de0d (for-next) > > v5: > Rebase to 5.15.0-rc2+ This is not the right base, I said you needed something path Rao's patch like current rdma for-next since it gets conflicts: Applying: RDMA/rxe: Move AV from rxe_send_wqe to rxe_send_wr Applying: RDMA/rxe: Change AH objects to indexed Using index info to reconstruct a base tree... M drivers/infiniband/sw/rxe/rxe_param.h Falling back to patching base and 3-way merge... Auto-merging drivers/infiniband/sw/rxe/rxe_param.h CONFLICT (content): Merge conflict in drivers/infiniband/sw/rxe/rxe_param.h error: Failed to merge in the changes. Patch failed at 0002 RDMA/rxe: Change AH objects to indexed hint: Use 'git am --show-current-patch=diff' to see the failed patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". Try again Jason
