| Message ID | 3282508.1630445914@warthog.procyon.org.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [GIT,PULL] fscache: Fixes and rewrite preparation | expand |
The pull request you sent on Tue, 31 Aug 2021 22:38:34 +0100:
> git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git tags/fscache-next-20210829
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/89594c746b00d3755e0792a2407f0b557a30ef37
Thank you!
Hi Linus, Can you pull these changes please? They perform some preparatory work for the fscache rewrite that's being worked on and fix some bugs. These include: (1) Always select netfs stats when enabling fscache stats since they're displayed through the same procfile. (2) Add a cookie debug ID that can be used in tracepoints instead of a pointer and cache it in the netfs_cache_resources struct rather than in the netfs_read_request struct to make it more available. (3) Use file_inode() in cachefiles rather than dereferencing file->f_inode directly. (4) Provide a procfile to display fscache cookies. (5) Remove the fscache and cachefiles histogram procfiles. (6) Remove the fscache object list procfile. (7) Avoid using %p in fscache and cachefiles as the value is hashed and not comparable to the register dump in an oops trace. (8) Fix the cookie hash function to actually achieve useful dispersion. (9) Fix fscache_cookie_put() so that it doesn't dereference the cookie pointer in the tracepoint after the refcount has been decremented (we're only allowed to do that if we decremented it to zero). (10) Use refcount_t rather than atomic_t for the fscache_cookie refcount. Some of these patches have been posted before as part of a larger patchset that effected almost the whole rewrite[1]. Changes ======= ver #2: - Fix a NULL pointer ref in a tracepoint (that patch reposted here [2]). David Link: https://lore.kernel.org/r/162431188431.2908479.14031376932042135080.stgit@warthog.procyon.org.uk/ # v1 Link: https://lore.kernel.org/r/160588455242.3465195.3214733858273019178.stgit@warthog.procyon.org.uk/ [1] Link: https://lore.kernel.org/r/2512396.1630067489@warthog.procyon.org.uk/ [2] --- The following changes since commit e73f0f0ee7541171d89f2e2491130c7771ba58d3: Linux 5.14-rc1 (2021-07-11 15:07:40 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git tags/fscache-next-20210829 for you to fetch changes up to 20ec197bfa13c5b799fc9527790ea7b5374fc8f2: fscache: Use refcount_t for the cookie refcount instead of atomic_t (2021-08-27 13:34:03 +0100) ---------------------------------------------------------------- fscache changes and fixes ---------------------------------------------------------------- David Howells (12): fscache: Select netfs stats if fscache stats are enabled netfs: Move cookie debug ID to struct netfs_cache_resources cachefiles: Use file_inode() rather than accessing ->f_inode fscache: Add a cookie debug ID and use that in traces fscache: Procfile to display cookies fscache, cachefiles: Remove the histogram stuff fscache: Remove the object list procfile fscache: Change %p in format strings to something else cachefiles: Change %p in format strings to something else fscache: Fix cookie key hashing fscache: Fix fscache_cookie_put() to not deref after dec fscache: Use refcount_t for the cookie refcount instead of atomic_t fs/cachefiles/Kconfig | 19 -- fs/cachefiles/Makefile | 2 - fs/cachefiles/bind.c | 2 - fs/cachefiles/interface.c | 6 +- fs/cachefiles/internal.h | 25 --- fs/cachefiles/io.c | 6 +- fs/cachefiles/key.c | 2 +- fs/cachefiles/main.c | 7 - fs/cachefiles/namei.c | 61 ++---- fs/cachefiles/proc.c | 114 ----------- fs/cachefiles/xattr.c | 4 +- fs/fscache/Kconfig | 25 +-- fs/fscache/Makefile | 2 - fs/fscache/cache.c | 11 +- fs/fscache/cookie.c | 201 +++++++++++++----- fs/fscache/fsdef.c | 3 +- fs/fscache/histogram.c | 87 -------- fs/fscache/internal.h | 57 ++---- fs/fscache/main.c | 39 ++++ fs/fscache/netfs.c | 2 +- fs/fscache/object-list.c | 414 -------------------------------------- fs/fscache/object.c | 8 - fs/fscache/operation.c | 3 - fs/fscache/page.c | 6 - fs/fscache/proc.c | 20 +- include/linux/fscache-cache.h | 4 - include/linux/fscache.h | 4 +- include/linux/netfs.h | 2 +- include/trace/events/cachefiles.h | 68 +++---- include/trace/events/fscache.h | 160 +++++++-------- include/trace/events/netfs.h | 2 +- 31 files changed, 368 insertions(+), 998 deletions(-) delete mode 100644 fs/cachefiles/proc.c delete mode 100644 fs/fscache/histogram.c delete mode 100644 fs/fscache/object-list.c