diff for duplicates of <20150523010415.GC4251@redhat.com> diff --git a/a/content_digest b/N1/content_digest index a37da1b..d1ed03c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -28,7 +28,7 @@ Dr. David Alan Gilbert <dgilbert@redhat.com> Johannes Weiner <hannes@cmpxchg.org> Huangpeng (Peter) <peter.huangpeng@huawei.com> - " Fengguang Wu <fengguan>\0" + " Fengguang Wu <fengguan\0" "\00:1\0" "b\0" "On Fri, May 22, 2015 at 02:18:30PM -0700, Andrew Morton wrote:\n" @@ -149,4 +149,4 @@ "see: http://www.linux-mm.org/ .\n" "Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>" -c56144f348ab345042144d1402f8f26c0df4c12ae456cd557275cd6dd393a107 +fe172832331374985229fc549da2766826fe7590daf48743ccc7395d680ca070
diff --git a/a/1.txt b/N2/1.txt index 562caae..409749c 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -34,84 +34,3 @@ recent change, perhaps the buildbot was shutdown recently? That buildbot was very useful to detect for problems like this. === ->From 2f0a48670dc515932dec8b983871ec35caeba553 Mon Sep 17 00:00:00 2001 -From: Andrea Arcangeli <aarcange@redhat.com> -Date: Sat, 23 May 2015 02:26:32 +0200 -Subject: [PATCH] userfaultfd: update the uffd_msg structure to be the same on - 32/64bit - -Avoiding to using packed allowed the code to be nicer and it avoided -the reserved1/2/3 but the structure must be the same for 32bit and -64bit archs so x86 applications built with the 32bit ABI can run on -the 64bit kernel without requiring translation of the data read -through the read syscall. - -$ gcc -m64 p.c && ./a.out -32 -0 -16 -8 -8 -16 -24 -$ gcc -m32 p.c && ./a.out -32 -0 -16 -8 -8 -16 -24 - -int main() -{ - printf("%lu\n", sizeof(struct uffd_msg)); - printf("%lu\n", (unsigned long) &((struct uffd_msg *) 0)->event); - printf("%lu\n", (unsigned long) &((struct uffd_msg *) 0)->arg.pagefault.address); - printf("%lu\n", (unsigned long) &((struct uffd_msg *) 0)->arg.pagefault.flags); - printf("%lu\n", (unsigned long) &((struct uffd_msg *) 0)->arg.reserved.reserved1); - printf("%lu\n", (unsigned long) &((struct uffd_msg *) 0)->arg.reserved.reserved2); - printf("%lu\n", (unsigned long) &((struct uffd_msg *) 0)->arg.reserved.reserved3); -} - -Reported-by: Andrew Morton <akpm@linux-foundation.org> -Signed-off-by: Andrea Arcangeli <aarcange@redhat.com> ---- - include/uapi/linux/userfaultfd.h | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/include/uapi/linux/userfaultfd.h b/include/uapi/linux/userfaultfd.h -index c8a543f..00d28e2 100644 ---- a/include/uapi/linux/userfaultfd.h -+++ b/include/uapi/linux/userfaultfd.h -@@ -59,9 +59,13 @@ - struct uffd_msg { - __u8 event; - -+ __u8 reserved1; -+ __u16 reserved2; -+ __u32 reserved3; -+ - union { - struct { -- __u32 flags; -+ __u64 flags; - __u64 address; - } pagefault; - -@@ -72,7 +76,7 @@ struct uffd_msg { - __u64 reserved3; - } reserved; - } arg; --}; -+} __attribute__((packed)); - - /* - * Start at 0x12 and not at 0 to be more strict against bugs. - - --- -To unsubscribe, send a message with 'unsubscribe linux-mm' in -the body to majordomo@kvack.org. For more info on Linux MM, -see: http://www.linux-mm.org/ . -Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> diff --git a/a/content_digest b/N2/content_digest index a37da1b..4d10161 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -28,7 +28,7 @@ Dr. David Alan Gilbert <dgilbert@redhat.com> Johannes Weiner <hannes@cmpxchg.org> Huangpeng (Peter) <peter.huangpeng@huawei.com> - " Fengguang Wu <fengguan>\0" + " Fengguang Wu <fengguang.wu@intel.com>\0" "\00:1\0" "b\0" "On Fri, May 22, 2015 at 02:18:30PM -0700, Andrew Morton wrote:\n" @@ -66,87 +66,6 @@ "recent change, perhaps the buildbot was shutdown recently? That\n" "buildbot was very useful to detect for problems like this.\n" "\n" - "===\n" - ">From 2f0a48670dc515932dec8b983871ec35caeba553 Mon Sep 17 00:00:00 2001\n" - "From: Andrea Arcangeli <aarcange@redhat.com>\n" - "Date: Sat, 23 May 2015 02:26:32 +0200\n" - "Subject: [PATCH] userfaultfd: update the uffd_msg structure to be the same on\n" - " 32/64bit\n" - "\n" - "Avoiding to using packed allowed the code to be nicer and it avoided\n" - "the reserved1/2/3 but the structure must be the same for 32bit and\n" - "64bit archs so x86 applications built with the 32bit ABI can run on\n" - "the 64bit kernel without requiring translation of the data read\n" - "through the read syscall.\n" - "\n" - "$ gcc -m64 p.c && ./a.out\n" - "32\n" - "0\n" - "16\n" - "8\n" - "8\n" - "16\n" - "24\n" - "$ gcc -m32 p.c && ./a.out\n" - "32\n" - "0\n" - "16\n" - "8\n" - "8\n" - "16\n" - "24\n" - "\n" - "int main()\n" - "{\n" - "\tprintf(\"%lu\\n\", sizeof(struct uffd_msg));\n" - "\tprintf(\"%lu\\n\", (unsigned long) &((struct uffd_msg *) 0)->event);\n" - "\tprintf(\"%lu\\n\", (unsigned long) &((struct uffd_msg *) 0)->arg.pagefault.address);\n" - "\tprintf(\"%lu\\n\", (unsigned long) &((struct uffd_msg *) 0)->arg.pagefault.flags);\n" - "\tprintf(\"%lu\\n\", (unsigned long) &((struct uffd_msg *) 0)->arg.reserved.reserved1);\n" - "\tprintf(\"%lu\\n\", (unsigned long) &((struct uffd_msg *) 0)->arg.reserved.reserved2);\n" - "\tprintf(\"%lu\\n\", (unsigned long) &((struct uffd_msg *) 0)->arg.reserved.reserved3);\n" - "}\n" - "\n" - "Reported-by: Andrew Morton <akpm@linux-foundation.org>\n" - "Signed-off-by: Andrea Arcangeli <aarcange@redhat.com>\n" - "---\n" - " include/uapi/linux/userfaultfd.h | 8 ++++++--\n" - " 1 file changed, 6 insertions(+), 2 deletions(-)\n" - "\n" - "diff --git a/include/uapi/linux/userfaultfd.h b/include/uapi/linux/userfaultfd.h\n" - "index c8a543f..00d28e2 100644\n" - "--- a/include/uapi/linux/userfaultfd.h\n" - "+++ b/include/uapi/linux/userfaultfd.h\n" - "@@ -59,9 +59,13 @@\n" - " struct uffd_msg {\n" - " \t__u8\tevent;\n" - " \n" - "+\t__u8\treserved1;\n" - "+\t__u16\treserved2;\n" - "+\t__u32\treserved3;\n" - "+\n" - " \tunion {\n" - " \t\tstruct {\n" - "-\t\t\t__u32\tflags;\n" - "+\t\t\t__u64\tflags;\n" - " \t\t\t__u64\taddress;\n" - " \t\t} pagefault;\n" - " \n" - "@@ -72,7 +76,7 @@ struct uffd_msg {\n" - " \t\t\t__u64\treserved3;\n" - " \t\t} reserved;\n" - " \t} arg;\n" - "-};\n" - "+} __attribute__((packed));\n" - " \n" - " /*\n" - " * Start at 0x12 and not at 0 to be more strict against bugs.\n" - "\n" - "\n" - "--\n" - "To unsubscribe, send a message with 'unsubscribe linux-mm' in\n" - "the body to majordomo@kvack.org. For more info on Linux MM,\n" - "see: http://www.linux-mm.org/ .\n" - "Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>" + === -c56144f348ab345042144d1402f8f26c0df4c12ae456cd557275cd6dd393a107 +c341f2c534bea37e55faa468de6cb72b142fbac68264148633b17f43b8062444
diff --git a/a/1.txt b/N3/1.txt index 562caae..198fa0c 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -108,10 +108,3 @@ index c8a543f..00d28e2 100644 /* * Start at 0x12 and not at 0 to be more strict against bugs. - - --- -To unsubscribe, send a message with 'unsubscribe linux-mm' in -the body to majordomo@kvack.org. For more info on Linux MM, -see: http://www.linux-mm.org/ . -Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> diff --git a/a/content_digest b/N3/content_digest index a37da1b..6d51435 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -28,7 +28,7 @@ Dr. David Alan Gilbert <dgilbert@redhat.com> Johannes Weiner <hannes@cmpxchg.org> Huangpeng (Peter) <peter.huangpeng@huawei.com> - " Fengguang Wu <fengguan>\0" + " Fengguang Wu <fengguang.wu@intel.com>\0" "\00:1\0" "b\0" "On Fri, May 22, 2015 at 02:18:30PM -0700, Andrew Morton wrote:\n" @@ -140,13 +140,6 @@ "+} __attribute__((packed));\n" " \n" " /*\n" - " * Start at 0x12 and not at 0 to be more strict against bugs.\n" - "\n" - "\n" - "--\n" - "To unsubscribe, send a message with 'unsubscribe linux-mm' in\n" - "the body to majordomo@kvack.org. For more info on Linux MM,\n" - "see: http://www.linux-mm.org/ .\n" - "Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>" + * Start at 0x12 and not at 0 to be more strict against bugs. -c56144f348ab345042144d1402f8f26c0df4c12ae456cd557275cd6dd393a107 +11b7f0b456be2954bc60fbed82972cb4ac6357e1d993a17c6196360ad035e3d1
diff --git a/a/1.txt b/N4/1.txt index 562caae..198fa0c 100644 --- a/a/1.txt +++ b/N4/1.txt @@ -108,10 +108,3 @@ index c8a543f..00d28e2 100644 /* * Start at 0x12 and not at 0 to be more strict against bugs. - - --- -To unsubscribe, send a message with 'unsubscribe linux-mm' in -the body to majordomo@kvack.org. For more info on Linux MM, -see: http://www.linux-mm.org/ . -Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> diff --git a/a/content_digest b/N4/content_digest index a37da1b..19fb4bc 100644 --- a/a/content_digest +++ b/N4/content_digest @@ -4,31 +4,30 @@ "ref\020150522204809.GB4251@redhat.com\0" "ref\020150522141830.f969b285ad072a23bb28f196@linux-foundation.org\0" "From\0Andrea Arcangeli <aarcange@redhat.com>\0" - "Subject\0Re: [PATCH 22/23] userfaultfd: avoid mmap_sem read recursion in mcopy_atomic\0" + "Subject\0Re: [Qemu-devel] [PATCH 22/23] userfaultfd: avoid mmap_sem read recursion in mcopy_atomic\0" "Date\0Sat, 23 May 2015 03:04:15 +0200\0" "To\0Andrew Morton <akpm@linux-foundation.org>\0" - "Cc\0linux-kernel@vger.kernel.org" - linux-mm@kvack.org + "Cc\0kvm@vger.kernel.org" qemu-devel@nongnu.org - kvm@vger.kernel.org - linux-api@vger.kernel.org - Pavel Emelyanov <xemul@parallels.com> Sanidhya Kashyap <sanidhya.gatech@gmail.com> - zhang.zhanghailiang@huawei.com - Linus Torvalds <torvalds@linux-foundation.org> - Kirill A. Shutemov <kirill@shutemov.name> - Andres Lagar-Cavilla <andreslc@google.com> Dave Hansen <dave.hansen@intel.com> - Paolo Bonzini <pbonzini@redhat.com> - Rik van Riel <riel@redhat.com> - Mel Gorman <mgorman@suse.de> - Andy Lutomirski <luto@amacapital.net> + zhang.zhanghailiang@huawei.com + Pavel Emelyanov <xemul@parallels.com> Hugh Dickins <hughd@google.com> - Peter Feiner <pfeiner@google.com> + Mel Gorman <mgorman@suse.de> + Huangpeng (Peter) <peter.huangpeng@huawei.com> Dr. David Alan Gilbert <dgilbert@redhat.com> + Andres Lagar-Cavilla <andreslc@google.com> + Kirill A. Shutemov <kirill@shutemov.name> + linux-mm@kvack.org + linux-api@vger.kernel.org + linux-kernel@vger.kernel.org + Andy Lutomirski <luto@amacapital.net> Johannes Weiner <hannes@cmpxchg.org> - Huangpeng (Peter) <peter.huangpeng@huawei.com> - " Fengguang Wu <fengguan>\0" + Paolo Bonzini <pbonzini@redhat.com> + Fengguang Wu <fengguang.wu@intel.com> + Linus Torvalds <torvalds@linux-foundation.org> + " Peter Feiner <pfeiner@google.com>\0" "\00:1\0" "b\0" "On Fri, May 22, 2015 at 02:18:30PM -0700, Andrew Morton wrote:\n" @@ -140,13 +139,6 @@ "+} __attribute__((packed));\n" " \n" " /*\n" - " * Start at 0x12 and not at 0 to be more strict against bugs.\n" - "\n" - "\n" - "--\n" - "To unsubscribe, send a message with 'unsubscribe linux-mm' in\n" - "the body to majordomo@kvack.org. For more info on Linux MM,\n" - "see: http://www.linux-mm.org/ .\n" - "Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>" + * Start at 0x12 and not at 0 to be more strict against bugs. -c56144f348ab345042144d1402f8f26c0df4c12ae456cd557275cd6dd393a107 +35f2fc8747758ae1798642626e4690411808148d5621fc1e01ba2153dd2c8aad
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.