Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934153AbeALR0Z (ORCPT + 1 other); Fri, 12 Jan 2018 12:26:25 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:44782 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934117AbeALR0X (ORCPT ); Fri, 12 Jan 2018 12:26:23 -0500 From: Laurent Dufour To: 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 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 Subject: [PATCH v6 00/24] Speculative page faults Date: Fri, 12 Jan 2018 18:25:44 +0100 X-Mailer: git-send-email 2.7.4 X-TM-AS-GCONF: 00 x-cbid: 18011217-0040-0000-0000-000004242183 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18011217-0041-0000-0000-000020C783F5 Message-Id: <1515777968-867-1-git-send-email-ldufour@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2018-01-12_09:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1011 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1709140000 definitions=main-1801120238 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: This is a port on kernel 4.15 of the work done by Peter Zijlstra to handle page fault without holding the mm semaphore [1]. The idea is to try to handle user space page faults without holding the mmap_sem. This should allow better concurrency for massively threaded process since the page fault handler will not wait for other threads memory layout change to be done, assuming that this change is done in another part of the process's memory space. This type page fault is named speculative page fault. If the speculative page fault fails because of a concurrency is detected or because underlying PMD or PTE tables are not yet allocating, it is failing its processing and a classic page fault is then tried. The speculative page fault (SPF) has to look for the VMA matching the fault address without holding the mmap_sem, this is done by introducing a rwlock which protects the access to the mm_rb tree. Previously this was done using SRCU but it was introducing a lot of scheduling to process the VMA's freeing operation which was hitting the performance by 20% as reported by Kemi Wang [2].Using a rwlock to protect access to the mm_rb tree is limiting the locking contention to these operations which are expected to be in a O(log n) order. In addition to ensure that the VMA is not freed in our back a reference count is added and 2 services (get_vma() and put_vma()) are introduced to handle the reference count. When a VMA is fetch from the RB tree using get_vma() is must be later freeed using put_vma(). Furthermore, to allow the VMA to be used again by the classic page fault handler a service is introduced can_reuse_spf_vma(). This service is expected to be called with the mmap_sem hold. It checked that the VMA is still matching the specified address and is releasing its reference count as the mmap_sem is hold it is ensure that it will not be freed in our back. In general, the VMA's reference count could be decremented when holding the mmap_sem but it should not be increased as holding the mmap_sem is ensuring that the VMA is stable. I can't see anymore the overhead I got while will-it-scale benchmark anymore. The VMA's attributes checked during the speculative page fault processing have to be protected against parallel changes. This is done by using a per VMA sequence lock. This sequence lock allows the speculative page fault handler to fast check for parallel changes in progress and to abort the speculative page fault in that case. Once the VMA is found, the speculative page fault handler would check for the VMA's attributes to verify that the page fault has to be handled correctly or not. Thus the VMA is protected through a sequence lock which allows fast detection of concurrent VMA changes. If such a change is detected, the speculative page fault is aborted and a *classic* page fault is tried. VMA sequence lockings are added when VMA attributes which are checked during the page fault are modified. When the PTE is fetched, the VMA is checked to see if it has been changed, so once the page table is locked, the VMA is valid, so any other changes leading to touching this PTE will need to lock the page table, so no parallel change is possible at this time. The locking of the PTE is done with interrupts disabled, this allows to check for the PMD to ensure that there is not an ongoing collapsing operation. Since khugepaged is firstly set the PMD to pmd_none and then is waiting for the other CPU to have catch the IPI interrupt, if the pmd is valid at the time the PTE is locked, we have the guarantee that the collapsing opertion will have to wait on the PTE lock to move foward. This allows the SPF handler to map the PTE safely. If the PMD value is different than the one recorded at the beginning of the SPF operation, the classic page fault handler will be called to handle the operation while holding the mmap_sem. As the PTE lock is done with the interrupts disabled, the lock is done using spin_trylock() to avoid dead lock when handling a page fault while a TLB invalidate is requested by an other CPU holding the PTE. Support for THP is not done because when checking for the PMD, we can be confused by an in progress collapsing operation done by khugepaged. The issue is that pmd_none() could be true either if the PMD is not already populate or if the underlying PTE are in the way to be collapsed. So we cannot safely allocate a PMD if pmd_none() is true. This series builds on top of v4.14-rc5 and is functional on x86 and PowerPC. ------------------ Benchmarks results Base kernel is 4.15-rc6-mmotm-2018-01-04-16-19 SPF is BASE + this series Kernbench: ---------- Here are the results on a 16 CPUs X86 guest using kernbench on a 4.13-rc4 kernel (kernel is build 5 times): Average Optimal load -j 8 Base SPF Run (std deviation) Elapsed Time 148.04 (0.62446) 150.31 (0.940585) 1.53% User Time 1017.27 (1.23567) 1029.14 (4.43995) 1.17% System Time 112.53 (0.888285) 118.62 (0.712215) 5.41% Percent CPU 762.6 (2.30217) 763 (2.64575) 0.05% Context Switches 46394.2 (792.6) 46880.2 (812.688) 1.05% Sleeps 85207.4 (659.075) 85525.2 (663.924) 0.37% Average Maximal load -j 16 Base SPF Run (std deviation) Elapsed Time 71.102 (0.424347) 72.438 (0.650054) 1.88% User Time 945.085 (76.0995) 957.76 (75.2979) 1.34% System Time 98.828 (14.4599) 104.596 (14.7918) 5.84% Percent CPU 1054.8 (308.054) 1055.7 (308.63) 0.09% Context Switches 65134.6 (19763.6) 65487 (19626.2) 0.54% Sleeps 90760.7 (5896.06) 90821.1 (5611.64) 0.07% The elapsed time is in the same order, a bit larger in the case of the spf release, but that seems to be in the error margin. Context switches are now in the same order. Here are the kerbench results on a 80 CPUs Power8 system : Average Maximal load -j 40 Base SPF Run (std deviation) Elapsed Time 108.37 (0.544885) 109.2 (0.454037) 0.77% User Time 4111.38 (13.7343) 4129.09 (13.6466) 0.43% System Time 99.098 (0.364925) 99.856 (0.386109) 0.76% Percent CPU 3884.6 (9.31665) 3871.8 (12.0706) -0.33% Context Switches 71962.2 (206.129) 72009.8 (185.303) 0.07% Sleeps 156369 (850.193) 155912 (1099.63) -0.29% Average Maximal load -j 80 Base SPF Run (std deviation) Elapsed Time 98.886 (0.629031) 99.726 (0.871854) 0.85% User Time 5408.5 (1367.35) 5416.23 (1356.89) 0.14% System Time 115.364 (17.161) 115.923 (16.939) 0.48% Percent CPU 5399.2 (1596.95) 5362.9 (1572.71) -0.67% Context Switches 138892 (70610.1) 138321 (69920.2) -0.41% Sleeps 159509 (6171.69) 158354 (3595.75) -0.72% We can't see any impact, neither performance improvement, but this is mostly mono threaded processes and the SPF handler is not activated. Ebizzy: ------- The test is counting the number of records per second it can manage, the higher is the best. I run it like this 'ebizzy -mTRp'. To get consistent result I repeated the test 100 times and measure the average result. The number is the record processes per second, the higher is the best. - 16 CPUs x86 VM BASE SPF delta 16 CPUs x86 VM 11485.14 60902.26 430.27% 80 CPUs P8 node 37648.73 83078.01 120.67% Here the delta is big, as this test is triggering the SPF handler massively. Will-It-Scale [6] ----------------- I got a lot of deviation in the results returned by this benchmark, especially when running a high number of CPUs. However while the series v5 was showing a performance degradation, despite the deviations, I can't see it anymore with this series. This being said, it's hard to produce numbers of such a benchmark as deviation is really too high. ------------------ Changes since V5: - use rwlock agains the mm RB tree in place of SRCU - add a VMA's reference count to protect VMA while using it without holding the mmap_sem. - check PMD value to detect collapsing operation - don't try speculative page fault for mono threaded processes - try to reuse the fetched VMA if VM_RETRY is returned - go directly to the error path if an error is detected during the SPF path - fix race window when moving VMA in move_vma() Changes since v4: - As requested by Andrew Morton, use CONFIG_SPF and define it earlier in the series to ease bisection. Changes since v3: - Don't build when CONFIG_SMP is not set - Fixed a lock dependency warning in __vma_adjust() - Use READ_ONCE to access p*d values in handle_speculative_fault() - Call memcp_oom() service in handle_speculative_fault() Changes since v2: - Perf event is renamed in PERF_COUNT_SW_SPF - On Power handle do_page_fault()'s cleaning - On Power if the VM_FAULT_ERROR is returned by handle_speculative_fault(), do not retry but jump to the error path - If VMA's flags are not matching the fault, directly returns VM_FAULT_SIGSEGV and not VM_FAULT_RETRY - Check for pud_trans_huge() to avoid speculative path - Handles _vm_normal_page()'s introduced by 6f16211df3bf ("mm/device-public-memory: device memory cache coherent with CPU") - add and review few comments in the code Changes since v1: - Remove PERF_COUNT_SW_SPF_FAILED perf event. - Add tracing events to details speculative page fault failures. - Cache VMA fields values which are used once the PTE is unlocked at the end of the page fault events. - Ensure that fields read during the speculative path are written and read using WRITE_ONCE and READ_ONCE. - Add checks at the beginning of the speculative path to abort it if the VMA is known to not be supported. Changes since RFC V5 [5] - Port to 4.13 kernel - Merging patch fixing lock dependency into the original patch - Replace the 2 parameters of vma_has_changed() with the vmf pointer - In patch 7, don't call __do_fault() in the speculative path as it may want to unlock the mmap_sem. - In patch 11-12, don't check for vma boundaries when page_add_new_anon_rmap() is called during the spf path and protect against anon_vma pointer's update. - In patch 13-16, add performance events to report number of successful and failed speculative events. [1] http://linux-kernel.2935.n7.nabble.com/RFC-PATCH-0-6-Another-go-at-speculative-page-faults-tt965642.html#none [2] https://patchwork.kernel.org/patch/9999687/ [3] http://ebizzy.sourceforge.net/ [4] http://ck.kolivas.org/apps/kernbench/kernbench-0.50/ [5] https://lwn.net/Articles/725607/ [6] https://github.com/antonblanchard/will-it-scale.git Laurent Dufour (19): x86/mm: Define CONFIG_SPF powerpc/mm: Define CONFIG_SPF mm: Introduce pte_spinlock for FAULT_FLAG_SPECULATIVE mm: Protect VMA modifications using VMA sequence count mm: protect mremap() against SPF hanlder mm: Protect SPF handler against anon_vma changes mm: Cache some VMA fields in the vm_fault structure mm/migrate: Pass vm_fault pointer to migrate_misplaced_page() mm: Introduce __lru_cache_add_active_or_unevictable mm: Introduce __maybe_mkwrite() mm: Introduce __vm_normal_page() mm: Introduce __page_add_new_anon_rmap() mm: Protect mm_rb tree with a rwlock mm: Try spin lock in speculative path mm: Adding speculative page fault failure trace events perf: Add a speculative page fault sw event perf tools: Add support for the SPF perf event mm: Speculative page fault handler return VMA powerpc/mm: Add speculative page fault Peter Zijlstra (5): mm: Dont assume page-table invariance during faults mm: Prepare for FAULT_FLAG_SPECULATIVE mm: VMA sequence count mm: Provide speculative fault infrastructure x86/mm: Add speculative pagefault handling arch/powerpc/Kconfig | 4 + arch/powerpc/mm/fault.c | 31 +- arch/x86/Kconfig | 4 + arch/x86/mm/fault.c | 38 ++- fs/proc/task_mmu.c | 5 +- fs/userfaultfd.c | 17 +- include/linux/hugetlb_inline.h | 2 +- include/linux/migrate.h | 4 +- include/linux/mm.h | 91 +++++- include/linux/mm_types.h | 7 + include/linux/pagemap.h | 4 +- include/linux/rmap.h | 12 +- include/linux/swap.h | 10 +- include/trace/events/pagefault.h | 87 ++++++ include/uapi/linux/perf_event.h | 1 + kernel/fork.c | 3 + mm/hugetlb.c | 2 + mm/init-mm.c | 3 + mm/internal.h | 20 ++ mm/khugepaged.c | 5 + mm/madvise.c | 6 +- mm/memory.c | 563 ++++++++++++++++++++++++++++++---- mm/mempolicy.c | 51 ++- mm/migrate.c | 4 +- mm/mlock.c | 13 +- mm/mmap.c | 209 ++++++++++--- mm/mprotect.c | 4 +- mm/mremap.c | 13 + mm/rmap.c | 5 +- mm/swap.c | 6 +- mm/swap_state.c | 8 +- tools/include/uapi/linux/perf_event.h | 1 + tools/perf/util/evsel.c | 1 + tools/perf/util/parse-events.c | 4 + tools/perf/util/parse-events.l | 1 + tools/perf/util/python.c | 1 + 36 files changed, 1076 insertions(+), 164 deletions(-) create mode 100644 include/trace/events/pagefault.h -- 2.7.4