stack based kmap_atomic -v2
Subsystems (73)
cover stack based kmap_atomic -v2
Latest bits..
Maybe FRV can do a kind of kmap-stack switch on (soft)irq enter/exit in order to stay below 5 entries.
Will continue prodding tomorrow, sleep time here.
RFC PATCH 1/4 mm: strictly nested kmap_atomic
Ensure kmap_atomic usage is strictly nested
LKML-Reference: <new-submission>
--- crypto/async_tx/async_memcpy.c | 2 +- crypto/blkcipher.c | 2 +- drivers/block/loop.c | 4 ++-- include/linux/highmem.h | 4 ++-- kernel/power/snapshot.c | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-)
crypto/async_tx/async_memcpy.c +1 -1
@@ -83,8 +83,8 @@ async_memcpy(struct page *dest, struct pmemcpy (dest_buf, src_buf, len); -kunmap_atomic (dest_buf,KM_USER0 );kunmap_atomic (src_buf,KM_USER1 ); +kunmap_atomic (dest_buf,KM_USER0 );async_tx_sync_epilog (submit); }
crypto/blkcipher.c +1 -1
@@ -89,9 +89,9 @@ static inline unsigned int blkcipher_donmemcpy (walk->dst.virt.addr, walk->page, n);blkcipher_unmap_dst (walk); }else if (!(walk->flags &BLKCIPHER_WALK_PHYS )) { -blkcipher_unmap_src (walk);if (walk->flags &BLKCIPHER_WALK_DIFF )blkcipher_unmap_dst (walk); +blkcipher_unmap_src (walk); }scatterwalk_advance (&walk->in, n);
drivers/block/loop.c +2 -2
@@ -99,8 +99,8 @@ static int transfer_none(struct loop_develse memcpy (raw_buf, loop_buf, size); -kunmap_atomic (raw_buf,KM_USER0 );kunmap_atomic (loop_buf,KM_USER1 ); +kunmap_atomic (raw_buf,KM_USER0 );cond_resched ();return 0 ; }
@@ -128,8 +128,8 @@ static int transfer_xor(struct loop_devifor (i =0 ; i < size; i++) *out++ = *in++ ^ key[(i &511 ) % keysize]; -kunmap_atomic (raw_buf,KM_USER0 );kunmap_atomic (loop_buf,KM_USER1 ); +kunmap_atomic (raw_buf,KM_USER0 );cond_resched ();return 0 ; }
include/linux/highmem.h +2 -2
@@ -191,8 +191,8 @@ static inline void copy_user_highpage(st vfrom =kmap_atomic (from,KM_USER0 ); vto =kmap_atomic (to,KM_USER1 );copy_user_page (vto, vfrom, vaddr, to); -kunmap_atomic (vfrom,KM_USER0 );kunmap_atomic (vto,KM_USER1 ); + kunmap_atomic(vfrom, KM_USER0); }#endif
@@ -204,8 +204,8 @@ static inline void copy_highpage(struct vfrom =kmap_atomic (from,KM_USER0 ); vto =kmap_atomic (to,KM_USER1 );copy_page (vto, vfrom); -kunmap_atomic (vfrom,KM_USER0 );kunmap_atomic (vto,KM_USER1 ); + kunmap_atomic(vfrom, KM_USER0); }#endif /* _LINUX_HIGHMEM_H */
kernel/power/snapshot.c +2 -2
@@ -978,8 +978,8 @@ static void copy_data_page(unsigned long src =kmap_atomic (s_page,KM_USER0 ); dst =kmap_atomic (d_page,KM_USER1 );do_copy_page (dst, src); -kunmap_atomic (src,KM_USER0 );kunmap_atomic (dst,KM_USER1 ); +kunmap_atomic (src,KM_USER0 ); }else {if (PageHighMem (d_page)) {/* Page pointed to by src may contain some kernel
@@ -2253,8 +2253,8 @@ swap_two_pages_data(struct page *p1, strmemcpy (buf, kaddr1,PAGE_SIZE );memcpy (kaddr1, kaddr2,PAGE_SIZE );memcpy (kaddr2, buf,PAGE_SIZE ); -kunmap_atomic (kaddr1,KM_USER0 );kunmap_atomic (kaddr2,KM_USER1 ); +kunmap_atomic (kaddr1,KM_USER0 ); }/**
RFC PATCH 2/4 mm: stack based kmap_atomic
In reply to Peter ZijlstraKeep the current interface but ignore the KM_type and use a stack based approach.
LKML-Reference: <new-submission>
--- arch/arm/mm/highmem.c | 8 +++++- arch/frv/include/asm/highmem.h | 3 +- arch/mips/mm/highmem.c | 11 ++++++-- arch/mn10300/include/asm/highmem.h | 10 ++++++- arch/powerpc/mm/highmem.c | 10 ++++++- arch/sparc/mm/highmem.c | 9 +++++- arch/x86/mm/highmem_32.c | 24 +++++++++++++++--- arch/x86/mm/iomap_32.c | 16 ------------ include/linux/highmem.h | 32 +++++++++++++++--------- mm/highmem.c | 49 +++---------------------------------- 10 files changed, 85 insertions(+), 87 deletions(-)
arch/arm/mm/highmem.c +7 -1
@@ -50,6 +50,8 @@ void *kmap_atomic(struct page *page, enuif (kmap)return kmap; + type =kmap_atomic_idx_push (); + idx = type +KM_TYPE_NR *smp_processor_id (); vaddr =__fix_to_virt (FIX_KMAP_BEGIN + idx);#ifdef CONFIG_DEBUG_HIGHMEM
@@ -74,7 +76,10 @@ EXPORT_SYMBOL(kmap_atomic);void kunmap_atomic (void *kvaddr,enum km_type type) {unsigned long vaddr = (unsigned long ) kvaddr &PAGE_MASK ; -unsigned int idx = type +KM_TYPE_NR *smp_processor_id (); +unsigned int idx; + + type =kmap_atomic_idx_pop (); + idx = type +KM_TYPE_NR *smp_processor_id ();if (kvaddr >= (void *)FIXADDR_START ) {__cpuc_flush_dcache_page ((void *)vaddr);
@@ -100,6 +105,7 @@ void *kmap_atomic_pfn(unsigned long pfn,pagefault_disable (); + type =kmap_atomic_idx_push (); idx = type +KM_TYPE_NR *smp_processor_id (); vaddr =__fix_to_virt (FIX_KMAP_BEGIN + idx);#ifdef CONFIG_DEBUG_HIGHMEM
arch/frv/include/asm/highmem.h +2 -1
@@ -117,7 +117,7 @@ static inline void *kmap_atomic(struct punsigned long paddr;pagefault_disable (); -debug_kmap_atomic (type); + type =kmap_atomic_idx_push (); paddr =page_to_phys (page);switch (type) {
@@ -154,6 +154,7 @@ do { \static inline void kunmap_atomic (void *kvaddr,enum km_type type) { + type =kmap_atomic_idx_pop ();switch (type) {case 0 :__kunmap_atomic_primary (0 ,2 );break ;case 1 :__kunmap_atomic_primary (1 ,3 );break ;
arch/mips/mm/highmem.c +8 -3
@@ -50,7 +50,7 @@ void *__kmap_atomic(struct page *page, eif (!PageHighMem (page))return page_address (page); -debug_kmap_atomic (type); + type =kmap_atomic_idx_push (); idx = type +KM_TYPE_NR *smp_processor_id (); vaddr =__fix_to_virt (FIX_KMAP_BEGIN + idx);#ifdef CONFIG_DEBUG_HIGHMEM
@@ -63,7 +63,7 @@ void *__kmap_atomic(struct page *page, e }EXPORT_SYMBOL (__kmap_atomic); -void __kunmap_atomic (void *kvaddr,enum km_type type) +static void __debug_kunmap_atomic (void *kvaddr,enum km_type type) {#ifdef CONFIG_DEBUG_HIGHMEM unsigned long vaddr = (unsigned long ) kvaddr &PAGE_MASK ;
@@ -83,7 +83,12 @@ void __kunmap_atomic(void *kvaddr, enumpte_clear (&init_mm, vaddr, kmap_pte-idx);local_flush_tlb_one (vaddr);#endif +} +void __kunmap_atomic (void *kvaddr,enum km_type type) +{ + type =kmap_atomic_idx_pop (); +__debug_kunmap_atomic (kvaddr, type);pagefault_enable (); }EXPORT_SYMBOL (__kunmap_atomic);
@@ -99,7 +104,7 @@ void *kmap_atomic_pfn(unsigned long pfn,pagefault_disable (); -debug_kmap_atomic (type); + type =kmap_atomic_idx_push (); idx = type +KM_TYPE_NR *smp_processor_id (); vaddr =__fix_to_virt (FIX_KMAP_BEGIN + idx);set_pte (kmap_pte-idx,pfn_pte (pfn,PAGE_KERNEL ));
arch/mn10300/include/asm/highmem.h +8 -2
@@ -78,7 +78,7 @@ static inline unsigned long kmap_atomic(if (page < highmem_start_page)return page_address (page); -debug_kmap_atomic (type); + type =kmap_atomic_idx_push (); idx = type +KM_TYPE_NR *smp_processor_id (); vaddr =__fix_to_virt (FIX_KMAP_BEGIN + idx);#if HIGHMEM_DEBUG
@@ -91,7 +91,7 @@ static inline unsigned long kmap_atomic(return vaddr; } -static inline void kunmap_atomic (unsigned long vaddr,enum km_type type) +static inline void debug_kunmap_atomic (unsigned long vaddr,enum km_type type) {#if HIGHMEM_DEBUG enum fixed_addresses idx = type +KM_TYPE_NR *smp_processor_id ();
@@ -111,6 +111,12 @@ static inline void kunmap_atomic(unsigne#endif } +static inline void kunmap_atomic (unsigned long vaddr,enum km_type type) +{ + type =kmap_atomic_idx_pop (); +debug_kunmap_atomic (vaddr, type); +} +#endif /* __KERNEL__ */ #endif /* _ASM_HIGHMEM_H */
arch/powerpc/mm/highmem.c +8 -2
@@ -39,7 +39,7 @@ void *kmap_atomic_prot(struct page *pageif (!PageHighMem (page))return page_address (page); -debug_kmap_atomic (type); + type =kmap_atomic_idx_push (); idx = type +KM_TYPE_NR *smp_processor_id (); vaddr =__fix_to_virt (FIX_KMAP_BEGIN + idx);#ifdef CONFIG_DEBUG_HIGHMEM
@@ -52,7 +52,7 @@ void *kmap_atomic_prot(struct page *page }EXPORT_SYMBOL (kmap_atomic_prot); -void kunmap_atomic (void *kvaddr,enum km_type type) +static void debug_kunmap_atomic (void *kvaddr,enum km_type type) {#ifdef CONFIG_DEBUG_HIGHMEM unsigned long vaddr = (unsigned long ) kvaddr &PAGE_MASK ;
@@ -72,6 +72,12 @@ void kunmap_atomic(void *kvaddr, enum kmpte_clear (&init_mm, vaddr, kmap_pte-idx);local_flush_tlb_page (NULL , vaddr);#endif +} + +void kunmap_atomic (void *kvaddr,enum km_type type) +{ + type =kmap_atomic_idx_pop (); +debug_kunmap_atomic (kvaddr, type);pagefault_enable (); }EXPORT_SYMBOL (kunmap_atomic);
arch/sparc/mm/highmem.c +7 -2
@@ -39,7 +39,7 @@ void *kmap_atomic(struct page *page, enuif (!PageHighMem (page))return page_address (page); -debug_kmap_atomic (type); + type =kmap_atomic_idx_push (); idx = type +KM_TYPE_NR *smp_processor_id (); vaddr =__fix_to_virt (FIX_KMAP_BEGIN + idx);
@@ -65,7 +65,7 @@ void *kmap_atomic(struct page *page, enu }EXPORT_SYMBOL (kmap_atomic); -void kunmap_atomic (void *kvaddr,enum km_type type) +static void debug_kunmap_atomic (void *kvaddr,enum km_type type) {#ifdef CONFIG_DEBUG_HIGHMEM unsigned long vaddr = (unsigned long ) kvaddr &PAGE_MASK ;
@@ -97,7 +97,12 @@ void kunmap_atomic(void *kvaddr, enum kmflush_tlb_all ();#endif #endif +} +void kunmap_atomic (void *kvaddr,enum km_type type) +{ + type =kmap_atomic_idx_pop (); +debug_kunmap_atomic (kvaddr, type);pagefault_enable (); }EXPORT_SYMBOL (kunmap_atomic);
arch/x86/mm/highmem_32.c +21 -3
@@ -38,8 +38,7 @@ void *kmap_atomic_prot(struct page *pageif (!PageHighMem (page))return page_address (page); -debug_kmap_atomic (type); - + type =kmap_atomic_idx_push (); idx = type +KM_TYPE_NR *smp_processor_id (); vaddr =__fix_to_virt (FIX_KMAP_BEGIN + idx);BUG_ON (!pte_none (*(kmap_pte-idx)));
@@ -56,7 +55,10 @@ void *kmap_atomic(struct page *page, enuvoid kunmap_atomic (void *kvaddr,enum km_type type) {unsigned long vaddr = (unsigned long ) kvaddr &PAGE_MASK ; -enum fixed_addresses idx = type +KM_TYPE_NR *smp_processor_id (); +enum fixed_addresses idx; + + type =kmap_atomic_idx_pop (); + idx = type +KM_TYPE_NR *smp_processor_id ();/* * Force other mappings to Oops if they'll try to access this pte
@@ -80,6 +82,22 @@ void kunmap_atomic(void *kvaddr, enum km* This is the same as kmap_atomic() but can map memory that doesn't * have a struct page associated with it. */ +void *kmap_atomic_prot_pfn (unsigned long pfn,enum km_type type,pgprot_t prot) +{ +enum fixed_addresses idx; +unsigned long vaddr; + +pagefault_disable (); + + type =kmap_atomic_idx_push (); + idx = type +KM_TYPE_NR *smp_processor_id (); + vaddr =__fix_to_virt (FIX_KMAP_BEGIN + idx); +set_pte (kmap_pte - idx,pfn_pte (pfn, prot)); +arch_flush_lazy_mmu_mode (); + +return (void *)vaddr; +} +void *kmap_atomic_pfn (unsigned long pfn,enum km_type type) {return kmap_atomic_prot_pfn (pfn, type, kmap_prot);
include/linux/highmem.h +20 -12
@@ -21,18 +21,6 @@ static inline void flush_kernel_dcache_p#include <asm/kmap_types.h> -#if defined(CONFIG_DEBUG_HIGHMEM ) && defined(CONFIG_TRACE_IRQFLAGS_SUPPORT ) - -void debug_kmap_atomic (enum km_type type); - -#else - -static inline void debug_kmap_atomic (enum km_type type) -{ -} - -#endif -#ifdef CONFIG_HIGHMEM #include <asm/highmem.h>
@@ -42,6 +30,26 @@ extern unsigned long totalhigh_pages;void kmap_flush_unused (void ); +DECLARE_PER_CPU (int, __kmap_atomic_idx); + +static inline int kmap_atomic_idx_push (void ) +{ +int idx =__get_cpu_var (__kmap_atomic_idx)++; +#ifdef CONFIG_DEBUG_HIGHMEM +BUG_ON (idx >KM_TYPE_NR ); +#endif +return idx; +} + +static inline int kmap_atomic_idx_pop (void ) +{ +int idx = --__get_cpu_var (__kmap_atomic_idx); +#ifdef CONFIG_DEBUG_HIGHMEM +BUG_ON (idx <0 ); +#endif +return idx; +} +#else /* CONFIG_HIGHMEM */ static inline unsigned int nr_free_highpages (void ) {return 0 ; }
mm/highmem.c +4 -45
58 lines not on this page · raw message
arch/x86/mm/iomap_32.c +0 -16
@@ -55,22 +55,6 @@ iomap_free(resource_size_t base, unsigne }EXPORT_SYMBOL_GPL (iomap_free); -void *kmap_atomic_prot_pfn (unsigned long pfn,enum km_type type,pgprot_t prot) -{ -enum fixed_addresses idx; -unsigned long vaddr; - -pagefault_disable (); - -debug_kmap_atomic (type); - idx = type +KM_TYPE_NR *smp_processor_id (); - vaddr =__fix_to_virt (FIX_KMAP_BEGIN + idx); -set_pte (kmap_pte - idx,pfn_pte (pfn, prot)); -arch_flush_lazy_mmu_mode (); - -return (void *)vaddr; -} -/* * Map 'pfn' using fixed map 'type' and protections 'prot' */
Re: [RFC][PATCH 2/4] mm: stack based kmap_atomic
Hi,
arch/arm/mm/highmem.c EXPORT_SYMBOL(kmap_atomic); · line 82
Quoted 9 lines · Peter Zijlstra
arch/arm/mm/highmem.c +4
-1@@ -74,7 +76,10 @@ EXPORT_SYMBOL(kmap_atomic);void kunmap_atomic (void *kvaddr,enum km_type type) {unsigned long vaddr = (unsigned long ) kvaddr &PAGE_MASK ; -unsigned int idx = type +KM_TYPE_NR *smp_processor_id (); +unsigned int idx; + + type =kmap_atomic_idx_pop (); + idx = type +KM_TYPE_NR *smp_processor_id ();
Maybe you can avoid the 4/4 patch and preserve clean bisects by renaming the unused parameter here and elsewhere, and introduce the 'type' local in this patch.
void kunmap_atomic(void *kvaddr, enum km_type unused)
{
...
unsigned int idx, type;
...
}That way, patch 3/4 will remove a genuinely unused parameter, and thus remain compile-able.
- Hari
RFC PATCH 3/4 mm: remove KM_type argument
In reply to Peter ZijlstraMostly mechanical removal of KM_type
LKML-Reference: <new-submission>
--- arch/arm/include/asm/highmem.h | 6 - arch/arm/include/asm/pgtable.h | 8 +- arch/arm/mm/copypage-fa.c | 12 +-- arch/arm/mm/copypage-feroceon.c | 12 +-- arch/arm/mm/copypage-v3.c | 12 +-- arch/arm/mm/copypage-v4mc.c | 8 +- arch/arm/mm/copypage-v4wb.c | 12 +-- arch/arm/mm/copypage-v4wt.c | 12 +-- arch/arm/mm/copypage-v6.c | 12 +-- arch/arm/mm/copypage-xsc3.c | 12 +-- arch/arm/mm/copypage-xscale.c | 8 +- arch/arm/mm/highmem.c | 6 - arch/frv/include/asm/highmem.h | 4 - arch/frv/include/asm/pgtable.h | 8 +- arch/microblaze/include/asm/pgtable.h | 8 +- arch/mips/include/asm/highmem.h | 6 - arch/mips/mm/c-r4k.c | 4 - arch/mips/mm/highmem.c | 8 +- arch/mips/mm/init.c | 8 +- arch/mn10300/include/asm/highmem.h | 6 - arch/powerpc/include/asm/highmem.h | 8 +- arch/powerpc/include/asm/pgtable-ppc32.h | 8 +- arch/powerpc/mm/dma-noncoherent.c | 2 arch/powerpc/mm/highmem.c | 8 +- arch/powerpc/mm/mem.c | 4 - arch/sh/mm/cache.c | 12 +-- arch/sparc/include/asm/highmem.h | 4 - arch/sparc/mm/highmem.c | 8 +- arch/um/kernel/skas/uaccess.c | 4 - arch/x86/include/asm/highmem.h | 10 +-- arch/x86/include/asm/iomap.h | 4 - arch/x86/include/asm/paravirt.h | 2 arch/x86/include/asm/paravirt_types.h | 2 arch/x86/include/asm/pgtable_32.h | 4 - arch/x86/kernel/crash_dump_32.c | 8 +- arch/x86/kernel/vmi_32.c | 2 arch/x86/kvm/lapic.c | 8 +- arch/x86/kvm/paging_tmpl.h | 4 - arch/x86/kvm/svm.c | 28 ++++---- arch/x86/kvm/x86.c | 8 +- arch/x86/lib/usercopy_32.c | 4 - arch/x86/mm/highmem_32.c | 17 +++-- arch/x86/mm/iomap_32.c | 4 - arch/x86/xen/mmu.c | 2 crypto/async_tx/async_memcpy.c | 8 +- drivers/ata/libata-sff.c | 8 +- drivers/block/brd.c | 20 +++--- drivers/block/loop.c | 16 ++--- drivers/block/pktcdvd.c | 8 +- drivers/crypto/hifn_795x.c | 10 +-- drivers/edac/edac_mc.c | 4 - drivers/gpu/drm/drm_cache.c | 8 +- drivers/gpu/drm/i915/i915_gem.c | 40 ++++++------ drivers/gpu/drm/i915/i915_gem_debug.c | 10 +-- drivers/gpu/drm/ttm/ttm_bo_util.c | 8 +- drivers/gpu/drm/ttm/ttm_tt.c | 16 ++--- drivers/ide/ide-taskfile.c | 4 - drivers/infiniband/ulp/iser/iser_memory.c | 8 +- drivers/md/bitmap.c | 36 +++++------ drivers/media/video/ivtv/ivtv-udma.c | 4 - drivers/memstick/host/jmb38x_ms.c | 4 - drivers/memstick/host/tifm_ms.c | 4 - drivers/mmc/host/at91_mci.c | 8 +- drivers/mmc/host/mmci.h | 4 - drivers/mmc/host/msm_sdcc.c | 2 drivers/mmc/host/sdhci.c | 4 - drivers/mmc/host/tifm_sd.c | 16 ++--- drivers/mmc/host/tmio_mmc.h | 4 - drivers/net/cassini.c | 4 - drivers/net/e1000e/netdev.c | 10 +-- drivers/scsi/arcmsr/arcmsr_hba.c | 8 +- drivers/scsi/cxgb3i/cxgb3i_pdu.c | 2 drivers/scsi/fcoe/fcoe.c | 6 - drivers/scsi/gdth.c | 4 - drivers/scsi/ips.c | 6 - drivers/scsi/libfc/fc_fcp.c | 4 - drivers/scsi/libiscsi_tcp.c | 4 - drivers/scsi/libsas/sas_host_smp.c | 8 +- drivers/scsi/megaraid.c | 4 - drivers/scsi/mvsas/mv_sas.c | 8 +- drivers/scsi/scsi_debug.c | 24 +++---- drivers/scsi/scsi_lib.c | 4 - drivers/scsi/sd_dif.c | 12 +-- drivers/staging/hv/RndisFilter.c | 4 - drivers/staging/hv/netvsc_drv.c | 2 drivers/staging/hv/storvsc_drv.c | 18 ++--- drivers/staging/pohmelfs/inode.c | 8 +- fs/afs/fsclient.c | 8 +- fs/afs/mntpt.c | 4 - fs/aio.c | 32 +++++----- fs/bio-integrity.c | 10 +-- fs/btrfs/compression.c | 8 +- fs/btrfs/ctree.c | 30 ++++----- fs/btrfs/ctree.h | 8 +- fs/btrfs/disk-io.c | 4 - fs/btrfs/extent_io.c | 56 ++++++++--------- fs/btrfs/file-item.c | 10 +-- fs/btrfs/inode.c | 22 +++---- fs/btrfs/struct-funcs.c | 10 +-- fs/btrfs/zlib.c | 8 +- fs/cifs/file.c | 4 - fs/ecryptfs/mmap.c | 4 - fs/ecryptfs/read_write.c | 8 +- fs/exec.c | 4 - fs/exofs/dir.c | 4 - fs/ext2/dir.c | 4 - fs/fuse/dev.c | 12 +-- fs/fuse/file.c | 4 - fs/gfs2/aops.c | 12 +-- fs/gfs2/lops.c | 8 +- fs/gfs2/quota.c | 4 - fs/jbd/journal.c | 12 +-- fs/jbd/transaction.c | 4 - fs/jbd2/commit.c | 4 - fs/jbd2/journal.c | 12 +-- fs/jbd2/transaction.c | 4 - fs/libfs.c | 4 - fs/minix/dir.c | 4 - fs/namei.c | 4 - fs/nfs/dir.c | 4 - fs/nfs/nfs2xdr.c | 8 +- fs/nfs/nfs3xdr.c | 8 +- fs/nfs/nfs4proc.c | 4 - fs/nfs/nfs4xdr.c | 10 +-- fs/nilfs2/cpfile.c | 94 +++++++++++++++--------------- fs/nilfs2/dat.c | 38 ++++++------ fs/nilfs2/dir.c | 4 - fs/nilfs2/ifile.c | 4 - fs/nilfs2/mdt.c | 4 - fs/nilfs2/page.c | 8 +- fs/nilfs2/recovery.c | 4 - fs/nilfs2/segbuf.c | 4 - fs/nilfs2/segment.c | 4 - fs/nilfs2/sufile.c | 50 +++++++-------- fs/ntfs/aops.c | 20 +++--- fs/ntfs/attrib.c | 20 +++--- fs/ntfs/file.c | 16 ++--- fs/ntfs/super.c | 8 +- fs/ocfs2/aops.c | 16 ++--- fs/pipe.c | 8 +- fs/reiserfs/stree.c | 4 - fs/reiserfs/tail_conversion.c | 4 - fs/splice.c | 4 - fs/squashfs/file.c | 8 +- fs/squashfs/symlink.c | 4 - fs/ubifs/file.c | 4 - fs/udf/file.c | 4 - include/linux/bio.h | 4 - include/linux/highmem.h | 30 ++++----- include/linux/io-mapping.h | 4 - kernel/power/snapshot.c | 28 ++++---- lib/scatterlist.c | 4 - lib/swiotlb.c | 2 mm/bounce.c | 4 - mm/filemap.c | 8 +- mm/ksm.c | 12 +-- mm/memory.c | 4 - mm/shmem.c | 14 ++-- mm/vmalloc.c | 8 +- net/core/kmap_skb.h | 4 - net/rds/ib_recv.c | 12 +-- net/rds/info.c | 6 - net/rds/iw_recv.c | 4 - net/rds/loop.c | 2 net/rds/page.c | 4 - net/rds/rds.h | 2 net/rds/recv.c | 2 net/rds/tcp_recv.c | 6 - net/sunrpc/auth_gss/gss_krb5_wrap.c | 4 - net/sunrpc/socklib.c | 4 - net/sunrpc/xdr.c | 16 ++--- net/sunrpc/xprtrdma/rpc_rdma.c | 4 - 172 files changed, 809 insertions(+), 808 deletions(-)
arch/arm/include/asm/highmem.h +3 -3
@@ -23,9 +23,9 @@ extern void kunmap_high(struct page *pagextern void *kmap (struct page *page);extern void kunmap (struct page *page); -extern void *kmap_atomic (struct page *page,enum km_type type); -extern void kunmap_atomic (void *kvaddr,enum km_type type); -extern void *kmap_atomic_pfn (unsigned long pfn,enum km_type type); +extern void *kmap_atomic (struct page *page); +extern void kunmap_atomic (void *kvaddr); +extern void *kmap_atomic_pfn (unsigned long pfn);extern struct page *kmap_atomic_to_page (const void *ptr);#endif
arch/arm/include/asm/pgtable.h +4 -4
@@ -263,10 +263,10 @@ extern struct page *empty_zero_page;#define pte_page (pte) (pfn_to_page(pte_pfn(pte)))#define pte_offset_kernel (dir,addr) (pmd_page_vaddr(*(dir)) + __pte_index(addr)) -#define pte_offset_map (dir,addr) (__pte_map(dir, KM_PTE0) + __pte_index(addr)) -#define pte_offset_map_nested (dir,addr) (__pte_map(dir, KM_PTE1) + __pte_index(addr)) -#define pte_unmap (pte) __pte_unmap(pte, KM_PTE0) -#define pte_unmap_nested (pte) __pte_unmap(pte, KM_PTE1) +#define pte_offset_map (dir,addr) (__pte_map(dir) + __pte_index(addr)) +#define pte_offset_map_nested (dir,addr) (__pte_map(dir) + __pte_index(addr)) +#define pte_unmap (pte) __pte_unmap(pte) +#define pte_unmap_nested (pte) __pte_unmap(pte)#ifndef CONFIG_HIGHPTE #define __pte_map (dir,km) pmd_page_vaddr(*(dir))
arch/arm/mm/copypage-fa.c +6 -6
@@ -44,11 +44,11 @@ void fa_copy_user_highpage(struct page * {void *kto, *kfrom; - kto =kmap_atomic (to,KM_USER0 ); - kfrom =kmap_atomic (from,KM_USER1 ); + kto =kmap_atomic (to); + kfrom =kmap_atomic (from);fa_copy_user_page (kto, kfrom); -kunmap_atomic (kfrom,KM_USER1 ); -kunmap_atomic (kto,KM_USER0 ); +kunmap_atomic (kfrom); +kunmap_atomic (kto); }/*
@@ -58,7 +58,7 @@ void fa_copy_user_highpage(struct page **/ void fa_clear_user_highpage (struct page *page,unsigned long vaddr) { -void *ptr, *kaddr =kmap_atomic (page,KM_USER0 ); +void *ptr, *kaddr =kmap_atomic (page); asm volatile("\ mov r1, %2 @ 1\n\ mov r2, #0 @ 1\n\
@@ -77,7 +77,7 @@ void fa_clear_user_highpage(struct page : "=r" (ptr) : "0" (kaddr), "I" (PAGE_SIZE / 32) : "r1", "r2", "r3", "ip", "lr"); -kunmap_atomic (kaddr,KM_USER0 ); +kunmap_atomic (kaddr); }struct cpu_user_fns fa_user_fns__initdata = {
arch/arm/mm/copypage-feroceon.c +6 -6
@@ -72,16 +72,16 @@ void feroceon_copy_user_highpage(struct {void *kto, *kfrom; - kto =kmap_atomic (to,KM_USER0 ); - kfrom =kmap_atomic (from,KM_USER1 ); + kto =kmap_atomic (to); + kfrom =kmap_atomic (from);feroceon_copy_user_page (kto, kfrom); -kunmap_atomic (kfrom,KM_USER1 ); -kunmap_atomic (kto,KM_USER0 ); +kunmap_atomic (kfrom); +kunmap_atomic (kto); }void feroceon_clear_user_highpage (struct page *page,unsigned long vaddr) { -void *ptr, *kaddr =kmap_atomic (page,KM_USER0 ); +void *ptr, *kaddr =kmap_atomic (page); asm volatile ("\ mov r1, %2 \n\ mov r2, #0 \n\
@@ -101,7 +101,7 @@ void feroceon_clear_user_highpage(struct : "=r" (ptr) : "0" (kaddr), "I" (PAGE_SIZE / 32) : "r1", "r2", "r3", "r4", "r5", "r6", "r7", "ip", "lr"); -kunmap_atomic (kaddr,KM_USER0 ); +kunmap_atomic (kaddr); }struct cpu_user_fns feroceon_user_fns__initdata = {
arch/arm/mm/copypage-v3.c +6 -6
@@ -42,11 +42,11 @@ void v3_copy_user_highpage(struct page * {void *kto, *kfrom; - kto =kmap_atomic (to,KM_USER0 ); - kfrom =kmap_atomic (from,KM_USER1 ); + kto =kmap_atomic (to); + kfrom =kmap_atomic (from);v3_copy_user_page (kto, kfrom); -kunmap_atomic (kfrom,KM_USER1 ); -kunmap_atomic (kto,KM_USER0 ); +kunmap_atomic (kfrom); +kunmap_atomic (kto); }/*
@@ -56,7 +56,7 @@ void v3_copy_user_highpage(struct page **/ void v3_clear_user_highpage (struct page *page,unsigned long vaddr) { -void *ptr, *kaddr =kmap_atomic (page,KM_USER0 ); +void *ptr, *kaddr =kmap_atomic (page); asm volatile("\n\ mov r1, %2 @ 1\n\ mov r2, #0 @ 1\n\
@@ -72,7 +72,7 @@ void v3_clear_user_highpage(struct page : "=r" (ptr) : "0" (kaddr), "I" (PAGE_SIZE / 64) : "r1", "r2", "r3", "ip", "lr"); -kunmap_atomic (kaddr,KM_USER0 ); +kunmap_atomic (kaddr); }struct cpu_user_fns v3_user_fns__initdata = {
arch/arm/mm/copypage-v4mc.c +4 -4
@@ -71,7 +71,7 @@ mc_copy_user_page(void *from, void *to)void v4_mc_copy_user_highpage (struct page *to,struct page *from,unsigned long vaddr) { -void *kto =kmap_atomic (to,KM_USER1 ); +void *kto =kmap_atomic (to);if (test_and_clear_bit (PG_dcache_dirty, &from->flags))__flush_dcache_page (page_mapping (from), from);
@@ -85,7 +85,7 @@ void v4_mc_copy_user_highpage(struct pagspin_unlock (&minicache_lock); -kunmap_atomic (kto,KM_USER1 ); +kunmap_atomic (kto); }/*
@@ -93,7 +93,7 @@ void v4_mc_copy_user_highpage(struct pag*/ void v4_mc_clear_user_highpage (struct page *page,unsigned long vaddr) { -void *ptr, *kaddr =kmap_atomic (page,KM_USER0 ); +void *ptr, *kaddr =kmap_atomic (page); asm volatile("\ mov r1, %2 @ 1\n\ mov r2, #0 @ 1\n\
@@ -111,7 +111,7 @@ void v4_mc_clear_user_highpage(struct pa : "=r" (ptr) : "0" (kaddr), "I" (PAGE_SIZE / 64) : "r1", "r2", "r3", "ip", "lr"); -kunmap_atomic (kaddr,KM_USER0 ); +kunmap_atomic (kaddr); }struct cpu_user_fns v4_mc_user_fns__initdata = {
arch/arm/mm/copypage-v4wb.c +6 -6
@@ -52,11 +52,11 @@ void v4wb_copy_user_highpage(struct page {void *kto, *kfrom; - kto =kmap_atomic (to,KM_USER0 ); - kfrom =kmap_atomic (from,KM_USER1 ); + kto =kmap_atomic (to); + kfrom =kmap_atomic (from);v4wb_copy_user_page (kto, kfrom); -kunmap_atomic (kfrom,KM_USER1 ); -kunmap_atomic (kto,KM_USER0 ); +kunmap_atomic (kfrom); +kunmap_atomic (kto); }/*
@@ -66,7 +66,7 @@ void v4wb_copy_user_highpage(struct page*/ void v4wb_clear_user_highpage (struct page *page,unsigned long vaddr) { -void *ptr, *kaddr =kmap_atomic (page,KM_USER0 ); +void *ptr, *kaddr =kmap_atomic (page); asm volatile("\ mov r1, %2 @ 1\n\ mov r2, #0 @ 1\n\
@@ -85,7 +85,7 @@ void v4wb_clear_user_highpage(struct pag : "=r" (ptr) : "0" (kaddr), "I" (PAGE_SIZE / 64) : "r1", "r2", "r3", "ip", "lr"); -kunmap_atomic (kaddr,KM_USER0 ); +kunmap_atomic (kaddr); }struct cpu_user_fns v4wb_user_fns__initdata = {
arch/arm/mm/copypage-v4wt.c +6 -6
@@ -48,11 +48,11 @@ void v4wt_copy_user_highpage(struct page {void *kto, *kfrom; - kto =kmap_atomic (to,KM_USER0 ); - kfrom =kmap_atomic (from,KM_USER1 ); + kto =kmap_atomic (to); + kfrom =kmap_atomic (from);v4wt_copy_user_page (kto, kfrom); -kunmap_atomic (kfrom,KM_USER1 ); -kunmap_atomic (kto,KM_USER0 ); +kunmap_atomic (kfrom); +kunmap_atomic (kto); }/*
@@ -62,7 +62,7 @@ void v4wt_copy_user_highpage(struct page*/ void v4wt_clear_user_highpage (struct page *page,unsigned long vaddr) { -void *ptr, *kaddr =kmap_atomic (page,KM_USER0 ); +void *ptr, *kaddr =kmap_atomic (page); asm volatile("\ mov r1, %2 @ 1\n\ mov r2, #0 @ 1\n\
@@ -79,7 +79,7 @@ void v4wt_clear_user_highpage(struct pag : "=r" (ptr) : "0" (kaddr), "I" (PAGE_SIZE / 64) : "r1", "r2", "r3", "ip", "lr"); -kunmap_atomic (kaddr,KM_USER0 ); +kunmap_atomic (kaddr); }struct cpu_user_fns v4wt_user_fns__initdata = {
arch/arm/mm/copypage-v6.c +6 -6
@@ -38,11 +38,11 @@ static void v6_copy_user_highpage_nonali {void *kto, *kfrom; - kfrom =kmap_atomic (from,KM_USER0 ); - kto =kmap_atomic (to,KM_USER1 ); + kfrom =kmap_atomic (from); + kto =kmap_atomic (to);copy_page (kto, kfrom); -kunmap_atomic (kto,KM_USER1 ); -kunmap_atomic (kfrom,KM_USER0 ); +kunmap_atomic (kto); +kunmap_atomic (kfrom); }/*
@@ -51,9 +51,9 @@ static void v6_copy_user_highpage_nonali*/ static void v6_clear_user_highpage_nonaliasing (struct page *page,unsigned long vaddr) { -void *kaddr =kmap_atomic (page,KM_USER0 ); +void *kaddr =kmap_atomic (page);clear_page (kaddr); -kunmap_atomic (kaddr,KM_USER0 ); +kunmap_atomic (kaddr); }/*
arch/arm/mm/copypage-xsc3.c +6 -6
@@ -75,11 +75,11 @@ void xsc3_mc_copy_user_highpage(struct p {void *kto, *kfrom; - kto =kmap_atomic (to,KM_USER0 ); - kfrom =kmap_atomic (from,KM_USER1 ); + kto =kmap_atomic (to); + kfrom =kmap_atomic (from);xsc3_mc_copy_user_page (kto, kfrom); -kunmap_atomic (kfrom,KM_USER1 ); -kunmap_atomic (kto,KM_USER0 ); +kunmap_atomic (kfrom); +kunmap_atomic (kto); }/*
@@ -89,7 +89,7 @@ void xsc3_mc_copy_user_highpage(struct p*/ void xsc3_mc_clear_user_highpage (struct page *page,unsigned long vaddr) { -void *ptr, *kaddr =kmap_atomic (page,KM_USER0 ); +void *ptr, *kaddr =kmap_atomic (page); asm volatile ("\ mov r1, %2 \n\ mov r2, #0 \n\
@@ -104,7 +104,7 @@ void xsc3_mc_clear_user_highpage(struct : "=r" (ptr) : "0" (kaddr), "I" (PAGE_SIZE / 32) : "r1", "r2", "r3"); -kunmap_atomic (kaddr,KM_USER0 ); +kunmap_atomic (kaddr); }struct cpu_user_fns xsc3_mc_user_fns__initdata = {
arch/arm/mm/copypage-xscale.c +4 -4
@@ -93,7 +93,7 @@ mc_copy_user_page(void *from, void *to)void xscale_mc_copy_user_highpage (struct page *to,struct page *from,unsigned long vaddr) { -void *kto =kmap_atomic (to,KM_USER1 ); +void *kto =kmap_atomic (to);if (test_and_clear_bit (PG_dcache_dirty, &from->flags))__flush_dcache_page (page_mapping (from), from);
@@ -107,7 +107,7 @@ void xscale_mc_copy_user_highpage(structspin_unlock (&minicache_lock); -kunmap_atomic (kto,KM_USER1 ); +kunmap_atomic (kto); }/*
@@ -116,7 +116,7 @@ void xscale_mc_copy_user_highpage(structvoid xscale_mc_clear_user_highpage (struct page *page,unsigned long vaddr) { -void *ptr, *kaddr =kmap_atomic (page,KM_USER0 ); +void *ptr, *kaddr =kmap_atomic (page); asm volatile( "mov r1, %2 \n\ mov r2, #0 \n\
@@ -133,7 +133,7 @@ xscale_mc_clear_user_highpage(struct pag : "=r" (ptr) : "0" (kaddr), "I" (PAGE_SIZE / 32) : "r1", "r2", "r3", "ip"); -kunmap_atomic (kaddr,KM_USER0 ); +kunmap_atomic (kaddr); }struct cpu_user_fns xscale_mc_user_fns__initdata = {
arch/arm/mm/highmem.c +3 -3
@@ -36,7 +36,7 @@ void kunmap(struct page *page) }EXPORT_SYMBOL (kunmap); -void *kmap_atomic (struct page *page,enum km_type type) +void *kmap_atomic (struct page *page) {unsigned int idx;unsigned long vaddr;
@@ -73,7 +73,7 @@ void *kmap_atomic(struct page *page, enu }EXPORT_SYMBOL (kmap_atomic); -void kunmap_atomic (void *kvaddr,enum km_type type) +void kunmap_atomic (void *kvaddr) {unsigned long vaddr = (unsigned long ) kvaddr &PAGE_MASK ;unsigned int idx;
@@ -98,7 +98,7 @@ void kunmap_atomic(void *kvaddr, enum km }EXPORT_SYMBOL (kunmap_atomic); -void *kmap_atomic_pfn (unsigned long pfn,enum km_type type) +void *kmap_atomic_pfn (unsigned long pfn) {unsigned int idx;unsigned long vaddr;
arch/frv/include/asm/highmem.h +2 -2
@@ -112,7 +112,7 @@ extern struct page *kmap_atomic_to_page( (void *) damlr; \ }) -static inline void *kmap_atomic (struct page *page,enum km_type type) +static inline void *kmap_atomic (struct page *page) {unsigned long paddr;
@@ -152,7 +152,7 @@ do { \ asmvolatile ("tlbpr %0,gr0,#4,#1" : :"r" (vaddr) :"memory" ); \ }while (0 ) -static inline void kunmap_atomic(void *kvaddr, enum km_type type) +static inline void kunmap_atomic(void *kvaddr) { type =kmap_atomic_idx_pop ();switch (type) {
arch/frv/include/asm/pgtable.h +4 -4
@@ -451,11 +451,11 @@ static inline pte_t pte_modify(pte_t pte#if defined(CONFIG_HIGHPTE )#define pte_offset_map (dir, address) \ - ((pte_t *)kmap_atomic(pmd_page(*(dir)),KM_PTE0) + pte_index(address)) + ((pte_t *)kmap_atomic(pmd_page(*(dir))) + pte_index(address))#define pte_offset_map_nested (dir, address) \ - ((pte_t *)kmap_atomic(pmd_page(*(dir)),KM_PTE1) + pte_index(address)) -#define pte_unmap (pte) kunmap_atomic(pte, KM_PTE0) -#define pte_unmap_nested (pte) kunmap_atomic((pte), KM_PTE1) + ((pte_t *)kmap_atomic(pmd_page(*(dir))) + pte_index(address)) +#define pte_unmap (pte) kunmap_atomic(pte) +#define pte_unmap_nested (pte) kunmap_atomic((pte))#else #define pte_offset_map (dir, address) \ ((pte_t *)page_address(pmd_page(*(dir))) + pte_index(address))
arch/microblaze/include/asm/pgtable.h +4 -4
@@ -478,12 +478,12 @@ static inline pmd_t *pmd_offset(pgd_t *d#define pte_offset_kernel (dir, addr) \ ((pte_t *) pmd_page_kernel(*(dir)) + pte_index(addr))#define pte_offset_map (dir, addr) \ - ((pte_t *) kmap_atomic(pmd_page(*(dir)), KM_PTE0) + pte_index(addr)) + ((pte_t *) kmap_atomic(pmd_page(*(dir))) + pte_index(addr))#define pte_offset_map_nested (dir, addr) \ - ((pte_t *) kmap_atomic(pmd_page(*(dir)), KM_PTE1) + pte_index(addr)) + ((pte_t *) kmap_atomic(pmd_page(*(dir))) + pte_index(addr)) -#define pte_unmap (pte) kunmap_atomic(pte, KM_PTE0) -#define pte_unmap_nested (pte) kunmap_atomic(pte, KM_PTE1) +#define pte_unmap (pte) kunmap_atomic(pte) +#define pte_unmap_nested (pte) kunmap_atomic(pte)/* Encode and decode a nonlinear file mapping entry */ #define PTE_FILE_MAX_BITS 29
arch/mips/include/asm/highmem.h +3 -3
@@ -47,9 +47,9 @@ extern void kunmap_high(struct page *pagextern void *__kmap (struct page *page);extern void __kunmap (struct page *page); -extern void *__kmap_atomic (struct page *page,enum km_type type); -extern void __kunmap_atomic (void *kvaddr,enum km_type type); -extern void *kmap_atomic_pfn (unsigned long pfn,enum km_type type); +extern void *__kmap_atomic (struct page *page); +extern void __kunmap_atomic (void *kvaddr); +extern void *kmap_atomic_pfn (unsigned long pfn);extern struct page *__kmap_atomic_to_page (void *ptr);#define kmap __kmap
arch/mips/mm/c-r4k.c +2 -2
@@ -498,7 +498,7 @@ static inline void local_r4k_flush_cacheif (map_coherent) vaddr =kmap_coherent (page, addr);else - vaddr =kmap_atomic (page,KM_USER0 ); + vaddr =kmap_atomic (page); addr = (unsigned long )vaddr; }
@@ -521,7 +521,7 @@ static inline void local_r4k_flush_cacheif (map_coherent)kunmap_coherent ();else -kunmap_atomic (vaddr,KM_USER0 ); +kunmap_atomic (vaddr); } }
arch/mips/mm/highmem.c +4 -4
@@ -40,7 +40,7 @@ EXPORT_SYMBOL(__kunmap);* kmaps are appropriate for short, tight code paths only. */ -void *__kmap_atomic (struct page *page,enum km_type type) +void *__kmap_atomic (struct page *page) {enum fixed_addresses idx;unsigned long vaddr;
@@ -85,9 +85,9 @@ static void __debug_kunmap_atomic(void *#endif } -void __kunmap_atomic (void *kvaddr,enum km_type type) +void __kunmap_atomic (void *kvaddr) { - type =kmap_atomic_idx_pop (); +int type =kmap_atomic_idx_pop ();__debug_kunmap_atomic (kvaddr, type);pagefault_enable (); }
@@ -97,7 +97,7 @@ EXPORT_SYMBOL(__kunmap_atomic);* This is the same as kmap_atomic() but can map memory that doesn't * have a struct page associated with it. */ -void *kmap_atomic_pfn (unsigned long pfn,enum km_type type) +void *kmap_atomic_pfn (unsigned long pfn) {enum fixed_addresses idx;unsigned long vaddr;
arch/mips/mm/init.c +4 -4
@@ -204,21 +204,21 @@ void copy_user_highpage(struct page *to, {void *vfrom, *vto; - vto =kmap_atomic (to,KM_USER1 ); + vto =kmap_atomic (to);if (cpu_has_dc_aliases &&page_mapped (from) && !Page_dcache_dirty (from)) { vfrom =kmap_coherent (from, vaddr);copy_page (vto, vfrom);kunmap_coherent (); }else { - vfrom =kmap_atomic (from,KM_USER0 ); + vfrom =kmap_atomic (from);copy_page (vto, vfrom); -kunmap_atomic (vfrom,KM_USER0 ); +kunmap_atomic (vfrom); }if ((!cpu_has_ic_fills_f_dc) ||pages_do_alias ((unsigned long )vto, vaddr &PAGE_MASK ))flush_data_cache_page ((unsigned long )vto); -kunmap_atomic (vto,KM_USER1 ); +kunmap_atomic (vto);/* Make sure this page is cleared on other CPU's too before using it */ smp_wmb (); }
arch/mn10300/include/asm/highmem.h +3 -3
@@ -70,7 +70,7 @@ static inline void kunmap(struct page *p* be used in IRQ contexts, so in some (very limited) cases we need * it. */ -static inline unsigned long kmap_atomic (struct page *page,enum km_type type) +static inline unsigned long kmap_atomic (struct page *page) {enum fixed_addresses idx;unsigned long vaddr;
@@ -111,9 +111,9 @@ static inline void debug_kunmap_atomic(u#endif } -static inline void kunmap_atomic (unsigned long vaddr,enum km_type type) +static inline void kunmap_atomic (unsigned long vaddr) { - type =kmap_atomic_idx_pop (); +int type =kmap_atomic_idx_pop ();debug_kunmap_atomic (vaddr, type); }
arch/powerpc/include/asm/highmem.h +4 -4
@@ -60,9 +60,9 @@ extern pte_t *pkmap_page_table;extern void *kmap_high (struct page *page);extern void kunmap_high (struct page *page); -extern void *kmap_atomic_prot (struct page *page,enum km_type type, +extern void *kmap_atomic_prot (struct page *page,pgprot_t prot); -extern void kunmap_atomic (void *kvaddr,enum km_type type); +extern void kunmap_atomic (void *kvaddr);static inline void *kmap (struct page *page) {
@@ -80,9 +80,9 @@ static inline void kunmap(struct page *pkunmap_high (page); } -static inline void *kmap_atomic (struct page *page,enum km_type type) +static inline void *kmap_atomic (struct page *page) { -return kmap_atomic_prot (page, type, kmap_prot); +return kmap_atomic_prot (page, kmap_prot); }static inline struct page *kmap_atomic_to_page (void *ptr)
arch/powerpc/include/asm/pgtable-ppc32.h +4 -4
@@ -308,12 +308,12 @@ static inline void __ptep_set_access_fla#define pte_offset_kernel (dir, addr) \ ((pte_t *) pmd_page_vaddr(*(dir)) + pte_index(addr))#define pte_offset_map (dir, addr) \ - ((pte_t *) kmap_atomic(pmd_page(*(dir)), KM_PTE0) + pte_index(addr)) + ((pte_t *) kmap_atomic(pmd_page(*(dir))) + pte_index(addr))#define pte_offset_map_nested (dir, addr) \ - ((pte_t *) kmap_atomic(pmd_page(*(dir)), KM_PTE1) + pte_index(addr)) + ((pte_t *) kmap_atomic(pmd_page(*(dir))) + pte_index(addr)) -#define pte_unmap (pte) kunmap_atomic(pte, KM_PTE0) -#define pte_unmap_nested (pte) kunmap_atomic(pte, KM_PTE1) +#define pte_unmap (pte) kunmap_atomic(pte) +#define pte_unmap_nested (pte) kunmap_atomic(pte)/* * Encode and decode a swap entry.
arch/powerpc/mm/dma-noncoherent.c +1 -1
@@ -368,7 +368,7 @@ static inline void __dma_sync_page_highm/* Sync this buffer segment */ __dma_sync ((void *)start, seg_size, direction); -kunmap_atomic ((void *)start,KM_PPC_SYNC_PAGE ); +kunmap_atomic ((void *)start); seg_nr++;/* Calculate next buffer segment size */
arch/powerpc/mm/highmem.c +4 -4
@@ -29,9 +29,9 @@* be used in IRQ contexts, so in some (very limited) cases we need * it. */ -void *kmap_atomic_prot (struct page *page,enum km_type type,pgprot_t prot) +void *kmap_atomic_prot (struct page *page,pgprot_t prot) { -unsigned int idx; +unsigned int idx, type;unsigned long vaddr;/* even !CONFIG_PREEMPT needs this, for in_atomic in do_page_fault */
@@ -74,9 +74,9 @@ static void debug_kunmap_atomic(void *kv#endif } -void kunmap_atomic (void *kvaddr,enum km_type type) +void kunmap_atomic (void *kvaddr) { - type =kmap_atomic_idx_pop (); +int type =kmap_atomic_idx_pop ();debug_kunmap_atomic (kvaddr, type);pagefault_enable (); }
arch/powerpc/mm/mem.c +2 -2
@@ -418,9 +418,9 @@ EXPORT_SYMBOL(flush_dcache_page);void flush_dcache_icache_page (struct page *page) {#ifdef CONFIG_BOOKE -void *start =kmap_atomic (page,KM_PPC_SYNC_ICACHE ); +void *start =kmap_atomic (page);__flush_dcache_icache (start); -kunmap_atomic (start,KM_PPC_SYNC_ICACHE ); +kunmap_atomic (start);#elif defined(CONFIG_8xx) || defined(CONFIG_PPC64 )/* On 8xx there is no need to kmap since highmem is not supported */ __flush_dcache_icache (page_address (page));
arch/sh/mm/cache.c +6 -6
@@ -83,7 +83,7 @@ void copy_user_highpage(struct page *to, {void *vfrom, *vto; - vto =kmap_atomic (to,KM_USER1 ); + vto =kmap_atomic (to);if (boot_cpu_data.dcache.n_aliases &&page_mapped (from) && !test_bit (PG_dcache_dirty, &from->flags)) {
@@ -91,15 +91,15 @@ void copy_user_highpage(struct page *to,copy_page (vto, vfrom);kunmap_coherent (vfrom); }else { - vfrom =kmap_atomic (from,KM_USER0 ); + vfrom =kmap_atomic (from);copy_page (vto, vfrom); -kunmap_atomic (vfrom,KM_USER0 ); +kunmap_atomic (vfrom); }if (pages_do_alias ((unsigned long )vto, vaddr &PAGE_MASK ))__flush_purge_region (vto,PAGE_SIZE ); -kunmap_atomic (vto,KM_USER1 ); +kunmap_atomic (vto);/* Make sure this page is cleared on other CPU's too before using it */ smp_wmb (); }
@@ -107,14 +107,14 @@ EXPORT_SYMBOL(copy_user_highpage);void clear_user_highpage (struct page *page,unsigned long vaddr) { -void *kaddr =kmap_atomic (page,KM_USER0 ); +void *kaddr =kmap_atomic (page);clear_page (kaddr);if (pages_do_alias ((unsigned long )kaddr, vaddr &PAGE_MASK ))__flush_purge_region (kaddr,PAGE_SIZE ); -kunmap_atomic (kaddr,KM_USER0 ); +kunmap_atomic (kaddr); }EXPORT_SYMBOL (clear_user_highpage);
arch/sparc/include/asm/highmem.h +2 -2
@@ -70,8 +70,8 @@ static inline void kunmap(struct page *pkunmap_high (page); } -extern void *kmap_atomic (struct page *page,enum km_type type); -extern void kunmap_atomic (void *kvaddr,enum km_type type); +extern void *kmap_atomic (struct page *page); +extern void kunmap_atomic (void *kvaddr);extern struct page *kmap_atomic_to_page (void *vaddr);#define flush_cache_kmaps () flush_cache_all()
arch/sparc/mm/highmem.c +4 -4
@@ -29,9 +29,9 @@#include <asm/tlbflush.h> #include <asm/fixmap.h> -void *kmap_atomic (struct page *page,enum km_type type) +void *kmap_atomic (struct page *page) { -unsigned long idx; +unsigned long idx, type;unsigned long vaddr;/* even !CONFIG_PREEMPT needs this, for in_atomic in do_page_fault */
@@ -99,9 +99,9 @@ static void debug_kunmap_atomic(void *kv#endif } -void kunmap_atomic (void *kvaddr,enum km_type type) +void kunmap_atomic (void *kvaddr) { - type =kmap_atomic_idx_pop (); +int type =kmap_atomic_idx_pop ();debug_kunmap_atomic (kvaddr, type);pagefault_enable (); }
arch/um/kernel/skas/uaccess.c +2 -2
@@ -68,7 +68,7 @@ static int do_op_one_page(unsigned longreturn -1 ; page =pte_page (*pte); - addr = (unsigned long )kmap_atomic (page,KM_UML_USERCOPY ) + + addr = (unsigned long )kmap_atomic (page) + (addr & ~PAGE_MASK ); current->thread.fault_catcher = &buf;
@@ -81,7 +81,7 @@ static int do_op_one_page(unsigned long current->thread.fault_catcher =NULL ; -kunmap_atomic (page,KM_UML_USERCOPY ); +kunmap_atomic (page);return n; }
arch/x86/include/asm/highmem.h +5 -5
@@ -59,11 +59,11 @@ extern void kunmap_high(struct page *pagvoid *kmap (struct page *page);void kunmap (struct page *page); -void *kmap_atomic_prot (struct page *page,enum km_type type,pgprot_t prot); -void *kmap_atomic (struct page *page,enum km_type type); -void kunmap_atomic (void *kvaddr,enum km_type type); -void *kmap_atomic_pfn (unsigned long pfn,enum km_type type); -void *kmap_atomic_prot_pfn (unsigned long pfn,enum km_type type,pgprot_t prot); +void *kmap_atomic_prot (struct page *page,pgprot_t prot); +void *kmap_atomic (struct page *page); +void kunmap_atomic (void *kvaddr); +void *kmap_atomic_pfn (unsigned long pfn); +void *kmap_atomic_prot_pfn (unsigned long pfn,pgprot_t prot);struct page *kmap_atomic_to_page (void *ptr);#ifndef CONFIG_PARAVIRT
arch/x86/include/asm/iomap.h +2 -2
@@ -27,10 +27,10 @@#include <asm/tlbflush.h> void * -iomap_atomic_prot_pfn (unsigned long pfn,enum km_type type,pgprot_t prot); +iomap_atomic_prot_pfn (unsigned long pfn,pgprot_t prot);void -iounmap_atomic (void *kvaddr,enum km_type type); +iounmap_atomic (void *kvaddr);int iomap_create_wc (resource_size_t base,unsigned long size,pgprot_t *prot);
arch/x86/include/asm/paravirt.h +1 -1
@@ -436,7 +436,7 @@ static inline void paravirt_release_pud( }#ifdef CONFIG_HIGHPTE -static inline void *kmap_atomic_pte (struct page *page,enum km_type type) +static inline void *kmap_atomic_pte (struct page *page) {unsigned long ret; ret = PVOP_CALL2(unsigned long, pv_mmu_ops.kmap_atomic_pte, page, type);
arch/x86/include/asm/paravirt_types.h +1 -1
@@ -305,7 +305,7 @@ struct pv_mmu_ops {#endif /* PAGETABLE_LEVELS >= 3 */ #ifdef CONFIG_HIGHPTE -void *(*kmap_atomic_pte)(struct page *page,enum km_type type); +void *(*kmap_atomic_pte)(struct page *page);#endif struct pv_lazy_ops lazy_mode;
arch/x86/include/asm/pgtable_32.h +2 -2
@@ -57,10 +57,10 @@ extern void set_pmd_pfn(unsigned long, u ((pte_t *)kmap_atomic_pte (pmd_page (*(dir)), __KM_PTE) + \ pte_index((address)))#define pte_offset_map_nested (dir, address) \ - ((pte_t *)kmap_atomic_pte(pmd_page(*(dir)), KM_PTE1) + \ + ((pte_t *)kmap_atomic_pte(pmd_page(*(dir))) + \ pte_index((address)))#define pte_unmap (pte) kunmap_atomic((pte), __KM_PTE) -#define pte_unmap_nested (pte) kunmap_atomic((pte), KM_PTE1) +#define pte_unmap_nested (pte) kunmap_atomic((pte))#else #define pte_offset_map (dir, address) \ ((pte_t *)page_address(pmd_page(*(dir))) + pte_index((address)))
arch/x86/kernel/crash_dump_32.c +4 -4
@@ -41,20 +41,20 @@ ssize_t copy_oldmem_page(unsigned long pif (!csize)return 0 ; - vaddr =kmap_atomic_pfn (pfn,KM_PTE0 ); + vaddr =kmap_atomic_pfn (pfn);if (!userbuf) {memcpy (buf, (vaddr + offset), csize); -kunmap_atomic (vaddr,KM_PTE0 ); +kunmap_atomic (vaddr); }else {if (!kdump_buf_page) {printk (KERN_WARNING "Kdump: Kdump buffer page not" " allocated\n" ); -kunmap_atomic (vaddr,KM_PTE0 ); +kunmap_atomic (vaddr);return -EFAULT ; }copy_page (kdump_buf_page, vaddr); -kunmap_atomic (vaddr,KM_PTE0 ); +kunmap_atomic (vaddr);if (copy_to_user (buf, (kdump_buf_page + offset), csize))return -EFAULT ; }
arch/x86/kernel/vmi_32.c +1 -1
@@ -267,7 +267,7 @@ static void vmi_nop(void) }#ifdef CONFIG_HIGHPTE -static void *vmi_kmap_atomic_pte (struct page *page,enum km_type type) +static void *vmi_kmap_atomic_pte (struct page *page) {void *va =kmap_atomic (page, type);
arch/x86/kvm/lapic.c +4 -4
@@ -1179,9 +1179,9 @@ void kvm_lapic_sync_from_vapic(struct kvif (!irqchip_in_kernel (vcpu->kvm) || !vcpu->arch.apic->vapic_addr)return ; - vapic =kmap_atomic (vcpu->arch.apic->vapic_page,KM_USER0 ); + vapic =kmap_atomic (vcpu->arch.apic->vapic_page); data = *(u32 *)(vapic +offset_in_page (vcpu->arch.apic->vapic_addr)); -kunmap_atomic (vapic,KM_USER0 ); +kunmap_atomic (vapic);apic_set_tpr (vcpu->arch.apic, data &0xff ); }
@@ -1206,9 +1206,9 @@ void kvm_lapic_sync_to_vapic(struct kvm_ max_isr =0 ; data = (tpr &0xff ) | ((max_isr &0xf0 ) <<8 ) | (max_irr <<24 ); - vapic =kmap_atomic (vcpu->arch.apic->vapic_page,KM_USER0 ); + vapic =kmap_atomic (vcpu->arch.apic->vapic_page); *(u32 *)(vapic +offset_in_page (vcpu->arch.apic->vapic_addr)) = data; -kunmap_atomic (vapic,KM_USER0 ); +kunmap_atomic (vapic); }void kvm_lapic_set_vapic_addr (struct kvm_vcpu *vcpu,gpa_t vapic_addr)
arch/x86/kvm/paging_tmpl.h +2 -2
@@ -88,9 +88,9 @@ static bool FNAME(cmpxchg_gpte)(struct k page =gfn_to_page (kvm, table_gfn); - table =kmap_atomic (page,KM_USER0 ); + table =kmap_atomic (page); ret =CMPXCHG (&table[index], orig_pte, new_pte); -kunmap_atomic (table,KM_USER0 ); +kunmap_atomic (table);kvm_release_page_dirty (page);
arch/x86/kvm/svm.c +14 -14
@@ -1386,7 +1386,7 @@ static inline int nested_svm_intr(structreturn 0 ; } -static void *nested_svm_map (struct vcpu_svm *svm,u64 gpa,enum km_type idx) +static void *nested_svm_map (struct vcpu_svm *svm,u64 gpa) {struct page *page;
@@ -1406,7 +1406,7 @@ error:return NULL ; } -static void nested_svm_unmap (void *addr,enum km_type idx) +static void nested_svm_unmap (void *addr) {struct page *page;
@@ -1430,7 +1430,7 @@ static bool nested_svm_exit_handled_msr(if (!(svm->nested.intercept & (1ULL <<INTERCEPT_MSR_PROT )))return false; - msrpm =nested_svm_map (svm, svm->nested.vmcb_msrpm,KM_USER0 ); + msrpm =nested_svm_map (svm, svm->nested.vmcb_msrpm);if (!msrpm) goto out;
@@ -1458,7 +1458,7 @@ static bool nested_svm_exit_handled_msr( ret = msrpm[t1] & ((1 << param) << t0); out: -nested_svm_unmap (msrpm,KM_USER0 ); +nested_svm_unmap (msrpm);return ret; }
@@ -1584,7 +1584,7 @@ static int nested_svm_vmexit(struct vcpustruct vmcb *hsave = svm->nested.hsave;struct vmcb *vmcb = svm->vmcb; - nested_vmcb =nested_svm_map (svm, svm->nested.vmcb,KM_USER0 ); + nested_vmcb =nested_svm_map (svm, svm->nested.vmcb);if (!nested_vmcb)return 1 ;
@@ -1662,7 +1662,7 @@ static int nested_svm_vmexit(struct vcpu/* Exit nested SVM mode */ svm->nested.vmcb =0 ; -nested_svm_unmap (nested_vmcb,KM_USER0 ); +nested_svm_unmap (nested_vmcb);kvm_mmu_reset_context (&svm->vcpu);kvm_mmu_load (&svm->vcpu);
@@ -1675,7 +1675,7 @@ static bool nested_svm_vmrun_msrpm(strucu32 *nested_msrpm;int i; - nested_msrpm =nested_svm_map (svm, svm->nested.vmcb_msrpm,KM_USER0 ); + nested_msrpm =nested_svm_map (svm, svm->nested.vmcb_msrpm);if (!nested_msrpm)return false;
@@ -1684,7 +1684,7 @@ static bool nested_svm_vmrun_msrpm(struc svm->vmcb->control.msrpm_base_pa =__pa (svm->nested.msrpm); -nested_svm_unmap (nested_msrpm,KM_USER0 ); +nested_svm_unmap (nested_msrpm);return true; }
@@ -1695,7 +1695,7 @@ static bool nested_svm_vmrun(struct vcpustruct vmcb *hsave = svm->nested.hsave;struct vmcb *vmcb = svm->vmcb; - nested_vmcb =nested_svm_map (svm, svm->vmcb->save.rax,KM_USER0 ); + nested_vmcb =nested_svm_map (svm, svm->vmcb->save.rax);if (!nested_vmcb)return false;
@@ -1814,7 +1814,7 @@ static bool nested_svm_vmrun(struct vcpu svm->vmcb->control.event_inj = nested_vmcb->control.event_inj; svm->vmcb->control.event_inj_err = nested_vmcb->control.event_inj_err; -nested_svm_unmap (nested_vmcb,KM_USER0 ); +nested_svm_unmap (nested_vmcb);enable_gif (svm);
@@ -1847,12 +1847,12 @@ static int vmload_interception(struct vc svm->next_rip =kvm_rip_read (&svm->vcpu) +3 ;skip_emulated_instruction (&svm->vcpu); - nested_vmcb =nested_svm_map (svm, svm->vmcb->save.rax,KM_USER0 ); + nested_vmcb =nested_svm_map (svm, svm->vmcb->save.rax);if (!nested_vmcb)return 1 ;nested_svm_vmloadsave (nested_vmcb, svm->vmcb); -nested_svm_unmap (nested_vmcb,KM_USER0 ); +nested_svm_unmap (nested_vmcb);return 1 ; }
@@ -1867,12 +1867,12 @@ static int vmsave_interception(struct vc svm->next_rip =kvm_rip_read (&svm->vcpu) +3 ;skip_emulated_instruction (&svm->vcpu); - nested_vmcb =nested_svm_map (svm, svm->vmcb->save.rax,KM_USER0 ); + nested_vmcb =nested_svm_map (svm, svm->vmcb->save.rax);if (!nested_vmcb)return 1 ;nested_svm_vmloadsave (svm->vmcb, nested_vmcb); -nested_svm_unmap (nested_vmcb,KM_USER0 ); +nested_svm_unmap (nested_vmcb);return 1 ; }
arch/x86/kvm/x86.c +4 -4
@@ -685,12 +685,12 @@ static void kvm_write_guest_time(struct*/ vcpu->hv_clock.version +=2 ; - shared_kaddr =kmap_atomic (vcpu->time_page,KM_USER0 ); + shared_kaddr =kmap_atomic (vcpu->time_page);memcpy (shared_kaddr + vcpu->time_offset, &vcpu->hv_clock,sizeof (vcpu->hv_clock)); -kunmap_atomic (shared_kaddr,KM_USER0 ); +kunmap_atomic (shared_kaddr);mark_page_dirty (v->kvm, vcpu->time >>PAGE_SHIFT ); }
@@ -2668,9 +2668,9 @@ static int emulator_cmpxchg_emulated(uns page =gfn_to_page (vcpu->kvm, gpa >>PAGE_SHIFT ); - kaddr =kmap_atomic (page,KM_USER0 ); + kaddr =kmap_atomic (page);set_64bit ((u64 *)(kaddr +offset_in_page (gpa)), val); -kunmap_atomic (kaddr,KM_USER0 ); +kunmap_atomic (kaddr);kvm_release_page_dirty (page); } emul_write:
arch/x86/lib/usercopy_32.c +2 -2
@@ -760,9 +760,9 @@ survive:break ; } - maddr =kmap_atomic (pg,KM_USER0 ); + maddr =kmap_atomic (pg);memcpy (maddr + offset, from, len); -kunmap_atomic (maddr,KM_USER0 ); +kunmap_atomic (maddr);set_page_dirty_lock (pg);put_page (pg);up_read (¤t->mm->mmap_sem);
arch/x86/mm/highmem_32.c +10 -7
@@ -27,10 +27,11 @@ void kunmap(struct page *page)* However when holding an atomic kmap it is not legal to sleep, so atomic * kmaps are appropriate for short, tight code paths only. */ -void *kmap_atomic_prot (struct page *page,enum km_type type,pgprot_t prot) +void *kmap_atomic_prot (struct page *page,pgprot_t prot) {enum fixed_addresses idx;unsigned long vaddr; +int type;/* even !CONFIG_PREEMPT needs this, for in_atomic in do_page_fault */ pagefault_disable ();
@@ -47,15 +48,16 @@ void *kmap_atomic_prot(struct page *pagereturn (void *)vaddr; } -void *kmap_atomic (struct page *page,enum km_type type) +void *kmap_atomic (struct page *page) { -return kmap_atomic_prot (page, type, kmap_prot); +return kmap_atomic_prot (page, kmap_prot); } -void kunmap_atomic (void *kvaddr,enum km_type type) +void kunmap_atomic (void *kvaddr) {unsigned long vaddr = (unsigned long ) kvaddr &PAGE_MASK ;enum fixed_addresses idx; +int type; type =kmap_atomic_idx_pop (); idx = type +KM_TYPE_NR *smp_processor_id ();
@@ -82,10 +84,11 @@ void kunmap_atomic(void *kvaddr, enum km* This is the same as kmap_atomic() but can map memory that doesn't * have a struct page associated with it. */ -void *kmap_atomic_prot_pfn (unsigned long pfn,enum km_type type,pgprot_t prot) +void *kmap_atomic_prot_pfn (unsigned long pfn,pgprot_t prot) {enum fixed_addresses idx;unsigned long vaddr; +int type;pagefault_disable ();
@@ -98,9 +101,9 @@ void *kmap_atomic_prot_pfn(unsigned longreturn (void *)vaddr; } -void *kmap_atomic_pfn (unsigned long pfn,enum km_type type) +void *kmap_atomic_pfn (unsigned long pfn) { -return kmap_atomic_prot_pfn (pfn, type, kmap_prot); +return kmap_atomic_prot_pfn (pfn, kmap_prot); }EXPORT_SYMBOL_GPL (kmap_atomic_pfn);/* temporarily in use by i915 GEM until vmap */
arch/x86/mm/iomap_32.c +2 -2
@@ -59,7 +59,7 @@ EXPORT_SYMBOL_GPL(iomap_free);* Map 'pfn' using fixed map 'type' and protections 'prot' */ void * -iomap_atomic_prot_pfn (unsigned long pfn,enum km_type type,pgprot_t prot) +iomap_atomic_prot_pfn (unsigned long pfn,pgprot_t prot) {/* * For non-PAT systems, promote PAGE_KERNEL_WC to PAGE_KERNEL_UC_MINUS.
@@ -75,7 +75,7 @@ iomap_atomic_prot_pfn(unsigned long pfn,EXPORT_SYMBOL_GPL (iomap_atomic_prot_pfn);void -iounmap_atomic (void *kvaddr,enum km_type type) +iounmap_atomic (void *kvaddr) {unsigned long vaddr = (unsigned long ) kvaddr &PAGE_MASK ;enum fixed_addresses idx = type +KM_TYPE_NR *smp_processor_id ();
arch/x86/xen/mmu.c +1 -1
@@ -1428,7 +1428,7 @@ static void xen_pgd_free(struct mm_struc }#ifdef CONFIG_HIGHPTE -static void *xen_kmap_atomic_pte (struct page *page,enum km_type type) +static void *xen_kmap_atomic_pte (struct page *page) {pgprot_t prot =PAGE_KERNEL ;
crypto/async_tx/async_memcpy.c +4 -4
@@ -78,13 +78,13 @@ async_memcpy(struct page *dest, struct p/* wait for any prerequisite operations */ async_tx_quiesce (&submit->depend_tx); - dest_buf =kmap_atomic (dest,KM_USER0 ) + dest_offset; - src_buf =kmap_atomic (src,KM_USER1 ) + src_offset; + dest_buf =kmap_atomic (dest) + dest_offset; + src_buf =kmap_atomic (src) + src_offset;memcpy (dest_buf, src_buf, len); -kunmap_atomic (src_buf,KM_USER1 ); -kunmap_atomic (dest_buf,KM_USER0 ); +kunmap_atomic (src_buf); +kunmap_atomic (dest_buf);async_tx_sync_epilog (submit); }
drivers/ata/libata-sff.c +4 -4
@@ -879,13 +879,13 @@ static void ata_pio_sector(struct ata_qu/* FIXME: use a bounce buffer */ local_irq_save (flags); - buf =kmap_atomic (page,KM_IRQ0 ); + buf =kmap_atomic (page);/* do the actual data transfer */ ap->ops->sff_data_xfer (qc->dev, buf + offset, qc->sect_size, do_write); -kunmap_atomic (buf,KM_IRQ0 ); +kunmap_atomic (buf);local_irq_restore (flags); }else { buf =page_address (page);
@@ -1017,13 +1017,13 @@ next_sg:/* FIXME: use bounce buffer */ local_irq_save (flags); - buf =kmap_atomic (page,KM_IRQ0 ); + buf =kmap_atomic (page);/* do the actual data transfer */ consumed = ap->ops->sff_data_xfer (dev, buf + offset, count, rw); -kunmap_atomic (buf,KM_IRQ0 ); +kunmap_atomic (buf);local_irq_restore (flags); }else { buf =page_address (page);
drivers/block/brd.c +10 -10
@@ -204,9 +204,9 @@ static void copy_to_brd(struct brd_devic page =brd_lookup_page (brd, sector);BUG_ON (!page); - dst =kmap_atomic (page,KM_USER1 ); + dst =kmap_atomic (page);memcpy (dst + offset, src, copy); -kunmap_atomic (dst,KM_USER1 ); +kunmap_atomic (dst);if (copy < n) { src += copy;
@@ -215,9 +215,9 @@ static void copy_to_brd(struct brd_devic page =brd_lookup_page (brd, sector);BUG_ON (!page); - dst =kmap_atomic (page,KM_USER1 ); + dst =kmap_atomic (page);memcpy (dst, src, copy); -kunmap_atomic (dst,KM_USER1 ); +kunmap_atomic (dst); } }
@@ -235,9 +235,9 @@ static void copy_from_brd(void *dst, str copy =min_t (size_t, n,PAGE_SIZE - offset); page =brd_lookup_page (brd, sector);if (page) { - src =kmap_atomic (page,KM_USER1 ); + src =kmap_atomic (page);memcpy (dst, src + offset, copy); -kunmap_atomic (src,KM_USER1 ); +kunmap_atomic (src); }else memset (dst,0 , copy);
@@ -247,9 +247,9 @@ static void copy_from_brd(void *dst, str copy = n - copy; page =brd_lookup_page (brd, sector);if (page) { - src =kmap_atomic (page,KM_USER1 ); + src =kmap_atomic (page);memcpy (dst, src, copy); -kunmap_atomic (src,KM_USER1 ); +kunmap_atomic (src); }else memset (dst,0 , copy); }
@@ -271,7 +271,7 @@ static int brd_do_bvec(struct brd_device goto out; } - mem =kmap_atomic (page,KM_USER0 ); + mem =kmap_atomic (page);if (rw ==READ ) {copy_from_brd (mem + off, brd, sector, len);flush_dcache_page (page);
@@ -279,7 +279,7 @@ static int brd_do_bvec(struct brd_deviceflush_dcache_page (page);copy_to_brd (brd, mem + off, sector, len); } -kunmap_atomic (mem,KM_USER0 ); +kunmap_atomic (mem); out:return err;
drivers/block/loop.c +8 -8
@@ -91,16 +91,16 @@ static int transfer_none(struct loop_dev struct page *loop_page, unsigned loop_off, int size, sector_t real_block) { - char *raw_buf = kmap_atomic(raw_page, KM_USER0) + raw_off; -char *loop_buf =kmap_atomic (loop_page,KM_USER1 ) + loop_off; + char *raw_buf = kmap_atomic(raw_page) + raw_off; +char *loop_buf =kmap_atomic (loop_page) + loop_off;if (cmd ==READ )memcpy (loop_buf, raw_buf, size);else memcpy (raw_buf, loop_buf, size); -kunmap_atomic (loop_buf,KM_USER1 ); -kunmap_atomic (raw_buf,KM_USER0 ); +kunmap_atomic (loop_buf); +kunmap_atomic (raw_buf);cond_resched ();return 0 ; }
@@ -110,8 +110,8 @@ static int transfer_xor(struct loop_devi struct page *loop_page, unsigned loop_off, int size, sector_t real_block) { - char *raw_buf = kmap_atomic(raw_page, KM_USER0) + raw_off; -char *loop_buf =kmap_atomic (loop_page,KM_USER1 ) + loop_off; + char *raw_buf = kmap_atomic(raw_page) + raw_off; +char *loop_buf =kmap_atomic (loop_page) + loop_off;char *in, *out, *key;int i, keysize;
@@ -128,8 +128,8 @@ static int transfer_xor(struct loop_devifor (i =0 ; i < size; i++) *out++ = *in++ ^ key[(i &511 ) % keysize]; -kunmap_atomic (loop_buf,KM_USER1 ); -kunmap_atomic (raw_buf,KM_USER0 ); +kunmap_atomic (loop_buf); +kunmap_atomic (raw_buf);cond_resched ();return 0 ; }
drivers/block/pktcdvd.c +4 -4
@@ -1021,14 +1021,14 @@ static void pkt_copy_bio_data(struct biowhile (copy_size >0 ) {struct bio_vec *src_bvl =bio_iovec_idx (src_bio, seg); -void *vfrom =kmap_atomic (src_bvl->bv_page,KM_USER0 ) + +void *vfrom =kmap_atomic (src_bvl->bv_page) + src_bvl->bv_offset + offs;void *vto =page_address (dst_page) + dst_offs;int len =min_t (int, copy_size, src_bvl->bv_len - offs);BUG_ON (len <0 );memcpy (vto, vfrom, len); -kunmap_atomic (vfrom,KM_USER0 ); +kunmap_atomic (vfrom); seg++; offs =0 ;
@@ -1053,10 +1053,10 @@ static void pkt_make_local_copy(struct p offs =0 ;for (f =0 ; f < pkt->frames; f++) {if (bvec[f].bv_page != pkt->pages[p]) { -void *vfrom =kmap_atomic (bvec[f].bv_page,KM_USER0 ) + bvec[f].bv_offset; +void *vfrom =kmap_atomic (bvec[f].bv_page) + bvec[f].bv_offset;void *vto =page_address (pkt->pages[p]) + offs;memcpy (vto, vfrom,CD_FRAMESIZE ); -kunmap_atomic (vfrom,KM_USER0 ); +kunmap_atomic (vfrom); bvec[f].bv_page = pkt->pages[p]; bvec[f].bv_offset = offs; }else {
drivers/crypto/hifn_795x.c +5 -5
@@ -1731,9 +1731,9 @@ static int ablkcipher_get(void *saddr, uwhile (size) { copy =min (srest,min (dst->length, size)); - daddr =kmap_atomic (sg_page (dst),KM_IRQ0 ); + daddr =kmap_atomic (sg_page (dst));memcpy (daddr + dst->offset + offset, saddr, copy); -kunmap_atomic (daddr,KM_IRQ0 ); +kunmap_atomic (daddr); nbytes -= copy; size -= copy;
@@ -1793,17 +1793,17 @@ static void hifn_process_ready(struct abcontinue ; } - saddr =kmap_atomic (sg_page (t),KM_SOFTIRQ0 ); + saddr =kmap_atomic (sg_page (t)); err =ablkcipher_get (saddr, &t->length, t->offset, dst, nbytes, &nbytes);if (err <0 ) { -kunmap_atomic (saddr,KM_SOFTIRQ0 ); +kunmap_atomic (saddr);break ; } idx += err; -kunmap_atomic (saddr,KM_SOFTIRQ0 ); +kunmap_atomic (saddr); }ablkcipher_walk_exit (&rctx->walk);
drivers/edac/edac_mc.c +2 -2
@@ -588,13 +588,13 @@ static void edac_mc_scrub_block(unsignedif (PageHighMem (pg))local_irq_save (flags); - virt_addr =kmap_atomic (pg,KM_BOUNCE_READ ); + virt_addr =kmap_atomic (pg);/* Perform architecture specific atomic scrub operation */ atomic_scrub (virt_addr + offset, size);/* Unmap and complete */ -kunmap_atomic (virt_addr,KM_BOUNCE_READ ); +kunmap_atomic (virt_addr);if (PageHighMem (pg))local_irq_restore (flags);
drivers/gpu/drm/drm_cache.c +4 -4
@@ -40,10 +40,10 @@ drm_clflush_page(struct page *page)if (unlikely (page ==NULL ))return ; - page_virtual =kmap_atomic (page,KM_USER0 ); + page_virtual =kmap_atomic (page);for (i =0 ; i <PAGE_SIZE ; i += boot_cpu_data.x86_clflush_size)clflush (page_virtual + i); -kunmap_atomic (page_virtual,KM_USER0 ); +kunmap_atomic (page_virtual); } static void drm_cache_flush_clflush(struct page *pages[],
@@ -86,10 +86,10 @@ drm_clflush_pages(struct page *pages[],if (unlikely (page ==NULL ))continue ; - page_virtual =kmap_atomic (page,KM_USER0 ); + page_virtual =kmap_atomic (page);flush_dcache_range ((unsigned long )page_virtual, (unsigned long )page_virtual +PAGE_SIZE ); - kunmap_atomic(page_virtual, KM_USER0); + kunmap_atomic(page_virtual); }#else printk (KERN_ERR "Architecture has no drm_cache.c support\n" );
drivers/gpu/drm/i915/i915_gem.c +20 -20
@@ -149,11 +149,11 @@ fast_shmem_read(struct page **pages,char __iomem *vaddr;int unwritten; - vaddr =kmap_atomic (pages[page_base >>PAGE_SHIFT ],KM_USER0 ); + vaddr =kmap_atomic (pages[page_base >>PAGE_SHIFT ]);if (vaddr ==NULL )return -ENOMEM ; unwritten =__copy_to_user_inatomic (data, vaddr + page_offset, length); -kunmap_atomic (vaddr,KM_USER0 ); +kunmap_atomic (vaddr);if (unwritten)return -EFAULT ;
@@ -179,20 +179,20 @@ slow_shmem_copy(struct page *dst_page, {char *dst_vaddr, *src_vaddr; - dst_vaddr =kmap_atomic (dst_page,KM_USER0 ); + dst_vaddr =kmap_atomic (dst_page);if (dst_vaddr ==NULL )return -ENOMEM ; - src_vaddr =kmap_atomic (src_page,KM_USER1 ); + src_vaddr =kmap_atomic (src_page);if (src_vaddr ==NULL ) { -kunmap_atomic (dst_vaddr,KM_USER0 ); +kunmap_atomic (dst_vaddr);return -ENOMEM ; }memcpy (dst_vaddr + dst_offset, src_vaddr + src_offset, length); -kunmap_atomic (src_vaddr,KM_USER1 ); -kunmap_atomic (dst_vaddr,KM_USER0 ); +kunmap_atomic (src_vaddr); +kunmap_atomic (dst_vaddr);return 0 ; }
@@ -217,13 +217,13 @@ slow_shmem_bit17_copy(struct page *gpu_p cpu_page, cpu_offset, length); } - gpu_vaddr =kmap_atomic (gpu_page,KM_USER0 ); + gpu_vaddr =kmap_atomic (gpu_page);if (gpu_vaddr ==NULL )return -ENOMEM ; - cpu_vaddr =kmap_atomic (cpu_page,KM_USER1 ); + cpu_vaddr =kmap_atomic (cpu_page);if (cpu_vaddr ==NULL ) { -kunmap_atomic (gpu_vaddr,KM_USER0 ); +kunmap_atomic (gpu_vaddr);return -ENOMEM ; }
@@ -249,8 +249,8 @@ slow_shmem_bit17_copy(struct page *gpu_p length -= this_length; } -kunmap_atomic (cpu_vaddr,KM_USER1 ); -kunmap_atomic (gpu_vaddr,KM_USER0 ); +kunmap_atomic (cpu_vaddr); +kunmap_atomic (gpu_vaddr);return 0 ; }
@@ -558,11 +558,11 @@ slow_kernel_write(struct io_mapping *mapunsigned long unwritten; dst_vaddr =io_mapping_map_atomic_wc (mapping, gtt_base); - src_vaddr =kmap_atomic (user_page,KM_USER1 ); + src_vaddr =kmap_atomic (user_page); unwritten =__copy_from_user_inatomic_nocache (dst_vaddr + gtt_offset, src_vaddr + user_offset, length); -kunmap_atomic (src_vaddr,KM_USER1 ); +kunmap_atomic (src_vaddr);io_mapping_unmap_atomic (dst_vaddr);if (unwritten)return -EFAULT ;
@@ -578,11 +578,11 @@ fast_shmem_write(struct page **pages,char __iomem *vaddr;unsigned long unwritten; - vaddr =kmap_atomic (pages[page_base >>PAGE_SHIFT ],KM_USER0 ); + vaddr =kmap_atomic (pages[page_base >>PAGE_SHIFT ]);if (vaddr ==NULL )return -ENOMEM ; unwritten =__copy_from_user_inatomic (vaddr + page_offset, data, length); -kunmap_atomic (vaddr,KM_USER0 ); +kunmap_atomic (vaddr);if (unwritten)return -EFAULT ;
@@ -4697,11 +4697,11 @@ void i915_gem_detach_phys_object(struct page_count = obj->size /PAGE_SIZE ;for (i =0 ; i < page_count; i++) { -char *dst =kmap_atomic (obj_priv->pages[i],KM_USER0 ); +char *dst =kmap_atomic (obj_priv->pages[i]);char *src = obj_priv->phys_obj->handle->vaddr + (i *PAGE_SIZE );memcpy (dst, src,PAGE_SIZE ); -kunmap_atomic (dst,KM_USER0 ); +kunmap_atomic (dst); }drm_clflush_pages (obj_priv->pages, page_count);drm_agp_chipset_flush (dev);
@@ -4757,11 +4757,11 @@ i915_gem_attach_phys_object(struct drm_d page_count = obj->size /PAGE_SIZE ;for (i =0 ; i < page_count; i++) { -char *src =kmap_atomic (obj_priv->pages[i],KM_USER0 ); +char *src =kmap_atomic (obj_priv->pages[i]);char *dst = obj_priv->phys_obj->handle->vaddr + (i *PAGE_SIZE );memcpy (dst, src,PAGE_SIZE ); -kunmap_atomic (src,KM_USER0 ); +kunmap_atomic (src); }i915_gem_object_put_pages (obj);
drivers/gpu/drm/i915/i915_gem_debug.c +5 -5
@@ -57,13 +57,13 @@ static void i915_gem_dump_page(struct page *page, uint32_t start, uint32_t end, uint32_t bias, uint32_t mark) { - uint32_t *mem = kmap_atomic(page, KM_USER0); + uint32_t *mem = kmap_atomic(page);int i;for (i = start; i < end; i +=4 )DRM_INFO ("%08x: %08x%s\n" , (int ) (bias + i), mem[i /4 ], (bias + i == mark) ?" ********" :"" ); -kunmap_atomic (mem,KM_USER0 ); +kunmap_atomic (mem);/* give syslog time to catch up */ msleep (1 ); }
@@ -157,7 +157,7 @@ i915_gem_object_check_coherency(struct dfor (page =0 ; page < obj->size /PAGE_SIZE ; page++) {int i; - backing_map =kmap_atomic (obj_priv->pages[page],KM_USER0 ); + backing_map =kmap_atomic (obj_priv->pages[page]);if (backing_map ==NULL ) {DRM_ERROR ("failed to map backing page\n" );
@@ -181,13 +181,13 @@ i915_gem_object_check_coherency(struct d } } } -kunmap_atomic (backing_map,KM_USER0 ); +kunmap_atomic (backing_map); backing_map =NULL ; } out:if (backing_map !=NULL ) -kunmap_atomic (backing_map,KM_USER0 ); +kunmap_atomic (backing_map);iounmap (gtt_mapping);/* give syslog time to catch up */
drivers/gpu/drm/ttm/ttm_bo_util.c +4 -4
@@ -148,7 +148,7 @@ static int ttm_copy_io_ttm_page(struct t src = (void *)((unsigned long )src + (page <<PAGE_SHIFT ));#ifdef CONFIG_X86 - dst =kmap_atomic_prot (d,KM_USER0 , prot); + dst =kmap_atomic_prot (d, prot);#else if (pgprot_val (prot) !=pgprot_val (PAGE_KERNEL )) dst =vmap (&d,1 ,0 , prot);
@@ -161,7 +161,7 @@ static int ttm_copy_io_ttm_page(struct tmemcpy_fromio (dst, src,PAGE_SIZE );#ifdef CONFIG_X86 -kunmap_atomic (dst,KM_USER0 ); +kunmap_atomic (dst);#else if (pgprot_val (prot) !=pgprot_val (PAGE_KERNEL ))vunmap (dst);
@@ -184,7 +184,7 @@ static int ttm_copy_ttm_io_page(struct t dst = (void *)((unsigned long )dst + (page <<PAGE_SHIFT ));#ifdef CONFIG_X86 - src =kmap_atomic_prot (s,KM_USER0 , prot); + src =kmap_atomic_prot (s, prot);#else if (pgprot_val (prot) !=pgprot_val (PAGE_KERNEL )) src =vmap (&s,1 ,0 , prot);
@@ -197,7 +197,7 @@ static int ttm_copy_ttm_io_page(struct tmemcpy_toio (dst, src,PAGE_SIZE );#ifdef CONFIG_X86 -kunmap_atomic (src,KM_USER0 ); +kunmap_atomic (src);#else if (pgprot_val (prot) !=pgprot_val (PAGE_KERNEL ))vunmap (src);
drivers/gpu/drm/ttm/ttm_tt.c +8 -8
@@ -491,11 +491,11 @@ static int ttm_tt_swapin(struct ttm_tt * goto out_err;preempt_disable (); - from_virtual =kmap_atomic (from_page,KM_USER0 ); - to_virtual =kmap_atomic (to_page,KM_USER1 ); + from_virtual =kmap_atomic (from_page); + to_virtual =kmap_atomic (to_page);memcpy (to_virtual, from_virtual,PAGE_SIZE ); -kunmap_atomic (to_virtual,KM_USER1 ); -kunmap_atomic (from_virtual,KM_USER0 ); +kunmap_atomic (to_virtual); +kunmap_atomic (from_virtual);preempt_enable ();page_cache_release (from_page); }
@@ -558,11 +558,11 @@ int ttm_tt_swapout(struct ttm_tt *ttm, s goto out_err;preempt_disable (); - from_virtual =kmap_atomic (from_page,KM_USER0 ); - to_virtual =kmap_atomic (to_page,KM_USER1 ); + from_virtual =kmap_atomic (from_page); + to_virtual =kmap_atomic (to_page);memcpy (to_virtual, from_virtual,PAGE_SIZE ); -kunmap_atomic (to_virtual,KM_USER1 ); -kunmap_atomic (from_virtual,KM_USER0 ); +kunmap_atomic (to_virtual); +kunmap_atomic (from_virtual);preempt_enable ();set_page_dirty (to_page);mark_page_accessed (to_page);
drivers/ide/ide-taskfile.c +2 -2
@@ -252,7 +252,7 @@ void ide_pio_bytes(ide_drive_t *drive, sif (page_is_high)local_irq_save (flags); - buf =kmap_atomic (page,KM_BIO_SRC_IRQ ) + offset; + buf =kmap_atomic (page) + offset; cmd->nleft -= nr_bytes; cmd->cursg_ofs += nr_bytes;
@@ -268,7 +268,7 @@ void ide_pio_bytes(ide_drive_t *drive, selse hwif->tp_ops->input_data (drive, cmd, buf, nr_bytes); -kunmap_atomic (buf,KM_BIO_SRC_IRQ ); +kunmap_atomic (buf);if (page_is_high)local_irq_restore (flags);
drivers/infiniband/ulp/iser/iser_memory.c +4 -4
@@ -129,11 +129,11 @@ static int iser_start_rdma_unaligned_sg( p = mem;for_each_sg (sgl, sg, data->size, i) { - from =kmap_atomic (sg_page (sg),KM_USER0 ); + from =kmap_atomic (sg_page (sg));memcpy (p, from + sg->offset, sg->length); -kunmap_atomic (from,KM_USER0 ); +kunmap_atomic (from); p += sg->length; } }
@@ -189,11 +189,11 @@ void iser_finalize_rdma_unaligned_sg(str p = mem;for_each_sg (sgl, sg, sg_size, i) { - to =kmap_atomic (sg_page (sg),KM_SOFTIRQ0 ); + to =kmap_atomic (sg_page (sg));memcpy (to + sg->offset, p, sg->length); -kunmap_atomic (to,KM_SOFTIRQ0 ); +kunmap_atomic (to); p += sg->length; } }
drivers/md/bitmap.c +18 -18
@@ -494,14 +494,14 @@ void bitmap_update_sb(struct bitmap *bitreturn ; }spin_unlock_irqrestore (&bitmap->lock, flags); - sb = (bitmap_super_t *)kmap_atomic (bitmap->sb_page,KM_USER0 ); + sb = (bitmap_super_t *)kmap_atomic (bitmap->sb_page); sb->events =cpu_to_le64 (bitmap->mddev->events);if (bitmap->mddev->events < bitmap->events_cleared) {/* rocking back to read-only */ bitmap->events_cleared = bitmap->mddev->events; sb->events_cleared =cpu_to_le64 (bitmap->events_cleared); } -kunmap_atomic (sb,KM_USER0 ); +kunmap_atomic (sb);write_page (bitmap, bitmap->sb_page,1 ); }
@@ -512,7 +512,7 @@ void bitmap_print_sb(struct bitmap *bitmif (!bitmap || !bitmap->sb_page)return ; - sb = (bitmap_super_t *)kmap_atomic (bitmap->sb_page,KM_USER0 ); + sb = (bitmap_super_t *)kmap_atomic (bitmap->sb_page);printk (KERN_DEBUG "%s: bitmap file superblock:\n" ,bmname (bitmap));printk (KERN_DEBUG " magic: %08x\n" ,le32_to_cpu (sb->magic));printk (KERN_DEBUG " version: %d\n" ,le32_to_cpu (sb->version));
@@ -531,7 +531,7 @@ void bitmap_print_sb(struct bitmap *bitmprintk (KERN_DEBUG " sync size: %llu KB\n" , (unsigned long long )le64_to_cpu (sb->sync_size)/2 );printk (KERN_DEBUG "max write behind: %d\n" ,le32_to_cpu (sb->write_behind)); -kunmap_atomic (sb,KM_USER0 ); +kunmap_atomic (sb); }/* read the superblock from the bitmap file and initialize some bitmap fields */
@@ -560,7 +560,7 @@ static int bitmap_read_sb(struct bitmapreturn err; } - sb = (bitmap_super_t *)kmap_atomic (bitmap->sb_page,KM_USER0 ); + sb = (bitmap_super_t *)kmap_atomic (bitmap->sb_page); chunksize =le32_to_cpu (sb->chunksize); daemon_sleep =le32_to_cpu (sb->daemon_sleep);
@@ -622,7 +622,7 @@ success: bitmap->events_cleared = bitmap->mddev->events; err =0 ; out: -kunmap_atomic (sb,KM_USER0 ); +kunmap_atomic (sb);if (err)bitmap_print_sb (bitmap);return err;
@@ -647,7 +647,7 @@ static int bitmap_mask_state(struct bitmreturn 0 ; }spin_unlock_irqrestore (&bitmap->lock, flags); - sb = (bitmap_super_t *)kmap_atomic (bitmap->sb_page,KM_USER0 ); + sb = (bitmap_super_t *)kmap_atomic (bitmap->sb_page); old =le32_to_cpu (sb->state) & bits;switch (op) {case MASK_SET : sb->state |=cpu_to_le32 (bits);
@@ -656,7 +656,7 @@ static int bitmap_mask_state(struct bitmbreak ;default :BUG (); } -kunmap_atomic (sb,KM_USER0 ); +kunmap_atomic (sb);return old; }
@@ -824,12 +824,12 @@ static void bitmap_file_set_bit(struct b bit =file_page_offset (chunk);/* set the bit */ - kaddr =kmap_atomic (page,KM_USER0 ); + kaddr =kmap_atomic (page);if (bitmap->flags &BITMAP_HOSTENDIAN )set_bit (bit, kaddr);else ext2_set_bit (bit, kaddr); -kunmap_atomic (kaddr,KM_USER0 ); +kunmap_atomic (kaddr);PRINTK ("set file bit %lu page %lu\n" , bit, page->index);/* record page number so it gets flushed to disk when unplug occurs */
@@ -995,10 +995,10 @@ static int bitmap_init_from_disk(struct* if bitmap is out of date, dirty the * whole page and write it out */ - paddr =kmap_atomic (page,KM_USER0 ); + paddr =kmap_atomic (page);memset (paddr + offset,0xff ,PAGE_SIZE - offset); -kunmap_atomic (paddr,KM_USER0 ); +kunmap_atomic (paddr);write_page (bitmap, page,1 ); ret = -EIO ;
@@ -1006,12 +1006,12 @@ static int bitmap_init_from_disk(struct goto err; } } - paddr =kmap_atomic (page,KM_USER0 ); + paddr =kmap_atomic (page);if (bitmap->flags &BITMAP_HOSTENDIAN ) b =test_bit (bit, paddr);else b =ext2_test_bit (bit, paddr); -kunmap_atomic (paddr,KM_USER0 ); +kunmap_atomic (paddr);if (b) {/* if the disk bit is set, set the memory bit */ int needed = ((sector_t)(i+1) << (CHUNK_BLOCK_SHIFT(bitmap))
@@ -1145,10 +1145,10 @@ void bitmap_daemon_work(struct bitmap *bif (bitmap->need_sync) {bitmap_super_t *sb; bitmap->need_sync =0 ; - sb =kmap_atomic (bitmap->sb_page,KM_USER0 ); + sb =kmap_atomic (bitmap->sb_page); sb->events_cleared =cpu_to_le64 (bitmap->events_cleared); -kunmap_atomic (sb,KM_USER0 ); +kunmap_atomic (sb);write_page (bitmap, bitmap->sb_page,1 ); }spin_lock_irqsave (&bitmap->lock, flags);
@@ -1175,12 +1175,12 @@ void bitmap_daemon_work(struct bitmap *b -1);/* clear the bit */ - paddr =kmap_atomic (page,KM_USER0 ); + paddr =kmap_atomic (page);if (bitmap->flags &BITMAP_HOSTENDIAN )clear_bit (file_page_offset (j), paddr);else ext2_clear_bit (file_page_offset (j), paddr); -kunmap_atomic (paddr,KM_USER0 ); +kunmap_atomic (paddr); } }else j |=PAGE_COUNTER_MASK ;
drivers/media/video/ivtv/ivtv-udma.c +2 -2
@@ -57,9 +57,9 @@ int ivtv_udma_fill_sg_list (struct ivtv_if (dma->bouncemap[map_offset] ==NULL )return -1 ;local_irq_save (flags); - src =kmap_atomic (dma->map[map_offset],KM_BOUNCE_READ ) + offset; + src =kmap_atomic (dma->map[map_offset]) + offset;memcpy (page_address (dma->bouncemap[map_offset]) + offset, src, len); -kunmap_atomic (src,KM_BOUNCE_READ ); +kunmap_atomic (src);local_irq_restore (flags);sg_set_page (&dma->SGlist[map_offset], dma->bouncemap[map_offset], len, offset); }
drivers/memstick/host/jmb38x_ms.c +2 -2
@@ -323,7 +323,7 @@ static int jmb38x_ms_transfer_data(struc p_cnt =min (p_cnt, length);local_irq_save (flags); - buf =kmap_atomic (pg,KM_BIO_SRC_IRQ ) + p_off; + buf =kmap_atomic (pg) + p_off; }else { buf = host->req->data + host->block_pos; p_cnt = host->req->data_len - host->block_pos;
@@ -339,7 +339,7 @@ static int jmb38x_ms_transfer_data(struc : jmb38x_ms_read_reg_data(host, buf, p_cnt);if (host->req->long_data) { -kunmap_atomic (buf - p_off,KM_BIO_SRC_IRQ ); +kunmap_atomic (buf - p_off);local_irq_restore (flags); }
drivers/memstick/host/tifm_ms.c +2 -2
@@ -209,7 +209,7 @@ static unsigned int tifm_ms_transfer_dat p_cnt =min (p_cnt, length);local_irq_save (flags); - buf =kmap_atomic (pg,KM_BIO_SRC_IRQ ) + p_off; + buf =kmap_atomic (pg) + p_off; }else { buf = host->req->data + host->block_pos; p_cnt = host->req->data_len - host->block_pos;
@@ -220,7 +220,7 @@ static unsigned int tifm_ms_transfer_dat : tifm_ms_read_data(host, buf, p_cnt);if (host->req->long_data) { -kunmap_atomic (buf - p_off,KM_BIO_SRC_IRQ ); +kunmap_atomic (buf - p_off);local_irq_restore (flags); }
drivers/mmc/host/at91_mci.c +4 -4
@@ -218,7 +218,7 @@ static inline void at91_mci_sg_to_dma(st sg = &data->sg[i]; - sgbuffer =kmap_atomic (sg_page (sg),KM_BIO_SRC_IRQ ) + sg->offset; + sgbuffer =kmap_atomic (sg_page (sg)) + sg->offset; amount =min (size, sg->length); size -= amount;
@@ -232,7 +232,7 @@ static inline void at91_mci_sg_to_dma(st dmabuf += amount; } -kunmap_atomic (sgbuffer,KM_BIO_SRC_IRQ ); +kunmap_atomic (sgbuffer);if (size ==0 )break ;
@@ -351,13 +351,13 @@ static void at91_mci_post_dma_read(strucint index;/* Swap the contents of the buffer */ - buffer =kmap_atomic (sg_page (sg),KM_BIO_SRC_IRQ ) + sg->offset; + buffer =kmap_atomic (sg_page (sg)) + sg->offset;pr_debug ("buffer = %p, length = %d\n" , buffer, sg->length);for (index =0 ; index < (sg->length /4 ); index++) buffer[index] =swab32 (buffer[index]); -kunmap_atomic (buffer,KM_BIO_SRC_IRQ ); +kunmap_atomic (buffer); }flush_dcache_page (sg_page (sg));
drivers/mmc/host/mmci.h +2 -2
@@ -200,11 +200,11 @@ static inline char *mmci_kmap_atomic(strstruct scatterlist *sg = host->sg_ptr;local_irq_save (*flags); -return kmap_atomic (sg_page (sg),KM_BIO_SRC_IRQ ) + sg->offset; +return kmap_atomic (sg_page (sg)) + sg->offset; }static inline void mmci_kunmap_atomic (struct mmci_host *host,void *buffer,unsigned long *flags) { -kunmap_atomic (buffer,KM_BIO_SRC_IRQ ); +kunmap_atomic (buffer);local_irq_restore (*flags); }
drivers/mmc/host/msm_sdcc.c +1 -1
@@ -516,7 +516,7 @@ msmsdcc_pio_irq(int irq, void *dev_id) len =msmsdcc_pio_write (host, buffer, remain, status);/* Unmap the buffer */ -kunmap_atomic (buffer,KM_BIO_SRC_IRQ ); +kunmap_atomic (buffer);local_irq_restore (flags); host->pio.sg_off += len;
drivers/mmc/host/sdhci.c +2 -2
@@ -367,12 +367,12 @@ static void sdhci_transfer_pio(struct sdstatic char *sdhci_kmap_atomic (struct scatterlist *sg,unsigned long *flags) {local_irq_save (*flags); -return kmap_atomic (sg_page (sg),KM_BIO_SRC_IRQ ) + sg->offset; +return kmap_atomic (sg_page (sg)) + sg->offset; }static void sdhci_kunmap_atomic (void *buffer,unsigned long *flags) { -kunmap_atomic (buffer,KM_BIO_SRC_IRQ ); +kunmap_atomic (buffer);local_irq_restore (*flags); }
drivers/mmc/host/tifm_sd.c +8 -8
@@ -117,7 +117,7 @@ static void tifm_sd_read_fifo(struct tifunsigned char *buf;unsigned int pos =0 , val; - buf =kmap_atomic (pg,KM_BIO_DST_IRQ ) + off; + buf =kmap_atomic (pg) + off;if (host->cmd_flags &DATA_CARRY ) { buf[pos++] = host->bounce_buf_data[0 ]; host->cmd_flags &= ~DATA_CARRY ;
@@ -133,7 +133,7 @@ static void tifm_sd_read_fifo(struct tif } buf[pos++] = (val >>8 ) &0xff ; } -kunmap_atomic (buf - off,KM_BIO_DST_IRQ ); +kunmap_atomic (buf - off); } static void tifm_sd_write_fifo(struct tifm_sd *host, struct page *pg,
@@ -143,7 +143,7 @@ static void tifm_sd_write_fifo(struct tiunsigned char *buf;unsigned int pos =0 , val; - buf =kmap_atomic (pg,KM_BIO_SRC_IRQ ) + off; + buf =kmap_atomic (pg) + off;if (host->cmd_flags &DATA_CARRY ) { val = host->bounce_buf_data[0 ] | ((buf[pos++] <<8 ) &0xff00 );writel (val, sock->addr +SOCK_MMCSD_DATA );
@@ -160,7 +160,7 @@ static void tifm_sd_write_fifo(struct ti val |= (buf[pos++] <<8 ) &0xff00 ;writel (val, sock->addr +SOCK_MMCSD_DATA ); } -kunmap_atomic (buf - off,KM_BIO_SRC_IRQ ); +kunmap_atomic (buf - off); }static void tifm_sd_transfer_data (struct tifm_sd *host)
@@ -211,13 +211,13 @@ static void tifm_sd_copy_page(struct pag struct page *src, unsigned int src_off, unsigned int count) { - unsigned char *src_buf = kmap_atomic(src, KM_BIO_SRC_IRQ) + src_off; -unsigned char *dst_buf =kmap_atomic (dst,KM_BIO_DST_IRQ ) + dst_off; + unsigned char *src_buf = kmap_atomic(src) + src_off; +unsigned char *dst_buf =kmap_atomic (dst) + dst_off;memcpy (dst_buf, src_buf, count); -kunmap_atomic (dst_buf - dst_off,KM_BIO_DST_IRQ ); -kunmap_atomic (src_buf - src_off,KM_BIO_SRC_IRQ ); +kunmap_atomic (dst_buf - dst_off); +kunmap_atomic (src_buf - src_off); }static void tifm_sd_bounce_block (struct tifm_sd *host,struct mmc_data *r_data)
drivers/mmc/host/tmio_mmc.h +2 -2
@@ -206,13 +206,13 @@ static inline char *tmio_mmc_kmap_atomicstruct scatterlist *sg = host->sg_ptr;local_irq_save (*flags); -return kmap_atomic (sg_page (sg),KM_BIO_SRC_IRQ ) + sg->offset; +return kmap_atomic (sg_page (sg)) + sg->offset; }static inline void tmio_mmc_kunmap_atomic (struct tmio_mmc_host *host,unsigned long *flags) { -kunmap_atomic (sg_page (host->sg_ptr),KM_BIO_SRC_IRQ ); +kunmap_atomic (sg_page (host->sg_ptr));local_irq_restore (*flags); }
drivers/net/cassini.c +2 -2
@@ -102,8 +102,8 @@#include <asm/byteorder.h> #include <asm/uaccess.h> -#define cas_page_map (x) kmap_atomic((x), KM_SKB_DATA_SOFTIRQ) -#define cas_page_unmap (x) kunmap_atomic((x), KM_SKB_DATA_SOFTIRQ) +#define cas_page_map (x) kmap_atomic((x)) +#define cas_page_unmap (x) kunmap_atomic((x))#define CAS_NCPUS num_online_cpus()#if defined(CONFIG_CASSINI_NAPI ) && defined(HAVE_NETDEV_POLL )
drivers/net/e1000e/netdev.c +4 -6
@@ -796,9 +796,9 @@ static bool e1000_clean_rx_irq_ps(struct*/ pci_dma_sync_single_for_cpu (pdev, ps_page->dma,PAGE_SIZE ,PCI_DMA_FROMDEVICE ); - vaddr =kmap_atomic (ps_page->page,KM_SKB_DATA_SOFTIRQ ); + vaddr =kmap_atomic (ps_page->page);memcpy (skb_tail_pointer (skb), vaddr, l1); -kunmap_atomic (vaddr,KM_SKB_DATA_SOFTIRQ ); +kunmap_atomic (vaddr);pci_dma_sync_single_for_device (pdev, ps_page->dma,PAGE_SIZE ,PCI_DMA_FROMDEVICE );
@@ -991,12 +991,10 @@ static bool e1000_clean_jumbo_rx_irq(strif (length <= copybreak &&skb_tailroom (skb) >= length) {u8 *vaddr; - vaddr =kmap_atomic (buffer_info->page, -KM_SKB_DATA_SOFTIRQ ); + vaddr =kmap_atomic (buffer_info->page);memcpy (skb_tail_pointer (skb), vaddr, length); -kunmap_atomic (vaddr, -KM_SKB_DATA_SOFTIRQ ); +kunmap_atomic (vaddr);/* re-use the page, so don't erase * buffer_info->page */ skb_put (skb, length);
drivers/scsi/arcmsr/arcmsr_hba.c +4 -4
@@ -1370,7 +1370,7 @@ static int arcmsr_iop_message_xfer(struc/* 4 bytes: Areca io control code */ sg =scsi_sglist (cmd); - buffer =kmap_atomic (sg_page (sg),KM_IRQ0 ) + sg->offset; + buffer =kmap_atomic (sg_page (sg)) + sg->offset;if (scsi_sg_count (cmd) >1 ) { retvalue =ARCMSR_MESSAGE_FAIL ; goto message_out;
@@ -1573,7 +1573,7 @@ static int arcmsr_iop_message_xfer(struc } message_out: sg =scsi_sglist (cmd); -kunmap_atomic (buffer - sg->offset,KM_IRQ0 ); +kunmap_atomic (buffer - sg->offset);return retvalue; }
@@ -1618,11 +1618,11 @@ static void arcmsr_handle_virtual_commanstrncpy (&inqdata[32 ],"R001" ,4 );/* Product Revision */ sg =scsi_sglist (cmd); - buffer =kmap_atomic (sg_page (sg),KM_IRQ0 ) + sg->offset; + buffer =kmap_atomic (sg_page (sg)) + sg->offset;memcpy (buffer, inqdata,sizeof (inqdata)); sg =scsi_sglist (cmd); -kunmap_atomic (buffer - sg->offset,KM_IRQ0 ); +kunmap_atomic (buffer - sg->offset); cmd->scsi_done (cmd); }
drivers/scsi/cxgb3i/cxgb3i_pdu.c +1 -1
@@ -324,7 +324,7 @@ int cxgb3i_conn_init_pdu(struct iscsi_tamemcpy (dst, src+frag->page_offset, frag->size); dst += frag->size; -kunmap_atomic (src,KM_SOFTIRQ0 ); +kunmap_atomic (src); }if (padlen) {memset (dst,0 , padlen);
drivers/scsi/fcoe/fcoe.c +3 -3
@@ -1162,7 +1162,7 @@ u32 fcoe_fc_crc(struct fc_frame *fp) data =kmap_atomic (frag->page + (off >>PAGE_SHIFT ),KM_SKB_DATA_SOFTIRQ ); crc =crc32 (crc, data + (off & ~PAGE_MASK ), clen); -kunmap_atomic (data,KM_SKB_DATA_SOFTIRQ ); +kunmap_atomic (data); off += clen; len -= clen; }
@@ -1236,7 +1236,7 @@ int fcoe_xmit(struct fc_lport *lp, strucreturn -ENOMEM ; } frag = &skb_shinfo (skb)->frags[skb_shinfo (skb)->nr_frags -1 ]; - cp =kmap_atomic (frag->page,KM_SKB_DATA_SOFTIRQ ) + cp =kmap_atomic (frag->page) + frag->page_offset; }else { cp = (struct fcoe_crc_eof *)skb_put (skb, tlen);
@@ -1247,7 +1247,7 @@ int fcoe_xmit(struct fc_lport *lp, struc cp->fcoe_crc32 =cpu_to_le32 (~crc);if (skb_is_nonlinear (skb)) { -kunmap_atomic (cp,KM_SKB_DATA_SOFTIRQ ); +kunmap_atomic (cp); cp =NULL ; }
drivers/scsi/gdth.c +2 -2
@@ -2307,10 +2307,10 @@ static void gdth_copy_internal_data(gdthreturn ; }local_irq_save (flags); - address =kmap_atomic (sg_page (sl),KM_BIO_SRC_IRQ ) + sl->offset; + address =kmap_atomic (sg_page (sl)) + sl->offset;memcpy (address, buffer, cpnow);flush_dcache_page (sg_page (sl)); -kunmap_atomic (address,KM_BIO_SRC_IRQ ); +kunmap_atomic (address);local_irq_restore (flags);if (cpsum == cpcount)break ;
drivers/scsi/ips.c +3 -3
@@ -1509,14 +1509,14 @@ static int ips_is_passthru(struct scsi_c/* kmap_atomic() ensures addressability of the user buffer.*/ /* local_irq_save() protects the KM_IRQ0 address slot. */ local_irq_save (flags); - buffer =kmap_atomic (sg_page (sg),KM_IRQ0 ) + sg->offset; + buffer =kmap_atomic (sg_page (sg)) + sg->offset;if (buffer && buffer[0 ] =='C' && buffer[1 ] =='O' && buffer[2 ] =='P' && buffer[3 ] =='P' ) { -kunmap_atomic (buffer - sg->offset,KM_IRQ0 ); +kunmap_atomic (buffer - sg->offset);local_irq_restore (flags);return 1 ; } -kunmap_atomic (buffer - sg->offset,KM_IRQ0 ); +kunmap_atomic (buffer - sg->offset);local_irq_restore (flags); }return 0 ;
drivers/scsi/libfc/fc_fcp.c +2 -2
@@ -387,7 +387,7 @@ static void fc_fcp_recv_data(struct fc_fmemcpy ((char *)page_addr + (off & ~PAGE_MASK ), buf, sg_bytes); -kunmap_atomic (page_addr,KM_SOFTIRQ0 ); +kunmap_atomic (page_addr); buf += sg_bytes; offset += sg_bytes; remaining -= sg_bytes;
@@ -564,7 +564,7 @@ static int fc_fcp_send_data(struct fc_fc KM_SOFTIRQ0);memcpy (data, (char *)page_addr + (off & ~PAGE_MASK ), sg_bytes); -kunmap_atomic (page_addr,KM_SOFTIRQ0 ); +kunmap_atomic (page_addr); data += sg_bytes; } offset += sg_bytes;
drivers/scsi/libiscsi_tcp.c +2 -2
@@ -131,14 +131,14 @@ static void iscsi_tcp_segment_map(structif (page_count (sg_page (sg)) >=1 && !recv)return ; - segment->sg_mapped =kmap_atomic (sg_page (sg),KM_SOFTIRQ0 ); + segment->sg_mapped =kmap_atomic (sg_page (sg)); segment->data = segment->sg_mapped + sg->offset + segment->sg_offset; }void iscsi_tcp_segment_unmap (struct iscsi_segment *segment) {if (segment->sg_mapped) { -kunmap_atomic (segment->sg_mapped,KM_SOFTIRQ0 ); +kunmap_atomic (segment->sg_mapped); segment->sg_mapped =NULL ; segment->data =NULL ; }
drivers/scsi/libsas/sas_host_smp.c +4 -4
@@ -159,9 +159,9 @@ int sas_smp_host_handler(struct Scsi_Hos }local_irq_disable (); - buf =kmap_atomic (bio_page (req->bio),KM_USER0 ) +bio_offset (req->bio); + buf =kmap_atomic (bio_page (req->bio)) +bio_offset (req->bio);memcpy (req_data, buf,blk_rq_bytes (req)); -kunmap_atomic (buf -bio_offset (req->bio),KM_USER0 ); +kunmap_atomic (buf -bio_offset (req->bio));local_irq_enable ();if (req_data[0 ] !=SMP_REQUEST )
@@ -260,10 +260,10 @@ int sas_smp_host_handler(struct Scsi_Hos }local_irq_disable (); - buf =kmap_atomic (bio_page (rsp->bio),KM_USER0 ) +bio_offset (rsp->bio); + buf =kmap_atomic (bio_page (rsp->bio)) +bio_offset (rsp->bio);memcpy (buf, resp_data,blk_rq_bytes (rsp));flush_kernel_dcache_page (bio_page (rsp->bio)); -kunmap_atomic (buf -bio_offset (rsp->bio),KM_USER0 ); +kunmap_atomic (buf -bio_offset (rsp->bio));local_irq_enable (); out:
drivers/scsi/megaraid.c +2 -2
@@ -659,10 +659,10 @@ mega_build_cmd(adapter_t *adapter, Scsi_struct scatterlist *sg; sg =scsi_sglist (cmd); - buf =kmap_atomic (sg_page (sg),KM_IRQ0 ) + sg->offset; + buf =kmap_atomic (sg_page (sg)) + sg->offset;memset (buf,0 , cmd->cmnd[4 ]); -kunmap_atomic (buf - sg->offset,KM_IRQ0 ); +kunmap_atomic (buf - sg->offset); cmd->result = (DID_OK <<16 ); cmd->scsi_done (cmd);
drivers/scsi/mvsas/mv_sas.c +4 -4
@@ -556,9 +556,9 @@ static int mvs_task_prep_smp(struct mvs_#if _MV_DUMP/* copy cmd table */ - from =kmap_atomic (sg_page (sg_req),KM_IRQ0 ); + from =kmap_atomic (sg_page (sg_req));memcpy (buf_cmd, from + sg_req->offset, req_len); -kunmap_atomic (from,KM_IRQ0 ); +kunmap_atomic (from);#endif return 0 ;
@@ -1849,11 +1849,11 @@ int mvs_slot_complete(struct mvs_info *mcase SAS_PROTOCOL_SMP : {struct scatterlist *sg_resp = &task->smp_task.smp_resp; tstat->stat =SAM_GOOD ; - to =kmap_atomic (sg_page (sg_resp),KM_IRQ0 ); + to =kmap_atomic (sg_page (sg_resp));memcpy (to + sg_resp->offset, slot->response +sizeof (struct mvs_err_info ),sg_dma_len (sg_resp)); -kunmap_atomic (to,KM_IRQ0 ); +kunmap_atomic (to);break ; }
drivers/scsi/scsi_debug.c +12 -12
@@ -1651,7 +1651,7 @@ static int prot_verify_read(struct scsi_scsi_for_each_prot_sg (SCpnt, psgl,scsi_prot_sg_count (SCpnt), i) {int len =min (psgl->length, resid); - paddr =kmap_atomic (sg_page (psgl),KM_IRQ0 ) + psgl->offset; + paddr =kmap_atomic (sg_page (psgl)) + psgl->offset;memcpy (paddr, dif_storep +dif_offset (sector), len); sector += len >>3 ;
@@ -1661,7 +1661,7 @@ static int prot_verify_read(struct scsi_ sector =do_div (tmp_sec, sdebug_store_sectors); } resid -= len; -kunmap_atomic (paddr,KM_IRQ0 ); +kunmap_atomic (paddr); } dix_reads++;
@@ -1757,12 +1757,12 @@ static int prot_verify_write(struct scsiBUG_ON (scsi_sg_count (SCpnt) ==0 );BUG_ON (scsi_prot_sg_count (SCpnt) ==0 ); - paddr =kmap_atomic (sg_page (psgl),KM_IRQ1 ) + psgl->offset; + paddr =kmap_atomic (sg_page (psgl)) + psgl->offset; ppage_offset =0 ;/* For each data page */ scsi_for_each_sg (SCpnt, dsgl,scsi_sg_count (SCpnt), i) { - daddr =kmap_atomic (sg_page (dsgl),KM_IRQ0 ) + dsgl->offset; + daddr =kmap_atomic (sg_page (dsgl)) + dsgl->offset;/* For each sector-sized chunk in data page */ for (j =0 ; j < dsgl->length ; j += scsi_debug_sector_size) {
@@ -1771,10 +1771,10 @@ static int prot_verify_write(struct scsi* protection page advance to the next one */ if (ppage_offset >= psgl->length) { -kunmap_atomic (paddr,KM_IRQ1 ); +kunmap_atomic (paddr); psgl =sg_next (psgl);BUG_ON (psgl ==NULL ); - paddr =kmap_atomic (sg_page (psgl),KM_IRQ1 ) + paddr =kmap_atomic (sg_page (psgl)) + psgl->offset; ppage_offset =0 ; }
@@ -1836,10 +1836,10 @@ static int prot_verify_write(struct scsi ppage_offset +=sizeof (struct sd_dif_tuple ); } -kunmap_atomic (daddr,KM_IRQ0 ); +kunmap_atomic (daddr); } -kunmap_atomic (paddr,KM_IRQ1 ); +kunmap_atomic (paddr); dix_writes++;
@@ -1847,8 +1847,8 @@ static int prot_verify_write(struct scsi out: dif_errors++; -kunmap_atomic (daddr,KM_IRQ0 ); -kunmap_atomic (paddr,KM_IRQ1 ); +kunmap_atomic (daddr); +kunmap_atomic (paddr);return ret; }
@@ -1959,7 +1959,7 @@ static int resp_xdwriteread(struct scsi_ offset =0 ;for_each_sg (sdb->table.sgl, sg, sdb->table.nents, i) { - kaddr = (unsigned char *)kmap_atomic (sg_page (sg),KM_USER0 ); + kaddr = (unsigned char *)kmap_atomic (sg_page (sg));if (!kaddr) goto out;
@@ -1967,7 +1967,7 @@ static int resp_xdwriteread(struct scsi_ *(kaddr + sg->offset + j) ^= *(buf + offset + j); offset += sg->length; -kunmap_atomic (kaddr,KM_USER0 ); +kunmap_atomic (kaddr); } ret =0 ; out:
drivers/scsi/scsi_lib.c +2 -2
@@ -2535,7 +2535,7 @@ void *scsi_kmap_atomic_sg(struct scatterif (*len > sg_len) *len = sg_len; -return kmap_atomic (page,KM_BIO_SRC_IRQ ); +return kmap_atomic (page); }EXPORT_SYMBOL (scsi_kmap_atomic_sg);
@@ -2545,6 +2545,6 @@ EXPORT_SYMBOL(scsi_kmap_atomic_sg);*/ void scsi_kunmap_atomic_sg (void *virt) { -kunmap_atomic (virt,KM_BIO_SRC_IRQ ); +kunmap_atomic (virt); }EXPORT_SYMBOL (scsi_kunmap_atomic_sg);
drivers/scsi/sd_dif.c +6 -6
@@ -458,7 +458,7 @@ int sd_dif_prepare(struct request *rq, s virt = bio->bi_integrity->bip_sector &0xffffffff ;bip_for_each_vec (iv, bio->bi_integrity, i) { - sdt =kmap_atomic (iv->bv_page,KM_USER0 ) + sdt =kmap_atomic (iv->bv_page) + iv->bv_offset;for (j =0 ; j < iv->bv_len ; j += tuple_sz, sdt++) {
@@ -471,14 +471,14 @@ int sd_dif_prepare(struct request *rq, s phys++; } -kunmap_atomic (sdt,KM_USER0 ); +kunmap_atomic (sdt); } }return 0 ; error: -kunmap_atomic (sdt,KM_USER0 ); +kunmap_atomic (sdt);sd_printk (KERN_ERR , sdkp,"%s: virt %u, phys %u, ref %u, app %4x\n" , __func__, virt, phys,be32_to_cpu (sdt->ref_tag),be16_to_cpu (sdt->app_tag));
@@ -517,13 +517,13 @@ void sd_dif_complete(struct scsi_cmnd *s virt = bio->bi_integrity->bip_sector &0xffffffff ;bip_for_each_vec (iv, bio->bi_integrity, i) { - sdt =kmap_atomic (iv->bv_page,KM_USER0 ) + sdt =kmap_atomic (iv->bv_page) + iv->bv_offset;for (j =0 ; j < iv->bv_len ; j += tuple_sz, sdt++) {if (sectors ==0 ) { -kunmap_atomic (sdt,KM_USER0 ); +kunmap_atomic (sdt);return ; }
@@ -538,7 +538,7 @@ void sd_dif_complete(struct scsi_cmnd *s sectors--; } -kunmap_atomic (sdt,KM_USER0 ); +kunmap_atomic (sdt); } } }
drivers/staging/hv/RndisFilter.c +2 -2
@@ -410,7 +410,7 @@ static int RndisFilterOnReceive(struct h } rndisHeader = (struct rndis_message *)kmap_atomic ( -pfn_to_page (Packet->PageBuffers[0 ].Pfn),KM_IRQ0 ); +pfn_to_page (Packet->PageBuffers[0 ].Pfn)); rndisHeader = (void *)((unsigned long )rndisHeader + Packet->PageBuffers[0 ].Offset);
@@ -448,7 +448,7 @@ static int RndisFilterOnReceive(struct h sizeof(struct rndis_message) : rndisHeader->MessageLength); -kunmap_atomic (rndisHeader - Packet->PageBuffers[0 ].Offset,KM_IRQ0 ); +kunmap_atomic (rndisHeader - Packet->PageBuffers[0 ].Offset);DumpRndisMessage (&rndisMessage);
drivers/staging/hv/netvsc_drv.c +1 -1
@@ -351,7 +351,7 @@ static int netvsc_recv_callback(struct h packet->PageBuffers[i].Length);kunmap_atomic ((void *)((unsigned long )data - - packet->PageBuffers[i].Offset),KM_IRQ1 ); + packet->PageBuffers[i].Offset)); }local_irq_restore (flags);
drivers/staging/hv/storvsc_drv.c +9 -9
@@ -533,7 +533,7 @@ static unsigned int copy_to_bounce_buffeASSERT (orig_sgl[i].offset + orig_sgl[i].length <=PAGE_SIZE );if (j ==0 ) - bounce_addr = (unsigned long )kmap_atomic (sg_page ((&bounce_sgl[j])),KM_IRQ0 ); + bounce_addr = (unsigned long )kmap_atomic (sg_page ((&bounce_sgl[j])));while (srclen) {/* assume bounce offset always == 0 */
@@ -550,19 +550,19 @@ static unsigned int copy_to_bounce_buffeif (bounce_sgl[j].length ==PAGE_SIZE ) {/* full..move to next entry */ -kunmap_atomic ((void *)bounce_addr,KM_IRQ0 ); +kunmap_atomic ((void *)bounce_addr); j++;/* if we need to use another bounce buffer */ if (srclen || i != orig_sgl_count -1 ) - bounce_addr = (unsigned long )kmap_atomic (sg_page ((&bounce_sgl[j])),KM_IRQ0 ); + bounce_addr = (unsigned long )kmap_atomic (sg_page ((&bounce_sgl[j]))); }else if (srclen ==0 && i == orig_sgl_count -1 ) {/* unmap the last bounce that is < PAGE_SIZE */ -kunmap_atomic ((void *)bounce_addr,KM_IRQ0 ); +kunmap_atomic ((void *)bounce_addr); } } -kunmap_atomic ((void *)(src_addr - orig_sgl[i].offset),KM_IRQ0 ); +kunmap_atomic ((void *)(src_addr - orig_sgl[i].offset)); }local_irq_restore (flags);
@@ -594,7 +594,7 @@ static unsigned int copy_from_bounce_bufASSERT (orig_sgl[i].offset + orig_sgl[i].length <=PAGE_SIZE );if (j ==0 ) - bounce_addr = (unsigned long )kmap_atomic (sg_page ((&bounce_sgl[j])),KM_IRQ0 ); + bounce_addr = (unsigned long )kmap_atomic (sg_page ((&bounce_sgl[j])));while (destlen) { src = bounce_addr + bounce_sgl[j].offset;
@@ -610,15 +610,15 @@ static unsigned int copy_from_bounce_bufif (bounce_sgl[j].offset == bounce_sgl[j].length) {/* full */ -kunmap_atomic ((void *)bounce_addr,KM_IRQ0 ); +kunmap_atomic ((void *)bounce_addr); j++;/* if we need to use another bounce buffer */ if (destlen || i != orig_sgl_count -1 ) - bounce_addr = (unsigned long )kmap_atomic (sg_page ((&bounce_sgl[j])),KM_IRQ0 ); + bounce_addr = (unsigned long )kmap_atomic (sg_page ((&bounce_sgl[j]))); }else if (destlen ==0 && i == orig_sgl_count -1 ) {/* unmap the last bounce that is < PAGE_SIZE */ -kunmap_atomic ((void *)bounce_addr,KM_IRQ0 ); +kunmap_atomic ((void *)bounce_addr); } }
drivers/staging/pohmelfs/inode.c +4 -4
@@ -614,11 +614,11 @@ static int pohmelfs_write_begin(struct f }if (len !=PAGE_CACHE_SIZE ) { -void *kaddr =kmap_atomic (page,KM_USER0 ); +void *kaddr =kmap_atomic (page);memset (kaddr + start,0 ,PAGE_CACHE_SIZE - start);flush_dcache_page (page); -kunmap_atomic (kaddr,KM_USER0 ); +kunmap_atomic (kaddr); }SetPageUptodate (page); }
@@ -644,11 +644,11 @@ static int pohmelfs_write_end(struct filif (copied != len) {unsigned from = pos & (PAGE_CACHE_SIZE -1 ); -void *kaddr =kmap_atomic (page,KM_USER0 ); +void *kaddr =kmap_atomic (page);memset (kaddr + from + copied,0 , len - copied);flush_dcache_page (page); -kunmap_atomic (kaddr,KM_USER0 ); +kunmap_atomic (kaddr); }SetPageUptodate (page);
fs/afs/fsclient.c +4 -4
@@ -363,10 +363,10 @@ static int afs_deliver_fs_fetch_data(str_debug ("extract data" );if (call->count >0 ) { page = call->reply3; - buffer =kmap_atomic (page,KM_USER0 ); + buffer =kmap_atomic (page); ret =afs_extract_data (call, skb, last, buffer, call->count); -kunmap_atomic (buffer,KM_USER0 ); +kunmap_atomic (buffer);switch (ret) {case 0 :break ;case -EAGAIN :return 0 ;
@@ -409,9 +409,9 @@ static int afs_deliver_fs_fetch_data(strif (call->count <PAGE_SIZE ) {_debug ("clear" ); page = call->reply3; - buffer =kmap_atomic (page,KM_USER0 ); + buffer =kmap_atomic (page);memset (buffer + call->count,0 ,PAGE_SIZE - call->count); -kunmap_atomic (buffer,KM_USER0 ); +kunmap_atomic (buffer); }_leave (" = 0 [done]" );
fs/afs/mntpt.c +2 -2
@@ -172,9 +172,9 @@ static struct vfsmount *afs_mntpt_do_autif (PageError (page)) goto error; - buf =kmap_atomic (page,KM_USER0 ); + buf =kmap_atomic (page);memcpy (devname, buf, size); -kunmap_atomic (buf,KM_USER0 ); +kunmap_atomic (buf);page_cache_release (page); page =NULL ;
fs/aio.c +16 -16
@@ -156,7 +156,7 @@ static int aio_setup_ring(struct kioctx info->nr = nr_events;/* trusted copy */ - ring =kmap_atomic (info->ring_pages[0 ],KM_USER0 ); + ring =kmap_atomic (info->ring_pages[0 ]); ring->nr = nr_events;/* user copy */ ring->id = ctx->user_id; ring->head = ring->tail =0 ;
@@ -164,7 +164,7 @@ static int aio_setup_ring(struct kioctx ring->compat_features =AIO_RING_COMPAT_FEATURES ; ring->incompat_features =AIO_RING_INCOMPAT_FEATURES ; ring->header_length =sizeof (struct aio_ring ); -kunmap_atomic (ring,KM_USER0 ); +kunmap_atomic (ring);return 0 ; }
@@ -177,19 +177,19 @@ static int aio_setup_ring(struct kioctx#define AIO_EVENTS_FIRST_PAGE ((PAGE_SIZE - sizeof(struct aio_ring)) / sizeof(struct io_event))#define AIO_EVENTS_OFFSET (AIO_EVENTS_PER_PAGE - AIO_EVENTS_FIRST_PAGE) -#define aio_ring_event (info, nr, km) ({ \ +#define aio_ring_event (info, nr) ({ \ unsigned pos = (nr) + AIO_EVENTS_OFFSET; \ struct io_event *__event; \ __event = kmap_atomic( \ - (info)->ring_pages[pos / AIO_EVENTS_PER_PAGE], km); \ + (info)->ring_pages[pos / AIO_EVENTS_PER_PAGE]); \ __event += pos % AIO_EVENTS_PER_PAGE; \ __event; \ }) -#define put_aio_ring_event (event, km) do { \ +#define put_aio_ring_event (event) do { \ struct io_event *__event = (event); \ (void)__event; \ - kunmap_atomic((void *)((unsigned long)__event & PAGE_MASK), km); \ + kunmap_atomic((void *)((unsigned long)__event & PAGE_MASK)); \ } while(0)static void ctx_rcu_free (struct rcu_head *head)
@@ -451,13 +451,13 @@ static struct kiocb *__aio_get_req(struc* accept an event from this io. */ spin_lock_irq (&ctx->ctx_lock); - ring =kmap_atomic (ctx->ring_info.ring_pages[0 ],KM_USER0 ); + ring =kmap_atomic (ctx->ring_info.ring_pages[0 ]);if (ctx->reqs_active <aio_ring_avail (&ctx->ring_info, ring)) {list_add (&req->ki_list, &ctx->active_reqs); ctx->reqs_active++; okay =1 ; } -kunmap_atomic (ring,KM_USER0 ); +kunmap_atomic (ring);spin_unlock_irq (&ctx->ctx_lock);if (!okay) {
@@ -940,10 +940,10 @@ int aio_complete(struct kiocb *iocb, lonif (kiocbIsCancelled (iocb)) goto put_rq; - ring =kmap_atomic (info->ring_pages[0 ],KM_IRQ1 ); + ring =kmap_atomic (info->ring_pages[0 ]); tail = info->tail; - event =aio_ring_event (info, tail,KM_IRQ0 ); + event =aio_ring_event (info, tail);if (++tail >= info->nr) tail =0 ;
@@ -964,8 +964,8 @@ int aio_complete(struct kiocb *iocb, lon info->tail = tail; ring->tail = tail; -put_aio_ring_event (event,KM_IRQ0 ); -kunmap_atomic (ring,KM_IRQ1 ); +put_aio_ring_event (event); +kunmap_atomic (ring);pr_debug ("added to ring %p at [%lu]\n" , iocb, tail);
@@ -1010,7 +1010,7 @@ static int aio_read_evt(struct kioctx *iunsigned long head;int ret =0 ; - ring =kmap_atomic (info->ring_pages[0 ],KM_USER0 ); + ring =kmap_atomic (info->ring_pages[0 ]);dprintk ("in aio_read_evt h%lu t%lu m%lu\n" , (unsigned long )ring->head, (unsigned long )ring->tail, (unsigned long )ring->nr);
@@ -1022,18 +1022,18 @@ static int aio_read_evt(struct kioctx *i head = ring->head % info->nr;if (head != ring->tail) { -struct io_event *evp =aio_ring_event (info, head,KM_USER1 ); +struct io_event *evp =aio_ring_event (info, head); *ent = *evp; head = (head +1 ) % info->nr;smp_mb ();/* finish reading the event before updatng the head */ ring->head = head; ret =1 ; -put_aio_ring_event (evp,KM_USER1 ); +put_aio_ring_event (evp); }spin_unlock (&info->ring_lock); out: -kunmap_atomic (ring,KM_USER0 ); +kunmap_atomic (ring);dprintk ("leaving aio_read_evt: %d h%lu t%lu\n" , ret, (unsigned long )ring->head, (unsigned long )ring->tail);return ret;
fs/bio-integrity.c +5 -5
@@ -354,7 +354,7 @@ static void bio_integrity_generate(struc bix.sector_size = bi->sector_size;bio_for_each_segment (bv, bio, i) { -void *kaddr =kmap_atomic (bv->bv_page,KM_USER0 ); +void *kaddr =kmap_atomic (bv->bv_page); bix.data_buf = kaddr + bv->bv_offset; bix.data_size = bv->bv_len; bix.prot_buf = prot_buf;
@@ -368,7 +368,7 @@ static void bio_integrity_generate(struc total += sectors * bi->tuple_size;BUG_ON (total > bio->bi_integrity->bip_size); -kunmap_atomic (kaddr,KM_USER0 ); +kunmap_atomic (kaddr); } }
@@ -495,7 +495,7 @@ static int bio_integrity_verify(struct b bix.sector_size = bi->sector_size;bio_for_each_segment (bv, bio, i) { -void *kaddr =kmap_atomic (bv->bv_page,KM_USER0 ); +void *kaddr =kmap_atomic (bv->bv_page); bix.data_buf = kaddr + bv->bv_offset; bix.data_size = bv->bv_len; bix.prot_buf = prot_buf;
@@ -504,7 +504,7 @@ static int bio_integrity_verify(struct b ret = bi->verify_fn (&bix);if (ret) { -kunmap_atomic (kaddr,KM_USER0 ); +kunmap_atomic (kaddr);return ret; }
@@ -514,7 +514,7 @@ static int bio_integrity_verify(struct b total += sectors * bi->tuple_size;BUG_ON (total > bio->bi_integrity->bip_size); -kunmap_atomic (kaddr,KM_USER0 ); +kunmap_atomic (kaddr); }return ret;
fs/btrfs/compression.c +4 -4
@@ -129,10 +129,10 @@ static int check_compressed_csum(struct page = cb->compressed_pages[i]; csum = ~(u32 )0 ; - kaddr =kmap_atomic (page,KM_USER0 ); + kaddr =kmap_atomic (page); csum =btrfs_csum_data (root, kaddr, csum,PAGE_CACHE_SIZE );btrfs_csum_final (csum, (char *)&csum); -kunmap_atomic (kaddr,KM_USER0 ); +kunmap_atomic (kaddr);if (csum != *cb_sum) { printk(KERN_INFO "btrfs csum failed ino %lu "
@@ -529,10 +529,10 @@ static noinline int add_ra_bio_pages(strif (zero_offset) {int zeros; zeros =PAGE_CACHE_SIZE - zero_offset; - userpage =kmap_atomic (page,KM_USER0 ); + userpage =kmap_atomic (page);memset (userpage + zero_offset,0 , zeros);flush_dcache_page (page); -kunmap_atomic (userpage,KM_USER0 ); +kunmap_atomic (userpage); } }
fs/btrfs/ctree.c +15 -15
@@ -875,14 +875,14 @@ static noinline int generic_bin_search(s (offset + sizeof(struct btrfs_disk_key)) > map_start + map_len) {if (map_token) { -unmap_extent_buffer (eb, map_token,KM_USER0 ); +unmap_extent_buffer (eb, map_token); map_token =NULL ; } err =map_private_extent_buffer (eb, offset,sizeof (struct btrfs_disk_key ), &map_token, &kaddr, - &map_start, &map_len,KM_USER0 ); + &map_start, &map_len);if (!err) { tmp = (struct btrfs_disk_key *)(kaddr + offset -
@@ -906,13 +906,13 @@ static noinline int generic_bin_search(selse { *slot = mid;if (map_token) -unmap_extent_buffer (eb, map_token,KM_USER0 ); +unmap_extent_buffer (eb, map_token);return 0 ; } } *slot = low;if (map_token) -unmap_extent_buffer (eb, map_token,KM_USER0 ); +unmap_extent_buffer (eb, map_token);return 1 ; }
@@ -2348,7 +2348,7 @@ static noinline int __push_leaf_right(st i--; }if (left->map_token) { -unmap_extent_buffer (left, left->map_token,KM_USER1 ); +unmap_extent_buffer (left, left->map_token); left->map_token =NULL ; }
@@ -2404,7 +2404,7 @@ static noinline int __push_leaf_right(st }if (right->map_token) { -unmap_extent_buffer (right, right->map_token,KM_USER1 ); +unmap_extent_buffer (right, right->map_token); right->map_token =NULL ; } left_nritems -= push_items;
@@ -2561,7 +2561,7 @@ static noinline int __push_leaf_left(str }if (right->map_token) { -unmap_extent_buffer (right, right->map_token,KM_USER1 ); +unmap_extent_buffer (right, right->map_token); right->map_token =NULL ; }
@@ -2608,7 +2608,7 @@ static noinline int __push_leaf_left(str }btrfs_set_header_nritems (left, old_left_nritems + push_items);if (left->map_token) { -unmap_extent_buffer (left, left->map_token,KM_USER1 ); +unmap_extent_buffer (left, left->map_token); left->map_token =NULL ; }
@@ -2650,7 +2650,7 @@ static noinline int __push_leaf_left(strbtrfs_set_item_offset (right, item, push_space); }if (right->map_token) { -unmap_extent_buffer (right, right->map_token,KM_USER1 ); +unmap_extent_buffer (right, right->map_token); right->map_token =NULL ; }
@@ -2798,7 +2798,7 @@ static noinline int copy_for_split(struc }if (right->map_token) { -unmap_extent_buffer (right, right->map_token,KM_USER1 ); +unmap_extent_buffer (right, right->map_token); right->map_token =NULL ; }
@@ -3184,7 +3184,7 @@ int btrfs_truncate_item(struct btrfs_tra }if (leaf->map_token) { -unmap_extent_buffer (leaf, leaf->map_token,KM_USER1 ); +unmap_extent_buffer (leaf, leaf->map_token); leaf->map_token =NULL ; }
@@ -3300,7 +3300,7 @@ int btrfs_extend_item(struct btrfs_trans }if (leaf->map_token) { -unmap_extent_buffer (leaf, leaf->map_token,KM_USER1 ); +unmap_extent_buffer (leaf, leaf->map_token); leaf->map_token =NULL ; }
@@ -3423,7 +3423,7 @@ int btrfs_insert_some_items(struct btrfsbtrfs_set_item_offset (leaf, item, ioff - total_data); }if (leaf->map_token) { -unmap_extent_buffer (leaf, leaf->map_token,KM_USER1 ); +unmap_extent_buffer (leaf, leaf->map_token); leaf->map_token =NULL ; }
@@ -3538,7 +3538,7 @@ setup_items_for_insert(struct btrfs_tranbtrfs_set_item_offset (leaf, item, ioff - total_data); }if (leaf->map_token) { -unmap_extent_buffer (leaf, leaf->map_token,KM_USER1 ); +unmap_extent_buffer (leaf, leaf->map_token); leaf->map_token =NULL ; }
@@ -3766,7 +3766,7 @@ int btrfs_del_items(struct btrfs_trans_h }if (leaf->map_token) { -unmap_extent_buffer (leaf, leaf->map_token,KM_USER1 ); +unmap_extent_buffer (leaf, leaf->map_token); leaf->map_token =NULL ; }
fs/btrfs/ctree.h +4 -4
@@ -1195,17 +1195,17 @@ void btrfs_set_##name(struct extent_buff#define BTRFS_SETGET_HEADER_FUNCS (name, type, member, bits) \ static inline u##bits btrfs_##name(struct extent_buffer *eb) \ { \ - type *p = kmap_atomic(eb->first_page, KM_USER0); \ + type *p = kmap_atomic(eb->first_page); \ u##bits res = le##bits##_to_cpu(p->member); \ - kunmap_atomic(p, KM_USER0); \ + kunmap_atomic(p); \ return res; \ } \ static inline void btrfs_set_##name(struct extent_buffer *eb, \ u##bits val) \ { \ - type *p = kmap_atomic(eb->first_page, KM_USER0); \ + type *p = kmap_atomic(eb->first_page); \ p->member = cpu_to_le##bits(val); \ - kunmap_atomic(p, KM_USER0); \ + kunmap_atomic(p); \ }#define BTRFS_SETGET_STACK_FUNCS (name, type, member, bits) \
fs/btrfs/disk-io.c +2 -2
@@ -207,7 +207,7 @@ static int csum_tree_block(struct btrfs_while (len >0 ) { err =map_private_extent_buffer (buf, offset,32 , &map_token, &kaddr, - &map_start, &map_len,KM_USER0 ); + &map_start, &map_len);if (err)return 1 ; cur_len =min (len, map_len - (offset - map_start));
@@ -215,7 +215,7 @@ static int csum_tree_block(struct btrfs_ crc, cur_len); len -= cur_len; offset += cur_len; -unmap_extent_buffer (buf, map_token,KM_USER0 ); +unmap_extent_buffer (buf, map_token); }if (csum_size >sizeof (inline_result)) { result =kzalloc (csum_size *sizeof (char ),GFP_NOFS );
fs/btrfs/extent_io.c +28 -28
165 lines not on this page · raw message
fs/btrfs/file-item.c +5 -5
@@ -409,13 +409,13 @@ int btrfs_csum_one_bio(struct btrfs_root sums->bytenr = ordered->start; } - data =kmap_atomic (bvec->bv_page,KM_USER0 ); + data =kmap_atomic (bvec->bv_page); sector_sum->sum = ~(u32 )0 ; sector_sum->sum =btrfs_csum_data (root, data + bvec->bv_offset, sector_sum->sum, bvec->bv_len); -kunmap_atomic (data,KM_USER0 ); +kunmap_atomic (data);btrfs_csum_final (sector_sum->sum, (char *)§or_sum->sum); sector_sum->bytenr = disk_bytenr;
@@ -787,12 +787,12 @@ next_sector:int err;if (eb_token) -unmap_extent_buffer (leaf, eb_token,KM_USER1 ); +unmap_extent_buffer (leaf, eb_token); eb_token =NULL ; err =map_private_extent_buffer (leaf, (unsigned long )item, csum_size, &eb_token, &eb_map, - &map_start, &map_len,KM_USER1 ); + &map_start, &map_len);if (err) eb_token =NULL ; }
@@ -816,7 +816,7 @@ next_sector: } }if (eb_token) { -unmap_extent_buffer (leaf, eb_token,KM_USER1 ); +unmap_extent_buffer (leaf, eb_token); eb_token =NULL ; }btrfs_mark_buffer_dirty (path->nodes[0 ]);
fs/btrfs/inode.c +11 -11
@@ -165,9 +165,9 @@ static noinline int insert_inline_extent cur_size = min_t(unsigned long, compressed_size,PAGE_CACHE_SIZE ); - kaddr =kmap_atomic (cpage,KM_USER0 ); + kaddr =kmap_atomic (cpage);write_extent_buffer (leaf, kaddr, ptr, cur_size); -kunmap_atomic (kaddr,KM_USER0 ); +kunmap_atomic (kaddr); i++; ptr += cur_size;
@@ -179,10 +179,10 @@ static noinline int insert_inline_extent page =find_get_page (inode->i_mapping, start >>PAGE_CACHE_SHIFT );btrfs_set_file_extent_compression (leaf, ei,0 ); - kaddr =kmap_atomic (page,KM_USER0 ); + kaddr =kmap_atomic (page); offset = start & (PAGE_CACHE_SIZE -1 );write_extent_buffer (leaf, kaddr + offset, ptr, size); -kunmap_atomic (kaddr,KM_USER0 ); +kunmap_atomic (kaddr);page_cache_release (page); }btrfs_mark_buffer_dirty (leaf);
@@ -390,10 +390,10 @@ again:* sending it down to disk */ if (offset) { - kaddr =kmap_atomic (page,KM_USER0 ); + kaddr =kmap_atomic (page);memset (kaddr + offset,0 ,PAGE_CACHE_SIZE - offset); -kunmap_atomic (kaddr,KM_USER0 ); +kunmap_atomic (kaddr); } will_compress =1 ; }
@@ -1915,7 +1915,7 @@ static int btrfs_readpage_end_io_hook(st }else { ret =get_state_private (io_tree, start, &private); } - kaddr =kmap_atomic (page,KM_USER0 ); + kaddr =kmap_atomic (page);if (ret) goto zeroit;
@@ -1924,7 +1924,7 @@ static int btrfs_readpage_end_io_hook(stif (csum != private) goto zeroit; -kunmap_atomic (kaddr,KM_USER0 ); +kunmap_atomic (kaddr); good:/* if the io failure tree for this inode is non-empty, * check to see if we've recovered from a failed IO
@@ -1941,7 +1941,7 @@ zeroit: }memset (kaddr + offset,1 , end - start +1 );flush_dcache_page (page); -kunmap_atomic (kaddr,KM_USER0 ); +kunmap_atomic (kaddr);if (private ==0 )return 0 ;return -EIO ;
@@ -4401,12 +4401,12 @@ static noinline int uncompress_inline(st ret =btrfs_zlib_decompress (tmp, page, extent_offset, inline_size, max_size);if (ret) { -char *kaddr =kmap_atomic (page,KM_USER0 ); +char *kaddr =kmap_atomic (page);unsigned long copy_size =min_t (u64,PAGE_CACHE_SIZE - pg_offset, max_size - extent_offset);memset (kaddr + pg_offset,0 , copy_size); -kunmap_atomic (kaddr,KM_USER0 ); +kunmap_atomic (kaddr); }kfree (tmp);return 0 ;
fs/btrfs/struct-funcs.c +5 -5
@@ -68,7 +68,7 @@ u##bits btrfs_##name(struct extent_buffe err =map_extent_buffer (eb, offset, \sizeof (((type *)0 )->member), \ &map_token, &kaddr, \ - &map_start, &map_len,KM_USER1 ); \ + &map_start, &map_len); \if (err) { \ __le##bits leres; \ read_eb_member(eb, s, type, member, &leres); \
@@ -77,7 +77,7 @@ u##bits btrfs_##name(struct extent_buffe p = (type *)(kaddr + part_offset - map_start); \ res = le##bits##_to_cpu(p->member); \if (unmap_on_exit) \ -unmap_extent_buffer (eb, map_token,KM_USER1 ); \ +unmap_extent_buffer (eb, map_token); \return res; \ } \ } \
@@ -105,7 +105,7 @@ void btrfs_set_##name(struct extent_buff err =map_extent_buffer (eb, offset, \sizeof (((type *)0 )->member), \ &map_token, &kaddr, \ - &map_start, &map_len,KM_USER1 ); \ + &map_start, &map_len); \if (err) { \ __le##bits val2; \ val2 = cpu_to_le##bits(val); \
@@ -115,7 +115,7 @@ void btrfs_set_##name(struct extent_buff p = (type *)(kaddr + part_offset - map_start); \ p->member = cpu_to_le##bits(val); \ if (unmap_on_exit) \ - unmap_extent_buffer(eb, map_token, KM_USER1); \ + unmap_extent_buffer(eb, map_token); \ } \ }
@@ -131,7 +131,7 @@ void btrfs_node_key(struct extent_buffer sizeof(*disk_key));return ; }else if (eb->map_token) { -unmap_extent_buffer (eb, eb->map_token,KM_USER1 ); +unmap_extent_buffer (eb, eb->map_token); eb->map_token =NULL ; } read_eb_member(eb, (struct btrfs_key_ptr *)ptr,
fs/btrfs/zlib.c +4 -4
@@ -448,10 +448,10 @@ int btrfs_zlib_decompress_biovec(struct bytes =min (PAGE_CACHE_SIZE - pg_offset,PAGE_CACHE_SIZE - buf_offset); bytes =min (bytes, working_bytes); - kaddr =kmap_atomic (page_out,KM_USER0 ); + kaddr =kmap_atomic (page_out);memcpy (kaddr + pg_offset, workspace->buf + buf_offset, bytes); -kunmap_atomic (kaddr,KM_USER0 ); +kunmap_atomic (kaddr);flush_dcache_page (page_out); pg_offset += bytes;
@@ -604,9 +604,9 @@ int btrfs_zlib_decompress(unsigned char PAGE_CACHE_SIZE - buf_offset); bytes =min (bytes, bytes_left); - kaddr =kmap_atomic (dest_page,KM_USER0 ); + kaddr =kmap_atomic (dest_page);memcpy (kaddr + pg_offset, workspace->buf + buf_offset, bytes); -kunmap_atomic (kaddr,KM_USER0 ); +kunmap_atomic (kaddr); pg_offset += bytes; bytes_left -= bytes;
fs/cifs/file.c +2 -2
@@ -1927,7 +1927,7 @@ static void cifs_copy_cache_pages(structcontinue ; } - target =kmap_atomic (page,KM_USER0 ); + target =kmap_atomic (page);if (PAGE_CACHE_SIZE > bytes_read) {memcpy (target, data, bytes_read);
@@ -1939,7 +1939,7 @@ static void cifs_copy_cache_pages(structmemcpy (target, data,PAGE_CACHE_SIZE ); bytes_read -=PAGE_CACHE_SIZE ; } -kunmap_atomic (target,KM_USER0 ); +kunmap_atomic (target);flush_dcache_page (page);SetPageUptodate (page);
fs/ecryptfs/mmap.c +2 -2
@@ -142,7 +142,7 @@ ecryptfs_copy_up_encrypted_with_header(s/* This is a header extent */ char *page_virt; - page_virt =kmap_atomic (page,KM_USER0 ); + page_virt =kmap_atomic (page);memset (page_virt,0 ,PAGE_CACHE_SIZE );/* TODO: Support more than one header extent */ if (view_extent_num ==0 ) {
@@ -150,7 +150,7 @@ ecryptfs_copy_up_encrypted_with_header(s page_virt, page->mapping->host);set_header_info (page_virt, crypt_stat); } -kunmap_atomic (page_virt,KM_USER0 ); +kunmap_atomic (page_virt);flush_dcache_page (page);if (rc) { printk(KERN_ERR "%s: Error reading xattr "
fs/ecryptfs/read_write.c +4 -4
@@ -155,7 +155,7 @@ int ecryptfs_write(struct file *ecryptfs ecryptfs_page_idx, rc); goto out; } - ecryptfs_page_virt =kmap_atomic (ecryptfs_page,KM_USER0 ); + ecryptfs_page_virt =kmap_atomic (ecryptfs_page);/* * pos: where we're now writing, offset: where the request was
@@ -178,7 +178,7 @@ int ecryptfs_write(struct file *ecryptfs (data + data_offset), num_bytes); data_offset += num_bytes; } -kunmap_atomic (ecryptfs_page_virt,KM_USER0 ); +kunmap_atomic (ecryptfs_page_virt);flush_dcache_page (ecryptfs_page);SetPageUptodate (ecryptfs_page);unlock_page (ecryptfs_page);
@@ -337,11 +337,11 @@ int ecryptfs_read(char *data, loff_t off ecryptfs_page_idx, rc); goto out;
Lines of this file are not shown. View the raw message.
fs/nilfs2/cpfile.c +47 -47
94 lines not on this page · raw message
fs/nilfs2/sufile.c +25 -25
50 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.
RFC PATCH 4/4 mm: remove KM_type argument fallout
In reply to Peter ZijlstraManual fixups of the previous patch
LKML-Reference: <new-submission>
--- arch/arm/mm/highmem.c | 6 +++--- arch/frv/include/asm/highmem.h | 3 ++- arch/mips/mm/highmem.c | 2 ++ arch/mn10300/include/asm/highmem.h | 1 + arch/x86/include/asm/highmem.h | 2 +- arch/x86/include/asm/pgtable_32.h | 8 ++------ arch/x86/kernel/cpu/perf_event.c | 5 ++--- arch/x86/mm/iomap_32.c | 16 ++-------------- drivers/net/e1000/e1000_main.c | 6 ++---- drivers/scsi/libfc/fc_fcp.c | 6 ++---- drivers/staging/hv/netvsc_drv.c | 3 +-- drivers/staging/hv/storvsc_drv.c | 11 +++++------ include/crypto/scatterwalk.h | 16 ++-------------- net/sunrpc/xprtrdma/rpc_rdma.c | 6 ++---- 14 files changed, 29 insertions(+), 62 deletions(-)
arch/arm/mm/highmem.c +3 -3
@@ -38,7 +38,7 @@ EXPORT_SYMBOL(kunmap);void *kmap_atomic (struct page *page) { -unsigned int idx; +unsigned int idx, type;unsigned long vaddr;void *kmap;
@@ -76,7 +76,7 @@ EXPORT_SYMBOL(kmap_atomic);void kunmap_atomic (void *kvaddr) {unsigned long vaddr = (unsigned long ) kvaddr &PAGE_MASK ; -unsigned int idx; +unsigned int idx, type; type =kmap_atomic_idx_pop (); idx = type +KM_TYPE_NR *smp_processor_id ();
@@ -100,7 +100,7 @@ EXPORT_SYMBOL(kunmap_atomic);void *kmap_atomic_pfn (unsigned long pfn) { -unsigned int idx; +unsigned int idx, type;unsigned long vaddr;pagefault_disable ();
arch/frv/include/asm/highmem.h +2 -1
@@ -115,6 +115,7 @@ extern struct page *kmap_atomic_to_page(static inline void *kmap_atomic (struct page *page) {unsigned long paddr; +int type;pagefault_disable (); type =kmap_atomic_idx_push ();
@@ -154,7 +155,7 @@ do { \static inline void kunmap_atomic (void *kvaddr) { - type =kmap_atomic_idx_pop (); +int type =kmap_atomic_idx_pop ();switch (type) {case 0 :__kunmap_atomic_primary (0 ,2 );break ;case 1 :__kunmap_atomic_primary (1 ,3 );break ;
arch/mips/mm/highmem.c +2 -0
@@ -44,6 +44,7 @@ void *__kmap_atomic(struct page *page) {enum fixed_addresses idx;unsigned long vaddr; +int type;/* even !CONFIG_PREEMPT needs this, for in_atomic in do_page_fault */ pagefault_disable ();
@@ -101,6 +102,7 @@ void *kmap_atomic_pfn(unsigned long pfn) {enum fixed_addresses idx;unsigned long vaddr; +int type;pagefault_disable ();
arch/x86/include/asm/highmem.h +1 -1
@@ -67,7 +67,7 @@ void *kmap_atomic_prot_pfn(unsigned longstruct page *kmap_atomic_to_page (void *ptr);#ifndef CONFIG_PARAVIRT -#define kmap_atomic_pte (page, type) kmap_atomic(page, type) +#define kmap_atomic_pte (page) kmap_atomic(page)#endif #define flush_cache_kmaps () do { } while (0)
arch/x86/include/asm/pgtable_32.h +2 -6
@@ -49,17 +49,13 @@ extern void set_pmd_pfn(unsigned long, u#endif #if defined(CONFIG_HIGHPTE ) -#define __KM_PTE \ - (in_nmi() ? KM_NMI_PTE : \ - in_irq() ? KM_IRQ_PTE : \ - KM_PTE0)#define pte_offset_map (dir, address) \ - ((pte_t *)kmap_atomic_pte(pmd_page(*(dir)), __KM_PTE) + \ + ((pte_t *)kmap_atomic_pte(pmd_page(*(dir))) + \ pte_index((address)))#define pte_offset_map_nested (dir, address) \ ((pte_t *)kmap_atomic_pte(pmd_page(*(dir))) + \ pte_index((address))) -#define pte_unmap (pte) kunmap_atomic((pte), __KM_PTE) +#define pte_unmap (pte) kunmap_atomic((pte))#define pte_unmap_nested (pte) kunmap_atomic((pte))#else #define pte_offset_map (dir, address) \
arch/x86/mm/iomap_32.c +2 -14
@@ -70,25 +70,13 @@ iomap_atomic_prot_pfn(unsigned long pfn,if (!pat_enabled &&pgprot_val (prot) ==pgprot_val (PAGE_KERNEL_WC )) prot =PAGE_KERNEL_UC_MINUS ; -return kmap_atomic_prot_pfn (pfn, type, prot); +return kmap_atomic_prot_pfn (pfn, prot); }EXPORT_SYMBOL_GPL (iomap_atomic_prot_pfn);void iounmap_atomic (void *kvaddr) { -unsigned long vaddr = (unsigned long ) kvaddr &PAGE_MASK ; -enum fixed_addresses idx = type +KM_TYPE_NR *smp_processor_id (); - -/* -* Force other mappings to Oops if they'll try to access this pte -* without first remap it. Keeping stale mappings around is a bad idea -* also, in case the page changes cacheability attributes or becomes -* a protected page in a hypervisor. -*/ -if (vaddr ==__fix_to_virt (FIX_KMAP_BEGIN +idx)) -kpte_clear_flush (kmap_pte-idx, vaddr); - -pagefault_enable (); +kunmap_atomic (kvaddr); }EXPORT_SYMBOL_GPL (iounmap_atomic);
arch/mn10300/include/asm/highmem.h +1 -0
@@ -74,6 +74,7 @@ static inline unsigned long kmap_atomic( {enum fixed_addresses idx;unsigned long vaddr; +int type;if (page < highmem_start_page)return page_address (page);
drivers/scsi/libfc/fc_fcp.c +2 -4
@@ -377,8 +377,7 @@ static void fc_fcp_recv_data(struct fc_f off = offset + sg->offset; sg_bytes =min (sg_bytes, (size_t ) (PAGE_SIZE - (off & ~PAGE_MASK ))); - page_addr =kmap_atomic (sg_page (sg) + (off >>PAGE_SHIFT ), -KM_SOFTIRQ0 ); + page_addr =kmap_atomic (sg_page (sg) + (off >>PAGE_SHIFT ));if (!page_addr)break ;/* XXX panic? */
@@ -560,8 +559,7 @@ static int fc_fcp_send_data(struct fc_fc sg_bytes =min (sg_bytes, (size_t ) (PAGE_SIZE - (off & ~PAGE_MASK ))); page_addr =kmap_atomic (sg_page (sg) + - (off >>PAGE_SHIFT ), -KM_SOFTIRQ0 ); + (off >>PAGE_SHIFT ));memcpy (data, (char *)page_addr + (off & ~PAGE_MASK ), sg_bytes);kunmap_atomic (page_addr);
drivers/staging/hv/netvsc_drv.c +1 -2
@@ -342,8 +342,7 @@ static int netvsc_recv_callback(struct h* hv_netvsc_packet cannot be deallocated */ for (i =0 ; i < packet->PageBufferCount; i++) { - data =kmap_atomic (pfn_to_page (packet->PageBuffers[i].Pfn), -KM_IRQ1 ); + data =kmap_atomic (pfn_to_page (packet->PageBuffers[i].Pfn)); data = (void *)(unsigned long )data + packet->PageBuffers[i].Offset;
drivers/staging/hv/storvsc_drv.c +5 -6
@@ -525,8 +525,8 @@ static unsigned int copy_to_bounce_buffelocal_irq_save (flags);for (i =0 ; i < orig_sgl_count; i++) { - src_addr = (unsigned long )kmap_atomic (sg_page ((&orig_sgl[i])), -KM_IRQ0 ) + orig_sgl[i].offset; + src_addr = (unsigned long )kmap_atomic (sg_page ((&orig_sgl[i]))) + + orig_sgl[i].offset; src = src_addr; srclen = orig_sgl[i].length;
@@ -587,8 +587,8 @@ static unsigned int copy_from_bounce_buflocal_irq_save (flags);for (i =0 ; i < orig_sgl_count; i++) { - dest_addr = (unsigned long )kmap_atomic (sg_page ((&orig_sgl[i])), -KM_IRQ0 ) + orig_sgl[i].offset; + dest_addr = (unsigned long )kmap_atomic (sg_page ((&orig_sgl[i]))) + + orig_sgl[i].offset; dest = dest_addr; destlen = orig_sgl[i].length;ASSERT (orig_sgl[i].offset + orig_sgl[i].length <=PAGE_SIZE );
@@ -622,8 +622,7 @@ static unsigned int copy_from_bounce_buf } } -kunmap_atomic ((void *)(dest_addr - orig_sgl[i].offset), -KM_IRQ0 ); +kunmap_atomic ((void *)(dest_addr - orig_sgl[i].offset)); }local_irq_restore (flags);
net/sunrpc/xprtrdma/rpc_rdma.c +2 -4
@@ -334,8 +334,7 @@ rpcrdma_inline_pullup(struct rpc_rqst *r curlen = copy_len;dprintk ("RPC: %s: page %d destp 0x%p len %d curlen %d\n" , __func__, i, destp, copy_len, curlen); - srcp =kmap_atomic (rqst->rq_snd_buf.pages[i], -KM_SKB_SUNRPC_DATA ); + srcp = kmap_atomic(rqst->rq_snd_buf.pages[i])if (i ==0 )memcpy (destp, srcp+rqst->rq_snd_buf.page_base, curlen);else
@@ -635,8 +634,7 @@ rpcrdma_inline_fixup(struct rpc_rqst *rqdprintk ("RPC: %s: page %d" " srcp 0x%p len %d curlen %d\n" , __func__, i, srcp, copy_len, curlen); - destp =kmap_atomic (rqst->rq_rcv_buf.pages[i], -KM_SKB_SUNRPC_DATA ); + destp =kmap_atomic (rqst->rq_rcv_buf.pages[i]);if (i ==0 )memcpy (destp + rqst->rq_rcv_buf.page_base, srcp, curlen);
arch/x86/kernel/cpu/perf_event.c +2 -3
@@ -2190,7 +2190,6 @@ static unsigned long copy_from_user_nmi(void *to, const void __user *from, unsigned long n) {unsigned long offset, addr = (unsigned long )from; -int type =in_nmi () ?KM_NMI :KM_IRQ0 ;unsigned long size, len =0 ;struct page *page;void *map;
@@ -2204,9 +2203,9 @@ copy_from_user_nmi(void *to, const void offset = addr & (PAGE_SIZE -1 ); size =min (PAGE_SIZE - offset, n - len); - map =kmap_atomic (page, type); + map =kmap_atomic (page);memcpy (to, map+offset, size); -kunmap_atomic (map, type); +kunmap_atomic (map);put_page (page); len += size;
drivers/net/e1000/e1000_main.c +2 -4
@@ -3705,11 +3705,9 @@ static bool e1000_clean_jumbo_rx_irq(strif (length <= copybreak &&skb_tailroom (skb) >= length) {u8 *vaddr; - vaddr =kmap_atomic (buffer_info->page, -KM_SKB_DATA_SOFTIRQ ); + vaddr =kmap_atomic (buffer_info->page);memcpy (skb_tail_pointer (skb), vaddr, length); -kunmap_atomic (vaddr, -KM_SKB_DATA_SOFTIRQ ); +kunmap_atomic (vaddr);/* re-use the page, so don't erase * buffer_info->page */ skb_put (skb, length);
include/crypto/scatterwalk.h +2 -14
@@ -25,26 +25,14 @@#include <linux/scatterlist.h> #include <linux/sched.h> -static inline enum km_type crypto_kmap_type (int out) -{ -enum km_type type; - -if (in_softirq ()) - type = out * (KM_SOFTIRQ1 -KM_SOFTIRQ0 ) +KM_SOFTIRQ0 ; -else - type = out * (KM_USER1 -KM_USER0 ) +KM_USER0 ; - -return type; -} -static inline void *crypto_kmap (struct page *page,int out) { -return kmap_atomic (page,crypto_kmap_type (out)); +return kmap_atomic (page); }static inline void crypto_kunmap (void *vaddr,int out) { -kunmap_atomic (vaddr,crypto_kmap_type (out)); +kunmap_atomic (vaddr); }static inline void crypto_yield (u32 flags)
Peter Zijlstra
maintainerQuoted 3 lines · Peter Zijlstra
Maybe FRV can do a kind of kmap-stack switch on (soft)irq enter/exit in order to stay below 5 entries.
David, would something like the below work for you?
You'd need to disallow nested hardirqs, but I'm not sure FRV suffers that particular issue?
---
include/linux/highmem.h +24 -0
@@ -83,6 +83,30 @@ static inline void *kmap_atomic(struct p#endif /* CONFIG_HIGHMEM */ +enum kmap_context { +KMAP_USER =0 , +KMAP_SOFTIRQ , +KMAP_IRQ , +KMAP_NMI , +KMAP_CONTEXT_NR , +} + +#if !defined(CONFIG_HIGHMEM ) || !defined(ARCH_HAS_KMAP_SWITCH ) +/* +* Routines the arch can use to save/restore kmap_atomic stacks. +* +* This can be useful when an arch has limited kmap_atomic slots +* and wants to deal with context nesting. +*/ +static inline void kmap_atomic_save (enum kmap_context kctx) +{ +} + +static inline void kmap_atomic_restore (enum kmap_context kctx) +{ +} +#endif +/* when CONFIG_HIGHMEM is not set these will be plain clear/copy_page */ #ifndef clear_user_highpagestatic inline void clear_user_highpage (struct page *page,unsigned long vaddr)
kernel/softirq.c +7 -1
@@ -283,6 +283,8 @@ void irq_enter(void)tick_check_idle (cpu); }else __irq_enter (); + +kmap_atomic_save (KMAP_IRQ ); }#ifdef __ARCH_IRQ_EXIT_IRQS_DISABLED
@@ -296,11 +298,15 @@ void irq_enter(void)*/ void irq_exit (void ) { +kmap_atomic_restore (KMAP_IRQ );account_system_vtime (current);trace_hardirq_exit ();sub_preempt_count (IRQ_EXIT_OFFSET ); -if (!in_interrupt () &&local_softirq_pending ()) +if (!in_interrupt () &&local_softirq_pending ()) { +kmap_atomic_save (KMAP_SOFTIRQ );invoke_softirq (); +kmap_atomic_restore (KMAP_SOFTIRQ ); + }#ifdef CONFIG_NO_HZ /* Make sure that timer wheel updates are propagated */
arch/frv/include/asm/highmem.h +36 -17
83 lines not on this page · raw message
arch/frv/include/asm/kmap_types.h +1 -20
@@ -3,27 +3,8 @@#define _ASM_KMAP_TYPES_Henum km_type { -/* arch specific kmaps - change the numbers attached to these at your peril */ - __KM_CACHE,/* cache flush page attachment point */ - __KM_PGD,/* current page directory */ - __KM_ITLB_PTD,/* current instruction TLB miss page table lookup */ - __KM_DTLB_PTD,/* current data TLB miss page table lookup */ -/* general kmaps */ -KM_BOUNCE_READ , -KM_SKB_SUNRPC_DATA , -KM_SKB_DATA_SOFTIRQ , -KM_USER0 , -KM_USER1 , -KM_BIO_SRC_IRQ , -KM_BIO_DST_IRQ , -KM_PTE0 , -KM_PTE1 , -KM_IRQ0 , -KM_IRQ1 , -KM_SOFTIRQ0 , -KM_SOFTIRQ1 , -KM_TYPE_NR +KM_TYPE_NR =5 };#endif
David Howells
maintainerarch/frv/include/asm/highmem.h static inline void *kmap_atomic(struct p · line 124
Quoted 3 lines · Peter Zijlstra
arch/frv/include/asm/highmem.h +1
-0type =kmap_atomic_idx_push (); +switch (type +4 ) {
This bit is the bit I particularly dislike. 'type' is not fixed at compile time, which means that the switch-statement cannot be optimised down. With your original patch, for example, the following code seems to simplify quite nicely from:
int test_kmap(struct page *page)
{
int *p, q;
p = kmap_atomic(page, KM_USER0);
q = *p;
kunmap_atomic(page, KM_USER0);
return q;
}to:
int test_kmap(struct page *page)
{
int *p, q;
p = kmap_atomic(page);
q = *p;
kunmap_atomic(page);
return q;
}but, the assembly goes from:
000002a0 <test_kmap>: 2a0: 82 40 1f f0 addi sp,-16,sp 2a4: 05 48 10 00 sti.p fp,@(sp,0) 2a8: 84 88 10 00 ori sp,0,fp 2ac: 88 0d 01 c5 movsg lr,gr5 2b0: 8b 48 20 08 sti gr5,@(fp,8) 2b4: 88 c8 f0 14 ldi @(gr15,20),gr4 2b8: 88 40 40 01 addi gr4,1,gr4 2bc: 89 48 f0 14 sti gr4,@(gr15,20) 2c0: 88 c9 00 00 ldi @(gr16,0),gr4 2c4: 10 00 81 04 sub.p gr8,gr4,gr8 2c8: 88 fc 0c 09 setlos 0xc09,gr4 2cc: 90 b0 80 05 srai gr8,5,gr8 2d0: 90 a0 80 0e slli gr8,14,gr8 2d4: 90 04 80 84 or gr8,gr4,gr8 2d8: ba 0c 91 88 movgs gr8,dampr9 2dc: b8 0c 91 c4 movsg damlr9,gr4 2e0: 90 08 41 00 ld @(gr4,gr0),gr8 2e4: ba 0c 91 80 movgs gr0,dampr9 2e8: 88 c8 f0 14 ldi @(gr15,20),gr4 2ec: 88 40 4f ff addi gr4,-1,gr4 2f0: 89 48 f0 14 sti gr4,@(gr15,20) 2f4: 8a c8 20 08 ldi @(fp,8),gr5 2f8: 84 08 21 00 ld @(fp,gr0),fp 2fc: 00 30 50 00 jmpl.p @(gr5,gr0) 300: 82 40 10 10 addi sp,16,sp
to:
000002a0 <test_kmap>: 2a0: 82 40 1f f0 addi sp,-16,sp 2a4: 05 48 10 00 sti.p fp,@(sp,0) 2a8: 84 88 10 00 ori sp,0,fp 2ac: 88 0d 01 c5 movsg lr,gr5 2b0: 0b 48 20 08 sti.p gr5,@(fp,8) 2b4: 94 88 80 00 ori gr8,0,gr10 2b8: 88 c8 f0 14 ldi @(gr15,20),gr4 2bc: 88 40 40 01 addi gr4,1,gr4 2c0: 89 48 f0 14 sti gr4,@(gr15,20) 2c4: 08 c9 00 00 ldi.p @(gr16,0),gr4 2c8: 96 f8 00 00 sethi hi(0x0),gr11 2cc: 96 f4 00 00 setlo lo(0x0),gr11 2d0: 92 08 b1 00 ld @(gr11,gr0),gr9 2d4: 88 00 81 04 sub gr8,gr4,gr4 2d8: 88 b0 40 05 srai gr4,5,gr4 2dc: 0a 40 90 01 addi.p gr9,1,gr5 2e0: 80 54 90 48 subicc gr9,72,gr0,icc0 2e4: 0a 0c b0 80 st.p gr5,@(gr11,gr0) 2e8: 8e a0 40 0e slli gr4,14,gr7 2ec: e8 1a 00 06 bhi icc0,0x2,304 <test_kmap+0x64> 2f0: 08 a0 90 02 slli.p gr9,2,gr4 2f4: 8a f8 00 00 sethi hi(0x0),gr5 2f8: 8a f4 00 00 setlo lo(0x0),gr5 2fc: 8c 08 41 05 ld @(gr4,gr5),gr6 300: 80 30 60 00 jmpl @(gr6,gr0) 304: 10 f8 00 00 sethi.p hi(0x0),gr8 308: 92 fc 00 8b setlos 0x8b,gr9 30c: 10 f4 00 00 setlo.p lo(0x0),gr8 310: 80 3c 00 00 call 310 <test_kmap+0x70> 314: 10 fc 00 06 setlos.p 0x6,gr8 318: 80 3c 00 00 call 318 <test_kmap+0x78> 31c: 80 88 00 00 nop 320: c0 1a ff fd bra 314 <test_kmap+0x74> 324: 08 a0 90 0e slli.p gr9,14,gr4 328: 8c f8 db fd sethi 0xdbfd,gr6 32c: 0a fc 0c 09 setlos.p 0xc09,gr5 330: 8c f4 c0 00 setlo 0xc000,gr6 334: 08 00 40 06 add.p gr4,gr6,gr4 338: 8a 04 70 85 or gr7,gr5,gr5 33c: bc 0d 21 84 movgs gr4,tplr 340: bc 0d 31 85 movgs gr5,tppr 344: 8a 0c 49 00 tlbpr gr4,gr0,0x2,0x1 348: 8a 88 40 00 ori gr4,0,gr5 34c: 88 08 b1 00 ld @(gr11,gr0),gr4 350: 90 08 51 00 ld @(gr5,gr0),gr8 354: 88 40 4f ff addi gr4,-1,gr4 358: 08 0c b0 80 st.p gr4,@(gr11,gr0) 35c: 80 54 40 48 subicc gr4,72,gr0,icc0 360: e8 1a 00 27 bhi icc0,0x2,3fc <test_kmap+0x15c> 364: 08 a0 40 02 slli.p gr4,2,gr4 368: 8a f8 00 00 sethi hi(0x0),gr5 36c: 8a f4 00 00 setlo lo(0x0),gr5 370: 8c 08 41 05 ld @(gr4,gr5),gr6 374: 80 30 60 00 jmpl @(gr6,gr0) 378: 88 fc 0c 09 setlos 0xc09,gr4 37c: 88 04 70 84 or gr7,gr4,gr4 380: b6 0c 21 84 movgs gr4,iampr2 384: ba 0c 21 84 movgs gr4,dampr2 388: b8 0c 21 c5 movsg damlr2,gr5 38c: c0 1a ff f0 bra 34c <test_kmap+0xac> 390: ba 0c 21 80 movgs gr0,dampr2 394: b6 0c 21 80 movgs gr0,iampr2 398: 88 c8 f0 14 ldi @(gr15,20),gr4 39c: 88 40 4f ff addi gr4,-1,gr4 3a0: 89 48 f0 14 sti gr4,@(gr15,20) 3a4: 8a c8 20 08 ldi @(fp,8),gr5 3a8: 84 08 21 00 ld @(fp,gr0),fp 3ac: 00 30 50 00 jmpl.p @(gr5,gr0) 3b0: 82 40 10 10 addi sp,16,sp 3b4: ba 0c 31 80 movgs gr0,dampr3 3b8: c0 1a ff f8 bra 398 <test_kmap+0xf8> 3bc: ba 0c 41 80 movgs gr0,dampr4 3c0: c0 1a ff f6 bra 398 <test_kmap+0xf8> 3c4: ba 0c 51 80 movgs gr0,dampr5 3c8: c0 1a ff f4 bra 398 <test_kmap+0xf8> 3cc: ba 0c 61 80 movgs gr0,dampr6 3d0: c0 1a ff f2 bra 398 <test_kmap+0xf8> 3d4: ba 0c 71 80 movgs gr0,dampr7 3d8: c0 1a ff f0 bra 398 <test_kmap+0xf8> 3dc: ba 0c 81 80 movgs gr0,dampr8 3e0: c0 1a ff ee bra 398 <test_kmap+0xf8> 3e4: ba 0c 91 80 movgs gr0,dampr9 3e8: c0 1a ff ec bra 398 <test_kmap+0xf8> 3ec: ba 0c a1 80 movgs gr0,dampr10 3f0: c0 1a ff ea bra 398 <test_kmap+0xf8> 3f4: 92 0c a9 00 tlbpr gr10,gr0,0x4,0x1 3f8: c0 1a ff e8 bra 398 <test_kmap+0xf8> 3fc: 10 f8 00 00 sethi.p hi(0x0),gr8 400: 92 fc 00 b0 setlos 0xb0,gr9 404: 10 f4 00 00 setlo.p lo(0x0),gr8 408: 80 3c 00 00 call 408 <test_kmap+0x168> 40c: 10 fc 00 06 setlos.p 0x6,gr8 410: 80 3c 00 00 call 410 <test_kmap+0x170> 414: 80 88 00 00 nop 418: c0 1a ff fd bra 40c <test_kmap+0x16c> 41c: 88 fc 0c 09 setlos 0xc09,gr4 420: 88 04 70 84 or gr7,gr4,gr4 424: ba 0c 31 84 movgs gr4,dampr3 428: b8 0c 31 c5 movsg damlr3,gr5 42c: c0 1a ff c8 bra 34c <test_kmap+0xac> 430: 88 fc 0c 09 setlos 0xc09,gr4 434: 88 04 70 84 or gr7,gr4,gr4 438: ba 0c 41 84 movgs gr4,dampr4 43c: b8 0c 41 c5 movsg damlr4,gr5 440: c0 1a ff c3 bra 34c <test_kmap+0xac> 444: 88 fc 0c 09 setlos 0xc09,gr4 448: 88 04 70 84 or gr7,gr4,gr4 44c: ba 0c 51 84 movgs gr4,dampr5 450: b8 0c 51 c5 movsg damlr5,gr5 454: c0 1a ff be bra 34c <test_kmap+0xac> 458: 88 fc 0c 09 setlos 0xc09,gr4 45c: 88 04 70 84 or gr7,gr4,gr4 460: ba 0c 61 84 movgs gr4,dampr6 464: b8 0c 61 c5 movsg damlr6,gr5 468: c0 1a ff b9 bra 34c <test_kmap+0xac> 46c: 88 fc 0c 09 setlos 0xc09,gr4 470: 88 04 70 84 or gr7,gr4,gr4 474: ba 0c 71 84 movgs gr4,dampr7 478: b8 0c 71 c5 movsg damlr7,gr5 47c: c0 1a ff b4 bra 34c <test_kmap+0xac> 480: 88 fc 0c 09 setlos 0xc09,gr4 484: 88 04 70 84 or gr7,gr4,gr4 488: ba 0c 81 84 movgs gr4,dampr8 48c: b8 0c 81 c5 movsg damlr8,gr5 490: c0 1a ff af bra 34c <test_kmap+0xac> 494: 88 fc 0c 09 setlos 0xc09,gr4 498: 88 04 70 84 or gr7,gr4,gr4 49c: ba 0c 91 84 movgs gr4,dampr9 4a0: b8 0c 91 c5 movsg damlr9,gr5 4a4: c0 1a ff aa bra 34c <test_kmap+0xac> 4a8: 88 fc 0c 09 setlos 0xc09,gr4 4ac: 88 04 70 84 or gr7,gr4,gr4 4b0: ba 0c a1 84 movgs gr4,dampr10 4b4: b8 0c a1 c5 movsg damlr10,gr5 4b8: c0 1a ff a5 bra 34c <test_kmap+0xac>
Your revised patch reduces the size of the overburden, but still has the irritating jump table.
Quoted 2 lines
You'd need to disallow nested hardirqs, but I'm not sure FRV suffers that particular issue?
It does permit such.
David