[PATCH net-next] SUNRPC: drop pointless static qualifier in xdr_get_next_encode_buffer()

[PATCH net-next] SUNRPC: drop pointless static qualifier in xdr_get_next_encode_buffer()

[YueHaibing]

There is no need to have the '__be32 *p' variable static since new value
always be assigned before use it.

Signed-off-by: YueHaibing <yuehaibing@huawei.com>
---
 net/sunrpc/xdr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c
index 2bbb8d3..d80b156 100644
--- a/net/sunrpc/xdr.c
+++ b/net/sunrpc/xdr.c
@@ -546,7 +546,7 @@ void xdr_commit_encode(struct xdr_stream *xdr)
 static __be32 *xdr_get_next_encode_buffer(struct xdr_stream *xdr,
 		size_t nbytes)
 {
-	static __be32 *p;
+	__be32 *p;
 	int space_left;
 	int frag1bytes, frag2bytes;

[PATCH net-next] SUNRPC: drop pointless static qualifier in xdr_get_next_encode_buffer()

[YueHaibing]

There is no need to have the '__be32 *p' variable static since new value
always be assigned before use it.

Signed-off-by: YueHaibing <yuehaibing@huawei.com>
---
 net/sunrpc/xdr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c
index 2bbb8d3..d80b156 100644
--- a/net/sunrpc/xdr.c
+++ b/net/sunrpc/xdr.c
@@ -546,7 +546,7 @@ void xdr_commit_encode(struct xdr_stream *xdr)
 static __be32 *xdr_get_next_encode_buffer(struct xdr_stream *xdr,
 		size_t nbytes)
 {
-	static __be32 *p;
+	__be32 *p;
 	int space_left;
 	int frag1bytes, frag2bytes;

Re: [PATCH net-next] SUNRPC: drop pointless static qualifier in xdr_get_next_encode_buffer()

[Trond Myklebust]

T24gVGh1LCAyMDE4LTExLTA4IGF0IDAyOjA0ICswMDAwLCBZdWVIYWliaW5nIHdyb3RlOg0KPiBU
aGVyZSBpcyBubyBuZWVkIHRvIGhhdmUgdGhlICdfX2JlMzIgKnAnIHZhcmlhYmxlIHN0YXRpYyBz
aW5jZSBuZXcNCj4gdmFsdWUNCj4gYWx3YXlzIGJlIGFzc2lnbmVkIGJlZm9yZSB1c2UgaXQuDQo+
IA0KPiBTaWduZWQtb2ZmLWJ5OiBZdWVIYWliaW5nIDx5dWVoYWliaW5nQGh1YXdlaS5jb20+DQo+
IC0tLQ0KPiAgbmV0L3N1bnJwYy94ZHIuYyB8IDIgKy0NCj4gIDEgZmlsZSBjaGFuZ2VkLCAxIGlu
c2VydGlvbigrKSwgMSBkZWxldGlvbigtKQ0KPiANCj4gZGlmZiAtLWdpdCBhL25ldC9zdW5ycGMv
eGRyLmMgYi9uZXQvc3VucnBjL3hkci5jDQo+IGluZGV4IDJiYmI4ZDMuLmQ4MGIxNTYgMTAwNjQ0
DQo+IC0tLSBhL25ldC9zdW5ycGMveGRyLmMNCj4gKysrIGIvbmV0L3N1bnJwYy94ZHIuYw0KPiBA
QCAtNTQ2LDcgKzU0Niw3IEBAIHZvaWQgeGRyX2NvbW1pdF9lbmNvZGUoc3RydWN0IHhkcl9zdHJl
YW0gKnhkcikNCj4gIHN0YXRpYyBfX2JlMzIgKnhkcl9nZXRfbmV4dF9lbmNvZGVfYnVmZmVyKHN0
cnVjdCB4ZHJfc3RyZWFtICp4ZHIsDQo+ICAJCXNpemVfdCBuYnl0ZXMpDQo+ICB7DQo+IC0Jc3Rh
dGljIF9fYmUzMiAqcDsNCj4gKwlfX2JlMzIgKnA7DQo+ICAJaW50IHNwYWNlX2xlZnQ7DQo+ICAJ
aW50IGZyYWcxYnl0ZXMsIGZyYWcyYnl0ZXM7DQo+IA0KDQpPdWNoLCB0aGF0J3MgYSByZWFsbHkg
bmFzdHkgYnVnIHRoYXQgY291bGQgZGVmaW5pdGVseSBjYXVzZSBjb3JydXB0aW9uDQppZiB5b3Ug
aGF2ZSAyIHRocmVhZHMgc2ltdWx0YW5lb3VzbHkgY2FsbGluZyB0aGlzIGZ1bmN0aW9uISBUaGlz
IHJlYWxseQ0KZGVzZXJ2ZXMgdG8gYmUgYSBzdGFibGUgcGF0Y2guDQoNClRoYW5rIHlvdSwgWXVl
SGFpYmluZyENCg0KQnJ1Y2UsIGRvIHlvdSB3YW50IHRvIHNoZXBoZXJkIHRoaXMgb25lIGluPw0K
DQotLSANClRyb25kIE15a2xlYnVzdA0KTGludXggTkZTIGNsaWVudCBtYWludGFpbmVyLCBIYW1t
ZXJzcGFjZQ0KdHJvbmQubXlrbGVidXN0QGhhbW1lcnNwYWNlLmNvbQ0KDQoNCg=

Re: [PATCH net-next] SUNRPC: drop pointless static qualifier in xdr_get_next_encode_buffer()

[Trond Myklebust]

On Thu, 2018-11-08 at 02:04 +0000, YueHaibing wrote:
> There is no need to have the '__be32 *p' variable static since new
> value
> always be assigned before use it.
> 
> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
> ---
>  net/sunrpc/xdr.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c
> index 2bbb8d3..d80b156 100644
> --- a/net/sunrpc/xdr.c
> +++ b/net/sunrpc/xdr.c
> @@ -546,7 +546,7 @@ void xdr_commit_encode(struct xdr_stream *xdr)
>  static __be32 *xdr_get_next_encode_buffer(struct xdr_stream *xdr,
>  		size_t nbytes)
>  {
> -	static __be32 *p;
> +	__be32 *p;
>  	int space_left;
>  	int frag1bytes, frag2bytes;
> 

Ouch, that's a really nasty bug that could definitely cause corruption
if you have 2 threads simultaneously calling this function! This really
deserves to be a stable patch.

Thank you, YueHaibing!

Bruce, do you want to shepherd this one in?

-- 
Trond Myklebust
Linux NFS client maintainer, Hammerspace
trond.myklebust@hammerspace.com

Re: [PATCH net-next] SUNRPC: drop pointless static qualifier in xdr_get_next_encode_buffer()

[bfields]

On Thu, Nov 08, 2018 at 03:13:25AM +0000, Trond Myklebust wrote:
> On Thu, 2018-11-08 at 02:04 +0000, YueHaibing wrote:
> > There is no need to have the '__be32 *p' variable static since new
> > value
> > always be assigned before use it.

Applying for 4.20 and stable, thanks!

> > 
> > Signed-off-by: YueHaibing <yuehaibing@huawei.com>
> > ---
> >  net/sunrpc/xdr.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c
> > index 2bbb8d3..d80b156 100644
> > --- a/net/sunrpc/xdr.c
> > +++ b/net/sunrpc/xdr.c
> > @@ -546,7 +546,7 @@ void xdr_commit_encode(struct xdr_stream *xdr)
> >  static __be32 *xdr_get_next_encode_buffer(struct xdr_stream *xdr,
> >  		size_t nbytes)
> >  {
> > -	static __be32 *p;
> > +	__be32 *p;
> >  	int space_left;
> >  	int frag1bytes, frag2bytes;
> > 
> 
> Ouch, that's a really nasty bug that could definitely cause corruption
> if you have 2 threads simultaneously calling this function! This really
> deserves to be a stable patch.

Agreed.  Looks like I introduced that in 3.16, over 5 years ago, so I'm
a little surprised not to have seen a bug report that this would
explain.  Maybe it's just that the critical section is only a few lines
of arithemtic at the end of the function.  Also it only gets called when
an xdr reply other than a read reaches the end of a page.  So you'd need
a lot of concurrent READDIRs of large directories or something.  Still,
I'd think it would be possible.....

> Thank you, YueHaibing!
> 
> Bruce, do you want to shepherd this one in?

Yes, I've got 3 bugfixes queued up now, I should send them along later
today or tomorrow.

--b.

Re: [PATCH net-next] SUNRPC: drop pointless static qualifier in xdr_get_next_encode_buffer()

[bfields]

On Thu, Nov 08, 2018 at 03:13:25AM +0000, Trond Myklebust wrote:
> On Thu, 2018-11-08 at 02:04 +0000, YueHaibing wrote:
> > There is no need to have the '__be32 *p' variable static since new
> > value
> > always be assigned before use it.

Applying for 4.20 and stable, thanks!

> > 
> > Signed-off-by: YueHaibing <yuehaibing@huawei.com>
> > ---
> >  net/sunrpc/xdr.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c
> > index 2bbb8d3..d80b156 100644
> > --- a/net/sunrpc/xdr.c
> > +++ b/net/sunrpc/xdr.c
> > @@ -546,7 +546,7 @@ void xdr_commit_encode(struct xdr_stream *xdr)
> >  static __be32 *xdr_get_next_encode_buffer(struct xdr_stream *xdr,
> >  		size_t nbytes)
> >  {
> > -	static __be32 *p;
> > +	__be32 *p;
> >  	int space_left;
> >  	int frag1bytes, frag2bytes;
> > 
> 
> Ouch, that's a really nasty bug that could definitely cause corruption
> if you have 2 threads simultaneously calling this function! This really
> deserves to be a stable patch.

Agreed.  Looks like I introduced that in 3.16, over 5 years ago, so I'm
a little surprised not to have seen a bug report that this would
explain.  Maybe it's just that the critical section is only a few lines
of arithemtic at the end of the function.  Also it only gets called when
an xdr reply other than a read reaches the end of a page.  So you'd need
a lot of concurrent READDIRs of large directories or something.  Still,
I'd think it would be possible.....

> Thank you, YueHaibing!
> 
> Bruce, do you want to shepherd this one in?

Yes, I've got 3 bugfixes queued up now, I should send them along later
today or tomorrow.

--b.