forked from Minki/linux
874c8ca1e6
While randstruct was satisfied with using an open-coded "void *" offset
cast for the netfs_i_context <-> inode casting, __builtin_object_size() as
used by FORTIFY_SOURCE was not as easily fooled. This was causing the
following complaint[1] from gcc v12:
In file included from include/linux/string.h:253,
from include/linux/ceph/ceph_debug.h:7,
from fs/ceph/inode.c:2:
In function 'fortify_memset_chk',
inlined from 'netfs_i_context_init' at include/linux/netfs.h:326:2,
inlined from 'ceph_alloc_inode' at fs/ceph/inode.c:463:2:
include/linux/fortify-string.h:242:25: warning: call to '__write_overflow_field' declared with attribute warning: detected write beyond size of field (1st parameter); maybe use struct_group()? [-Wattribute-warning]
242 | __write_overflow_field(p_size_field, size);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Fix this by embedding a struct inode into struct netfs_i_context (which
should perhaps be renamed to struct netfs_inode). The struct inode
vfs_inode fields are then removed from the 9p, afs, ceph and cifs inode
structs and vfs_inode is then simply changed to "netfs.inode" in those
filesystems.
Further, rename netfs_i_context to netfs_inode, get rid of the
netfs_inode() function that converted a netfs_i_context pointer to an
inode pointer (that can now be done with &ctx->inode) and rename the
netfs_i_context() function to netfs_inode() (which is now a wrapper
around container_of()).
Most of the changes were done with:
perl -p -i -e 's/vfs_inode/netfs.inode/'g \
`git grep -l 'vfs_inode' -- fs/{9p,afs,ceph,cifs}/*.[ch]`
Kees suggested doing it with a pair structure[2] and a special
declarator to insert that into the network filesystem's inode
wrapper[3], but I think it's cleaner to embed it - and then it doesn't
matter if struct randomisation reorders things.
Dave Chinner suggested using a filesystem-specific VFS_I() function in
each filesystem to convert that filesystem's own inode wrapper struct
into the VFS inode struct[4].
Version #2:
- Fix a couple of missed name changes due to a disabled cifs option.
- Rename nfs_i_context to nfs_inode
- Use "netfs" instead of "nic" as the member name in per-fs inode wrapper
structs.
[ This also undoes commit 507160f46c ("netfs: gcc-12: temporarily
disable '-Wattribute-warning' for now") that is no longer needed ]
Fixes: bc899ee1c8 ("netfs: Add a netfs inode context")
Reported-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: David Howells <dhowells@redhat.com>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Reviewed-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Xiubo Li <xiubli@redhat.com>
cc: Jonathan Corbet <corbet@lwn.net>
cc: Eric Van Hensbergen <ericvh@gmail.com>
cc: Latchesar Ionkov <lucho@ionkov.net>
cc: Dominique Martinet <asmadeus@codewreck.org>
cc: Christian Schoenebeck <linux_oss@crudebyte.com>
cc: Marc Dionne <marc.dionne@auristor.com>
cc: Ilya Dryomov <idryomov@gmail.com>
cc: Steve French <smfrench@gmail.com>
cc: William Kucharski <william.kucharski@oracle.com>
cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>
cc: Dave Chinner <david@fromorbit.com>
cc: linux-doc@vger.kernel.org
cc: v9fs-developer@lists.sourceforge.net
cc: linux-afs@lists.infradead.org
cc: ceph-devel@vger.kernel.org
cc: linux-cifs@vger.kernel.org
cc: samba-technical@lists.samba.org
cc: linux-fsdevel@vger.kernel.org
cc: linux-hardening@vger.kernel.org
Link: https://lore.kernel.org/r/d2ad3a3d7bdd794c6efb562d2f2b655fb67756b9.camel@kernel.org/ [1]
Link: https://lore.kernel.org/r/20220517210230.864239-1-keescook@chromium.org/ [2]
Link: https://lore.kernel.org/r/20220518202212.2322058-1-keescook@chromium.org/ [3]
Link: https://lore.kernel.org/r/20220524101205.GI2306852@dread.disaster.area/ [4]
Link: https://lore.kernel.org/r/165296786831.3591209.12111293034669289733.stgit@warthog.procyon.org.uk/ # v1
Link: https://lore.kernel.org/r/165305805651.4094995.7763502506786714216.stgit@warthog.procyon.org.uk # v2
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
149 lines
3.6 KiB
C
149 lines
3.6 KiB
C
/* SPDX-License-Identifier: GPL-2.0-only */
|
|
/*
|
|
* Ceph cache definitions.
|
|
*
|
|
* Copyright (C) 2013 by Adfin Solutions, Inc. All Rights Reserved.
|
|
* Written by Milosz Tanski (milosz@adfin.com)
|
|
*/
|
|
|
|
#ifndef _CEPH_CACHE_H
|
|
#define _CEPH_CACHE_H
|
|
|
|
#include <linux/netfs.h>
|
|
|
|
#ifdef CONFIG_CEPH_FSCACHE
|
|
#include <linux/fscache.h>
|
|
|
|
int ceph_fscache_register_fs(struct ceph_fs_client* fsc, struct fs_context *fc);
|
|
void ceph_fscache_unregister_fs(struct ceph_fs_client* fsc);
|
|
|
|
void ceph_fscache_register_inode_cookie(struct inode *inode);
|
|
void ceph_fscache_unregister_inode_cookie(struct ceph_inode_info* ci);
|
|
|
|
void ceph_fscache_use_cookie(struct inode *inode, bool will_modify);
|
|
void ceph_fscache_unuse_cookie(struct inode *inode, bool update);
|
|
|
|
void ceph_fscache_update(struct inode *inode);
|
|
void ceph_fscache_invalidate(struct inode *inode, bool dio_write);
|
|
|
|
static inline struct fscache_cookie *ceph_fscache_cookie(struct ceph_inode_info *ci)
|
|
{
|
|
return netfs_i_cookie(&ci->netfs.inode);
|
|
}
|
|
|
|
static inline void ceph_fscache_resize(struct inode *inode, loff_t to)
|
|
{
|
|
struct ceph_inode_info *ci = ceph_inode(inode);
|
|
struct fscache_cookie *cookie = ceph_fscache_cookie(ci);
|
|
|
|
if (cookie) {
|
|
ceph_fscache_use_cookie(inode, true);
|
|
fscache_resize_cookie(cookie, to);
|
|
ceph_fscache_unuse_cookie(inode, true);
|
|
}
|
|
}
|
|
|
|
static inline void ceph_fscache_unpin_writeback(struct inode *inode,
|
|
struct writeback_control *wbc)
|
|
{
|
|
fscache_unpin_writeback(wbc, ceph_fscache_cookie(ceph_inode(inode)));
|
|
}
|
|
|
|
static inline int ceph_fscache_dirty_folio(struct address_space *mapping,
|
|
struct folio *folio)
|
|
{
|
|
struct ceph_inode_info *ci = ceph_inode(mapping->host);
|
|
|
|
return fscache_dirty_folio(mapping, folio, ceph_fscache_cookie(ci));
|
|
}
|
|
|
|
static inline int ceph_begin_cache_operation(struct netfs_io_request *rreq)
|
|
{
|
|
struct fscache_cookie *cookie = ceph_fscache_cookie(ceph_inode(rreq->inode));
|
|
|
|
return fscache_begin_read_operation(&rreq->cache_resources, cookie);
|
|
}
|
|
|
|
static inline bool ceph_is_cache_enabled(struct inode *inode)
|
|
{
|
|
return fscache_cookie_enabled(ceph_fscache_cookie(ceph_inode(inode)));
|
|
}
|
|
|
|
static inline void ceph_fscache_note_page_release(struct inode *inode)
|
|
{
|
|
struct ceph_inode_info *ci = ceph_inode(inode);
|
|
|
|
fscache_note_page_release(ceph_fscache_cookie(ci));
|
|
}
|
|
#else /* CONFIG_CEPH_FSCACHE */
|
|
static inline int ceph_fscache_register_fs(struct ceph_fs_client* fsc,
|
|
struct fs_context *fc)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline void ceph_fscache_unregister_fs(struct ceph_fs_client* fsc)
|
|
{
|
|
}
|
|
|
|
static inline void ceph_fscache_register_inode_cookie(struct inode *inode)
|
|
{
|
|
}
|
|
|
|
static inline void ceph_fscache_unregister_inode_cookie(struct ceph_inode_info* ci)
|
|
{
|
|
}
|
|
|
|
static inline void ceph_fscache_use_cookie(struct inode *inode, bool will_modify)
|
|
{
|
|
}
|
|
|
|
static inline void ceph_fscache_unuse_cookie(struct inode *inode, bool update)
|
|
{
|
|
}
|
|
|
|
static inline void ceph_fscache_update(struct inode *inode)
|
|
{
|
|
}
|
|
|
|
static inline void ceph_fscache_invalidate(struct inode *inode, bool dio_write)
|
|
{
|
|
}
|
|
|
|
static inline struct fscache_cookie *ceph_fscache_cookie(struct ceph_inode_info *ci)
|
|
{
|
|
return NULL;
|
|
}
|
|
|
|
static inline void ceph_fscache_resize(struct inode *inode, loff_t to)
|
|
{
|
|
}
|
|
|
|
static inline void ceph_fscache_unpin_writeback(struct inode *inode,
|
|
struct writeback_control *wbc)
|
|
{
|
|
}
|
|
|
|
static inline int ceph_fscache_dirty_folio(struct address_space *mapping,
|
|
struct folio *folio)
|
|
{
|
|
return filemap_dirty_folio(mapping, folio);
|
|
}
|
|
|
|
static inline bool ceph_is_cache_enabled(struct inode *inode)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
static inline int ceph_begin_cache_operation(struct netfs_io_request *rreq)
|
|
{
|
|
return -ENOBUFS;
|
|
}
|
|
|
|
static inline void ceph_fscache_note_page_release(struct inode *inode)
|
|
{
|
|
}
|
|
#endif /* CONFIG_CEPH_FSCACHE */
|
|
|
|
#endif
|