Received: by 2002:a05:7412:798b:b0:fc:a2b0:25d7 with SMTP id fb11csp481554rdb; Thu, 22 Feb 2024 09:26:44 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVK/Cdq5ubid+WXh9LjIb3Kqm2lCojsguajd4WvVZjL2hq9uv0hFFWvI/KxoNcuF+ZMyEGtWtjehWiMCPdS7jJNVOObapDlEqNRg3IMkQ== X-Google-Smtp-Source: AGHT+IHPaimGMBf7pJ8VvQqwO/grwnSypPRJ1PyDFbMsMlcVNrbMsIGlEOi4z83izO9Z2QbYleWi X-Received: by 2002:a25:8489:0:b0:dc6:ff12:1a21 with SMTP id v9-20020a258489000000b00dc6ff121a21mr2882322ybk.31.1708622804218; Thu, 22 Feb 2024 09:26:44 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708622804; cv=pass; d=google.com; s=arc-20160816; b=G+fX1+RSZ36srIz9gkdr/GZLoiIlz06t7hSvv0cy7ui8Oljsxgmx+44rKNLW33vGXj ONCg1dlMdGBMXSt2qDkRX0ndr/FAU2OmNokM8gUYRhGu5ZNETcxPosUUU9lbdva8TEce Q7sAJgj3GhqhARje0nKzXYN6qltgELC2lAhnaP+r3SeEDub1PuqngJl39Y5pAufolTT3 77LZinQlfWZuKyAD5ZTE28ludANCRGvE4lYfd5kz/icf6O9S2z8okryKSxmMSWEt7DiW Sekr/4WvX2vHk8QaYXN0QypMD8wSfS8VzHpQykvWykXd5LS4wJAwH5DA/rgPq/kxMxnK TlCg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:subject:cc:to:from :date; bh=JQzbn7xzG9vyIrXjqT8JJu/dSr69psZEimdyab8GYzw=; fh=Q/2QU5q+soC3VXa/rDMcC8Bbnb8VHWr0mNjz0iQ4fvY=; b=reuDn+ZMEbMqwRrYyzE7U1979I/X4GiHzvWuqUGcNt/IV2Ui+t5p3sZaC849JOe/FN QTgqQDMMScAogChwY442VRV1J+4GswKrOxKwi165A85ejVGgzSJWIPrVZNt06tuuEUjz cx/3MyHHwhxMoc/ms+LWwjT9T93sXWdOf3WM+lk/YELjs7178tD82L488ZEJmrhY6WLR Vk+/6vxt+HJsXrBHet+DXJiv/xR5ERAcCgl9FNj7wkenFufUkO4FtDsXusCM71L64CQm MnGox9HISEjdhVCpZZBSSjYeMdMu3GZG58lNrvvKQtFom1wzt0ZQ7hqbreM783tNAcjn ZE4w==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of linux-nfs+bounces-2051-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-nfs+bounces-2051-linux.lists.archive=gmail.com@vger.kernel.org" Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id b15-20020a05620a126f00b0078732f4e6basi13132404qkl.558.2024.02.22.09.26.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 09:26:44 -0800 (PST) Received-SPF: pass (google.com: domain of linux-nfs+bounces-2051-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of linux-nfs+bounces-2051-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-nfs+bounces-2051-linux.lists.archive=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id EC8AC1C23EA4 for ; Thu, 22 Feb 2024 17:26:43 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 38F20154C17; Thu, 22 Feb 2024 17:26:40 +0000 (UTC) X-Original-To: linux-nfs@vger.kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 18D891482EA; Thu, 22 Feb 2024 17:26:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708622800; cv=none; b=Kp8EmxvN0lVhsR10hKOvYE98GvOgln+0sIc6UsRGI7G4UzxLD/pgDs5fskObtQZvgHfN2YJcE5/voSn98RxRyF55yLQPlyBYmHoH4m0+YiyuuosD4qbSFlytsKjnlGhrmcUmI2yX+mYbzFl8AVrrG4tJwvNez1/Y/xybVU3DUUU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708622800; c=relaxed/simple; bh=6g0prWZ7Mq8U3GlrMjmMcSvysWHUsBuonuNf4FT0a8Y=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=bFvMRJP38UBKezeFjz5vsHDykBSnOAvmHlEz/JPQ9jvpJYi/hSXyPOsiXcffGUkUK1A67bsvJjBasxmcy3QJ0KGRs+eBGOU5cad+Y22fAXfWO1s8EU7d6kP7OnaJwRiQ8Jw3lz3YTpvXXyqMkdsG0Rf9ZaGSpcu5P4K+kBCve84= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id A6111C433C7; Thu, 22 Feb 2024 17:26:38 +0000 (UTC) Date: Thu, 22 Feb 2024 12:28:28 -0500 From: Steven Rostedt To: LKML , Linux Trace Kernel Cc: linux-nfs@vger.kernel.org, Chuck Lever , Jeff Layton , Neil Brown , Olga Kornievskaia , Dai Ngo , Tom Talpey Subject: [PATCH] NFSD: Fix nfsd_clid_class use of __string_len() macro Message-ID: <20240222122828.3d8d213c@gandalf.local.home> X-Mailer: Claws Mail 3.19.1 (GTK+ 2.24.33; x86_64-pc-linux-gnu) Precedence: bulk X-Mailing-List: linux-nfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit From: "Steven Rostedt (Google)" I'm working on restructuring the __string* macros so that it doesn't need to recalculate the string twice. That is, it will save it off when processing __string() and the __assign_str() will not need to do the work again as it currently does. Currently __string_len(item, src, len) doesn't actually use "src", but my changes will require src to be correct as that is where the __assign_str() will get its value from. The event class nfsd_clid_class has: __string_len(name, name, clp->cl_name.len) But the second "name" does not exist and causes my changes to fail to build. That second parameter should be: clp->cl_name.data. Fixes: d27b74a8675ca ("NFSD: Use new __string_len C macros for nfsd_clid_class") Signed-off-by: Steven Rostedt (Google) --- fs/nfsd/trace.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/nfsd/trace.h b/fs/nfsd/trace.h index d1e8cf079b0f..2cd57033791f 100644 --- a/fs/nfsd/trace.h +++ b/fs/nfsd/trace.h @@ -843,7 +843,7 @@ DECLARE_EVENT_CLASS(nfsd_clid_class, __array(unsigned char, addr, sizeof(struct sockaddr_in6)) __field(unsigned long, flavor) __array(unsigned char, verifier, NFS4_VERIFIER_SIZE) - __string_len(name, name, clp->cl_name.len) + __string_len(name, clp->cl_name.data, clp->cl_name.len) ), TP_fast_assign( __entry->cl_boot = clp->cl_clientid.cl_boot; -- 2.43.0