Received: by 2002:a05:7412:d8a:b0:e2:908c:2ebd with SMTP id b10csp956526rdg; Fri, 13 Oct 2023 06:22:16 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGNLl8KSe9gDHu9JbmR3p9y914UpgU1p0HjS3CVSb7mHF0kmxMH3YWDWPE/id0JYZ1YCrY6 X-Received: by 2002:a05:6870:5ccd:b0:1e9:ce72:35e0 with SMTP id et13-20020a0568705ccd00b001e9ce7235e0mr3709333oab.0.1697203335918; Fri, 13 Oct 2023 06:22:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697203335; cv=none; d=google.com; s=arc-20160816; b=C6te8GQPry7ga0RPyuYrdf9tINm9rVFOkRJ9AFxRM9XPc6GGQuWtgvbXMVzGc2Fhe1 vARkhGYixgLD5aP8a7Pk1EcDGC04qPfd2HXwFGy/Wx9AkGrFflFky1tA+rQ0KGoSn7Yj OvkJvy0btKfQRYJfbUP6kRwC4H8Aznnp9yChBamtBZ4GWkVE4gKp2Eg04RNQmrUsahIu Bpwz6buG4VAZD/l8QGlxeYUGAnoert3APQpdBc6ZVncF9dXLq+KCSrif4PJ7VmedJj7G 0PIPYvm7OG2pZ+alOPgIPwJ+RkkdiZcux2/MBJUf3ZDtNsN2mwnjxsLCMyVW0jut1rfb pCdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=QQQE31zFpo8QatpPTAvUD2SVRPdN5cNZGFnMJG0fc5U=; fh=y0duoSpLUMMyUllwAd7xXTp0S4yOcMDX982UKgSDPR8=; b=Fh9N/rBlLX3zpsn8b1rrtdy7Nr+JES1aGYDSlbe5G/zp1alvyGyKlGG69YPXy2Mv4Y M5WYFNzCuG3F/ufAY8OUb/idVIYIaIUSaQSrj+Hrna7b52blE25d++gXWipzq1FiqI+N DRj7CfIFDZ6cl6n/6E+AYvb4AVdZftS7cibVwozq9VHAtw1loPNjzBTTAgJ4BpfR8hgn QBEV5+bOWf1OxH5xMhlHOPN7wYYM07verKdKKlIgi8O/1b+kNI+B6ncmvW26Cl/9aOYQ 9R6nJeMXhJ8Q3RCPPFcFFNJjH9O14p2qvgI1H71JCOqiKxaELjFEKp6NWBlOLk2BymV3 6IUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=WhHD85Ke; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id bv130-20020a632e88000000b005775e17f552si4458081pgb.249.2023.10.13.06.22.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Oct 2023 06:22:15 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=WhHD85Ke; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id C1D70805A907; Fri, 13 Oct 2023 06:22:04 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231948AbjJMNWD (ORCPT + 99 others); Fri, 13 Oct 2023 09:22:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36258 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231892AbjJMNWC (ORCPT ); Fri, 13 Oct 2023 09:22:02 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AAF22BE for ; Fri, 13 Oct 2023 06:21:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697203276; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=QQQE31zFpo8QatpPTAvUD2SVRPdN5cNZGFnMJG0fc5U=; b=WhHD85KeUJ7d2LjzJWrU0kcC6O48N8XyLNg+dtcVjiaJjA5PFxF0Bs/VPicaJom7ggpaYw kbzJuvw4rou8K/jtoNbvMfOjm20HyoAr/S4ShUwBYL4MMkLB7H7T4+0pyKcxyTv2dyrQew kZadvU0olZ4ERyEcvthRf9gLRmgRaXs= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-315-BZaXNoJEPxq5fxXbi_-ttQ-1; Fri, 13 Oct 2023 09:21:05 -0400 X-MC-Unique: BZaXNoJEPxq5fxXbi_-ttQ-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E20193C170B3; Fri, 13 Oct 2023 13:21:04 +0000 (UTC) Received: from [10.22.32.24] (unknown [10.22.32.24]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C4E0620296DB; Fri, 13 Oct 2023 13:21:04 +0000 (UTC) From: Benjamin Coddington To: Chuck Lever Cc: linux-nfs@vger.kernel.org, Chuck Lever Subject: Re: [PATCH] svcrdma: Fix tracepoint printk format Date: Fri, 13 Oct 2023 09:21:04 -0400 Message-ID: <26C93D24-5CC6-44CD-9825-17D7D46A64FC@redhat.com> In-Reply-To: <169719969566.6999.18083178189502993580.stgit@oracle-102.nfsv4bat.org> References: <169719969566.6999.18083178189502993580.stgit@oracle-102.nfsv4bat.org> MIME-Version: 1.0 Content-Type: text/plain X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, 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 pete.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 (pete.vger.email [0.0.0.0]); Fri, 13 Oct 2023 06:22:05 -0700 (PDT) On 13 Oct 2023, at 8:22, Chuck Lever wrote: > 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 > ) Reviewed-by: Benjamin Coddington Ben