From nobody Thu Nov 9 21:01:57 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SRDsd5gvkz50WNV; Thu, 9 Nov 2023 21:01:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SRDsd5F74z3cWF; Thu, 9 Nov 2023 21:01:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699563717; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uVsg5O6J/sDZFfHkEaIqcyT9a5otDY9cNwiCJ/Z7CG8=; b=b4gkhq2S924zjqfTaVIkoJTLD1/qzsb8Vm2JArBdGf8k92twGwHZWZ5vrwbtpFPRC7KvnQ jhI8cT0ZX36ETD7Uv+Unv1/dEIvdC9pNocs2gTuUMrvti6MIMoOe+OjeAdWA27fXf+qQIF nnRK6wjJoVE2WYVLL2OMUGmWZ6JFK1e7mE1MukvW/5PV1vmgnhVhApXcZHXjvmFUSpE+fa lu1GYGslD/dwpxXYVx8Guzui1s0CtGw1s07oL2WTfH9QB32berEJZ/ZCAi3HBxZpzWDVuO GB58vJN1PehcrqzydJs+OM9B9wMUFss+wCkBrdiasGq35wNip2Q2ljw9lu+aMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699563717; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uVsg5O6J/sDZFfHkEaIqcyT9a5otDY9cNwiCJ/Z7CG8=; b=vR0VROhd4Cy6uwKAorYj9esi5B1ZUBczE7sdP6CCHfLQZJAF58O5/x7eRHZ38EBxVlULSM ltnd/n48SnfhXx2yW/gym1PgoBxXbtFSrK/MpzGklzLjSCsG1N2FDk7pySQlKLT1hvXAq6 LbfKT+1f8zI+89ZGs4V+8onLpZnxiUus+E4ZL7HcJKKfhaFc/bX+0UPQfrPQ22SmP9IdsE eHg5pWShp7qEBFjkuguu1mo0IZxq2M+HpvRJOS5qKz+NKRdWQle4TyXwFT4v/Nd4CmYYuR e07NW2wbpuNte0mMoilRCmHaSgx/5OgBwFIFawtzfYwomTx5poYQmB3fHhjDcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699563717; a=rsa-sha256; cv=none; b=SGlEqXoGbwxHSrKhY/GJI0m7cCq/QzPZGI6veSiW+XaA81MUzkuszqU6AgPAb6dk0NPOhf Wy8vwM+s4TgaqjbFAeK0B8M+rx4oFhfJZV0pi7w2RBUHbBwZkrfAZjyIYd68x9AYCMs2mM LxUncUtygY9z/onqhgAvcXexyOPp1w3DeFDAHkBxTE21V94ODQA0vrnC8UhfLyfyy3XoB7 Qh+vuuXh9+dpZSpqSxFzz7JNo4tY7jqpNdvU7C8rWQrvB/gNx1yBufjiwfXu4CBhxYhXtY KmytHxhVa3/GzVapHQIwasHFJdVcaX+en0CgHjYl1m2DD9ydoccUeHjO+Kk+6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SRDsd3zRHzWLG; Thu, 9 Nov 2023 21:01:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A9L1vCE013307; Thu, 9 Nov 2023 21:01:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A9L1vu1013283; Thu, 9 Nov 2023 21:01:57 GMT (envelope-from git) Date: Thu, 9 Nov 2023 21:01:57 GMT Message-Id: <202311092101.3A9L1vu1013283@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 14105aae555c - main - nlm: Fix error messages for failed remote rpcbind contact List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 14105aae555cc22554d87ab041ee736c086f5ef1 Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=14105aae555cc22554d87ab041ee736c086f5ef1 commit 14105aae555cc22554d87ab041ee736c086f5ef1 Author: Tom Jones AuthorDate: 2023-09-25 18:33:45 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-11-09 20:54:28 +0000 nlm: Fix error messages for failed remote rpcbind contact In case of a remote rpcbind connection timeout, the NFS kernel lock manager emits an error message along the lines of: NLM: failed to contact remote rpcbind, stat = 5, port = 28416 In the Bugzilla PR, Garrett Wollman identified the following problems with that error message: - The error is in decimal, which can only be deciphered by reading the source code. - The port number is byte-swapped. - The error message does not identify the client the NLM is trying to communicate with. Fix the shortcomings of the current error message by: - Printing out the port number correctly. - Mentioning the remote client. The low-level decimal error remains an outstanding issue though. It seems like the error strings describing the error codes live outside of the kernel code currently. PR: 244698 Reported by: wollman Approved by: allanjude Sponsored by: National Bureau of Economic Research Sponsored by: Klara, Inc. Co-authored-by: Mateusz Piotrowski <0mp@FreeBSD.org> --- sys/nlm/nlm_prot_impl.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/sys/nlm/nlm_prot_impl.c b/sys/nlm/nlm_prot_impl.c index a5b917b07f8b..216c4ac82b53 100644 --- a/sys/nlm/nlm_prot_impl.c +++ b/sys/nlm/nlm_prot_impl.c @@ -343,6 +343,12 @@ nlm_get_rpc(struct sockaddr *sa, rpcprog_t prog, rpcvers_t vers) bool_t tryagain = FALSE; struct portmap mapping; u_short port = 0; + struct sockaddr_in *sin4; + char namebuf[INET_ADDRSTRLEN]; +#ifdef INET6 + struct sockaddr_in6 *sin6; + char namebuf6[INET6_ADDRSTRLEN]; +#endif /* * First we need to contact the remote RPCBIND service to find @@ -489,8 +495,26 @@ again: } /* Otherwise, bad news. */ - NLM_ERR("NLM: failed to contact remote rpcbind, " - "stat = %d, port = %d\n", (int) stat, port); + switch (ss.ss_family) { + case AF_INET: + sin4 = (struct sockaddr_in *)&ss; + inet_ntop(ss.ss_family, &sin4->sin_addr, + namebuf, sizeof namebuf); + NLM_ERR("NLM: failed to contact remote rpcbind, " + "stat = %d, host = %s, port = %d\n", + (int) stat, namebuf, htons(port)); + break; +#ifdef INET6 + case AF_INET6: + sin6 = (struct sockaddr_in6 *)&ss; + inet_ntop(ss.ss_family, &sin6->sin6_addr, + namebuf6, sizeof namebuf6); + NLM_ERR("NLM: failed to contact remote rpcbind, " + "stat = %d, host = %s, port = %d\n", + (int) stat, namebuf6, htons(port)); + break; +#endif + } CLNT_DESTROY(rpcb); return (NULL); }