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 23698C433E0 for ; Wed, 12 Aug 2020 21:06:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F181720774 for ; Wed, 12 Aug 2020 21:06:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597266406; bh=4FVa/bHFAqwfJ7WkdVagpdN+SdWIPsBKJavjM10UnOY=; h=Date:From:To:Subject:Reply-To:List-ID:From; b=dduYyGWx8Ws7xoctnxP2Etc0SqaDJJQ1eWeJD/8HJ7avk5/USjkfDrWJxstTpC27w DX9/XI4IucJJRNjguYCyXnNPfpEgSonpsidSTZdscTtifqwrUry9z00l9UPhrL3aqC RY3OBY546CydEI5nBCsdw9x1NGIydUNcw/Od0U8k= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726567AbgHLVGp (ORCPT ); Wed, 12 Aug 2020 17:06:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:33894 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726030AbgHLVGp (ORCPT ); Wed, 12 Aug 2020 17:06:45 -0400 Received: from localhost.localdomain (c-71-198-47-131.hsd1.ca.comcast.net [71.198.47.131]) (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 821C52078B; Wed, 12 Aug 2020 21:06:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597266404; bh=4FVa/bHFAqwfJ7WkdVagpdN+SdWIPsBKJavjM10UnOY=; h=Date:From:To:Subject:From; b=uofysFLcoqiWuYNtshy/9LNfpqJGlKyPkUA+kPmTj6YYG+VzBO9qQRC+Vi7FPfwSk ILZ/msvwwK7aWNcWTJiCg9OmVPBuZUTw4uLqYHzcxBctSABKeBC0rx1va1Lp5R0cY3 ciLjKWK7MlbOxXop8smJWBfPkimgXqbXMZA+T4Ps= Date: Wed, 12 Aug 2020 14:06:44 -0700 From: akpm@linux-foundation.org To: jonas@southpole.se, mm-commits@vger.kernel.org, peterx@redhat.com, shorne@gmail.com, stefan.kristiansson@saunalahti.fi Subject: [merged] mm-openrisc-use-general-page-fault-accounting.patch removed from -mm tree Message-ID: <20200812210644.FuWJTaDYT%akpm@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 The patch titled Subject: mm/openrisc: use general page fault accounting has been removed from the -mm tree. Its filename was mm-openrisc-use-general-page-fault-accounting.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Peter Xu Subject: mm/openrisc: 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. Add the missing PERF_COUNT_SW_PAGE_FAULTS perf events too. Note, the other two perf events (PERF_COUNT_SW_PAGE_FAULTS_[MAJ|MIN]) were done in handle_mm_fault(). Link: http://lkml.kernel.org/r/20200707225021.200906-15-peterx@redhat.com Signed-off-by: Peter Xu Acked-by: Stafford Horne Cc: Jonas Bonn Cc: Stefan Kristiansson Signed-off-by: Andrew Morton --- arch/openrisc/mm/fault.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) --- a/arch/openrisc/mm/fault.c~mm-openrisc-use-general-page-fault-accounting +++ a/arch/openrisc/mm/fault.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include @@ -103,6 +104,8 @@ asmlinkage void do_page_fault(struct pt_ if (in_interrupt() || !mm) goto no_context; + perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, address); + retry: mmap_read_lock(mm); vma = find_vma(mm, address); @@ -159,7 +162,7 @@ good_area: * 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; @@ -176,10 +179,6 @@ good_area: if (flags & FAULT_FLAG_ALLOW_RETRY) { /*RGD modeled on Cris */ - if (fault & VM_FAULT_MAJOR) - tsk->maj_flt++; - else - tsk->min_flt++; if (fault & VM_FAULT_RETRY) { flags |= FAULT_FLAG_TRIED; _ Patches currently in -mm which might be from peterx@redhat.com are