mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 03:10:12 +00:00
![Tejun Heo](/assets/img/avatar_default.png)
percpu.h is included by sched.h and module.h and thus ends up being included when building most .c files. percpu.h includes slab.h which in turn includes gfp.h making everything defined by the two files universally available and complicating inclusion dependencies. percpu.h -> slab.h dependency is about to be removed. Prepare for this change by updating users of gfp and slab facilities include those headers directly instead of assuming availability. As this conversion needs to touch large number of source files, the following script is used as the basis of conversion. http://userweb.kernel.org/~tj/misc/slabh-sweep.py The script does the followings. * Scan files for gfp and slab usages and update includes such that only the necessary includes are there. ie. if only gfp is used, gfp.h, if slab is used, slab.h. * When the script inserts a new include, it looks at the include blocks and try to put the new include such that its order conforms to its surrounding. It's put in the include block which contains core kernel includes, in the same order that the rest are ordered - alphabetical, Christmas tree, rev-Xmas-tree or at the end if there doesn't seem to be any matching order. * If the script can't find a place to put a new include (mostly because the file doesn't have fitting include block), it prints out an error message indicating which .h file needs to be added to the file. The conversion was done in the following steps. 1. The initial automatic conversion of all .c files updated slightly over 4000 files, deleting around 700 includes and adding ~480 gfp.h and ~3000 slab.h inclusions. The script emitted errors for ~400 files. 2. Each error was manually checked. Some didn't need the inclusion, some needed manual addition while adding it to implementation .h or embedding .c file was more appropriate for others. This step added inclusions to around 150 files. 3. The script was run again and the output was compared to the edits from #2 to make sure no file was left behind. 4. Several build tests were done and a couple of problems were fixed. e.g. lib/decompress_*.c used malloc/free() wrappers around slab APIs requiring slab.h to be added manually. 5. The script was run on all .h files but without automatically editing them as sprinkling gfp.h and slab.h inclusions around .h files could easily lead to inclusion dependency hell. Most gfp.h inclusion directives were ignored as stuff from gfp.h was usually wildly available and often used in preprocessor macros. Each slab.h inclusion directive was examined and added manually as necessary. 6. percpu.h was updated not to include slab.h. 7. Build test were done on the following configurations and failures were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my distributed build env didn't work with gcov compiles) and a few more options had to be turned off depending on archs to make things build (like ipr on powerpc/64 which failed due to missing writeq). * x86 and x86_64 UP and SMP allmodconfig and a custom test config. * powerpc and powerpc64 SMP allmodconfig * sparc and sparc64 SMP allmodconfig * ia64 SMP allmodconfig * s390 SMP allmodconfig * alpha SMP allmodconfig * um on x86_64 SMP allmodconfig 8. percpu.h modifications were reverted so that it could be applied as a separate patch and serve as bisection point. Given the fact that I had only a couple of failures from tests on step 6, I'm fairly confident about the coverage of this conversion patch. If there is a breakage, it's likely to be something in one of the arch headers which should be easily discoverable easily on most builds of the specific arch. Signed-off-by: Tejun Heo <tj@kernel.org> Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
402 lines
11 KiB
C
402 lines
11 KiB
C
/* AFS caching stuff
|
|
*
|
|
* Copyright (C) 2008 Red Hat, Inc. All Rights Reserved.
|
|
* Written by David Howells (dhowells@redhat.com)
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version
|
|
* 2 of the License, or (at your option) any later version.
|
|
*/
|
|
|
|
#include <linux/sched.h>
|
|
#include "internal.h"
|
|
|
|
static uint16_t afs_cell_cache_get_key(const void *cookie_netfs_data,
|
|
void *buffer, uint16_t buflen);
|
|
static uint16_t afs_cell_cache_get_aux(const void *cookie_netfs_data,
|
|
void *buffer, uint16_t buflen);
|
|
static enum fscache_checkaux afs_cell_cache_check_aux(void *cookie_netfs_data,
|
|
const void *buffer,
|
|
uint16_t buflen);
|
|
|
|
static uint16_t afs_vlocation_cache_get_key(const void *cookie_netfs_data,
|
|
void *buffer, uint16_t buflen);
|
|
static uint16_t afs_vlocation_cache_get_aux(const void *cookie_netfs_data,
|
|
void *buffer, uint16_t buflen);
|
|
static enum fscache_checkaux afs_vlocation_cache_check_aux(
|
|
void *cookie_netfs_data, const void *buffer, uint16_t buflen);
|
|
|
|
static uint16_t afs_volume_cache_get_key(const void *cookie_netfs_data,
|
|
void *buffer, uint16_t buflen);
|
|
|
|
static uint16_t afs_vnode_cache_get_key(const void *cookie_netfs_data,
|
|
void *buffer, uint16_t buflen);
|
|
static void afs_vnode_cache_get_attr(const void *cookie_netfs_data,
|
|
uint64_t *size);
|
|
static uint16_t afs_vnode_cache_get_aux(const void *cookie_netfs_data,
|
|
void *buffer, uint16_t buflen);
|
|
static enum fscache_checkaux afs_vnode_cache_check_aux(void *cookie_netfs_data,
|
|
const void *buffer,
|
|
uint16_t buflen);
|
|
static void afs_vnode_cache_now_uncached(void *cookie_netfs_data);
|
|
|
|
struct fscache_netfs afs_cache_netfs = {
|
|
.name = "afs",
|
|
.version = 0,
|
|
};
|
|
|
|
struct fscache_cookie_def afs_cell_cache_index_def = {
|
|
.name = "AFS.cell",
|
|
.type = FSCACHE_COOKIE_TYPE_INDEX,
|
|
.get_key = afs_cell_cache_get_key,
|
|
.get_aux = afs_cell_cache_get_aux,
|
|
.check_aux = afs_cell_cache_check_aux,
|
|
};
|
|
|
|
struct fscache_cookie_def afs_vlocation_cache_index_def = {
|
|
.name = "AFS.vldb",
|
|
.type = FSCACHE_COOKIE_TYPE_INDEX,
|
|
.get_key = afs_vlocation_cache_get_key,
|
|
.get_aux = afs_vlocation_cache_get_aux,
|
|
.check_aux = afs_vlocation_cache_check_aux,
|
|
};
|
|
|
|
struct fscache_cookie_def afs_volume_cache_index_def = {
|
|
.name = "AFS.volume",
|
|
.type = FSCACHE_COOKIE_TYPE_INDEX,
|
|
.get_key = afs_volume_cache_get_key,
|
|
};
|
|
|
|
struct fscache_cookie_def afs_vnode_cache_index_def = {
|
|
.name = "AFS.vnode",
|
|
.type = FSCACHE_COOKIE_TYPE_DATAFILE,
|
|
.get_key = afs_vnode_cache_get_key,
|
|
.get_attr = afs_vnode_cache_get_attr,
|
|
.get_aux = afs_vnode_cache_get_aux,
|
|
.check_aux = afs_vnode_cache_check_aux,
|
|
.now_uncached = afs_vnode_cache_now_uncached,
|
|
};
|
|
|
|
/*
|
|
* set the key for the index entry
|
|
*/
|
|
static uint16_t afs_cell_cache_get_key(const void *cookie_netfs_data,
|
|
void *buffer, uint16_t bufmax)
|
|
{
|
|
const struct afs_cell *cell = cookie_netfs_data;
|
|
uint16_t klen;
|
|
|
|
_enter("%p,%p,%u", cell, buffer, bufmax);
|
|
|
|
klen = strlen(cell->name);
|
|
if (klen > bufmax)
|
|
return 0;
|
|
|
|
memcpy(buffer, cell->name, klen);
|
|
return klen;
|
|
}
|
|
|
|
/*
|
|
* provide new auxilliary cache data
|
|
*/
|
|
static uint16_t afs_cell_cache_get_aux(const void *cookie_netfs_data,
|
|
void *buffer, uint16_t bufmax)
|
|
{
|
|
const struct afs_cell *cell = cookie_netfs_data;
|
|
uint16_t dlen;
|
|
|
|
_enter("%p,%p,%u", cell, buffer, bufmax);
|
|
|
|
dlen = cell->vl_naddrs * sizeof(cell->vl_addrs[0]);
|
|
dlen = min(dlen, bufmax);
|
|
dlen &= ~(sizeof(cell->vl_addrs[0]) - 1);
|
|
|
|
memcpy(buffer, cell->vl_addrs, dlen);
|
|
return dlen;
|
|
}
|
|
|
|
/*
|
|
* check that the auxilliary data indicates that the entry is still valid
|
|
*/
|
|
static enum fscache_checkaux afs_cell_cache_check_aux(void *cookie_netfs_data,
|
|
const void *buffer,
|
|
uint16_t buflen)
|
|
{
|
|
_leave(" = OKAY");
|
|
return FSCACHE_CHECKAUX_OKAY;
|
|
}
|
|
|
|
/*****************************************************************************/
|
|
/*
|
|
* set the key for the index entry
|
|
*/
|
|
static uint16_t afs_vlocation_cache_get_key(const void *cookie_netfs_data,
|
|
void *buffer, uint16_t bufmax)
|
|
{
|
|
const struct afs_vlocation *vlocation = cookie_netfs_data;
|
|
uint16_t klen;
|
|
|
|
_enter("{%s},%p,%u", vlocation->vldb.name, buffer, bufmax);
|
|
|
|
klen = strnlen(vlocation->vldb.name, sizeof(vlocation->vldb.name));
|
|
if (klen > bufmax)
|
|
return 0;
|
|
|
|
memcpy(buffer, vlocation->vldb.name, klen);
|
|
|
|
_leave(" = %u", klen);
|
|
return klen;
|
|
}
|
|
|
|
/*
|
|
* provide new auxilliary cache data
|
|
*/
|
|
static uint16_t afs_vlocation_cache_get_aux(const void *cookie_netfs_data,
|
|
void *buffer, uint16_t bufmax)
|
|
{
|
|
const struct afs_vlocation *vlocation = cookie_netfs_data;
|
|
uint16_t dlen;
|
|
|
|
_enter("{%s},%p,%u", vlocation->vldb.name, buffer, bufmax);
|
|
|
|
dlen = sizeof(struct afs_cache_vlocation);
|
|
dlen -= offsetof(struct afs_cache_vlocation, nservers);
|
|
if (dlen > bufmax)
|
|
return 0;
|
|
|
|
memcpy(buffer, (uint8_t *)&vlocation->vldb.nservers, dlen);
|
|
|
|
_leave(" = %u", dlen);
|
|
return dlen;
|
|
}
|
|
|
|
/*
|
|
* check that the auxilliary data indicates that the entry is still valid
|
|
*/
|
|
static
|
|
enum fscache_checkaux afs_vlocation_cache_check_aux(void *cookie_netfs_data,
|
|
const void *buffer,
|
|
uint16_t buflen)
|
|
{
|
|
const struct afs_cache_vlocation *cvldb;
|
|
struct afs_vlocation *vlocation = cookie_netfs_data;
|
|
uint16_t dlen;
|
|
|
|
_enter("{%s},%p,%u", vlocation->vldb.name, buffer, buflen);
|
|
|
|
/* check the size of the data is what we're expecting */
|
|
dlen = sizeof(struct afs_cache_vlocation);
|
|
dlen -= offsetof(struct afs_cache_vlocation, nservers);
|
|
if (dlen != buflen)
|
|
return FSCACHE_CHECKAUX_OBSOLETE;
|
|
|
|
cvldb = container_of(buffer, struct afs_cache_vlocation, nservers);
|
|
|
|
/* if what's on disk is more valid than what's in memory, then use the
|
|
* VL record from the cache */
|
|
if (!vlocation->valid || vlocation->vldb.rtime == cvldb->rtime) {
|
|
memcpy((uint8_t *)&vlocation->vldb.nservers, buffer, dlen);
|
|
vlocation->valid = 1;
|
|
_leave(" = SUCCESS [c->m]");
|
|
return FSCACHE_CHECKAUX_OKAY;
|
|
}
|
|
|
|
/* need to update the cache if the cached info differs */
|
|
if (memcmp(&vlocation->vldb, buffer, dlen) != 0) {
|
|
/* delete if the volume IDs for this name differ */
|
|
if (memcmp(&vlocation->vldb.vid, &cvldb->vid,
|
|
sizeof(cvldb->vid)) != 0
|
|
) {
|
|
_leave(" = OBSOLETE");
|
|
return FSCACHE_CHECKAUX_OBSOLETE;
|
|
}
|
|
|
|
_leave(" = UPDATE");
|
|
return FSCACHE_CHECKAUX_NEEDS_UPDATE;
|
|
}
|
|
|
|
_leave(" = OKAY");
|
|
return FSCACHE_CHECKAUX_OKAY;
|
|
}
|
|
|
|
/*****************************************************************************/
|
|
/*
|
|
* set the key for the volume index entry
|
|
*/
|
|
static uint16_t afs_volume_cache_get_key(const void *cookie_netfs_data,
|
|
void *buffer, uint16_t bufmax)
|
|
{
|
|
const struct afs_volume *volume = cookie_netfs_data;
|
|
uint16_t klen;
|
|
|
|
_enter("{%u},%p,%u", volume->type, buffer, bufmax);
|
|
|
|
klen = sizeof(volume->type);
|
|
if (klen > bufmax)
|
|
return 0;
|
|
|
|
memcpy(buffer, &volume->type, sizeof(volume->type));
|
|
|
|
_leave(" = %u", klen);
|
|
return klen;
|
|
|
|
}
|
|
|
|
/*****************************************************************************/
|
|
/*
|
|
* set the key for the index entry
|
|
*/
|
|
static uint16_t afs_vnode_cache_get_key(const void *cookie_netfs_data,
|
|
void *buffer, uint16_t bufmax)
|
|
{
|
|
const struct afs_vnode *vnode = cookie_netfs_data;
|
|
uint16_t klen;
|
|
|
|
_enter("{%x,%x,%llx},%p,%u",
|
|
vnode->fid.vnode, vnode->fid.unique, vnode->status.data_version,
|
|
buffer, bufmax);
|
|
|
|
klen = sizeof(vnode->fid.vnode);
|
|
if (klen > bufmax)
|
|
return 0;
|
|
|
|
memcpy(buffer, &vnode->fid.vnode, sizeof(vnode->fid.vnode));
|
|
|
|
_leave(" = %u", klen);
|
|
return klen;
|
|
}
|
|
|
|
/*
|
|
* provide updated file attributes
|
|
*/
|
|
static void afs_vnode_cache_get_attr(const void *cookie_netfs_data,
|
|
uint64_t *size)
|
|
{
|
|
const struct afs_vnode *vnode = cookie_netfs_data;
|
|
|
|
_enter("{%x,%x,%llx},",
|
|
vnode->fid.vnode, vnode->fid.unique,
|
|
vnode->status.data_version);
|
|
|
|
*size = vnode->status.size;
|
|
}
|
|
|
|
/*
|
|
* provide new auxilliary cache data
|
|
*/
|
|
static uint16_t afs_vnode_cache_get_aux(const void *cookie_netfs_data,
|
|
void *buffer, uint16_t bufmax)
|
|
{
|
|
const struct afs_vnode *vnode = cookie_netfs_data;
|
|
uint16_t dlen;
|
|
|
|
_enter("{%x,%x,%Lx},%p,%u",
|
|
vnode->fid.vnode, vnode->fid.unique, vnode->status.data_version,
|
|
buffer, bufmax);
|
|
|
|
dlen = sizeof(vnode->fid.unique) + sizeof(vnode->status.data_version);
|
|
if (dlen > bufmax)
|
|
return 0;
|
|
|
|
memcpy(buffer, &vnode->fid.unique, sizeof(vnode->fid.unique));
|
|
buffer += sizeof(vnode->fid.unique);
|
|
memcpy(buffer, &vnode->status.data_version,
|
|
sizeof(vnode->status.data_version));
|
|
|
|
_leave(" = %u", dlen);
|
|
return dlen;
|
|
}
|
|
|
|
/*
|
|
* check that the auxilliary data indicates that the entry is still valid
|
|
*/
|
|
static enum fscache_checkaux afs_vnode_cache_check_aux(void *cookie_netfs_data,
|
|
const void *buffer,
|
|
uint16_t buflen)
|
|
{
|
|
struct afs_vnode *vnode = cookie_netfs_data;
|
|
uint16_t dlen;
|
|
|
|
_enter("{%x,%x,%llx},%p,%u",
|
|
vnode->fid.vnode, vnode->fid.unique, vnode->status.data_version,
|
|
buffer, buflen);
|
|
|
|
/* check the size of the data is what we're expecting */
|
|
dlen = sizeof(vnode->fid.unique) + sizeof(vnode->status.data_version);
|
|
if (dlen != buflen) {
|
|
_leave(" = OBSOLETE [len %hx != %hx]", dlen, buflen);
|
|
return FSCACHE_CHECKAUX_OBSOLETE;
|
|
}
|
|
|
|
if (memcmp(buffer,
|
|
&vnode->fid.unique,
|
|
sizeof(vnode->fid.unique)
|
|
) != 0) {
|
|
unsigned unique;
|
|
|
|
memcpy(&unique, buffer, sizeof(unique));
|
|
|
|
_leave(" = OBSOLETE [uniq %x != %x]",
|
|
unique, vnode->fid.unique);
|
|
return FSCACHE_CHECKAUX_OBSOLETE;
|
|
}
|
|
|
|
if (memcmp(buffer + sizeof(vnode->fid.unique),
|
|
&vnode->status.data_version,
|
|
sizeof(vnode->status.data_version)
|
|
) != 0) {
|
|
afs_dataversion_t version;
|
|
|
|
memcpy(&version, buffer + sizeof(vnode->fid.unique),
|
|
sizeof(version));
|
|
|
|
_leave(" = OBSOLETE [vers %llx != %llx]",
|
|
version, vnode->status.data_version);
|
|
return FSCACHE_CHECKAUX_OBSOLETE;
|
|
}
|
|
|
|
_leave(" = SUCCESS");
|
|
return FSCACHE_CHECKAUX_OKAY;
|
|
}
|
|
|
|
/*
|
|
* indication the cookie is no longer uncached
|
|
* - this function is called when the backing store currently caching a cookie
|
|
* is removed
|
|
* - the netfs should use this to clean up any markers indicating cached pages
|
|
* - this is mandatory for any object that may have data
|
|
*/
|
|
static void afs_vnode_cache_now_uncached(void *cookie_netfs_data)
|
|
{
|
|
struct afs_vnode *vnode = cookie_netfs_data;
|
|
struct pagevec pvec;
|
|
pgoff_t first;
|
|
int loop, nr_pages;
|
|
|
|
_enter("{%x,%x,%Lx}",
|
|
vnode->fid.vnode, vnode->fid.unique, vnode->status.data_version);
|
|
|
|
pagevec_init(&pvec, 0);
|
|
first = 0;
|
|
|
|
for (;;) {
|
|
/* grab a bunch of pages to clean */
|
|
nr_pages = pagevec_lookup(&pvec, vnode->vfs_inode.i_mapping,
|
|
first,
|
|
PAGEVEC_SIZE - pagevec_count(&pvec));
|
|
if (!nr_pages)
|
|
break;
|
|
|
|
for (loop = 0; loop < nr_pages; loop++)
|
|
ClearPageFsCache(pvec.pages[loop]);
|
|
|
|
first = pvec.pages[nr_pages - 1]->index + 1;
|
|
|
|
pvec.nr = nr_pages;
|
|
pagevec_release(&pvec);
|
|
cond_resched();
|
|
}
|
|
|
|
_leave("");
|
|
}
|