diff options
| author | David Howells <dhowells@redhat.com> | 2020-10-26 13:22:47 +0000 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2020-10-29 13:53:04 +0000 |
| commit | 185f0c7073bd5c78f86265f703f5daf1306ab5a7 (patch) | |
| tree | 01355ebab583d813e1a38823473626d0eb9aa046 /include/trace/events | |
| parent | f792e3ac82fe2c6c863e93187eb7ddfccab68fa7 (diff) | |
| download | linux-stable-185f0c7073bd5c78f86265f703f5daf1306ab5a7.tar.gz linux-stable-185f0c7073bd5c78f86265f703f5daf1306ab5a7.tar.bz2 linux-stable-185f0c7073bd5c78f86265f703f5daf1306ab5a7.zip | |
afs: Wrap page->private manipulations in inline functions
The afs filesystem uses page->private to store the dirty range within a
page such that in the event of a conflicting 3rd-party write to the server,
we write back just the bits that got changed locally.
However, there are a couple of problems with this:
(1) I need a bit to note if the page might be mapped so that partial
invalidation doesn't shrink the range.
(2) There aren't necessarily sufficient bits to store the entire range of
data altered (say it's a 32-bit system with 64KiB pages or transparent
huge pages are in use).
So wrap the accesses in inline functions so that future commits can change
how this works.
Also move them out of the tracing header into the in-directory header.
There's not really any need for them to be in the tracing header.
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'include/trace/events')
| -rw-r--r-- | include/trace/events/afs.h | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/include/trace/events/afs.h b/include/trace/events/afs.h index 8eb49231c6bb..866fc67d5aa5 100644 --- a/include/trace/events/afs.h +++ b/include/trace/events/afs.h @@ -966,19 +966,6 @@ TRACE_EVENT(afs_dir_check_failed, __entry->vnode, __entry->off, __entry->i_size) ); -/* - * We use page->private to hold the amount of the page that we've written to, - * splitting the field into two parts. However, we need to represent a range - * 0...PAGE_SIZE inclusive, so we can't support 64K pages on a 32-bit system. - */ -#if PAGE_SIZE > 32768 -#define AFS_PRIV_MAX 0xffffffff -#define AFS_PRIV_SHIFT 32 -#else -#define AFS_PRIV_MAX 0xffff -#define AFS_PRIV_SHIFT 16 -#endif - TRACE_EVENT(afs_page_dirty, TP_PROTO(struct afs_vnode *vnode, const char *where, pgoff_t page, unsigned long priv), @@ -999,10 +986,10 @@ TRACE_EVENT(afs_page_dirty, __entry->priv = priv; ), - TP_printk("vn=%p %lx %s %lu-%lu", + TP_printk("vn=%p %lx %s %zx-%zx", __entry->vnode, __entry->page, __entry->where, - __entry->priv & AFS_PRIV_MAX, - __entry->priv >> AFS_PRIV_SHIFT) + afs_page_dirty_from(__entry->priv), + afs_page_dirty_to(__entry->priv)) ); TRACE_EVENT(afs_call_state, |