![Alexey Dobriyan](/assets/img/avatar_default.png)
Remove fs.h from mm.h. For this, 1) Uninline vma_wants_writenotify(). It's pretty huge anyway. 2) Add back fs.h or less bloated headers (err.h) to files that need it. As result, on x86_64 allyesconfig, fs.h dependencies cut down from 3929 files rebuilt down to 3444 (-12.3%). Cross-compile tested without regressions on my two usual configs and (sigh): alpha arm-mx1ads mips-bigsur powerpc-ebony alpha-allnoconfig arm-neponset mips-capcella powerpc-g5 alpha-defconfig arm-netwinder mips-cobalt powerpc-holly alpha-up arm-netx mips-db1000 powerpc-iseries arm arm-ns9xxx mips-db1100 powerpc-linkstation arm-assabet arm-omap_h2_1610 mips-db1200 powerpc-lite5200 arm-at91rm9200dk arm-onearm mips-db1500 powerpc-maple arm-at91rm9200ek arm-picotux200 mips-db1550 powerpc-mpc7448_hpc2 arm-at91sam9260ek arm-pleb mips-ddb5477 powerpc-mpc8272_ads arm-at91sam9261ek arm-pnx4008 mips-decstation powerpc-mpc8313_rdb arm-at91sam9263ek arm-pxa255-idp mips-e55 powerpc-mpc832x_mds arm-at91sam9rlek arm-realview mips-emma2rh powerpc-mpc832x_rdb arm-ateb9200 arm-realview-smp mips-excite powerpc-mpc834x_itx arm-badge4 arm-rpc mips-fulong powerpc-mpc834x_itxgp arm-carmeva arm-s3c2410 mips-ip22 powerpc-mpc834x_mds arm-cerfcube arm-shannon mips-ip27 powerpc-mpc836x_mds arm-clps7500 arm-shark mips-ip32 powerpc-mpc8540_ads arm-collie arm-simpad mips-jazz powerpc-mpc8544_ds arm-corgi arm-spitz mips-jmr3927 powerpc-mpc8560_ads arm-csb337 arm-trizeps4 mips-malta powerpc-mpc8568mds arm-csb637 arm-versatile mips-mipssim powerpc-mpc85xx_cds arm-ebsa110 i386 mips-mpc30x powerpc-mpc8641_hpcn arm-edb7211 i386-allnoconfig mips-msp71xx powerpc-mpc866_ads arm-em_x270 i386-defconfig mips-ocelot powerpc-mpc885_ads arm-ep93xx i386-up mips-pb1100 powerpc-pasemi arm-footbridge ia64 mips-pb1500 powerpc-pmac32 arm-fortunet ia64-allnoconfig mips-pb1550 powerpc-ppc64 arm-h3600 ia64-bigsur mips-pnx8550-jbs powerpc-prpmc2800 arm-h7201 ia64-defconfig mips-pnx8550-stb810 powerpc-ps3 arm-h7202 ia64-gensparse mips-qemu powerpc-pseries arm-hackkit ia64-sim mips-rbhma4200 powerpc-up arm-integrator ia64-sn2 mips-rbhma4500 s390 arm-iop13xx ia64-tiger mips-rm200 s390-allnoconfig arm-iop32x ia64-up mips-sb1250-swarm s390-defconfig arm-iop33x ia64-zx1 mips-sead s390-up arm-ixp2000 m68k mips-tb0219 sparc arm-ixp23xx m68k-amiga mips-tb0226 sparc-allnoconfig arm-ixp4xx m68k-apollo mips-tb0287 sparc-defconfig arm-jornada720 m68k-atari mips-workpad sparc-up arm-kafa m68k-bvme6000 mips-wrppmc sparc64 arm-kb9202 m68k-hp300 mips-yosemite sparc64-allnoconfig arm-ks8695 m68k-mac parisc sparc64-defconfig arm-lart m68k-mvme147 parisc-allnoconfig sparc64-up arm-lpd270 m68k-mvme16x parisc-defconfig um-x86_64 arm-lpd7a400 m68k-q40 parisc-up x86_64 arm-lpd7a404 m68k-sun3 powerpc x86_64-allnoconfig arm-lubbock m68k-sun3x powerpc-cell x86_64-defconfig arm-lusl7200 mips powerpc-celleb x86_64-up arm-mainstone mips-atlas powerpc-chrp32 Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
284 lines
7.3 KiB
C
284 lines
7.3 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 <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;
|
|
}
|
|
|
|
ioctl_out:
|
|
DBG("ioctl returns %d\n", ret_val);
|
|
mutex_unlock(&(agp_fe.agp_mutex));
|
|
return ret_val;
|
|
}
|
|
|