9 files changed, 388 insertions, 220 deletions

diff --git a/lib/Kconfig b/lib/Kconfig
index 7823f8342abf..2ba43c4a5b07 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -64,6 +64,8 @@ config CRC7
 
 config LIBCRC32C
         tristate "CRC32c (Castagnoli, et al) Cyclic Redundancy-Check"
+        select CRYPTO
+        select CRYPTO_CRC32C
         help
           This option is provided for the case where no in-kernel-tree
           modules require CRC32c functions, but a module built outside the
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 1e3fd3e3436a..2e75478e9c69 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -252,6 +252,14 @@ config DEBUG_OBJECTS_TIMERS
           timer routines to track the life time of timer objects and
           validate the timer operations.
 
+config DEBUG_OBJECTS_ENABLE_DEFAULT
+        int "debug_objects bootup default value (0-1)"
+        range 0 1
+        default "1"
+        depends on DEBUG_OBJECTS
+        help
+          Debug objects boot parameter default value
+
 config DEBUG_SLAB
         bool "Debug slab memory allocations"
         depends on DEBUG_KERNEL && SLAB
@@ -629,6 +637,19 @@ config RCU_CPU_STALL_DETECTOR
 
           Say N if you are unsure.
 
+config RCU_CPU_STALL_DETECTOR
+        bool "Check for stalled CPUs delaying RCU grace periods"
+        depends on CLASSIC_RCU || TREE_RCU
+        default n
+        help
+          This option causes RCU to printk information on which
+          CPUs are delaying the current grace period, but only when
+          the grace period extends for excessive time periods.
+
+          Say Y if you want RCU to perform such checks.
+
+          Say N if you are unsure.
+
 config KPROBES_SANITY_TEST
         bool "Kprobes sanity tests"
         depends on DEBUG_KERNEL
@@ -709,6 +730,7 @@ config FAULT_INJECTION
 config FAILSLAB
         bool "Fault-injection capability for kmalloc"
         depends on FAULT_INJECTION
+        depends on SLAB || SLUB
         help
           Provide fault-injection capability for kmalloc.
 
diff --git a/lib/Makefile b/lib/Makefile
index 7cb65d85aeb0..80fe8a3ec12a 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -11,7 +11,7 @@ lib-y := ctype.o string.o vsprintf.o cmdline.o \
          rbtree.o radix-tree.o dump_stack.o \
          idr.o int_sqrt.o extable.o prio_tree.o \
          sha1.o irq_regs.o reciprocal_div.o argv_split.o \
-         proportions.o prio_heap.o ratelimit.o show_mem.o
+         proportions.o prio_heap.o ratelimit.o show_mem.o is_single_threaded.o
 
 lib-$(CONFIG_MMU) += ioremap.o
 lib-$(CONFIG_SMP) += cpumask.o
diff --git a/lib/bug.c b/lib/bug.c
index bfeafd60ee9f..300e41afbf97 100644
--- a/lib/bug.c
+++ b/lib/bug.c
@@ -5,6 +5,8 @@
 
   CONFIG_BUG - emit BUG traps.  Nothing happens without this.
   CONFIG_GENERIC_BUG - enable this code.
+  CONFIG_GENERIC_BUG_RELATIVE_POINTERS - use 32-bit pointers relative to
+        the containing struct bug_entry for bug_addr and file.
   CONFIG_DEBUG_BUGVERBOSE - emit full file+line information for each BUG
 
   CONFIG_BUG and CONFIG_DEBUG_BUGVERBOSE are potentially user-settable
@@ -43,6 +45,15 @@
 
 extern const struct bug_entry __start___bug_table[], __stop___bug_table[];
 
+static inline unsigned long bug_addr(const struct bug_entry *bug)
+{
+#ifndef CONFIG_GENERIC_BUG_RELATIVE_POINTERS
+        return bug->bug_addr;
+#else
+        return (unsigned long)bug + bug->bug_addr_disp;
+#endif
+}
+
 #ifdef CONFIG_MODULES
 static LIST_HEAD(module_bug_list);
 
@@ -55,7 +66,7 @@ static const struct bug_entry *module_find_bug(unsigned long bugaddr)
                 unsigned i;
 
                 for (i = 0; i < mod->num_bugs; ++i, ++bug)
-                        if (bugaddr == bug->bug_addr)
+                        if (bugaddr == bug_addr(bug))
                                 return bug;
         }
         return NULL;
@@ -108,7 +119,7 @@ const struct bug_entry *find_bug(unsigned long bugaddr)
         const struct bug_entry *bug;
 
         for (bug = __start___bug_table; bug < __stop___bug_table; ++bug)
-                if (bugaddr == bug->bug_addr)
+                if (bugaddr == bug_addr(bug))
                         return bug;
 
         return module_find_bug(bugaddr);
@@ -133,7 +144,11 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
 
         if (bug) {
 #ifdef CONFIG_DEBUG_BUGVERBOSE
+#ifndef CONFIG_GENERIC_BUG_RELATIVE_POINTERS
                 file = bug->file;
+#else
+                file = (const char *)bug + bug->file_disp;
+#endif
                 line = bug->line;
 #endif
                 warning = (bug->flags & BUGFLAG_WARNING) != 0;
diff --git a/lib/debugobjects.c b/lib/debugobjects.c
index e3ab374e1334..5d99be1fd988 100644
--- a/lib/debugobjects.c
+++ b/lib/debugobjects.c
@@ -45,7 +45,9 @@ static struct kmem_cache	*obj_cache;
 static int                      debug_objects_maxchain __read_mostly;
 static int                      debug_objects_fixups __read_mostly;
 static int                      debug_objects_warnings __read_mostly;
-static int                      debug_objects_enabled __read_mostly;
+static int                      debug_objects_enabled __read_mostly
+                                = CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT;
+
 static struct debug_obj_descr   *descr_test  __read_mostly;
 
 static int __init enable_object_debug(char *str)
diff --git a/lib/is_single_threaded.c b/lib/is_single_threaded.c
new file mode 100644
index 000000000000..f1ed2fe76c65
--- /dev/null
+++ b/lib/is_single_threaded.c
@@ -0,0 +1,45 @@
+/* Function to determine if a thread group is single threaded or not
+ *
+ * Copyright (C) 2008 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ * - Derived from security/selinux/hooks.c
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+
+#include <linux/sched.h>
+
+/**
+ * is_single_threaded - Determine if a thread group is single-threaded or not
+ * @p: A task in the thread group in question
+ *
+ * This returns true if the thread group to which a task belongs is single
+ * threaded, false if it is not.
+ */
+bool is_single_threaded(struct task_struct *p)
+{
+        struct task_struct *g, *t;
+        struct mm_struct *mm = p->mm;
+
+        if (atomic_read(&p->signal->count) != 1)
+                goto no;
+
+        if (atomic_read(&p->mm->mm_users) != 1) {
+                read_lock(&tasklist_lock);
+                do_each_thread(g, t) {
+                        if (t->mm == mm && t != p)
+                                goto no_unlock;
+                } while_each_thread(g, t);
+                read_unlock(&tasklist_lock);
+        }
+
+        return true;
+
+no_unlock:
+        read_unlock(&tasklist_lock);
+no:
+        return false;
+}
diff --git a/lib/libcrc32c.c b/lib/libcrc32c.c
index b5c3287d8ea4..244f5480c898 100644
--- a/lib/libcrc32c.c
+++ b/lib/libcrc32c.c
@@ -30,168 +30,52 @@
  * any later version.
  *
  */
-#include <linux/crc32c.h>
-#include <linux/compiler.h>
-#include <linux/module.h>
-
-MODULE_AUTHOR("Clay Haapala <chaapala@cisco.com>");
-MODULE_DESCRIPTION("CRC32c (Castagnoli) calculations");
-MODULE_LICENSE("GPL");
 
-#define CRC32C_POLY_BE 0x1EDC6F41
-#define CRC32C_POLY_LE 0x82F63B78
+#include <crypto/hash.h>
+#include <linux/err.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
 
-#ifndef CRC_LE_BITS 
-# define CRC_LE_BITS 8
-#endif
+static struct crypto_shash *tfm;
 
+u32 crc32c(u32 crc, const void *address, unsigned int length)
+{
+        struct {
+                struct shash_desc shash;
+                char ctx[crypto_shash_descsize(tfm)];
+        } desc;
+        int err;
 
-/*
- * Haven't generated a big-endian table yet, but the bit-wise version
- * should at least work.
- */
-#if defined CRC_BE_BITS && CRC_BE_BITS != 1
-#undef CRC_BE_BITS
-#endif
-#ifndef CRC_BE_BITS
-# define CRC_BE_BITS 1
-#endif
+        desc.shash.tfm = tfm;
+        desc.shash.flags = 0;
+        *(u32 *)desc.ctx = crc;
 
-EXPORT_SYMBOL(crc32c_le);
+        err = crypto_shash_update(&desc.shash, address, length);
+        BUG_ON(err);
 
-#if CRC_LE_BITS == 1
-/*
- * Compute things bit-wise, as done in crc32.c.  We could share the tight 
- * loop below with crc32 and vary the POLY if we don't find value in terms
- * of space and maintainability in keeping the two modules separate.
- */
-u32 __pure
-crc32c_le(u32 crc, unsigned char const *p, size_t len)
-{
-        int i;
-        while (len--) {
-                crc ^= *p++;
-                for (i = 0; i < 8; i++)
-                        crc = (crc >> 1) ^ ((crc & 1) ? CRC32C_POLY_LE : 0);
-        }
-        return crc;
+        return *(u32 *)desc.ctx;
 }
-#else
-
-/*
- * This is the CRC-32C table
- * Generated with:
- * width = 32 bits
- * poly = 0x1EDC6F41
- * reflect input bytes = true
- * reflect output bytes = true
- */
-
-static const u32 crc32c_table[256] = {
-        0x00000000L, 0xF26B8303L, 0xE13B70F7L, 0x1350F3F4L,
-        0xC79A971FL, 0x35F1141CL, 0x26A1E7E8L, 0xD4CA64EBL,
-        0x8AD958CFL, 0x78B2DBCCL, 0x6BE22838L, 0x9989AB3BL,
-        0x4D43CFD0L, 0xBF284CD3L, 0xAC78BF27L, 0x5E133C24L,
-        0x105EC76FL, 0xE235446CL, 0xF165B798L, 0x030E349BL,
-        0xD7C45070L, 0x25AFD373L, 0x36FF2087L, 0xC494A384L,
-        0x9A879FA0L, 0x68EC1CA3L, 0x7BBCEF57L, 0x89D76C54L,
-        0x5D1D08BFL, 0xAF768BBCL, 0xBC267848L, 0x4E4DFB4BL,
-        0x20BD8EDEL, 0xD2D60DDDL, 0xC186FE29L, 0x33ED7D2AL,
-        0xE72719C1L, 0x154C9AC2L, 0x061C6936L, 0xF477EA35L,
-        0xAA64D611L, 0x580F5512L, 0x4B5FA6E6L, 0xB93425E5L,
-        0x6DFE410EL, 0x9F95C20DL, 0x8CC531F9L, 0x7EAEB2FAL,
-        0x30E349B1L, 0xC288CAB2L, 0xD1D83946L, 0x23B3BA45L,
-        0xF779DEAEL, 0x05125DADL, 0x1642AE59L, 0xE4292D5AL,
-        0xBA3A117EL, 0x4851927DL, 0x5B016189L, 0xA96AE28AL,
-        0x7DA08661L, 0x8FCB0562L, 0x9C9BF696L, 0x6EF07595L,
-        0x417B1DBCL, 0xB3109EBFL, 0xA0406D4BL, 0x522BEE48L,
-        0x86E18AA3L, 0x748A09A0L, 0x67DAFA54L, 0x95B17957L,
-        0xCBA24573L, 0x39C9C670L, 0x2A993584L, 0xD8F2B687L,
-        0x0C38D26CL, 0xFE53516FL, 0xED03A29BL, 0x1F682198L,
-        0x5125DAD3L, 0xA34E59D0L, 0xB01EAA24L, 0x42752927L,
-        0x96BF4DCCL, 0x64D4CECFL, 0x77843D3BL, 0x85EFBE38L,
-        0xDBFC821CL, 0x2997011FL, 0x3AC7F2EBL, 0xC8AC71E8L,
-        0x1C661503L, 0xEE0D9600L, 0xFD5D65F4L, 0x0F36E6F7L,
-        0x61C69362L, 0x93AD1061L, 0x80FDE395L, 0x72966096L,
-        0xA65C047DL, 0x5437877EL, 0x4767748AL, 0xB50CF789L,
-        0xEB1FCBADL, 0x197448AEL, 0x0A24BB5AL, 0xF84F3859L,
-        0x2C855CB2L, 0xDEEEDFB1L, 0xCDBE2C45L, 0x3FD5AF46L,
-        0x7198540DL, 0x83F3D70EL, 0x90A324FAL, 0x62C8A7F9L,
-        0xB602C312L, 0x44694011L, 0x5739B3E5L, 0xA55230E6L,
-        0xFB410CC2L, 0x092A8FC1L, 0x1A7A7C35L, 0xE811FF36L,
-        0x3CDB9BDDL, 0xCEB018DEL, 0xDDE0EB2AL, 0x2F8B6829L,
-        0x82F63B78L, 0x709DB87BL, 0x63CD4B8FL, 0x91A6C88CL,
-        0x456CAC67L, 0xB7072F64L, 0xA457DC90L, 0x563C5F93L,
-        0x082F63B7L, 0xFA44E0B4L, 0xE9141340L, 0x1B7F9043L,
-        0xCFB5F4A8L, 0x3DDE77ABL, 0x2E8E845FL, 0xDCE5075CL,
-        0x92A8FC17L, 0x60C37F14L, 0x73938CE0L, 0x81F80FE3L,
-        0x55326B08L, 0xA759E80BL, 0xB4091BFFL, 0x466298FCL,
-        0x1871A4D8L, 0xEA1A27DBL, 0xF94AD42FL, 0x0B21572CL,
-        0xDFEB33C7L, 0x2D80B0C4L, 0x3ED04330L, 0xCCBBC033L,
-        0xA24BB5A6L, 0x502036A5L, 0x4370C551L, 0xB11B4652L,
-        0x65D122B9L, 0x97BAA1BAL, 0x84EA524EL, 0x7681D14DL,
-        0x2892ED69L, 0xDAF96E6AL, 0xC9A99D9EL, 0x3BC21E9DL,
-        0xEF087A76L, 0x1D63F975L, 0x0E330A81L, 0xFC588982L,
-        0xB21572C9L, 0x407EF1CAL, 0x532E023EL, 0xA145813DL,
-        0x758FE5D6L, 0x87E466D5L, 0x94B49521L, 0x66DF1622L,
-        0x38CC2A06L, 0xCAA7A905L, 0xD9F75AF1L, 0x2B9CD9F2L,
-        0xFF56BD19L, 0x0D3D3E1AL, 0x1E6DCDEEL, 0xEC064EEDL,
-        0xC38D26C4L, 0x31E6A5C7L, 0x22B65633L, 0xD0DDD530L,
-        0x0417B1DBL, 0xF67C32D8L, 0xE52CC12CL, 0x1747422FL,
-        0x49547E0BL, 0xBB3FFD08L, 0xA86F0EFCL, 0x5A048DFFL,
-        0x8ECEE914L, 0x7CA56A17L, 0x6FF599E3L, 0x9D9E1AE0L,
-        0xD3D3E1ABL, 0x21B862A8L, 0x32E8915CL, 0xC083125FL,
-        0x144976B4L, 0xE622F5B7L, 0xF5720643L, 0x07198540L,
-        0x590AB964L, 0xAB613A67L, 0xB831C993L, 0x4A5A4A90L,
-        0x9E902E7BL, 0x6CFBAD78L, 0x7FAB5E8CL, 0x8DC0DD8FL,
-        0xE330A81AL, 0x115B2B19L, 0x020BD8EDL, 0xF0605BEEL,
-        0x24AA3F05L, 0xD6C1BC06L, 0xC5914FF2L, 0x37FACCF1L,
-        0x69E9F0D5L, 0x9B8273D6L, 0x88D28022L, 0x7AB90321L,
-        0xAE7367CAL, 0x5C18E4C9L, 0x4F48173DL, 0xBD23943EL,
-        0xF36E6F75L, 0x0105EC76L, 0x12551F82L, 0xE03E9C81L,
-        0x34F4F86AL, 0xC69F7B69L, 0xD5CF889DL, 0x27A40B9EL,
-        0x79B737BAL, 0x8BDCB4B9L, 0x988C474DL, 0x6AE7C44EL,
-        0xBE2DA0A5L, 0x4C4623A6L, 0x5F16D052L, 0xAD7D5351L
-};
 
-/*
- * Steps through buffer one byte at at time, calculates reflected 
- * crc using table.
- */
+EXPORT_SYMBOL(crc32c);
 
-u32 __pure
-crc32c_le(u32 crc, unsigned char const *data, size_t length)
+static int __init libcrc32c_mod_init(void)
 {
-        while (length--)
-                crc =
-                    crc32c_table[(crc ^ *data++) & 0xFFL] ^ (crc >> 8);
+        tfm = crypto_alloc_shash("crc32c", 0, 0);
+        if (IS_ERR(tfm))
+                return PTR_ERR(tfm);
 
-        return crc;
+        return 0;
 }
 
-#endif  /* CRC_LE_BITS == 8 */
-
-EXPORT_SYMBOL(crc32c_be);
-
-#if CRC_BE_BITS == 1
-u32 __pure
-crc32c_be(u32 crc, unsigned char const *p, size_t len)
+static void __exit libcrc32c_mod_fini(void)
 {
-        int i;
-        while (len--) {
-                crc ^= *p++ << 24;
-                for (i = 0; i < 8; i++)
-                        crc =
-                            (crc << 1) ^ ((crc & 0x80000000) ? CRC32C_POLY_BE :
-                                          0);
-        }
-        return crc;
+        crypto_free_shash(tfm);
 }
-#endif
 
-/*
- * Unit test
- *
- * A small unit test suite is implemented as part of the crypto suite.
- * Select CRYPTO_CRC32C and use the tcrypt module to run the tests.
- */
+module_init(libcrc32c_mod_init);
+module_exit(libcrc32c_mod_fini);
+
+MODULE_AUTHOR("Clay Haapala <chaapala@cisco.com>");
+MODULE_DESCRIPTION("CRC32c (Castagnoli) calculations");
+MODULE_LICENSE("GPL");
diff --git a/lib/swiotlb.c b/lib/swiotlb.c
index 5f6c629a924d..fa2dc4e5f9ba 100644
--- a/lib/swiotlb.c
+++ b/lib/swiotlb.c
@@ -21,9 +21,12 @@
 #include <linux/mm.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
+#include <linux/swiotlb.h>
 #include <linux/string.h>
+#include <linux/swiotlb.h>
 #include <linux/types.h>
 #include <linux/ctype.h>
+#include <linux/highmem.h>
 
 #include <asm/io.h>
 #include <asm/dma.h>
@@ -36,22 +39,6 @@
 #define OFFSET(val,align) ((unsigned long)      \
                            ( (val) & ( (align) - 1)))
 
-#define SG_ENT_VIRT_ADDRESS(sg) (sg_virt((sg)))
-#define SG_ENT_PHYS_ADDRESS(sg) virt_to_bus(SG_ENT_VIRT_ADDRESS(sg))
-
-/*
- * Maximum allowable number of contiguous slabs to map,
- * must be a power of 2.  What is the appropriate value ?
- * The complexity of {map,unmap}_single is linearly dependent on this value.
- */
-#define IO_TLB_SEGSIZE  128
-
-/*
- * log of the size of each IO TLB slab.  The number of slabs is command line
- * controllable.
- */
-#define IO_TLB_SHIFT 11
-
 #define SLABS_PER_PAGE (1 << (PAGE_SHIFT - IO_TLB_SHIFT))
 
 /*
@@ -102,7 +89,10 @@ static unsigned int io_tlb_index;
  * We need to save away the original address corresponding to a mapped entry
  * for the sync operations.
  */
-static unsigned char **io_tlb_orig_addr;
+static struct swiotlb_phys_addr {
+        struct page *page;
+        unsigned int offset;
+} *io_tlb_orig_addr;
 
 /*
  * Protect the above data structures in the map and unmap calls
@@ -126,6 +116,72 @@ setup_io_tlb_npages(char *str)
 __setup("swiotlb=", setup_io_tlb_npages);
 /* make io_tlb_overflow tunable too? */
 
+void * __weak swiotlb_alloc_boot(size_t size, unsigned long nslabs)
+{
+        return alloc_bootmem_low_pages(size);
+}
+
+void * __weak swiotlb_alloc(unsigned order, unsigned long nslabs)
+{
+        return (void *)__get_free_pages(GFP_DMA | __GFP_NOWARN, order);
+}
+
+dma_addr_t __weak swiotlb_phys_to_bus(phys_addr_t paddr)
+{
+        return paddr;
+}
+
+phys_addr_t __weak swiotlb_bus_to_phys(dma_addr_t baddr)
+{
+        return baddr;
+}
+
+static dma_addr_t swiotlb_virt_to_bus(volatile void *address)
+{
+        return swiotlb_phys_to_bus(virt_to_phys(address));
+}
+
+static void *swiotlb_bus_to_virt(dma_addr_t address)
+{
+        return phys_to_virt(swiotlb_bus_to_phys(address));
+}
+
+int __weak swiotlb_arch_range_needs_mapping(void *ptr, size_t size)
+{
+        return 0;
+}
+
+static dma_addr_t swiotlb_sg_to_bus(struct scatterlist *sg)
+{
+        return swiotlb_phys_to_bus(page_to_phys(sg_page(sg)) + sg->offset);
+}
+
+static void swiotlb_print_info(unsigned long bytes)
+{
+        phys_addr_t pstart, pend;
+        dma_addr_t bstart, bend;
+
+        pstart = virt_to_phys(io_tlb_start);
+        pend = virt_to_phys(io_tlb_end);
+
+        bstart = swiotlb_phys_to_bus(pstart);
+        bend = swiotlb_phys_to_bus(pend);
+
+        printk(KERN_INFO "Placing %luMB software IO TLB between %p - %p\n",
+               bytes >> 20, io_tlb_start, io_tlb_end);
+        if (pstart != bstart || pend != bend)
+                printk(KERN_INFO "software IO TLB at phys %#llx - %#llx"
+                       " bus %#llx - %#llx\n",
+                       (unsigned long long)pstart,
+                       (unsigned long long)pend,
+                       (unsigned long long)bstart,
+                       (unsigned long long)bend);
+        else
+                printk(KERN_INFO "software IO TLB at phys %#llx - %#llx\n",
+                       (unsigned long long)pstart,
+                       (unsigned long long)pend);
+}
+
 /*
  * Statically reserve bounce buffer space and initialize bounce buffer data
  * structures for the software IO TLB used to implement the DMA API.
@@ -145,7 +201,7 @@ swiotlb_init_with_default_size(size_t default_size)
         /*
          * Get IO TLB memory from the low pages
          */
-        io_tlb_start = alloc_bootmem_low_pages(bytes);
+        io_tlb_start = swiotlb_alloc_boot(bytes, io_tlb_nslabs);
         if (!io_tlb_start)
                 panic("Cannot allocate SWIOTLB buffer");
         io_tlb_end = io_tlb_start + bytes;
@@ -159,7 +215,7 @@ swiotlb_init_with_default_size(size_t default_size)
         for (i = 0; i < io_tlb_nslabs; i++)
                 io_tlb_list[i] = IO_TLB_SEGSIZE - OFFSET(i, IO_TLB_SEGSIZE);
         io_tlb_index = 0;
-        io_tlb_orig_addr = alloc_bootmem(io_tlb_nslabs * sizeof(char *));
+        io_tlb_orig_addr = alloc_bootmem(io_tlb_nslabs * sizeof(struct swiotlb_phys_addr));
 
         /*
          * Get the overflow emergency buffer
@@ -168,8 +224,7 @@ swiotlb_init_with_default_size(size_t default_size)
         if (!io_tlb_overflow_buffer)
                 panic("Cannot allocate SWIOTLB overflow buffer!\n");
 
-        printk(KERN_INFO "Placing software IO TLB between 0x%lx - 0x%lx\n",
-               virt_to_bus(io_tlb_start), virt_to_bus(io_tlb_end));
+        swiotlb_print_info(bytes);
 }
 
 void __init
@@ -202,8 +257,7 @@ swiotlb_late_init_with_default_size(size_t default_size)
         bytes = io_tlb_nslabs << IO_TLB_SHIFT;
 
         while ((SLABS_PER_PAGE << order) > IO_TLB_MIN_SLABS) {
-                io_tlb_start = (char *)__get_free_pages(GFP_DMA | __GFP_NOWARN,
-                                                        order);
+                io_tlb_start = swiotlb_alloc(order, io_tlb_nslabs);
                 if (io_tlb_start)
                         break;
                 order--;
@@ -235,12 +289,12 @@ swiotlb_late_init_with_default_size(size_t default_size)
                 io_tlb_list[i] = IO_TLB_SEGSIZE - OFFSET(i, IO_TLB_SEGSIZE);
         io_tlb_index = 0;
 
-        io_tlb_orig_addr = (unsigned char **)__get_free_pages(GFP_KERNEL,
-                                   get_order(io_tlb_nslabs * sizeof(char *)));
+        io_tlb_orig_addr = (struct swiotlb_phys_addr *)__get_free_pages(GFP_KERNEL,
+                                   get_order(io_tlb_nslabs * sizeof(struct swiotlb_phys_addr)));
         if (!io_tlb_orig_addr)
                 goto cleanup3;
 
-        memset(io_tlb_orig_addr, 0, io_tlb_nslabs * sizeof(char *));
+        memset(io_tlb_orig_addr, 0, io_tlb_nslabs * sizeof(struct swiotlb_phys_addr));
 
         /*
          * Get the overflow emergency buffer
@@ -250,9 +304,7 @@ swiotlb_late_init_with_default_size(size_t default_size)
         if (!io_tlb_overflow_buffer)
                 goto cleanup4;
 
-        printk(KERN_INFO "Placing %luMB software IO TLB between 0x%lx - "
-               "0x%lx\n", bytes >> 20,
-               virt_to_bus(io_tlb_start), virt_to_bus(io_tlb_end));
+        swiotlb_print_info(bytes);
 
         return 0;
 
@@ -279,16 +331,69 @@ address_needs_mapping(struct device *hwdev, dma_addr_t addr, size_t size)
         return !is_buffer_dma_capable(dma_get_mask(hwdev), addr, size);
 }
 
+static inline int range_needs_mapping(void *ptr, size_t size)
+{
+        return swiotlb_force || swiotlb_arch_range_needs_mapping(ptr, size);
+}
+
 static int is_swiotlb_buffer(char *addr)
 {
         return addr >= io_tlb_start && addr < io_tlb_end;
 }
 
+static struct swiotlb_phys_addr swiotlb_bus_to_phys_addr(char *dma_addr)
+{
+        int index = (dma_addr - io_tlb_start) >> IO_TLB_SHIFT;
+        struct swiotlb_phys_addr buffer = io_tlb_orig_addr[index];
+        buffer.offset += (long)dma_addr & ((1 << IO_TLB_SHIFT) - 1);
+        buffer.page += buffer.offset >> PAGE_SHIFT;
+        buffer.offset &= PAGE_SIZE - 1;
+        return buffer;
+}
+
+static void
+__sync_single(struct swiotlb_phys_addr buffer, char *dma_addr, size_t size, int dir)
+{
+        if (PageHighMem(buffer.page)) {
+                size_t len, bytes;
+                char *dev, *host, *kmp;
+
+                len = size;
+                while (len != 0) {
+                        unsigned long flags;
+
+                        bytes = len;
+                        if ((bytes + buffer.offset) > PAGE_SIZE)
+                                bytes = PAGE_SIZE - buffer.offset;
+                        local_irq_save(flags); /* protects KM_BOUNCE_READ */
+                        kmp  = kmap_atomic(buffer.page, KM_BOUNCE_READ);
+                        dev  = dma_addr + size - len;
+                        host = kmp + buffer.offset;
+                        if (dir == DMA_FROM_DEVICE)
+                                memcpy(host, dev, bytes);
+                        else
+                                memcpy(dev, host, bytes);
+                        kunmap_atomic(kmp, KM_BOUNCE_READ);
+                        local_irq_restore(flags);
+                        len -= bytes;
+                        buffer.page++;
+                        buffer.offset = 0;
+                }
+        } else {
+                void *v = page_address(buffer.page) + buffer.offset;
+
+                if (dir == DMA_TO_DEVICE)
+                        memcpy(dma_addr, v, size);
+                else
+                        memcpy(v, dma_addr, size);
+        }
+}
+
 /*
  * Allocates bounce buffer and returns its kernel virtual address.
  */
 static void *
-map_single(struct device *hwdev, char *buffer, size_t size, int dir)
+map_single(struct device *hwdev, struct swiotlb_phys_addr buffer, size_t size, int dir)
 {
         unsigned long flags;
         char *dma_addr;
@@ -298,11 +403,16 @@ map_single(struct device *hwdev, char *buffer, size_t size, int dir)
         unsigned long mask;
         unsigned long offset_slots;
         unsigned long max_slots;
+        struct swiotlb_phys_addr slot_buf;
 
         mask = dma_get_seg_boundary(hwdev);
-        start_dma_addr = virt_to_bus(io_tlb_start) & mask;
+        start_dma_addr = swiotlb_virt_to_bus(io_tlb_start) & mask;
 
         offset_slots = ALIGN(start_dma_addr, 1 << IO_TLB_SHIFT) >> IO_TLB_SHIFT;
+
+        /*
+         * Carefully handle integer overflow which can occur when mask == ~0UL.
+         */
         max_slots = mask + 1
                     ? ALIGN(mask + 1, 1 << IO_TLB_SHIFT) >> IO_TLB_SHIFT
                     : 1UL << (BITS_PER_LONG - IO_TLB_SHIFT);
@@ -378,10 +488,15 @@ found:
          * This is needed when we sync the memory.  Then we sync the buffer if
          * needed.
          */
-        for (i = 0; i < nslots; i++)
-                io_tlb_orig_addr[index+i] = buffer + (i << IO_TLB_SHIFT);
+        slot_buf = buffer;
+        for (i = 0; i < nslots; i++) {
+                slot_buf.page += slot_buf.offset >> PAGE_SHIFT;
+                slot_buf.offset &= PAGE_SIZE - 1;
+                io_tlb_orig_addr[index+i] = slot_buf;
+                slot_buf.offset += 1 << IO_TLB_SHIFT;
+        }
         if (dir == DMA_TO_DEVICE || dir == DMA_BIDIRECTIONAL)
-                memcpy(dma_addr, buffer, size);
+                __sync_single(buffer, dma_addr, size, DMA_TO_DEVICE);
 
         return dma_addr;
 }
@@ -395,17 +510,17 @@ unmap_single(struct device *hwdev, char *dma_addr, size_t size, int dir)
         unsigned long flags;
         int i, count, nslots = ALIGN(size, 1 << IO_TLB_SHIFT) >> IO_TLB_SHIFT;
         int index = (dma_addr - io_tlb_start) >> IO_TLB_SHIFT;
-        char *buffer = io_tlb_orig_addr[index];
+        struct swiotlb_phys_addr buffer = swiotlb_bus_to_phys_addr(dma_addr);
 
         /*
          * First, sync the memory before unmapping the entry
          */
-        if (buffer && ((dir == DMA_FROM_DEVICE) || (dir == DMA_BIDIRECTIONAL)))
+        if ((dir == DMA_FROM_DEVICE) || (dir == DMA_BIDIRECTIONAL))
                 /*
                  * bounce... copy the data back into the original buffer * and
                  * delete the bounce buffer.
                  */
-                memcpy(buffer, dma_addr, size);
+                __sync_single(buffer, dma_addr, size, DMA_FROM_DEVICE);
 
         /*
          * Return the buffer to the free list by setting the corresponding
@@ -437,21 +552,18 @@ static void
 sync_single(struct device *hwdev, char *dma_addr, size_t size,
             int dir, int target)
 {
-        int index = (dma_addr - io_tlb_start) >> IO_TLB_SHIFT;
-        char *buffer = io_tlb_orig_addr[index];
-
-        buffer += ((unsigned long)dma_addr & ((1 << IO_TLB_SHIFT) - 1));
+        struct swiotlb_phys_addr buffer = swiotlb_bus_to_phys_addr(dma_addr);
 
         switch (target) {
         case SYNC_FOR_CPU:
                 if (likely(dir == DMA_FROM_DEVICE || dir == DMA_BIDIRECTIONAL))
-                        memcpy(buffer, dma_addr, size);
+                        __sync_single(buffer, dma_addr, size, DMA_FROM_DEVICE);
                 else
                         BUG_ON(dir != DMA_TO_DEVICE);
                 break;
         case SYNC_FOR_DEVICE:
                 if (likely(dir == DMA_TO_DEVICE || dir == DMA_BIDIRECTIONAL))
-                        memcpy(dma_addr, buffer, size);
+                        __sync_single(buffer, dma_addr, size, DMA_TO_DEVICE);
                 else
                         BUG_ON(dir != DMA_FROM_DEVICE);
                 break;
@@ -473,7 +585,7 @@ swiotlb_alloc_coherent(struct device *hwdev, size_t size,
                 dma_mask = hwdev->coherent_dma_mask;
 
         ret = (void *)__get_free_pages(flags, order);
-        if (ret && !is_buffer_dma_capable(dma_mask, virt_to_bus(ret), size)) {
+        if (ret && !is_buffer_dma_capable(dma_mask, swiotlb_virt_to_bus(ret), size)) {
                 /*
                  * The allocated memory isn't reachable by the device.
                  * Fall back on swiotlb_map_single().
@@ -488,13 +600,16 @@ swiotlb_alloc_coherent(struct device *hwdev, size_t size,
                  * swiotlb_map_single(), which will grab memory from
                  * the lowest available address range.
                  */
-                ret = map_single(hwdev, NULL, size, DMA_FROM_DEVICE);
+                struct swiotlb_phys_addr buffer;
+                buffer.page = virt_to_page(NULL);
+                buffer.offset = 0;
+                ret = map_single(hwdev, buffer, size, DMA_FROM_DEVICE);
                 if (!ret)
                         return NULL;
         }
 
         memset(ret, 0, size);
-        dev_addr = virt_to_bus(ret);
+        dev_addr = swiotlb_virt_to_bus(ret);
 
         /* Confirm address can be DMA'd by device */
         if (!is_buffer_dma_capable(dma_mask, dev_addr, size)) {
@@ -554,8 +669,9 @@ dma_addr_t
 swiotlb_map_single_attrs(struct device *hwdev, void *ptr, size_t size,
                          int dir, struct dma_attrs *attrs)
 {
-        dma_addr_t dev_addr = virt_to_bus(ptr);
+        dma_addr_t dev_addr = swiotlb_virt_to_bus(ptr);
         void *map;
+        struct swiotlb_phys_addr buffer;
 
         BUG_ON(dir == DMA_NONE);
         /*
@@ -563,19 +679,22 @@ swiotlb_map_single_attrs(struct device *hwdev, void *ptr, size_t size,
          * we can safely return the device addr and not worry about bounce
          * buffering it.
          */
-        if (!address_needs_mapping(hwdev, dev_addr, size) && !swiotlb_force)
+        if (!address_needs_mapping(hwdev, dev_addr, size) &&
+            !range_needs_mapping(ptr, size))
                 return dev_addr;
 
         /*
          * Oh well, have to allocate and map a bounce buffer.
          */
-        map = map_single(hwdev, ptr, size, dir);
+        buffer.page   = virt_to_page(ptr);
+        buffer.offset = (unsigned long)ptr & ~PAGE_MASK;
+        map = map_single(hwdev, buffer, size, dir);
         if (!map) {
                 swiotlb_full(hwdev, size, dir, 1);
                 map = io_tlb_overflow_buffer;
         }
 
-        dev_addr = virt_to_bus(map);
+        dev_addr = swiotlb_virt_to_bus(map);
 
         /*
          * Ensure that the address returned is DMA'ble
@@ -605,7 +724,7 @@ void
 swiotlb_unmap_single_attrs(struct device *hwdev, dma_addr_t dev_addr,
                            size_t size, int dir, struct dma_attrs *attrs)
 {
-        char *dma_addr = bus_to_virt(dev_addr);
+        char *dma_addr = swiotlb_bus_to_virt(dev_addr);
 
         BUG_ON(dir == DMA_NONE);
         if (is_swiotlb_buffer(dma_addr))
@@ -635,7 +754,7 @@ static void
 swiotlb_sync_single(struct device *hwdev, dma_addr_t dev_addr,
                     size_t size, int dir, int target)
 {
-        char *dma_addr = bus_to_virt(dev_addr);
+        char *dma_addr = swiotlb_bus_to_virt(dev_addr);
 
         BUG_ON(dir == DMA_NONE);
         if (is_swiotlb_buffer(dma_addr))
@@ -666,7 +785,7 @@ swiotlb_sync_single_range(struct device *hwdev, dma_addr_t dev_addr,
                           unsigned long offset, size_t size,
                           int dir, int target)
 {
-        char *dma_addr = bus_to_virt(dev_addr) + offset;
+        char *dma_addr = swiotlb_bus_to_virt(dev_addr) + offset;
 
         BUG_ON(dir == DMA_NONE);
         if (is_swiotlb_buffer(dma_addr))
@@ -714,18 +833,20 @@ swiotlb_map_sg_attrs(struct device *hwdev, struct scatterlist *sgl, int nelems,
                      int dir, struct dma_attrs *attrs)
 {
         struct scatterlist *sg;
-        void *addr;
+        struct swiotlb_phys_addr buffer;
         dma_addr_t dev_addr;
         int i;
 
         BUG_ON(dir == DMA_NONE);
 
         for_each_sg(sgl, sg, nelems, i) {
-                addr = SG_ENT_VIRT_ADDRESS(sg);
-                dev_addr = virt_to_bus(addr);
-                if (swiotlb_force ||
+                dev_addr = swiotlb_sg_to_bus(sg);
+                if (range_needs_mapping(sg_virt(sg), sg->length) ||
                     address_needs_mapping(hwdev, dev_addr, sg->length)) {
-                        void *map = map_single(hwdev, addr, sg->length, dir);
+                        void *map;
+                        buffer.page   = sg_page(sg);
+                        buffer.offset = sg->offset;
+                        map = map_single(hwdev, buffer, sg->length, dir);
                         if (!map) {
                                 /* Don't panic here, we expect map_sg users
                                    to do proper error handling. */
@@ -735,7 +856,7 @@ swiotlb_map_sg_attrs(struct device *hwdev, struct scatterlist *sgl, int nelems,
                                 sgl[0].dma_length = 0;
                                 return 0;
                         }
-                        sg->dma_address = virt_to_bus(map);
+                        sg->dma_address = swiotlb_virt_to_bus(map);
                 } else
                         sg->dma_address = dev_addr;
                 sg->dma_length = sg->length;
@@ -765,11 +886,11 @@ swiotlb_unmap_sg_attrs(struct device *hwdev, struct scatterlist *sgl,
         BUG_ON(dir == DMA_NONE);
 
         for_each_sg(sgl, sg, nelems, i) {
-                if (sg->dma_address != SG_ENT_PHYS_ADDRESS(sg))
-                        unmap_single(hwdev, bus_to_virt(sg->dma_address),
+                if (sg->dma_address != swiotlb_sg_to_bus(sg))
+                        unmap_single(hwdev, swiotlb_bus_to_virt(sg->dma_address),
                                      sg->dma_length, dir);
                 else if (dir == DMA_FROM_DEVICE)
-                        dma_mark_clean(SG_ENT_VIRT_ADDRESS(sg), sg->dma_length);
+                        dma_mark_clean(swiotlb_bus_to_virt(sg->dma_address), sg->dma_length);
         }
 }
 EXPORT_SYMBOL(swiotlb_unmap_sg_attrs);
@@ -798,11 +919,11 @@ swiotlb_sync_sg(struct device *hwdev, struct scatterlist *sgl,
         BUG_ON(dir == DMA_NONE);
 
         for_each_sg(sgl, sg, nelems, i) {
-                if (sg->dma_address != SG_ENT_PHYS_ADDRESS(sg))
-                        sync_single(hwdev, bus_to_virt(sg->dma_address),
+                if (sg->dma_address != swiotlb_sg_to_bus(sg))
+                        sync_single(hwdev, swiotlb_bus_to_virt(sg->dma_address),
                                     sg->dma_length, dir, target);
                 else if (dir == DMA_FROM_DEVICE)
-                        dma_mark_clean(SG_ENT_VIRT_ADDRESS(sg), sg->dma_length);
+                        dma_mark_clean(swiotlb_bus_to_virt(sg->dma_address), sg->dma_length);
         }
 }
 
@@ -823,7 +944,7 @@ swiotlb_sync_sg_for_device(struct device *hwdev, struct scatterlist *sg,
 int
 swiotlb_dma_mapping_error(struct device *hwdev, dma_addr_t dma_addr)
 {
-        return (dma_addr == virt_to_bus(io_tlb_overflow_buffer));
+        return (dma_addr == swiotlb_virt_to_bus(io_tlb_overflow_buffer));
 }
 
 /*
@@ -835,7 +956,7 @@ swiotlb_dma_mapping_error(struct device *hwdev, dma_addr_t dma_addr)
 int
 swiotlb_dma_supported(struct device *hwdev, u64 mask)
 {
-        return virt_to_bus(io_tlb_end - 1) <= mask;
+        return swiotlb_virt_to_bus(io_tlb_end - 1) <= mask;
 }
 
 EXPORT_SYMBOL(swiotlb_map_single);
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index a013bbc23717..3b777025d876 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -581,6 +581,62 @@ static char *resource_string(char *buf, char *end, struct resource *res, int fie
         return string(buf, end, sym, field_width, precision, flags);
 }
 
+static char *mac_address_string(char *buf, char *end, u8 *addr, int field_width,
+                                int precision, int flags)
+{
+        char mac_addr[6 * 3]; /* (6 * 2 hex digits), 5 colons and trailing zero */
+        char *p = mac_addr;
+        int i;
+
+        for (i = 0; i < 6; i++) {
+                p = pack_hex_byte(p, addr[i]);
+                if (!(flags & SPECIAL) && i != 5)
+                        *p++ = ':';
+        }
+        *p = '\0';
+
+        return string(buf, end, mac_addr, field_width, precision, flags & ~SPECIAL);
+}
+
+static char *ip6_addr_string(char *buf, char *end, u8 *addr, int field_width,
+                         int precision, int flags)
+{
+        char ip6_addr[8 * 5]; /* (8 * 4 hex digits), 7 colons and trailing zero */
+        char *p = ip6_addr;
+        int i;
+
+        for (i = 0; i < 8; i++) {
+                p = pack_hex_byte(p, addr[2 * i]);
+                p = pack_hex_byte(p, addr[2 * i + 1]);
+                if (!(flags & SPECIAL) && i != 7)
+                        *p++ = ':';
+        }
+        *p = '\0';
+
+        return string(buf, end, ip6_addr, field_width, precision, flags & ~SPECIAL);
+}
+
+static char *ip4_addr_string(char *buf, char *end, u8 *addr, int field_width,
+                         int precision, int flags)
+{
+        char ip4_addr[4 * 4]; /* (4 * 3 decimal digits), 3 dots and trailing zero */
+        char temp[3];   /* hold each IP quad in reverse order */
+        char *p = ip4_addr;
+        int i, digits;
+
+        for (i = 0; i < 4; i++) {
+                digits = put_dec_trunc(temp, addr[i]) - temp;
+                /* reverse the digits in the quad */
+                while (digits--)
+                        *p++ = temp[digits];
+                if (i != 3)
+                        *p++ = '.';
+        }
+        *p = '\0';
+
+        return string(buf, end, ip4_addr, field_width, precision, flags & ~SPECIAL);
+}
+
 /*
  * Show a '%p' thing.  A kernel extension is that the '%p' is followed
  * by an extra set of alphanumeric characters that are extended format
@@ -592,6 +648,12 @@ static char *resource_string(char *buf, char *end, struct resource *res, int fie
  * - 'S' For symbolic direct pointers
  * - 'R' For a struct resource pointer, it prints the range of
  *       addresses (not the name nor the flags)
+ * - 'M' For a 6-byte MAC address, it prints the address in the
+ *       usual colon-separated hex notation
+ * - 'I' [46] for IPv4/IPv6 addresses printed in the usual way (dot-separated
+ *       decimal for v4 and colon separated network-order 16 bit hex for v6)
+ * - 'i' [46] for 'raw' IPv4/IPv6 addresses, IPv6 omits the colons, IPv4 is
+ *       currently the same
  *
  * Note: The difference between 'S' and 'F' is that on ia64 and ppc64
  * function pointers are really function descriptors, which contain a
@@ -607,6 +669,21 @@ static char *pointer(const char *fmt, char *buf, char *end, void *ptr, int field
                 return symbol_string(buf, end, ptr, field_width, precision, flags);
         case 'R':
                 return resource_string(buf, end, ptr, field_width, precision, flags);
+        case 'm':
+                flags |= SPECIAL;
+                /* Fallthrough */
+        case 'M':
+                return mac_address_string(buf, end, ptr, field_width, precision, flags);
+        case 'i':
+                flags |= SPECIAL;
+                /* Fallthrough */
+        case 'I':
+                if (fmt[1] == '6')
+                        return ip6_addr_string(buf, end, ptr, field_width, precision, flags);
+                if (fmt[1] == '4')
+                        return ip4_addr_string(buf, end, ptr, field_width, precision, flags);
+                flags &= ~SPECIAL;
+                break;
         }
         flags |= SMALL;
         if (field_width == -1) {