Received: by 2002:a05:7412:d8a:b0:e2:908c:2ebd with SMTP id b10csp918947rdg; Fri, 13 Oct 2023 05:22:34 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEZ7bxo4/TOLv9YsB3nWgGGeKOreEyhWQuOX6DS2nPc50EypL9GeZ95yvWZ9wduCbz9/w9Z X-Received: by 2002:a17:902:ab45:b0:1c9:cf26:8d91 with SMTP id ij5-20020a170902ab4500b001c9cf268d91mr7133229plb.8.1697199753915; Fri, 13 Oct 2023 05:22:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697199753; cv=none; d=google.com; s=arc-20160816; b=hmM31sgCST4ByR/8o3oWKSuVNa1T4A8YgryH7uj/VcRaBFgisH0pYlIYD50zMOPS4h kXwUNNXCcbq408shVSLwOj+BjpsLQwW/WXuLN3fOkURKESeCJaMeISZOCdrhta5qge8j G89MT1qRiZuxlyFBkHYZMYkViNhndeNIBSYNM3Xom0qoF6rZwHNqAaVHl29HqX5UICVY AhWPbrp3SpyscDvaFol2Y7jiPTFRadmrwVkYm08A1abRUEors+/asztsEuvojG24C3lZ yGlNw81BBI0eYHGTBS3aIcHg/8TZlMNj4uYTG0NgpEgj7quXjvK5UmIXHGGpjNfANbmm hOcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:message-id:date:cc:to:from:subject:dkim-signature; bh=DWEqCEbn0UzByabjgkB/enBlf8IVExqxJFXxu/WEyYg=; fh=v8a13lpFSZWlL4AptTEJnmXnlqoWXhGCGCgvrcnCT9I=; b=l4tx7QEIjcjGNjKf6L4jR8N+AAjNY72GqrZ25JmGv4rMY6htm62zdcIlkYv1gvyvib xsa/sCtYr/HOpHGCnCD3mUp2LqrX5D4FZGSMEvDmsT1DHZp6ZL31yusJipfJfVIneYCZ yJeVjcQ4G9qPZDpyclUJN/zS2DHM4/dB6tmZ+NvIjp8zLAzamfvJwRIpQZOTwV67PGkX ulU6dI7KKlbBuT/97O+82lIWkP2vlClgycSPy4lD9/+JgW0CupyDh5pWG+RGpRrZC3rB FOlV6BvUU/EqUQaSQY7YYX+Q3I2vKpANv+kN12pPO9kMOFTJlUF97NhYXR5P2G6Iu9im UCzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=StWwC2NW; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id z7-20020a170902708700b001b8a67f1c10si4071406plk.468.2023.10.13.05.22.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Oct 2023 05:22:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=StWwC2NW; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 0CE4A81DD265; Fri, 13 Oct 2023 05:22:30 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231598AbjJMMW2 (ORCPT + 99 others); Fri, 13 Oct 2023 08:22:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58192 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231376AbjJMMW2 (ORCPT ); Fri, 13 Oct 2023 08:22:28 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 231A3CC for ; Fri, 13 Oct 2023 05:22:27 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6E990C433C9; Fri, 13 Oct 2023 12:22:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1697199746; bh=5ieBfpexugpxeu6obseg8XR8H+4XnON/7uNfVF/VKbk=; h=Subject:From:To:Cc:Date:From; b=StWwC2NWuopW0LuEK0guqGpt7O+Cy6NZIX6Dw4Jop9AbAy2TB3eAMracjA2jVdROl 0kaFawa3VB0nUw4wUdaNGZ7LDM/wNGNIruh2gLfxeMH9d/2GafaEEawqqvKMY/Wks9 ehnpsn2uWWRJP5dBWr7TupvR1v/nauKVSn8bfCRFMznfTMtRwpfTEm6M+t+YS3RjtW AfQT4HkJFn3EhiwLsmOzOreH5deRlypOih0kpdlJZkaEPI29ZCMmTtJQvvjPbAbjMt z7X3KJtI73Zep46MVGP688Ux11iQ0cU+d3n5zsM9opZFI1855Qck70+BKnK96/8PD+ oVsmN5k+GXSAA== Subject: [PATCH] svcrdma: Fix tracepoint printk format From: Chuck Lever To: linux-nfs@vger.kernel.org Cc: Chuck Lever Date: Fri, 13 Oct 2023 08:22:24 -0400 Message-ID: <169719969566.6999.18083178189502993580.stgit@oracle-102.nfsv4bat.org> User-Agent: StGit/1.5 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Fri, 13 Oct 2023 05:22:30 -0700 (PDT) From: Chuck Lever Other tracepoints use "cq.id=" rather than "cq_id=". Let's make it more reliable to grep for the CQ restracker ID. Signed-off-by: Chuck Lever --- include/trace/events/rpcrdma.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) One more trivial fix to svcrdma for 6.7. diff --git a/include/trace/events/rpcrdma.h b/include/trace/events/rpcrdma.h index f8069ef2ee0f..718df1d9b834 100644 --- a/include/trace/events/rpcrdma.h +++ b/include/trace/events/rpcrdma.h @@ -1667,7 +1667,7 @@ TRACE_EVENT(svcrdma_encode_wseg, __entry->offset = offset; ), - TP_printk("cq_id=%u cid=%d segno=%u %u@0x%016llx:0x%08x", + TP_printk("cq.id=%u cid=%d segno=%u %u@0x%016llx:0x%08x", __entry->cq_id, __entry->completion_id, __entry->segno, __entry->length, (unsigned long long)__entry->offset, __entry->handle @@ -1703,7 +1703,7 @@ TRACE_EVENT(svcrdma_decode_rseg, __entry->offset = segment->rs_offset; ), - TP_printk("cq_id=%u cid=%d segno=%u position=%u %u@0x%016llx:0x%08x", + TP_printk("cq.id=%u cid=%d segno=%u position=%u %u@0x%016llx:0x%08x", __entry->cq_id, __entry->completion_id, __entry->segno, __entry->position, __entry->length, (unsigned long long)__entry->offset, __entry->handle @@ -1740,7 +1740,7 @@ TRACE_EVENT(svcrdma_decode_wseg, __entry->offset = segment->rs_offset; ), - TP_printk("cq_id=%u cid=%d segno=%u %u@0x%016llx:0x%08x", + TP_printk("cq.id=%u cid=%d segno=%u %u@0x%016llx:0x%08x", __entry->cq_id, __entry->completion_id, __entry->segno, __entry->length, (unsigned long long)__entry->offset, __entry->handle @@ -1959,7 +1959,7 @@ TRACE_EVENT(svcrdma_send_pullup, __entry->msglen = msglen; ), - TP_printk("cq_id=%u cid=%d hdr=%u msg=%u (total %u)", + TP_printk("cq.id=%u cid=%d hdr=%u msg=%u (total %u)", __entry->cq_id, __entry->completion_id, __entry->hdrlen, __entry->msglen, __entry->hdrlen + __entry->msglen) @@ -2014,7 +2014,7 @@ TRACE_EVENT(svcrdma_post_send, wr->ex.invalidate_rkey : 0; ), - TP_printk("cq_id=%u cid=%d num_sge=%u inv_rkey=0x%08x", + TP_printk("cq.id=%u cid=%d num_sge=%u inv_rkey=0x%08x", __entry->cq_id, __entry->completion_id, __entry->num_sge, __entry->inv_rkey )