forked from Minki/linux
5a0e3ad6af
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>
289 lines
7.4 KiB
C
289 lines
7.4 KiB
C
/*
|
|
* AGPGART driver frontend compatibility ioctls
|
|
* Copyright (C) 2004 Silicon Graphics, Inc.
|
|
* Copyright (C) 2002-2003 Dave Jones
|
|
* Copyright (C) 1999 Jeff Hartmann
|
|
* Copyright (C) 1999 Precision Insight, Inc.
|
|
* Copyright (C) 1999 Xi Graphics, Inc.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included
|
|
* in all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
|
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* JEFF HARTMANN, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM,
|
|
* DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
|
|
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
|
|
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
*
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/pci.h>
|
|
#include <linux/fs.h>
|
|
#include <linux/agpgart.h>
|
|
#include <linux/slab.h>
|
|
#include <asm/uaccess.h>
|
|
#include "agp.h"
|
|
#include "compat_ioctl.h"
|
|
|
|
static int compat_agpioc_info_wrap(struct agp_file_private *priv, void __user *arg)
|
|
{
|
|
struct agp_info32 userinfo;
|
|
struct agp_kern_info kerninfo;
|
|
|
|
agp_copy_info(agp_bridge, &kerninfo);
|
|
|
|
userinfo.version.major = kerninfo.version.major;
|
|
userinfo.version.minor = kerninfo.version.minor;
|
|
userinfo.bridge_id = kerninfo.device->vendor |
|
|
(kerninfo.device->device << 16);
|
|
userinfo.agp_mode = kerninfo.mode;
|
|
userinfo.aper_base = (compat_long_t)kerninfo.aper_base;
|
|
userinfo.aper_size = kerninfo.aper_size;
|
|
userinfo.pg_total = userinfo.pg_system = kerninfo.max_memory;
|
|
userinfo.pg_used = kerninfo.current_memory;
|
|
|
|
if (copy_to_user(arg, &userinfo, sizeof(userinfo)))
|
|
return -EFAULT;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int compat_agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
|
|
{
|
|
struct agp_region32 ureserve;
|
|
struct agp_region kreserve;
|
|
struct agp_client *client;
|
|
struct agp_file_private *client_priv;
|
|
|
|
DBG("");
|
|
if (copy_from_user(&ureserve, arg, sizeof(ureserve)))
|
|
return -EFAULT;
|
|
|
|
if ((unsigned) ureserve.seg_count >= ~0U/sizeof(struct agp_segment32))
|
|
return -EFAULT;
|
|
|
|
kreserve.pid = ureserve.pid;
|
|
kreserve.seg_count = ureserve.seg_count;
|
|
|
|
client = agp_find_client_by_pid(kreserve.pid);
|
|
|
|
if (kreserve.seg_count == 0) {
|
|
/* remove a client */
|
|
client_priv = agp_find_private(kreserve.pid);
|
|
|
|
if (client_priv != NULL) {
|
|
set_bit(AGP_FF_IS_CLIENT, &client_priv->access_flags);
|
|
set_bit(AGP_FF_IS_VALID, &client_priv->access_flags);
|
|
}
|
|
if (client == NULL) {
|
|
/* client is already removed */
|
|
return 0;
|
|
}
|
|
return agp_remove_client(kreserve.pid);
|
|
} else {
|
|
struct agp_segment32 *usegment;
|
|
struct agp_segment *ksegment;
|
|
int seg;
|
|
|
|
if (ureserve.seg_count >= 16384)
|
|
return -EINVAL;
|
|
|
|
usegment = kmalloc(sizeof(*usegment) * ureserve.seg_count, GFP_KERNEL);
|
|
if (!usegment)
|
|
return -ENOMEM;
|
|
|
|
ksegment = kmalloc(sizeof(*ksegment) * kreserve.seg_count, GFP_KERNEL);
|
|
if (!ksegment) {
|
|
kfree(usegment);
|
|
return -ENOMEM;
|
|
}
|
|
|
|
if (copy_from_user(usegment, (void __user *) ureserve.seg_list,
|
|
sizeof(*usegment) * ureserve.seg_count)) {
|
|
kfree(usegment);
|
|
kfree(ksegment);
|
|
return -EFAULT;
|
|
}
|
|
|
|
for (seg = 0; seg < ureserve.seg_count; seg++) {
|
|
ksegment[seg].pg_start = usegment[seg].pg_start;
|
|
ksegment[seg].pg_count = usegment[seg].pg_count;
|
|
ksegment[seg].prot = usegment[seg].prot;
|
|
}
|
|
|
|
kfree(usegment);
|
|
kreserve.seg_list = ksegment;
|
|
|
|
if (client == NULL) {
|
|
/* Create the client and add the segment */
|
|
client = agp_create_client(kreserve.pid);
|
|
|
|
if (client == NULL) {
|
|
kfree(ksegment);
|
|
return -ENOMEM;
|
|
}
|
|
client_priv = agp_find_private(kreserve.pid);
|
|
|
|
if (client_priv != NULL) {
|
|
set_bit(AGP_FF_IS_CLIENT, &client_priv->access_flags);
|
|
set_bit(AGP_FF_IS_VALID, &client_priv->access_flags);
|
|
}
|
|
}
|
|
return agp_create_segment(client, &kreserve);
|
|
}
|
|
/* Will never really happen */
|
|
return -EINVAL;
|
|
}
|
|
|
|
static int compat_agpioc_allocate_wrap(struct agp_file_private *priv, void __user *arg)
|
|
{
|
|
struct agp_memory *memory;
|
|
struct agp_allocate32 alloc;
|
|
|
|
DBG("");
|
|
if (copy_from_user(&alloc, arg, sizeof(alloc)))
|
|
return -EFAULT;
|
|
|
|
memory = agp_allocate_memory_wrap(alloc.pg_count, alloc.type);
|
|
|
|
if (memory == NULL)
|
|
return -ENOMEM;
|
|
|
|
alloc.key = memory->key;
|
|
alloc.physical = memory->physical;
|
|
|
|
if (copy_to_user(arg, &alloc, sizeof(alloc))) {
|
|
agp_free_memory_wrap(memory);
|
|
return -EFAULT;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static int compat_agpioc_bind_wrap(struct agp_file_private *priv, void __user *arg)
|
|
{
|
|
struct agp_bind32 bind_info;
|
|
struct agp_memory *memory;
|
|
|
|
DBG("");
|
|
if (copy_from_user(&bind_info, arg, sizeof(bind_info)))
|
|
return -EFAULT;
|
|
|
|
memory = agp_find_mem_by_key(bind_info.key);
|
|
|
|
if (memory == NULL)
|
|
return -EINVAL;
|
|
|
|
return agp_bind_memory(memory, bind_info.pg_start);
|
|
}
|
|
|
|
static int compat_agpioc_unbind_wrap(struct agp_file_private *priv, void __user *arg)
|
|
{
|
|
struct agp_memory *memory;
|
|
struct agp_unbind32 unbind;
|
|
|
|
DBG("");
|
|
if (copy_from_user(&unbind, arg, sizeof(unbind)))
|
|
return -EFAULT;
|
|
|
|
memory = agp_find_mem_by_key(unbind.key);
|
|
|
|
if (memory == NULL)
|
|
return -EINVAL;
|
|
|
|
return agp_unbind_memory(memory);
|
|
}
|
|
|
|
long compat_agp_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
|
|
{
|
|
struct agp_file_private *curr_priv = file->private_data;
|
|
int ret_val = -ENOTTY;
|
|
|
|
mutex_lock(&(agp_fe.agp_mutex));
|
|
|
|
if ((agp_fe.current_controller == NULL) &&
|
|
(cmd != AGPIOC_ACQUIRE32)) {
|
|
ret_val = -EINVAL;
|
|
goto ioctl_out;
|
|
}
|
|
if ((agp_fe.backend_acquired != true) &&
|
|
(cmd != AGPIOC_ACQUIRE32)) {
|
|
ret_val = -EBUSY;
|
|
goto ioctl_out;
|
|
}
|
|
if (cmd != AGPIOC_ACQUIRE32) {
|
|
if (!(test_bit(AGP_FF_IS_CONTROLLER, &curr_priv->access_flags))) {
|
|
ret_val = -EPERM;
|
|
goto ioctl_out;
|
|
}
|
|
/* Use the original pid of the controller,
|
|
* in case it's threaded */
|
|
|
|
if (agp_fe.current_controller->pid != curr_priv->my_pid) {
|
|
ret_val = -EBUSY;
|
|
goto ioctl_out;
|
|
}
|
|
}
|
|
|
|
switch (cmd) {
|
|
case AGPIOC_INFO32:
|
|
ret_val = compat_agpioc_info_wrap(curr_priv, (void __user *) arg);
|
|
break;
|
|
|
|
case AGPIOC_ACQUIRE32:
|
|
ret_val = agpioc_acquire_wrap(curr_priv);
|
|
break;
|
|
|
|
case AGPIOC_RELEASE32:
|
|
ret_val = agpioc_release_wrap(curr_priv);
|
|
break;
|
|
|
|
case AGPIOC_SETUP32:
|
|
ret_val = agpioc_setup_wrap(curr_priv, (void __user *) arg);
|
|
break;
|
|
|
|
case AGPIOC_RESERVE32:
|
|
ret_val = compat_agpioc_reserve_wrap(curr_priv, (void __user *) arg);
|
|
break;
|
|
|
|
case AGPIOC_PROTECT32:
|
|
ret_val = agpioc_protect_wrap(curr_priv);
|
|
break;
|
|
|
|
case AGPIOC_ALLOCATE32:
|
|
ret_val = compat_agpioc_allocate_wrap(curr_priv, (void __user *) arg);
|
|
break;
|
|
|
|
case AGPIOC_DEALLOCATE32:
|
|
ret_val = agpioc_deallocate_wrap(curr_priv, (int) arg);
|
|
break;
|
|
|
|
case AGPIOC_BIND32:
|
|
ret_val = compat_agpioc_bind_wrap(curr_priv, (void __user *) arg);
|
|
break;
|
|
|
|
case AGPIOC_UNBIND32:
|
|
ret_val = compat_agpioc_unbind_wrap(curr_priv, (void __user *) arg);
|
|
break;
|
|
|
|
case AGPIOC_CHIPSET_FLUSH32:
|
|
ret_val = agpioc_chipset_flush_wrap(curr_priv);
|
|
break;
|
|
}
|
|
|
|
ioctl_out:
|
|
DBG("ioctl returns %d\n", ret_val);
|
|
mutex_unlock(&(agp_fe.agp_mutex));
|
|
return ret_val;
|
|
}
|
|
|