* [PATCH] SUNRPC/backchanel: set XPT_CONG_CTRL flag for bc xprt
@ 2017-03-07 9:22 Kinglong Mee
2017-03-07 11:11 ` Jeff Layton
0 siblings, 1 reply; 6+ messages in thread
From: Kinglong Mee @ 2017-03-07 9:22 UTC (permalink / raw)
To: Trond Myklebust, linux-nfs@vger.kernel.org
Cc: J. Bruce Fields, Kinglong Mee, Anna Schumaker, Jeff Layton
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 <kinglongmee@gmail.com>
---
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;
--
2.9.3
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] SUNRPC/backchanel: set XPT_CONG_CTRL flag for bc xprt
2017-03-07 9:22 [PATCH] SUNRPC/backchanel: set XPT_CONG_CTRL flag for bc xprt Kinglong Mee
@ 2017-03-07 11:11 ` Jeff Layton
2017-03-09 20:26 ` J. Bruce Fields
0 siblings, 1 reply; 6+ messages in thread
From: Jeff Layton @ 2017-03-07 11:11 UTC (permalink / raw)
To: Kinglong Mee, Trond Myklebust, linux-nfs@vger.kernel.org
Cc: J. Bruce Fields, Anna Schumaker
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 <kinglongmee@gmail.com>
> ---
> 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 <jlayton@redhat.com>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] SUNRPC/backchanel: set XPT_CONG_CTRL flag for bc xprt
2017-03-07 11:11 ` Jeff Layton
@ 2017-03-09 20:26 ` J. Bruce Fields
2017-03-10 21:29 ` Benjamin Coddington
2017-03-31 20:44 ` Olga Kornievskaia
0 siblings, 2 replies; 6+ messages in thread
From: J. Bruce Fields @ 2017-03-09 20:26 UTC (permalink / raw)
To: Jeff Layton
Cc: Kinglong Mee, Trond Myklebust, linux-nfs@vger.kernel.org,
Anna Schumaker
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 <kinglongmee@gmail.com>
> > ---
> > 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 <jlayton@redhat.com>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] SUNRPC/backchanel: set XPT_CONG_CTRL flag for bc xprt
2017-03-09 20:26 ` J. Bruce Fields
@ 2017-03-10 21:29 ` Benjamin Coddington
2017-03-31 20:44 ` Olga Kornievskaia
1 sibling, 0 replies; 6+ messages in thread
From: Benjamin Coddington @ 2017-03-10 21:29 UTC (permalink / raw)
To: Kinglong Mee; +Cc: linux-nfs@vger.kernel.org
On 9 Mar 2017, at 15:26, 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 <kinglongmee@gmail.com>
>>> ---
>>> 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 <jlayton@redhat.com>
This one fixes my failing xfstests generic/089. Thanks, Kinglong Mee.
Ben
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] SUNRPC/backchanel: set XPT_CONG_CTRL flag for bc xprt
2017-03-09 20:26 ` J. Bruce Fields
2017-03-10 21:29 ` Benjamin Coddington
@ 2017-03-31 20:44 ` Olga Kornievskaia
2017-04-01 1:07 ` J. Bruce Fields
1 sibling, 1 reply; 6+ messages in thread
From: Olga Kornievskaia @ 2017-03-31 20:44 UTC (permalink / raw)
To: J. Bruce Fields
Cc: Jeff Layton, Kinglong Mee, Trond Myklebust,
linux-nfs@vger.kernel.org, Anna Schumaker
Hey Bruce,
When is this going to go upstream?
On Thu, Mar 9, 2017 at 3:26 PM, J. Bruce Fields <bfields@fieldses.org> 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 <kinglongmee@gmail.com>
>> > ---
>> > 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 <jlayton@redhat.com>
> --
> 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
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] SUNRPC/backchanel: set XPT_CONG_CTRL flag for bc xprt
2017-03-31 20:44 ` Olga Kornievskaia
@ 2017-04-01 1:07 ` J. Bruce Fields
0 siblings, 0 replies; 6+ messages in thread
From: J. Bruce Fields @ 2017-04-01 1:07 UTC (permalink / raw)
To: Olga Kornievskaia
Cc: Jeff Layton, Kinglong Mee, Trond Myklebust,
linux-nfs@vger.kernel.org, Anna Schumaker
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 <bfields@fieldses.org> 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 <kinglongmee@gmail.com>
> >> > ---
> >> > 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 <jlayton@redhat.com>
> > --
> > 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
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-04-01 1:07 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-07 9:22 [PATCH] SUNRPC/backchanel: set XPT_CONG_CTRL flag for bc xprt Kinglong Mee
2017-03-07 11:11 ` Jeff Layton
2017-03-09 20:26 ` J. Bruce Fields
2017-03-10 21:29 ` Benjamin Coddington
2017-03-31 20:44 ` Olga Kornievskaia
2017-04-01 1:07 ` J. Bruce Fields
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).