![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>
193 lines
4.2 KiB
C
193 lines
4.2 KiB
C
/* hvapi.c: Hypervisor API management.
|
|
*
|
|
* Copyright (C) 2007 David S. Miller <davem@davemloft.net>
|
|
*/
|
|
#include <linux/kernel.h>
|
|
#include <linux/module.h>
|
|
#include <linux/init.h>
|
|
|
|
#include <asm/hypervisor.h>
|
|
#include <asm/oplib.h>
|
|
|
|
/* If the hypervisor indicates that the API setting
|
|
* calls are unsupported, by returning HV_EBADTRAP or
|
|
* HV_ENOTSUPPORTED, we assume that API groups with the
|
|
* PRE_API flag set are major 1 minor 0.
|
|
*/
|
|
struct api_info {
|
|
unsigned long group;
|
|
unsigned long major;
|
|
unsigned long minor;
|
|
unsigned int refcnt;
|
|
unsigned int flags;
|
|
#define FLAG_PRE_API 0x00000001
|
|
};
|
|
|
|
static struct api_info api_table[] = {
|
|
{ .group = HV_GRP_SUN4V, .flags = FLAG_PRE_API },
|
|
{ .group = HV_GRP_CORE, .flags = FLAG_PRE_API },
|
|
{ .group = HV_GRP_INTR, },
|
|
{ .group = HV_GRP_SOFT_STATE, },
|
|
{ .group = HV_GRP_PCI, .flags = FLAG_PRE_API },
|
|
{ .group = HV_GRP_LDOM, },
|
|
{ .group = HV_GRP_SVC_CHAN, .flags = FLAG_PRE_API },
|
|
{ .group = HV_GRP_NCS, .flags = FLAG_PRE_API },
|
|
{ .group = HV_GRP_RNG, },
|
|
{ .group = HV_GRP_NIAG_PERF, .flags = FLAG_PRE_API },
|
|
{ .group = HV_GRP_FIRE_PERF, },
|
|
{ .group = HV_GRP_N2_CPU, },
|
|
{ .group = HV_GRP_NIU, },
|
|
{ .group = HV_GRP_VF_CPU, },
|
|
{ .group = HV_GRP_DIAG, .flags = FLAG_PRE_API },
|
|
};
|
|
|
|
static DEFINE_SPINLOCK(hvapi_lock);
|
|
|
|
static struct api_info *__get_info(unsigned long group)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < ARRAY_SIZE(api_table); i++) {
|
|
if (api_table[i].group == group)
|
|
return &api_table[i];
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
static void __get_ref(struct api_info *p)
|
|
{
|
|
p->refcnt++;
|
|
}
|
|
|
|
static void __put_ref(struct api_info *p)
|
|
{
|
|
if (--p->refcnt == 0) {
|
|
unsigned long ignore;
|
|
|
|
sun4v_set_version(p->group, 0, 0, &ignore);
|
|
p->major = p->minor = 0;
|
|
}
|
|
}
|
|
|
|
/* Register a hypervisor API specification. It indicates the
|
|
* API group and desired major+minor.
|
|
*
|
|
* If an existing API registration exists '0' (success) will
|
|
* be returned if it is compatible with the one being registered.
|
|
* Otherwise a negative error code will be returned.
|
|
*
|
|
* Otherwise an attempt will be made to negotiate the requested
|
|
* API group/major/minor with the hypervisor, and errors returned
|
|
* if that does not succeed.
|
|
*/
|
|
int sun4v_hvapi_register(unsigned long group, unsigned long major,
|
|
unsigned long *minor)
|
|
{
|
|
struct api_info *p;
|
|
unsigned long flags;
|
|
int ret;
|
|
|
|
spin_lock_irqsave(&hvapi_lock, flags);
|
|
p = __get_info(group);
|
|
ret = -EINVAL;
|
|
if (p) {
|
|
if (p->refcnt) {
|
|
ret = -EINVAL;
|
|
if (p->major == major) {
|
|
*minor = p->minor;
|
|
ret = 0;
|
|
}
|
|
} else {
|
|
unsigned long actual_minor;
|
|
unsigned long hv_ret;
|
|
|
|
hv_ret = sun4v_set_version(group, major, *minor,
|
|
&actual_minor);
|
|
ret = -EINVAL;
|
|
if (hv_ret == HV_EOK) {
|
|
*minor = actual_minor;
|
|
p->major = major;
|
|
p->minor = actual_minor;
|
|
ret = 0;
|
|
} else if (hv_ret == HV_EBADTRAP ||
|
|
hv_ret == HV_ENOTSUPPORTED) {
|
|
if (p->flags & FLAG_PRE_API) {
|
|
if (major == 1) {
|
|
p->major = 1;
|
|
p->minor = 0;
|
|
*minor = 0;
|
|
ret = 0;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
if (ret == 0)
|
|
__get_ref(p);
|
|
}
|
|
spin_unlock_irqrestore(&hvapi_lock, flags);
|
|
|
|
return ret;
|
|
}
|
|
EXPORT_SYMBOL(sun4v_hvapi_register);
|
|
|
|
void sun4v_hvapi_unregister(unsigned long group)
|
|
{
|
|
struct api_info *p;
|
|
unsigned long flags;
|
|
|
|
spin_lock_irqsave(&hvapi_lock, flags);
|
|
p = __get_info(group);
|
|
if (p)
|
|
__put_ref(p);
|
|
spin_unlock_irqrestore(&hvapi_lock, flags);
|
|
}
|
|
EXPORT_SYMBOL(sun4v_hvapi_unregister);
|
|
|
|
int sun4v_hvapi_get(unsigned long group,
|
|
unsigned long *major,
|
|
unsigned long *minor)
|
|
{
|
|
struct api_info *p;
|
|
unsigned long flags;
|
|
int ret;
|
|
|
|
spin_lock_irqsave(&hvapi_lock, flags);
|
|
ret = -EINVAL;
|
|
p = __get_info(group);
|
|
if (p && p->refcnt) {
|
|
*major = p->major;
|
|
*minor = p->minor;
|
|
ret = 0;
|
|
}
|
|
spin_unlock_irqrestore(&hvapi_lock, flags);
|
|
|
|
return ret;
|
|
}
|
|
EXPORT_SYMBOL(sun4v_hvapi_get);
|
|
|
|
void __init sun4v_hvapi_init(void)
|
|
{
|
|
unsigned long group, major, minor;
|
|
|
|
group = HV_GRP_SUN4V;
|
|
major = 1;
|
|
minor = 0;
|
|
if (sun4v_hvapi_register(group, major, &minor))
|
|
goto bad;
|
|
|
|
group = HV_GRP_CORE;
|
|
major = 1;
|
|
minor = 1;
|
|
if (sun4v_hvapi_register(group, major, &minor))
|
|
goto bad;
|
|
|
|
return;
|
|
|
|
bad:
|
|
prom_printf("HVAPI: Cannot register API group "
|
|
"%lx with major(%u) minor(%u)\n",
|
|
group, major, minor);
|
|
prom_halt();
|
|
}
|