FAILED: patch "[PATCH] IB/core: Make testing MR flags for writability a static" failed to apply to 4.9-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 4.9-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
Quoted 1 line
From
08bb558ac11ab944e0539e78619d7b4c356278bdMon Sep 17 00:00:00 2001
From: Jack Morgenstein <[email protected]>
Date: Wed, 23 May 2018 15:30:30 +0300
Subject: [PATCH] IB/core: Make testing MR flags for writability a static
inline function
Make the MR writability flags check, which is performed in umem.c, a static inline function in file ib_verbs.h
This allows the function to be used by low-level infiniband drivers.
Cc <[email protected]>
Signed-off-by Jason Gunthorpe <[email protected]>
Signed-off-by Jack Morgenstein <[email protected]>
Signed-off-by Leon Romanovsky <[email protected]>
drivers/infiniband/core/umem.c +1 -10
@@ -119,16 +119,7 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr, umem->length = size; umem->address = addr; umem->page_shift =PAGE_SHIFT ; -/* -* We ask for writable memory if any of the following -* access flags are set. "Local write" and "remote write" -* obviously require write access. "Remote atomic" can do -* things like fetch and add, which will modify memory, and -* "MW bind" can change permissions by binding a window. -*/ - umem->writable = !!(access & - (IB_ACCESS_LOCAL_WRITE |IB_ACCESS_REMOTE_WRITE | -IB_ACCESS_REMOTE_ATOMIC |IB_ACCESS_MW_BIND )); + umem->writable =ib_access_writable (access);if (access &IB_ACCESS_ON_DEMAND ) { ret =ib_umem_odp_get (context, umem, access);
include/rdma/ib_verbs.h +14 -0
@@ -3734,6 +3734,20 @@ static inline int ib_check_mr_access(int flags)return 0 ; } +static inline bool ib_access_writable (int access_flags) +{ +/* +* We have writable memory backing the MR if any of the following +* access flags are set. "Local write" and "remote write" obviously +* require write access. "Remote atomic" can do things like fetch and +* add, which will modify memory, and "MW bind" can change permissions +* by binding a window. +*/ +return access_flags & + (IB_ACCESS_LOCAL_WRITE |IB_ACCESS_REMOTE_WRITE | +IB_ACCESS_REMOTE_ATOMIC |IB_ACCESS_MW_BIND ); +} +/** * ib_check_mr_status: lightweight check of MR status. * This routine may provide status checks on a selected