2007-11-29 23:20:26

by Tom Tucker

Subject: [RFC,PATCH 04/38] svc: Add a max payload value to the transport

The svc_max_payload function currently looks at the socket type
to determine the max payload. Add a max payload value to svc_xprt_class
so it can be returned directly.

Signed-off-by: Tom Tucker <[email protected]>
---

include/linux/sunrpc/svc_xprt.h | 1 +
net/sunrpc/svc.c | 4 +---
net/sunrpc/svcsock.c | 2 ++
3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/include/linux/sunrpc/svc_xprt.h b/include/linux/sunrpc/svc_xprt.h
index a8b1da8..b4ce054 100644
--- a/include/linux/sunrpc/svc_xprt.h
+++ b/include/linux/sunrpc/svc_xprt.h
@@ -17,6 +17,7 @@ struct svc_xprt_class {
struct module *xcl_owner;
struct svc_xprt_ops *xcl_ops;
struct list_head xcl_list;
+ u32 xcl_max_payload;
};

struct svc_xprt {
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index a4a6bf7..ce59044 100644
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -1054,10 +1054,8 @@ err_bad:
*/
u32 svc_max_payload(const struct svc_rqst *rqstp)
{
- int max = RPCSVC_MAXPAYLOAD_TCP;
+ int max = rqstp->rq_xprt->xpt_class->xcl_max_payload;

- if (rqstp->rq_sock->sk_sock->type == SOCK_DGRAM)
- max = RPCSVC_MAXPAYLOAD_UDP;
if (rqstp->rq_server->sv_max_payload < max)
max = rqstp->rq_server->sv_max_payload;
return max;
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index 4755467..ca9b8d8 100644
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -906,6 +906,7 @@ static struct svc_xprt_ops svc_udp_ops = {
static struct svc_xprt_class svc_udp_class = {
.xcl_name = "udp",
.xcl_ops = &svc_udp_ops,
+ .xcl_max_payload = RPCSVC_MAXPAYLOAD_UDP,
};

static void
@@ -1359,6 +1360,7 @@ static struct svc_xprt_ops svc_tcp_ops = {
static struct svc_xprt_class svc_tcp_class = {
.xcl_name = "tcp",
.xcl_ops = &svc_tcp_ops,
+ .xcl_max_payload = RPCSVC_MAXPAYLOAD_TCP,
};

void svc_init_xprt_sock(void)

2007-11-30 20:23:58

by Chuck Lever III

Subject: Re: [RFC,PATCH 04/38] svc: Add a max payload value to the transport

On Nov 29, 2007, at 5:40 PM, Tom Tucker wrote:
> The svc_max_payload function currently looks at the socket type
> to determine the max payload. Add a max payload value to
> svc_xprt_class
> so it can be returned directly.
>
> Signed-off-by: Tom Tucker <[email protected]>
> ---
>
> include/linux/sunrpc/svc_xprt.h | 1 +
> net/sunrpc/svc.c | 4 +---
> net/sunrpc/svcsock.c | 2 ++
> 3 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/include/linux/sunrpc/svc_xprt.h b/include/linux/sunrpc/
> svc_xprt.h
> index a8b1da8..b4ce054 100644
> --- a/include/linux/sunrpc/svc_xprt.h
> +++ b/include/linux/sunrpc/svc_xprt.h
> @@ -17,6 +17,7 @@ struct svc_xprt_class {
> struct module *xcl_owner;
> struct svc_xprt_ops *xcl_ops;
> struct list_head xcl_list;
> + u32 xcl_max_payload;
> };
>
> struct svc_xprt {
> diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
> index a4a6bf7..ce59044 100644
> --- a/net/sunrpc/svc.c
> +++ b/net/sunrpc/svc.c
> @@ -1054,10 +1054,8 @@ err_bad:
> */
> u32 svc_max_payload(const struct svc_rqst *rqstp)
> {
> - int max = RPCSVC_MAXPAYLOAD_TCP;
> + int max = rqstp->rq_xprt->xpt_class->xcl_max_payload;

Nit: xcl_max_payload is unsigned, as is sv_max_payload, and so is the
return type of the svc_max_payload() function, so the automatic
variable "max" should also be an unsigned integral type. (Implicit
type conversion in the comparison below prevents this from being an
actual bug).

> - if (rqstp->rq_sock->sk_sock->type == SOCK_DGRAM)
> - max = RPCSVC_MAXPAYLOAD_UDP;
> if (rqstp->rq_server->sv_max_payload < max)
> max = rqstp->rq_server->sv_max_payload;
> return max;
> diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
> index 4755467..ca9b8d8 100644
> --- a/net/sunrpc/svcsock.c
> +++ b/net/sunrpc/svcsock.c
> @@ -906,6 +906,7 @@ static struct svc_xprt_ops svc_udp_ops = {
> static struct svc_xprt_class svc_udp_class = {
> .xcl_name = "udp",
> .xcl_ops = &svc_udp_ops,
> + .xcl_max_payload = RPCSVC_MAXPAYLOAD_UDP,
> };
>
> static void
> @@ -1359,6 +1360,7 @@ static struct svc_xprt_ops svc_tcp_ops = {
> static struct svc_xprt_class svc_tcp_class = {
> .xcl_name = "tcp",
> .xcl_ops = &svc_tcp_ops,
> + .xcl_max_payload = RPCSVC_MAXPAYLOAD_TCP,
> };
>
> void svc_init_xprt_sock(void)

--
Chuck Lever
chuck[dot]lever[at]oracle[dot]com

2007-11-30 20:47:21

by Tom Tucker

Subject: Re: [RFC,PATCH 04/38] svc: Add a max payload value to the transport

Thanks Chuck, I'll fix this.

On Fri, 2007-11-30 at 15:22 -0500, Chuck Lever wrote:
> On Nov 29, 2007, at 5:40 PM, Tom Tucker wrote:
> > The svc_max_payload function currently looks at the socket type
> > to determine the max payload. Add a max payload value to
> > svc_xprt_class
> > so it can be returned directly.
> >
> > Signed-off-by: Tom Tucker <[email protected]>
> > ---
> >
> > include/linux/sunrpc/svc_xprt.h | 1 +
> > net/sunrpc/svc.c | 4 +---
> > net/sunrpc/svcsock.c | 2 ++
> > 3 files changed, 4 insertions(+), 3 deletions(-)
> >
> > diff --git a/include/linux/sunrpc/svc_xprt.h b/include/linux/sunrpc/
> > svc_xprt.h
> > index a8b1da8..b4ce054 100644
> > --- a/include/linux/sunrpc/svc_xprt.h
> > +++ b/include/linux/sunrpc/svc_xprt.h
> > @@ -17,6 +17,7 @@ struct svc_xprt_class {
> > struct module *xcl_owner;
> > struct svc_xprt_ops *xcl_ops;
> > struct list_head xcl_list;
> > + u32 xcl_max_payload;
> > };
> >
> > struct svc_xprt {
> > diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
> > index a4a6bf7..ce59044 100644
> > --- a/net/sunrpc/svc.c
> > +++ b/net/sunrpc/svc.c
> > @@ -1054,10 +1054,8 @@ err_bad:
> > */
> > u32 svc_max_payload(const struct svc_rqst *rqstp)
> > {
> > - int max = RPCSVC_MAXPAYLOAD_TCP;
> > + int max = rqstp->rq_xprt->xpt_class->xcl_max_payload;
>
> Nit: xcl_max_payload is unsigned, as is sv_max_payload, and so is the
> return type of the svc_max_payload() function, so the automatic
> variable "max" should also be an unsigned integral type. (Implicit
> type conversion in the comparison below prevents this from being an
> actual bug).
>
> > - if (rqstp->rq_sock->sk_sock->type == SOCK_DGRAM)
> > - max = RPCSVC_MAXPAYLOAD_UDP;
> > if (rqstp->rq_server->sv_max_payload < max)
> > max = rqstp->rq_server->sv_max_payload;
> > return max;
> > diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
> > index 4755467..ca9b8d8 100644
> > --- a/net/sunrpc/svcsock.c
> > +++ b/net/sunrpc/svcsock.c
> > @@ -906,6 +906,7 @@ static struct svc_xprt_ops svc_udp_ops = {
> > static struct svc_xprt_class svc_udp_class = {
> > .xcl_name = "udp",
> > .xcl_ops = &svc_udp_ops,
> > + .xcl_max_payload = RPCSVC_MAXPAYLOAD_UDP,
> > };
> >
> > static void
> > @@ -1359,6 +1360,7 @@ static struct svc_xprt_ops svc_tcp_ops = {
> > static struct svc_xprt_class svc_tcp_class = {
> > .xcl_name = "tcp",
> > .xcl_ops = &svc_tcp_ops,
> > + .xcl_max_payload = RPCSVC_MAXPAYLOAD_TCP,
> > };
> >
> > void svc_init_xprt_sock(void)
>
> --
> Chuck Lever
> chuck[dot]lever[at]oracle[dot]com