From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-it0-f72.google.com (mail-it0-f72.google.com [209.85.214.72]) by kanga.kvack.org (Postfix) with ESMTP id 8D2256B0005 for ; Mon, 26 Feb 2018 12:16:51 -0500 (EST) Received: by mail-it0-f72.google.com with SMTP id y187so9408975itc.8 for ; Mon, 26 Feb 2018 09:16:51 -0800 (PST) Received: from userp2120.oracle.com (userp2120.oracle.com. [156.151.31.85]) by mx.google.com with ESMTPS id s23si5849313ios.173.2018.02.26.09.16.49 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Feb 2018 09:16:50 -0800 (PST) Subject: Re: [PATCH v8 18/24] mm: Provide speculative fault infrastructure References: <1518794738-4186-1-git-send-email-ldufour@linux.vnet.ibm.com> <1518794738-4186-19-git-send-email-ldufour@linux.vnet.ibm.com> From: Daniel Jordan Message-ID: <5b16d6ce-6b62-e4ca-2d78-c25bb008e27e@oracle.com> Date: Mon, 26 Feb 2018 12:16:09 -0500 MIME-Version: 1.0 In-Reply-To: <1518794738-4186-19-git-send-email-ldufour@linux.vnet.ibm.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit Sender: owner-linux-mm@kvack.org List-ID: To: Laurent Dufour , paulmck@linux.vnet.ibm.com, peterz@infradead.org, akpm@linux-foundation.org, kirill@shutemov.name, ak@linux.intel.com, mhocko@kernel.org, dave@stgolabs.net, jack@suse.cz, Matthew Wilcox , benh@kernel.crashing.org, mpe@ellerman.id.au, paulus@samba.org, Thomas Gleixner , Ingo Molnar , hpa@zytor.com, Will Deacon , Sergey Senozhatsky , Andrea Arcangeli , Alexei Starovoitov , kemi.wang@intel.com, sergey.senozhatsky.work@gmail.com, Daniel Jordan Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, haren@linux.vnet.ibm.com, khandual@linux.vnet.ibm.com, npiggin@gmail.com, bsingharora@gmail.com, Tim Chen , linuxppc-dev@lists.ozlabs.org, x86@kernel.org Hi Laurent, This series doesn't build for me[*] when CONFIG_TRANSPARENT_HUGEPAGE is unset. The problem seems to be that the BUILD_BUG() version of pmd_same is called in pte_map_lock: On 02/16/2018 10:25 AM, Laurent Dufour wrote: > +static bool pte_map_lock(struct vm_fault *vmf) > +{ ...snip... > + if (!pmd_same(pmdval, vmf->orig_pmd)) > + goto out; Since SPF can now call pmd_same without THP, maybe the way to fix it is just diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h index 2cfa3075d148..e130692db24a 100644 --- a/include/asm-generic/pgtable.h +++ b/include/asm-generic/pgtable.h @@ -375,7 +375,8 @@ static inline int pte_unused(pte_t pte) #endif #ifndef __HAVE_ARCH_PMD_SAME -#ifdef CONFIG_TRANSPARENT_HUGEPAGE +#if defined(CONFIG_TRANSPARENT_HUGEPAGE) || \ + defined(CONFIG_SPECULATIVE_PAGE_FAULT) static inline int pmd_same(pmd_t pmd_a, pmd_t pmd_b) { return pmd_val(pmd_a) == pmd_val(pmd_b); ? Daniel [*] The errors are: In file included from /home/dmjordan/src/linux/include/linux/kernel.h:10:0, from /home/dmjordan/src/linux/include/linux/list.h:9, from /home/dmjordan/src/linux/include/linux/smp.h:12, from /home/dmjordan/src/linux/include/linux/kernel_stat.h:5, from /home/dmjordan/src/linux/mm/memory.c:41: In function a??pmd_same.isra.104a??, inlined from a??pte_map_locka?? at /home/dmjordan/src/linux/mm/memory.c:2380:7: /home/dmjordan/src/linux/include/linux/compiler.h:324:38: error: call to a??__compiletime_assert_391a?? declared with attribute error: BUILD_BUG failed _compiletime_assert(condition, msg, __compiletime_assert_, __LINE__) ^ /home/dmjordan/src/linux/include/linux/compiler.h:304:4: note: in definition of macro a??__compiletime_asserta?? prefix ## suffix(); \ ^~~~~~ /home/dmjordan/src/linux/include/linux/compiler.h:324:2: note: in expansion of macro a??_compiletime_asserta?? _compiletime_assert(condition, msg, __compiletime_assert_, __LINE__) ^~~~~~~~~~~~~~~~~~~ /home/dmjordan/src/linux/include/linux/build_bug.h:45:37: note: in expansion of macro a??compiletime_asserta?? #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) ^~~~~~~~~~~~~~~~~~ /home/dmjordan/src/linux/include/linux/build_bug.h:79:21: note: in expansion of macro a??BUILD_BUG_ON_MSGa?? #define BUILD_BUG() BUILD_BUG_ON_MSG(1, "BUILD_BUG failed") ^~~~~~~~~~~~~~~~ /home/dmjordan/src/linux/include/asm-generic/pgtable.h:391:2: note: in expansion of macro a??BUILD_BUGa?? BUILD_BUG(); ^~~~~~~~~ CC block/elevator.o CC crypto/crypto_wq.o In function a??pmd_same.isra.104a??, inlined from a??pte_spinlocka?? at /home/dmjordan/src/linux/mm/memory.c:2326:7, inlined from a??handle_pte_faulta?? at /home/dmjordan/src/linux/mm/memory.c:4181:7: /home/dmjordan/src/linux/include/linux/compiler.h:324:38: error: call to a??__compiletime_assert_391a?? declared with attribute error: BUILD_BUG failed _compiletime_assert(condition, msg, __compiletime_assert_, __LINE__) ^ /home/dmjordan/src/linux/include/linux/compiler.h:304:4: note: in definition of macro a??__compiletime_asserta?? prefix ## suffix(); \ ^~~~~~ /home/dmjordan/src/linux/include/linux/compiler.h:324:2: note: in expansion of macro a??_compiletime_asserta?? _compiletime_assert(condition, msg, __compiletime_assert_, __LINE__) ^~~~~~~~~~~~~~~~~~~ /home/dmjordan/src/linux/include/linux/build_bug.h:45:37: note: in expansion of macro a??compiletime_asserta?? #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) ^~~~~~~~~~~~~~~~~~ /home/dmjordan/src/linux/include/linux/build_bug.h:79:21: note: in expansion of macro a??BUILD_BUG_ON_MSGa?? #define BUILD_BUG() BUILD_BUG_ON_MSG(1, "BUILD_BUG failed") ^~~~~~~~~~~~~~~~ /home/dmjordan/src/linux/include/asm-generic/pgtable.h:391:2: note: in expansion of macro a??BUILD_BUGa?? BUILD_BUG(); ^~~~~~~~~ ... make[2]: *** [/home/dmjordan/src/linux/scripts/Makefile.build:316: mm/memory.o] Error 1 make[1]: *** [/home/dmjordan/src/linux/Makefile:1047: mm] Error 2 -- 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: email@kvack.org