Also need some comment and Documentation/ changes:
diff --git a/Documentation/x86/exception-tables.txt
index 32901aa36f0a..ae47b9f64b8a 100644
@@ -290,3 +290,37 @@ Due to the way that the exception table is built and needs to be
only use exceptions for code in the .text section. Any other section
will cause the exception table to not be sorted correctly, and the
exceptions will fail.
+Things changed when 64-bit support was added to x86 Linux. Rather than
+double the size of the exception table by expanding the two entries
+from 32-bits to 64 bits, a clever trick was used to store addreesses
+as relative offsets from the table itself. The assembly code changed
+ .long 1b,3b
+ .long (from) - .
+ .long (to) - .
+and the C-code that uses these values converts back to absolute addresses
+ ex_insn_addr(const struct exception_table_entry *x)
+ return (unsigned long)&x->insn + x->insn;
+In v4.5 the exception table entry was given a new field "handler".
+This is also 32-bits wide and contains a table entry relative address
+of a handler function that can perform specific operations in addition
+to re-writing the instruction pointer to jump to the fixup location.
+Initially there are three such functions:
+1) int ex_handler_default(const struct exception_table_entry *fixup,
+ This is legacy case that just jumps to the fixup code
+2) int ex_handler_fault(const struct exception_table_entry *fixup,
+ This case provides the fault number of the trap that occured at
+ entry->insn. It is used to distinguish page faults from machine
+3) int ex_handler_ext(const struct exception_table_entry *fixup,
+ This case is used to for uaccess_err ... we need to set a flag
+ in the task structure. Before the handler functions existed this
+ case was handled by adding a large offset to the fixup to tag
+ it as special.
diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
index b8f6f7545679..563443870915 100644
@@ -90,12 +90,12 @@ static inline bool __chk_range_not_ok(unsigned long addr, unsigned
long size, un
likely(!__range_not_ok(addr, size, user_addr_max()))
- * The exception table consists of pairs of addresses relative to the
+ * The exception table consists of triples of addresses relative to the
* exception table enty itself: the first is the address of an
- * instruction that is allowed to fault, and the second is the address
- * at which the program should continue. No registers are modified,
- * so it is entirely up to the continuation code to figure out what to
- * do.
+ * instruction that is allowed to fault, the second is the address
+ * at which the program should continue, the last is the address of
+ * a handler function to deal with the fault referenced by the instruction
+ * in the first field.
* All the routines below use bits of fixup code that are out of line
* with the main instruction path. This means when everything is well,
diff --git a/arch/x86/lib/memcpy_64.S b/arch/x86/lib/memcpy_64.S
index f057718d8d15..195ff0144152 100644
@@ -310,4 +310,3 @@ ENTRY(__mcsafe_copy)