From patchwork Tue Oct 10 17:31:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9996819 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DA242603B5 for ; Tue, 10 Oct 2017 17:31:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C8E7D28706 for ; Tue, 10 Oct 2017 17:31:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BC28A28714; Tue, 10 Oct 2017 17:31:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0CC6128706 for ; Tue, 10 Oct 2017 17:31:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756555AbdJJRbt (ORCPT ); Tue, 10 Oct 2017 13:31:49 -0400 Received: from mail-it0-f67.google.com ([209.85.214.67]:45516 "EHLO mail-it0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756553AbdJJRbs (ORCPT ); Tue, 10 Oct 2017 13:31:48 -0400 Received: by mail-it0-f67.google.com with SMTP id n195so3014364itg.0 for ; Tue, 10 Oct 2017 10:31:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=TQg22AON/j4wRZwlC5KCZxipdTE6+1bLNjfCb2IUssA=; b=h9Z8VRd7Ocmpl3CCu9x9QLR0hS5n4YtbsapoUGRaFpKZgdVBe9xgsOFSRqbqJfFymr WKtdZ1sYuiR4r/eUxNePK4e0IPHZjAKs/vMGIW9c02kvkrGAT2/a2cvZd2nHUlciX+Pm oq6/0Qpou8KxxBOPF1gc63bDnoiCiMtPHresebPqrvFouuwJ+xlIWVCwVgw9hza1s5Oh 4EmgKrmgRI39xekG6ClH37wIhpvlbZZK9dF9d89rAnq177LrdJqYW+ujzdOUC+VDlyQH gStFo+dOQwaE2c5Z1JPazJuXhO91jMHGC6qpUQaKl5J7+jrXlSsx1GNJpZuifh/u+vXk H0/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=TQg22AON/j4wRZwlC5KCZxipdTE6+1bLNjfCb2IUssA=; b=H8TfN9j8jvpI75oKMLDdjcoyO6pC0PyzfdAxJT5osd0JB/I0l7iGR+iRelzSe8mA4d CqdVYUrjPDsHKJa+gNdcrLQ0L9bVurGSgMN3CrtN/GmDUInBouTBCaIhqzrD4rbHc2Tl MD3nTwyz58AsIpyVv0D1U+etOUIra6nwCA9paOOl9N4MVDY5cABUaLxq4xVtiNfPLtCA +Q+nL1ozYDl2X6qdS+fB1bWgbPC/8qagKcagYuZ1oDeWlNTjedxqOoderEXtmGeJ6+2t l8bxPXetkuIevCapPt1QrMEdfCvY8LkIHBQJs7qNYnZCQjEQcpqMIM6pCWK7bvcMT6dR 0iig== X-Gm-Message-State: AMCzsaX9WHRzYsKPwnlM0CV0dv9Cx9puE9nyvL6+rIMlLo4ocVuXvbo8 pU+IdRpjxUzXBC7r22YnxQ== X-Google-Smtp-Source: AOwi7QBbJH8G7xlcha+crbMjJR8zKAR+sPd4x656Iogu5vPeR4RFzZL5/DTqIcj36HtrQFwCjC+u9g== X-Received: by 10.36.238.137 with SMTP id b131mr18322740iti.76.1507656707521; Tue, 10 Oct 2017 10:31:47 -0700 (PDT) Received: from localhost.localdomain (c-68-49-162-121.hsd1.mi.comcast.net. [68.49.162.121]) by smtp.gmail.com with ESMTPSA id c13sm4328171itd.32.2017.10.10.10.31.45 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Oct 2017 10:31:46 -0700 (PDT) From: Trond Myklebust To: bfields@redhat.com, jlayton@redhat.com Cc: linux-nfs@vger.kernel.org Subject: [PATCH 1/2] SUNRPC: Fix tracepoint storage issues with svc_recv and svc_rqst_status Date: Tue, 10 Oct 2017 13:31:42 -0400 Message-Id: <20171010173143.106492-1-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.13.6 MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP There is no guarantee that either the request or the svc_xprt exist by the time we get round to printing the trace message. Signed-off-by: Trond Myklebust --- include/trace/events/sunrpc.h | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/include/trace/events/sunrpc.h b/include/trace/events/sunrpc.h index 8a707f8a41c3..8a13e3903839 100644 --- a/include/trace/events/sunrpc.h +++ b/include/trace/events/sunrpc.h @@ -455,20 +455,22 @@ TRACE_EVENT(svc_recv, TP_ARGS(rqst, status), TP_STRUCT__entry( - __field(struct sockaddr *, addr) __field(__be32, xid) __field(int, status) __field(unsigned long, flags) + __dynamic_array(unsigned char, addr, rqst->rq_addrlen) ), TP_fast_assign( - __entry->addr = (struct sockaddr *)&rqst->rq_addr; __entry->xid = status > 0 ? rqst->rq_xid : 0; __entry->status = status; __entry->flags = rqst->rq_flags; + memcpy(__get_dynamic_array(addr), + &rqst->rq_addr, rqst->rq_addrlen); ), - TP_printk("addr=%pIScp xid=0x%x status=%d flags=%s", __entry->addr, + TP_printk("addr=%pIScp xid=0x%x status=%d flags=%s", + (struct sockaddr *)__get_dynamic_array(addr), be32_to_cpu(__entry->xid), __entry->status, show_rqstp_flags(__entry->flags)) ); @@ -513,22 +515,23 @@ DECLARE_EVENT_CLASS(svc_rqst_status, TP_ARGS(rqst, status), TP_STRUCT__entry( - __field(struct sockaddr *, addr) __field(__be32, xid) - __field(int, dropme) __field(int, status) __field(unsigned long, flags) + __dynamic_array(unsigned char, addr, rqst->rq_addrlen) ), TP_fast_assign( - __entry->addr = (struct sockaddr *)&rqst->rq_addr; __entry->xid = rqst->rq_xid; __entry->status = status; __entry->flags = rqst->rq_flags; + memcpy(__get_dynamic_array(addr), + &rqst->rq_addr, rqst->rq_addrlen); ), TP_printk("addr=%pIScp rq_xid=0x%x status=%d flags=%s", - __entry->addr, be32_to_cpu(__entry->xid), + (struct sockaddr *)__get_dynamic_array(addr), + be32_to_cpu(__entry->xid), __entry->status, show_rqstp_flags(__entry->flags)) );