> On Aug 23, 2016, at 6:21 PM, Trond Myklebust <trondmy@xxxxxxxxxxxxxxx> wrote: > >> >> On Aug 23, 2016, at 17:05, Chuck Lever <chuck.lever@xxxxxxxxxx> wrote: >> >>> >>> On Aug 23, 2016, at 4:53 PM, J. Bruce Fields <bfields@xxxxxxxxxxxx> wrote: >>> >>> On Tue, Aug 23, 2016 at 01:39:15PM -0400, Chuck Lever wrote: >>>> Hi Bruce- >>>> >>>> >>>>> On Aug 22, 2016, at 2:57 PM, Chuck Lever <chuck.lever@xxxxxxxxxx> wrote: >>>>> >>>>> Using NFSv4.1 on RDMA should be safe, so broaden the new checks in >>>>> rpc_create(). >>>>> >>>>> WARN_ON_ONCE is used, matching most other WARN call sites in clnt.c. >>>>> >>>>> Fixes: 39a9beab5acb ("rpc: share one xps between all backchannels") >>>>> Fixes: d50039ea5ee6 ("nfsd4/rpc: move backchannel create logic...") >>>>> Signed-off-by: Chuck Lever <chuck.lever@xxxxxxxxxx> >>>>> --- >>>> >>>> Do you want to take this, or should it go through Trond/Anna ? >>> >>> I don't care, feel free to add my reviewed-by: if it goes through >>> someone else. >>> >>> Looks like this should be for 4.8 (and stable), not 4.9? >> >> I won't disagree with that. >> >> I think Trond or Anna need to weigh in on all questions >> (who takes it, does it go to stable as well). > > If you want it in for 4.8, then I can pull it in together with the current bugfixes. Does that work for everyone? Thanks, that's perfect! >>> --b. >>> >>>> >>>> >>>>> net/sunrpc/clnt.c | 4 ++-- >>>>> 1 file changed, 2 insertions(+), 2 deletions(-) >>>>> >>>>> diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c >>>>> index 7f79fb7..66f23b3 100644 >>>>> --- a/net/sunrpc/clnt.c >>>>> +++ b/net/sunrpc/clnt.c >>>>> @@ -453,7 +453,7 @@ static struct rpc_clnt *rpc_create_xprt(struct rpc_create_args *args, >>>>> struct rpc_xprt_switch *xps; >>>>> >>>>> if (args->bc_xprt && args->bc_xprt->xpt_bc_xps) { >>>>> - WARN_ON(args->protocol != XPRT_TRANSPORT_BC_TCP); >>>>> + WARN_ON_ONCE(!(args->protocol & XPRT_TRANSPORT_BC)); >>>>> xps = args->bc_xprt->xpt_bc_xps; >>>>> xprt_switch_get(xps); >>>>> } else { >>>>> @@ -520,7 +520,7 @@ struct rpc_clnt *rpc_create(struct rpc_create_args *args) >>>>> char servername[48]; >>>>> >>>>> if (args->bc_xprt) { >>>>> - WARN_ON(args->protocol != XPRT_TRANSPORT_BC_TCP); >>>>> + WARN_ON_ONCE(!(args->protocol & XPRT_TRANSPORT_BC)); >>>>> xprt = args->bc_xprt->xpt_bc_xprt; >>>>> if (xprt) { >>>>> xprt_get(xprt); >>>>> >>>>> -- >>>>> To unsubscribe from this list: send the line "unsubscribe linux-nfs" in >>>>> the body of a message to majordomo@xxxxxxxxxxxxxxx >>>>> More majordomo info at http://vger.kernel.org/majordomo-info.html >>>> >>>> -- >>>> Chuck Lever >> >> -- >> Chuck Lever -- Chuck Lever -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html