Return-Path: Received: from fieldses.org ([173.255.197.46]:33490 "EHLO fieldses.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755169AbdDABH6 (ORCPT ); Fri, 31 Mar 2017 21:07:58 -0400 Date: Fri, 31 Mar 2017 21:07:57 -0400 From: "J. Bruce Fields" To: Olga Kornievskaia Cc: Jeff Layton , Kinglong Mee , Trond Myklebust , "linux-nfs@vger.kernel.org" , Anna Schumaker Subject: Re: [PATCH] SUNRPC/backchanel: set XPT_CONG_CTRL flag for bc xprt Message-ID: <20170401010757.GC14424@fieldses.org> References: <1488885081.2788.0.camel@redhat.com> <20170309202610.GF3929@fieldses.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: Sender: linux-nfs-owner@vger.kernel.org List-ID: On Fri, Mar 31, 2017 at 04:44:43PM -0400, Olga Kornievskaia wrote: > Hey Bruce, > > When is this going to go upstream? I have it queued up for 4.11. I'm hoping to send out a pull request tonight, since I'll be taking most of next week off. --b. > > On Thu, Mar 9, 2017 at 3:26 PM, J. Bruce Fields wrote: > > Thanks! Applying.--b. > > > > On Tue, Mar 07, 2017 at 06:11:21AM -0500, Jeff Layton wrote: > >> On Tue, 2017-03-07 at 17:22 +0800, Kinglong Mee wrote: > >> > The xprt for backchannel is created separately, not in TCP/UDP code. > >> > Because without the flags, the requests from NFSv41 backchannel are > >> > rejected in svc_process_common(), > >> > > >> > 1191 if (versp->vs_need_cong_ctrl && > >> > 1192 !test_bit(XPT_CONG_CTRL, &rqstp->rq_xprt->xpt_flags)) > >> > 1193 goto err_bad_vers; > >> > > >> > Fixes: 5283b03ee5 ("nfs/nfsd/sunrpc: enforce transport...") > >> > Signed-off-by: Kinglong Mee > >> > --- > >> > net/sunrpc/svcsock.c | 1 + > >> > 1 file changed, 1 insertion(+) > >> > > >> > diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c > >> > index 8931e33..2b720fa 100644 > >> > --- a/net/sunrpc/svcsock.c > >> > +++ b/net/sunrpc/svcsock.c > >> > @@ -1635,6 +1635,7 @@ static struct svc_xprt *svc_bc_create_socket(struct svc_serv *serv, > >> > > >> > xprt = &svsk->sk_xprt; > >> > svc_xprt_init(net, &svc_tcp_bc_class, xprt, serv); > >> > + set_bit(XPT_CONG_CTRL, &svsk->sk_xprt.xpt_flags); > >> > > >> > serv->sv_bc_xprt = xprt; > >> > > >> > >> Good catch. > >> > >> Reviewed-by: Jeff Layton > > -- > > To unsubscribe from this list: send the line "unsubscribe linux-nfs" in > > the body of a message to majordomo@vger.kernel.org > > More majordomo info at http://vger.kernel.org/majordomo-info.html