From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793831770; b=IQ3/t7IY38EqhoRx/++IQoJFAV5zgXapnDNS+lZnZmPuNNSIk00hr69V6TEK5CH3DYZL 1do00bhWZTqRcYf/3Zf7x02MynnzeXpw1S+LMSYndw7TX+RU0+tfV92qwuSWfsey4+Ses DqffSTiTJps9p44f34TWj9Q3h+pZt9jFpdSWWata86vj8ILCsp7pSpeJCN1IhqRed6uZv VDfMQwM7fx8jJAm300bVCzQ7nnV9bwGn3CainyiPdbl2poL94+tqibY0iPR/UnVxiBY/w fu3iR9xEp2RzioTmEn26CnBbMZN4aHpmYbg2Ujn75rfMEGCo1Gvgsdx4hcp7QNibWTQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793831770; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=sw14OA6HNyon2a7VTZDnPB7S5N1UHAye9ff4C/FybSI=; b=Bj8bHVyjNyovSJzSS3ipQu6pMWZLzurUF3674czYPxkKsVWfbvTMkMotAHK4jIIvgbu9 DZq5SRnnmNLtQLJ/uh7hJNs3Fla/2bmJnNVTsbwo0J2qUidaa3ABgy8VpzvO2EOjmu0Os jdmf0uzK9oQ2MCmJ5PzmI0vvr5CRm0wjv+HLu84f42hR0GhTXzrXUFuDyFwXQn4OLsKQC H0P9cL3AOucEOwyPBzsg1HXKoL/mQIXqOmO0AZG5USdxkrXEUZTBeUhyFGkMzUaRIQT9e ih0O9woHrmTVtbopd82I0gUteB3hzld/LaUiPAmhc7+P6AZpXLZiy8Cug2vFtsEdvvA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=GbjOpBs9; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8DDDA606A31B; Wed, 4 Nov 2026 22:36:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key, unprotected) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=GbjOpBs9 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2C53A1F000C1; Wed, 4 Nov 2026 22:36:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1793831770; bh=sw14OA6HNyon2a7VTZDnPB7S5N1UHAye9ff4C/FybSI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=GbjOpBs9jUOignz5Q2Yps78upGpXJtYNaxLmEcdxI/mLqjwAzATZddePep8eeWR7Q TPWW8CD7SaJydqe4EeSaXebivrHOxuGb17bKp+GurIhyC7d2+5MFaOscNkjDjnfLez 1bYy7CNv2hNa/svpF22OYD9TK+Zuj/egIiEVLgtU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jeff Layton , Christoph Hellwig , Chuck Lever Subject: [PATCH 6.18 0902/1005] NFSD: Resolve the recall-any mask names in the trace format Date: Wed, 4 Nov 2026 16:10:35 -0500 Message-ID: <20261104211108.458144635@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261104211043.516122098@linuxfoundation.org> References: <20261104211043.516122098@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Chuck Lever commit c563a1f0679566d7d586802e5346591d0af8da78 upstream. RCA4_TYPE_MASK_* are enum constants, so the preprocessor cannot fold them into the print format that show_rca_mask() builds for the nfsd_cb_recall_any event. Nothing declares an eval map for them either, so trace_event_eval_update() has no substitution to apply at module load, and the event's format file ships the enumerator names verbatim. trace-cmd and perf cannot decode the bmval0 field. Declare the eval maps for the nine mask bits show_rca_mask() decodes. The format then carries the shift counts as integers, the same shape the SUNRPC trace points already emit from their BIT() flag decoders. Fixes: 638593be55c0 ("NFSD: add CB_RECALL_ANY tracepoints") Cc: stable@vger.kernel.org Reviewed-by: Jeff Layton Reviewed-by: Christoph Hellwig Link: https://patch.msgid.link/20260818184151.31180-1-cel@kernel.org Signed-off-by: Chuck Lever Signed-off-by: Greg Kroah-Hartman --- include/trace/misc/nfs.h | 10 ++++++++++ 1 file changed, 10 insertions(+) --- a/include/trace/misc/nfs.h +++ b/include/trace/misc/nfs.h @@ -358,6 +358,16 @@ TRACE_DEFINE_ENUM(IOMODE_ANY); { IOMODE_RW, "RW" }, \ { IOMODE_ANY, "ANY" }) +TRACE_DEFINE_ENUM(RCA4_TYPE_MASK_RDATA_DLG); +TRACE_DEFINE_ENUM(RCA4_TYPE_MASK_WDATA_DLG); +TRACE_DEFINE_ENUM(RCA4_TYPE_MASK_DIR_DLG); +TRACE_DEFINE_ENUM(RCA4_TYPE_MASK_FILE_LAYOUT); +TRACE_DEFINE_ENUM(RCA4_TYPE_MASK_BLK_LAYOUT); +TRACE_DEFINE_ENUM(RCA4_TYPE_MASK_OBJ_LAYOUT_MIN); +TRACE_DEFINE_ENUM(RCA4_TYPE_MASK_OBJ_LAYOUT_MAX); +TRACE_DEFINE_ENUM(RCA4_TYPE_MASK_OTHER_LAYOUT_MIN); +TRACE_DEFINE_ENUM(RCA4_TYPE_MASK_OTHER_LAYOUT_MAX); + #define show_rca_mask(x) \ __print_flags(x, "|", \ { BIT(RCA4_TYPE_MASK_RDATA_DLG), "RDATA_DLG" }, \