From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759682AbcLAOTi (ORCPT ); Thu, 1 Dec 2016 09:19:38 -0500 Received: from smtprelay0030.hostedemail.com ([216.40.44.30]:40093 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755026AbcLAOTf (ORCPT ); Thu, 1 Dec 2016 09:19:35 -0500 X-Session-Marker: 726F737465647440676F6F646D69732E6F7267 X-Spam-Summary: 2,0,0,,d41d8cd98f00b204,rostedt@goodmis.org,:::::::::::::::::::::::::,RULES_HIT:41:355:379:541:599:960:973:988:989:1260:1277:1311:1313:1314:1345:1359:1437:1515:1516:1518:1534:1543:1593:1594:1711:1730:1747:1777:1792:2198:2199:2393:2553:2559:2562:2693:2897:2901:3138:3139:3140:3141:3142:3355:3622:3865:3871:3873:3874:4321:5007:6119:6261:6742:7875:7903:10004:10400:10848:10967:11026:11232:11473:11658:11914:12043:12114:12296:12438:12555:12740:12760:13439:14181:14659:14721:21080:21451:30003:30029:30054:30090:30091,0,RBL:none,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:none,Custom_rules:0:0:0,LFtime:16,LUA_SUMMARY:none X-HE-Tag: quilt50_8d777dfb5565f X-Filterd-Recvd-Size: 4526 Date: Thu, 1 Dec 2016 09:19:30 -0500 From: Steven Rostedt To: Ross Zwisler Cc: linux-kernel@vger.kernel.org, Alexander Viro , Andrew Morton , Christoph Hellwig , Dan Williams , Dave Chinner , Ingo Molnar , Jan Kara , Matthew Wilcox , linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-nvdimm@ml01.01.org Subject: Re: [PATCH v2 6/6] dax: add tracepoints to dax_pmd_insert_mapping() Message-ID: <20161201091930.2084d32c@gandalf.local.home> In-Reply-To: <1480549533-29038-7-git-send-email-ross.zwisler@linux.intel.com> References: <1480549533-29038-1-git-send-email-ross.zwisler@linux.intel.com> <1480549533-29038-7-git-send-email-ross.zwisler@linux.intel.com> X-Mailer: Claws Mail 3.14.0 (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 30 Nov 2016 16:45:33 -0700 Ross Zwisler wrote: > diff --git a/include/linux/pfn_t.h b/include/linux/pfn_t.h > index a3d90b9..033fc7b 100644 > --- a/include/linux/pfn_t.h > +++ b/include/linux/pfn_t.h > @@ -15,6 +15,12 @@ > #define PFN_DEV (1ULL << (BITS_PER_LONG_LONG - 3)) > #define PFN_MAP (1ULL << (BITS_PER_LONG_LONG - 4)) > > +#define PFN_FLAGS_TRACE \ > + { PFN_SG_CHAIN, "SG_CHAIN" }, \ > + { PFN_SG_LAST, "SG_LAST" }, \ > + { PFN_DEV, "DEV" }, \ > + { PFN_MAP, "MAP" } > + > static inline pfn_t __pfn_to_pfn_t(unsigned long pfn, u64 flags) > { > pfn_t pfn_t = { .val = pfn | (flags & PFN_FLAGS_MASK), }; > diff --git a/include/trace/events/fs_dax.h b/include/trace/events/fs_dax.h > index 9f0a455..7d0ea33 100644 > --- a/include/trace/events/fs_dax.h > +++ b/include/trace/events/fs_dax.h > @@ -104,6 +104,57 @@ DEFINE_EVENT(dax_pmd_load_hole_class, name, \ > DEFINE_PMD_LOAD_HOLE_EVENT(dax_pmd_load_hole); > DEFINE_PMD_LOAD_HOLE_EVENT(dax_pmd_load_hole_fallback); > > +DECLARE_EVENT_CLASS(dax_pmd_insert_mapping_class, > + TP_PROTO(struct inode *inode, struct vm_area_struct *vma, > + unsigned long address, int write, long length, pfn_t pfn, > + void *radix_entry), > + TP_ARGS(inode, vma, address, write, length, pfn, radix_entry), > + TP_STRUCT__entry( > + __field(dev_t, dev) > + __field(unsigned long, ino) > + __field(unsigned long, vm_flags) > + __field(unsigned long, address) > + __field(int, write) Place "write" at the end. The ring buffer is 4 byte aligned, so on archs that can access 8 bytes on 4 byte alignment, this will be packed tighter. Otherwise, you'll get 4 empty bytes after "write". -- Steve > + __field(long, length) > + __field(u64, pfn_val) > + __field(void *, radix_entry) > + ), > + TP_fast_assign( > + __entry->dev = inode->i_sb->s_dev; > + __entry->ino = inode->i_ino; > + __entry->vm_flags = vma->vm_flags; > + __entry->address = address; > + __entry->write = write; > + __entry->length = length; > + __entry->pfn_val = pfn.val; > + __entry->radix_entry = radix_entry; > + ), > + TP_printk("dev %d:%d ino %#lx %s %s address %#lx length %#lx " > + "pfn %#llx %s radix_entry %#lx", > + MAJOR(__entry->dev), > + MINOR(__entry->dev), > + __entry->ino, > + __entry->vm_flags & VM_SHARED ? "shared" : "private", > + __entry->write ? "write" : "read", > + __entry->address, > + __entry->length, > + __entry->pfn_val & ~PFN_FLAGS_MASK, > + __print_flags_u64(__entry->pfn_val & PFN_FLAGS_MASK, "|", > + PFN_FLAGS_TRACE), > + (unsigned long)__entry->radix_entry > + ) > +) > + > +#define DEFINE_PMD_INSERT_MAPPING_EVENT(name) \ > +DEFINE_EVENT(dax_pmd_insert_mapping_class, name, \ > + TP_PROTO(struct inode *inode, struct vm_area_struct *vma, \ > + unsigned long address, int write, long length, pfn_t pfn, \ > + void *radix_entry), \ > + TP_ARGS(inode, vma, address, write, length, pfn, radix_entry)) > + > +DEFINE_PMD_INSERT_MAPPING_EVENT(dax_pmd_insert_mapping); > +DEFINE_PMD_INSERT_MAPPING_EVENT(dax_pmd_insert_mapping_fallback); > + > #endif /* _TRACE_FS_DAX_H */ > > /* This part must be outside protection */