RnJvbTogQm9kbyBTdHJvZXNzZXIgPGJzdHJvZXNzZXJAdHMuZnVqaXRzdS5jb20+CkRhdGU6
IFRodSwgMDkgT2N0IDIwMTQgMTM6MDc6MzMgKzAyMDAKU3ViamVjdDogW25mcy11dGlsc10g
W1BBVENIIDIvM10gcnBjLm1vdW50ZDogc2V0IG5vbmJsb2NraW5nIG1vZGUgd2l0aCBsaWJ0
aXJwYwoKSWYgbW91bnRkIGlzIGJ1aWx0IHdpdGggbGlidGlycGMgdGhlIHRjcCBsaXN0ZW5l
cnMgYW5kIHRoZSBzb2NrZXRzCndhaXRpbmcgZm9yIFVEUCBtZXNzYWdlcyBhcmUgbm90IGlu
IG5vbi1ibG9ja2luZyBtb2RlLiBUaHVzIGlmIHJ1bm5pbmcKd2l0aCBtdWx0aXBsZSB0aHJl
YWRzICgtdCBYWCksIGFsbCB0aHJlYWRzIHdpbGwgd2FrZSB1cCBmcm9tIHNlbGVjdCBvbgph
IGNvbm5lY3Rpb24gcmVxdWVzdCBvciBhIFVEUCBtZXNzYWdlLCBidXQgb25seSBvbmUgdGhy
ZWFkIHdpbGwgc3VjY2VlZC4KQWxsIG90aGVycyB3aWxsIHdhaXQgb24gYWNjZXB0KCkgb3Ig
cmVhZCgpIGZvciB0aGUgbmV4dCBldmVudC4KClNpZ25lZC1vZmYtYnk6IEJvZG8gU3Ryb2Vz
c2VyIDxic3Ryb2Vzc2VyQHRzLmZ1aml0c3UuY29tPgotLS0KCi0tLSBuZnMtdXRpbHMtMS4z
LjEvc3VwcG9ydC9uZnMvc3ZjX2NyZWF0ZS5jCTIwMTQtMTAtMDggMjE6Mzk6MDEuMDAwMDAw
MDAwICswMjAwCisrKyBuZnMtdXRpbHMtMS4zLjEvc3VwcG9ydC9uZnMvc3ZjX2NyZWF0ZS5j
CTIwMTQtMTAtMDggMjI6MjA6MDIuMDAwMDAwMDAwICswMjAwCkBAIC0yNzcsNiArMjc3LDEy
IEBACiAJCQkiKCVzLCAldSwgJXMpIiwgbmFtZSwgdmVyc2lvbiwgbmNvbmYtPm5jX25ldGlk
KTsKIAkJcmV0dXJuIDA7CiAJfQorCWlmIChzdmNzb2NrX25vbmJsb2NrKHhwcnQtPnhwX2Zk
KSA8IDApIHsKKwkJLyogY2xvc2UoKSBhbHJlYWR5IGRvbmUgYnkgc3Zjc29ja19ub25ibG9j
aygpICovCisJCXhwcnQtPnhwX2ZkID0gUlBDX0FOWUZEOworCQlTVkNfREVTVFJPWSh4cHJ0
KTsKKwkJcmV0dXJuIDA7CisJfQogCiAJaWYgKCFzdmNfcmVnKHhwcnQsIHByb2dyYW0sIHZl
cnNpb24sIGRpc3BhdGNoLCBuY29uZikpIHsKIAkJLyogc3ZjX3JlZygzKSBkZXN0cm95cyBA
eHBydCBpbiB0aGlzIGNhc2UgKi8KQEAgLTMzMiw2ICszMzgsNyBAQAogCQlpbnQgZmQ7CiAK
IAkJZmQgPSBzdmNfY3JlYXRlX3NvY2soYWktPmFpX2FkZHIsIGFpLT5haV9hZGRybGVuLCBu
Y29uZik7CisJCWZkID0gc3Zjc29ja19ub25ibG9jayhmZCk7CiAJCWlmIChmZCA9PSAtMSkK
IAkJCWdvdG8gb3V0X2ZyZWU7CiAK
On 05 Nov 2014 21:23:39 +0100 [email protected] wrote:
> From: Bodo Stroesser <[email protected]>
> Date: Thu, 09 Oct 2014 13:07:33 +0200
> Subject: [nfs-utils] [PATCH 2/3] rpc.mountd: set nonblocking mode with libtirpc
>
> If mountd is built with libtirpc the tcp listeners and the sockets
> waiting for UDP messages are not in non-blocking mode. Thus if running
> with multiple threads (-t XX), all threads will wake up from select on
> a connection request or a UDP message, but only one thread will succeed.
> All others will wait on accept() or read() for the next event.
>
> Signed-off-by: Bodo Stroesser <[email protected]>
Reviewed-by: NeilBrown <[email protected]>
The two changes provide identical functionality: one in
svc_create_nconf_rand_port
the other in
svc_create_nconf_fixed_port
We really do want non-blocking sockets here!
Thanks,
NeilBrown
> ---
>
> --- nfs-utils-1.3.1/support/nfs/svc_create.c 2014-10-08 21:39:01.000000000 +0200
> +++ nfs-utils-1.3.1/support/nfs/svc_create.c 2014-10-08 22:20:02.000000000 +0200
> @@ -277,6 +277,12 @@
> "(%s, %u, %s)", name, version, nconf->nc_netid);
> return 0;
> }
> + if (svcsock_nonblock(xprt->xp_fd) < 0) {
> + /* close() already done by svcsock_nonblock() */
> + xprt->xp_fd = RPC_ANYFD;
> + SVC_DESTROY(xprt);
> + return 0;
> + }
>
> if (!svc_reg(xprt, program, version, dispatch, nconf)) {
> /* svc_reg(3) destroys @xprt in this case */
> @@ -332,6 +338,7 @@
> int fd;
>
> fd = svc_create_sock(ai->ai_addr, ai->ai_addrlen, nconf);
> + fd = svcsock_nonblock(fd);
> if (fd == -1)
> goto out_free;
>