diff for duplicates of <20170115211215.17216-7-mcgrof@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 3cdd2c2..4d99c22 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -24,8 +24,8 @@ foo_fixup Completed initializing pci ! Number of init entries: 1 Initializing kprobes ... -== OK: test_kprobe_0001 within range! -== OK: test_kprobe_0002 not in range as expected! += OK: test_kprobe_0001 within range! += OK: test_kprobe_0002 not in range as expected! Completed initializing kprobes ! Initializing kasan ... Early init for Kasan... @@ -231,8 +231,7 @@ index bc2d9f46cde6..2f2bb1fc0798 100644 + :doc: Linker table provenance and userspace testing Benefits of using Linker tables - =============================== -diff --git a/MAINTAINERS b/MAINTAINERS + ===============diff --git a/MAINTAINERS b/MAINTAINERS index cee1efd50e04..b83bd957011e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -722,7 +721,7 @@ index 000000000000..e2db4da87222 + * At least as per nasm (x86/x86_64 only), in the absence of qualifiers the + * defaults are as follows: + * -+ * section .text progbits alloc exec nowrite align=16 ++ * section .text progbits alloc exec nowrite align\x16 + * section .rodata progbits alloc noexec nowrite align=4 + * section .lrodata progbits alloc noexec nowrite align=4 + * section .data progbits alloc noexec write align=4 @@ -914,7 +913,7 @@ index 000000000000..3368fc475cd8 + * + * bool is_empty = LINKTABLE_EMPTY(some_fns); + */ -+#define SECTION_RANGE_EMPTY(name) (SECTION_RANGE_SIZE(name) == 0) ++#define SECTION_RANGE_EMPTY(name) (SECTION_RANGE_SIZE(name) = 0) + +/** + * SECTION_RANGE_ADDR_WITHIN - returns true if address is in the section range @@ -1417,7 +1416,7 @@ index 000000000000..9dd8f947b60b + * + * bool is_empty = LINKTABLE_EMPTY(frobnicator_fns); + */ -+#define LINKTABLE_EMPTY(name) (LINKTABLE_SIZE(name) == 0) ++#define LINKTABLE_EMPTY(name) (LINKTABLE_SIZE(name) = 0) + +/** + * LINKTABLE_ADDR_WITHIN - returns true if address is in the linker table @@ -1847,8 +1846,7 @@ index 000000000000..9d4e6fb0d176 +include $(srctree)/tools/build/Makefile.include + +ifeq ($(V),1) -+ Q= -+ NQ=@true ++ Q+ NQ=@true +else + Q=@ + NQ=@echo @@ -2002,7 +2000,7 @@ index 000000000000..729241f9e4c4 +++ b/tools/linker-tables/README @@ -0,0 +1,114 @@ +Linux linker table userspace sandbox -+==================================== ++================== + +This is a userspace sandbox to allow easy experimentation and +test extensions with linker tables. It tries to mimic the Linux @@ -2017,8 +2015,7 @@ index 000000000000..729241f9e4c4 +application. + +History -+======= -+ ++===+ +This was hacked on first in an external repository, that tree has +the full set of history of how this work came about. Refer to that +tree for more details if you are interested in the logic used for @@ -2030,8 +2027,7 @@ index 000000000000..729241f9e4c4 +is kept in sync with the kernel. + +Compile -+======= -+ ++===+ +Run: + make + @@ -2044,8 +2040,7 @@ index 000000000000..729241f9e4c4 + make OUTPUT=/tmp/path/ clean + +Supported architectures -+======================= -+ ++===========+ +x86_64 + +Currently only x86_64 is supported for the demo. It should be @@ -2060,8 +2055,7 @@ index 000000000000..729241f9e4c4 +file over. + +x86 Simulated boots -+=================== -+ ++=========+ +This programs simulates boot on both bare metal and with the +Xen PV entry on x86. + @@ -2074,7 +2068,7 @@ index 000000000000..729241f9e4c4 +./demo -x + +Testing new features -+==================== ++========== + +A copy of each kernel header file is maintained in tools/include/, +as well as a respective generated asm file for each sandbox supported @@ -2093,8 +2087,7 @@ index 000000000000..729241f9e4c4 +each respective tools/linker-tables/arch/$(ARCH)/include/asm/. + +Features evaluation -+=================== -+ ++=========+ +This lists features currently being evaluated in the sandbox, not yet +present upstream. These make use of the existing set of header files +without modification. @@ -2679,15 +2672,15 @@ index 000000000000..c4e42beae55b +{ + if (SECTION_RANGE_ADDR_WITHIN(kprobes, addr)) + if (should_match) -+ pr_info("== OK: %s within range!\n", test); ++ pr_info("= OK: %s within range!\n", test); + else -+ pr_info("== FAIL: %s should not be in range...\n", ++ pr_info("= FAIL: %s should not be in range...\n", + test); + else + if (should_match) -+ pr_info("== FAIL: %s should be in range...\n", test); ++ pr_info("= FAIL: %s should be in range...\n", test); + else -+ pr_info("== OK: %s not in range as expected!\n", test); ++ pr_info("= OK: %s not in range as expected!\n", test); +} + +void early_init_kprobes(void) diff --git a/a/content_digest b/N1/content_digest index 2a90e1c..627cb16 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\020170115211215.17216-1-mcgrof@kernel.org\0" "From\0Luis R. Rodriguez <mcgrof@kernel.org>\0" "Subject\0[PATCH v4 6/6] tools: add userspace linker table sandbox\0" - "Date\0Sun, 15 Jan 2017 13:12:15 -0800\0" + "Date\0Sun, 15 Jan 2017 21:12:15 +0000\0" "To\0bp@alien8.de" bp@suse.de hpa@zytor.com @@ -82,8 +82,8 @@ "Completed initializing pci !\n" "Number of init entries: 1\n" "Initializing kprobes ...\n" - "== OK: test_kprobe_0001 within range!\n" - "== OK: test_kprobe_0002 not in range as expected!\n" + "= OK: test_kprobe_0001 within range!\n" + "= OK: test_kprobe_0002 not in range as expected!\n" "Completed initializing kprobes !\n" "Initializing kasan ...\n" "Early init for Kasan...\n" @@ -289,8 +289,7 @@ "+ :doc: Linker table provenance and userspace testing\n" " \n" " Benefits of using Linker tables\n" - " ===============================\n" - "diff --git a/MAINTAINERS b/MAINTAINERS\n" + " ===============diff --git a/MAINTAINERS b/MAINTAINERS\n" "index cee1efd50e04..b83bd957011e 100644\n" "--- a/MAINTAINERS\n" "+++ b/MAINTAINERS\n" @@ -780,7 +779,7 @@ "+ * At least as per nasm (x86/x86_64 only), in the absence of qualifiers the\n" "+ * defaults are as follows:\n" "+ *\n" - "+ * section .text progbits alloc exec nowrite align=16\n" + "+ * section .text progbits alloc exec nowrite align\026\n" "+ * section .rodata progbits alloc noexec nowrite align=4\n" "+ * section .lrodata progbits alloc noexec nowrite align=4\n" "+ * section .data progbits alloc noexec write align=4\n" @@ -972,7 +971,7 @@ "+ *\n" "+ * bool is_empty = LINKTABLE_EMPTY(some_fns);\n" "+ */\n" - "+#define SECTION_RANGE_EMPTY(name)\t(SECTION_RANGE_SIZE(name) == 0)\n" + "+#define SECTION_RANGE_EMPTY(name)\t(SECTION_RANGE_SIZE(name) = 0)\n" "+\n" "+/**\n" "+ * SECTION_RANGE_ADDR_WITHIN - returns true if address is in the section range\n" @@ -1475,7 +1474,7 @@ "+ *\n" "+ * bool is_empty = LINKTABLE_EMPTY(frobnicator_fns);\n" "+ */\n" - "+#define LINKTABLE_EMPTY(name)\t(LINKTABLE_SIZE(name) == 0)\n" + "+#define LINKTABLE_EMPTY(name)\t(LINKTABLE_SIZE(name) = 0)\n" "+\n" "+/**\n" "+ * LINKTABLE_ADDR_WITHIN - returns true if address is in the linker table\n" @@ -1905,8 +1904,7 @@ "+include $(srctree)/tools/build/Makefile.include\n" "+\n" "+ifeq ($(V),1)\n" - "+\tQ=\n" - "+\tNQ=@true\n" + "+\tQ+\tNQ=@true\n" "+else\n" "+\tQ=@\n" "+\tNQ=@echo\n" @@ -2060,7 +2058,7 @@ "+++ b/tools/linker-tables/README\n" "@@ -0,0 +1,114 @@\n" "+Linux linker table userspace sandbox\n" - "+====================================\n" + "+==================\n" "+\n" "+This is a userspace sandbox to allow easy experimentation and\n" "+test extensions with linker tables. It tries to mimic the Linux\n" @@ -2075,8 +2073,7 @@ "+application.\n" "+\n" "+History\n" - "+=======\n" - "+\n" + "+===+\n" "+This was hacked on first in an external repository, that tree has\n" "+the full set of history of how this work came about. Refer to that\n" "+tree for more details if you are interested in the logic used for\n" @@ -2088,8 +2085,7 @@ "+is kept in sync with the kernel.\n" "+\n" "+Compile\n" - "+=======\n" - "+\n" + "+===+\n" "+Run:\n" "+\tmake\n" "+\n" @@ -2102,8 +2098,7 @@ "+\tmake OUTPUT=/tmp/path/ clean\n" "+\n" "+Supported architectures\n" - "+=======================\n" - "+\n" + "+===========+\n" "+x86_64\n" "+\n" "+Currently only x86_64 is supported for the demo. It should be\n" @@ -2118,8 +2113,7 @@ "+file over.\n" "+\n" "+x86 Simulated boots\n" - "+===================\n" - "+\n" + "+=========+\n" "+This programs simulates boot on both bare metal and with the\n" "+Xen PV entry on x86.\n" "+\n" @@ -2132,7 +2126,7 @@ "+./demo -x\n" "+\n" "+Testing new features\n" - "+====================\n" + "+==========\n" "+\n" "+A copy of each kernel header file is maintained in tools/include/,\n" "+as well as a respective generated asm file for each sandbox supported\n" @@ -2151,8 +2145,7 @@ "+each respective tools/linker-tables/arch/$(ARCH)/include/asm/.\n" "+\n" "+Features evaluation\n" - "+===================\n" - "+\n" + "+=========+\n" "+This lists features currently being evaluated in the sandbox, not yet\n" "+present upstream. These make use of the existing set of header files\n" "+without modification.\n" @@ -2737,15 +2730,15 @@ "+{\n" "+\tif (SECTION_RANGE_ADDR_WITHIN(kprobes, addr))\n" "+\t\tif (should_match)\n" - "+\t\t\tpr_info(\"== OK: %s within range!\\n\", test);\n" + "+\t\t\tpr_info(\"= OK: %s within range!\\n\", test);\n" "+\t\telse\n" - "+\t\t\tpr_info(\"== FAIL: %s should not be in range...\\n\",\n" + "+\t\t\tpr_info(\"= FAIL: %s should not be in range...\\n\",\n" "+\t\t\t\ttest);\n" "+\telse\n" "+\t\tif (should_match)\n" - "+\t\t\tpr_info(\"== FAIL: %s should be in range...\\n\", test);\n" + "+\t\t\tpr_info(\"= FAIL: %s should be in range...\\n\", test);\n" "+\t\telse\n" - "+\t\t\tpr_info(\"== OK: %s not in range as expected!\\n\", test);\n" + "+\t\t\tpr_info(\"= OK: %s not in range as expected!\\n\", test);\n" "+}\n" "+\n" "+void early_init_kprobes(void)\n" @@ -3986,4 +3979,4 @@ "-- \n" 2.11.0 -3a863b76c89b3ecf993aea05653e3b47385ae8c6df68b21cb63629570c7543bc +3839a469003abf058391271ba3b3c52c6a68cc0813a8c1ba5864b65a90213465
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.