From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1814FC433DF for ; Wed, 12 Aug 2020 01:38:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DC20D20658 for ; Wed, 12 Aug 2020 01:38:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597196298; bh=B3MYOvoa5eq3YkKWHd+iwhUqN0Jb9geCU3i9lGZAqxU=; h=Date:From:To:Subject:In-Reply-To:Reply-To:List-ID:From; b=LeTFcUTWVIu0FDo8lvrJN81LFwJnC3bbordmZU018nljJ+/xL3NTkOTZw/FkuKNmq sbBVX7ZEcKKagZPczHX6ax1AJLsqqVDv6o5AzRwwgN+53VLtYTQdjwVxm0f8psO78E VPjrquILfCVZmJcwNml6nuU0g3c+JXwQpSId1m9w= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726430AbgHLBiS (ORCPT ); Tue, 11 Aug 2020 21:38:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:40550 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726235AbgHLBiR (ORCPT ); Tue, 11 Aug 2020 21:38:17 -0400 Received: from localhost.localdomain (c-73-231-172-41.hsd1.ca.comcast.net [73.231.172.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 614FE2054F; Wed, 12 Aug 2020 01:38:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597196296; bh=B3MYOvoa5eq3YkKWHd+iwhUqN0Jb9geCU3i9lGZAqxU=; h=Date:From:To:Subject:In-Reply-To:From; b=XjuiSXJK1U3xn7AWneMjma+iVQjnKhyNvQ3TnEoEqm1eufM2k3QVkK/CVMgG4pz3N DQXtdlStdv/LXHcTwawA4h4ztwHYHHFmFWSgEFrzyxFghNhlMjeQ/6qrBow6rrGo3A mXdJ0s4V8LdZzp5aZ6dS1KJlXlsOs8U/B7u7HKhc= Date: Tue, 11 Aug 2020 18:38:15 -0700 From: Andrew Morton To: akpm@linux-foundation.org, linux-mm@kvack.org, mm-commits@vger.kernel.org, peterx@redhat.com, torvalds@linux-foundation.org, tsbogend@alpha.franken.de Subject: [patch 151/165] mm/mips: use general page fault accounting Message-ID: <20200812013815.5ZejPDyvy%akpm@linux-foundation.org> In-Reply-To: <20200811182949.e12ae9a472e3b5e27e16ad6c@linux-foundation.org> User-Agent: s-nail v14.8.16 Sender: mm-commits-owner@vger.kernel.org Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org From: Peter Xu Subject: mm/mips: use general page fault accounting Use the general page fault accounting by passing regs into handle_mm_fault(). It naturally solve the issue of multiple page fault accounting when page fault retry happened. Fix PERF_COUNT_SW_PAGE_FAULTS perf event manually for page fault retries, by moving it before taking mmap_sem. Link: http://lkml.kernel.org/r/20200707225021.200906-12-peterx@redhat.com Signed-off-by: Peter Xu Acked-by: Thomas Bogendoerfer Signed-off-by: Andrew Morton --- arch/mips/mm/fault.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) --- a/arch/mips/mm/fault.c~mm-mips-use-general-page-fault-accounting +++ a/arch/mips/mm/fault.c @@ -96,6 +96,8 @@ static void __kprobes __do_page_fault(st if (user_mode(regs)) flags |= FAULT_FLAG_USER; + + perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, address); retry: mmap_read_lock(mm); vma = find_vma(mm, address); @@ -152,12 +154,11 @@ good_area: * make sure we exit gracefully rather than endlessly redo * the fault. */ - fault = handle_mm_fault(vma, address, flags, NULL); + fault = handle_mm_fault(vma, address, flags, regs); if (fault_signal_pending(fault, regs)) return; - perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, address); if (unlikely(fault & VM_FAULT_ERROR)) { if (fault & VM_FAULT_OOM) goto out_of_memory; @@ -168,15 +169,6 @@ good_area: BUG(); } if (flags & FAULT_FLAG_ALLOW_RETRY) { - if (fault & VM_FAULT_MAJOR) { - perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MAJ, 1, - regs, address); - tsk->maj_flt++; - } else { - perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MIN, 1, - regs, address); - tsk->min_flt++; - } if (fault & VM_FAULT_RETRY) { flags |= FAULT_FLAG_TRIED; _