From nobody Sat Jul 23 20:53:38 2022 X-Original-To: dev-commits-src-all@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 4Lqz6p5spVz4WTM6; Sat, 23 Jul 2022 20:53:38 +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 4Lqz6p51TYz3Y45; Sat, 23 Jul 2022 20:53:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658609618; 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=/EgYeUjFBJfg8pBR0E1aokKy+gXuflym4CYXwVn/h5Q=; b=FhlA2F4sQGRQhyKepFaOlOLPDqLqH2rc2+yTPWC1rSTHaWAhcceib57Hx3vgrEb6Gpyjob hz5QH5DY6WQ8nZOswjIUZMD7B2kM/FkdxdTc4iwxNHa6Mo2Nd/Y+Lid1v/A+f9yhZbOv/M 2O447Z9kobEyBq/FRS1cDCxD5EN5W7vZ7Z2Ob93mjhzbYrCvPGCql9/onxVX2gZENX4kQo QcVtL+VQ7xAewWthKxZtracZzjL8Frb5CFlL+D+dgjJYL7aYx/iT/D5GhDUWOnsIG4sT+u fDyLEDjKoFwmdH/RsyNI3sw4wiTuKqwC5okZdfb64FUsfuQj/gJZsAKSB+C+nw== 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 4Lqz6p43q2zt4v; Sat, 23 Jul 2022 20:53:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26NKrcCi087757; Sat, 23 Jul 2022 20:53:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26NKrcRG087756; Sat, 23 Jul 2022 20:53:38 GMT (envelope-from git) Date: Sat, 23 Jul 2022 20:53:38 GMT Message-Id: <202207232053.26NKrcRG087756@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: c6e56b2a89ea - stable/12 - nfscl: Fix setting of nfsess_defunct for nfscl_hasexpired() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: c6e56b2a89ea54b4861a622772b86d04076499f3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658609618; 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=/EgYeUjFBJfg8pBR0E1aokKy+gXuflym4CYXwVn/h5Q=; b=n6JsEGQWWXkfOYmLHfY10epnIGpnykFglUlKEoD/pjgotkkjuVe/sIsWiSB/GQVZyEK7ls bpArHyANj8VQg+1czkpNUfwS1M4HgQs0dKGxMNfiQzed8f7uFF0jqhoOPZLWkelO+4uaxL dMuIucOoPBzY5sQqD9LarSd5fAie5aVOXXij/AHTsmU6qZIOmJoTeKkMRKCDeDJ7vJ+BOA npUF10YkwadwYArhhwbOQCfbpAy5Xt+rbhl33O1yM4nC0RT6t+VnY1E3VrgJEusPd6bItX ybhM6cn3W2mimNSG78odEEFspbVnSc2Wh24hwnuv3rW7gHODRr+bIy7a7kjLxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658609618; a=rsa-sha256; cv=none; b=Rbr6rtio/zUZCRWQzmenT159z+CqqANJgmawGmbBJmMt/PXygqHC57nrx73dt9Poi3WkYs MM05knLxGcFt0AWkdPhjpdUVtcZkSJ1DQW7+QnR3guZ9z7vzj2V3iBH9BYaLLNfsWEfPAy QzKBWGXWlU/B1+9DqcaQMOsDwWRMW6b9kvIESHM+XTWWIoRloTwZ3Z7YVg4k9TfOYANYx2 FG4BySpIXt/83Noz+a0B5JFIT3AiU0qT8nJ0agAPGWDrqabeqdaRbvW5pZSxcEC5kv+mCL tlN9RuhOEhm3ziX9S4g6DtKDnaCoJoXwWzGhtoxIkAlLqvEFtZP4HoI5kPkUAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=c6e56b2a89ea54b4861a622772b86d04076499f3 commit c6e56b2a89ea54b4861a622772b86d04076499f3 Author: Rick Macklem AuthorDate: 2022-07-08 14:37:36 +0000 Commit: Rick Macklem CommitDate: 2022-07-23 20:50:38 +0000 nfscl: Fix setting of nfsess_defunct for nfscl_hasexpired() Commit a7bb120f8b87 added a printf for the case where recovery has not marked the session defunct by setting nfsess_defunct to 1. It turns out that nfscl_hasexpired() calls nfsrpc_setclient() directly, without setting nfsess_defunct. This patch replaces the printf with code that sets nfsess_defunct to 1 to handle this case. If SIGTERM is issued to a process when it is doing I/O on an "intr" mount, the NFSv4 server may reply NFSERR_BADSTATEID, due to the Open being prematurely closed. This can result in a call to nfscl_hasexpired() to do a recovery. This would explain at least one hang described in the PR. PR: 260011 MFC after: 2 weeks (cherry picked from commit be7b87de16ffbabb81989e13a4b19a178e3ab8ee) --- sys/fs/nfsclient/nfs_clrpcops.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index 3e081fa750db..53e3ab9b03ea 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -974,10 +974,12 @@ nfsrpc_setclient(struct nfsmount *nmp, struct nfsclclient *clp, int reclaim, */ tsep = NULL; if (TAILQ_FIRST(&nmp->nm_sess) != NULL) { + /* + * Mark the old session defunct. Needed + * when called from nfscl_hasexpired(). + */ tsep = NFSMNT_MDSSESSION(nmp); - if (tsep->nfsess_defunct == 0) - printf("nfsrpc_setclient: " - "nfsess_defunct not set\n"); + tsep->nfsess_defunct = 1; } TAILQ_INSERT_HEAD(&nmp->nm_sess, dsp, nfsclds_list);