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 E5757C433DF for ; Wed, 12 Aug 2020 21:06:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A25A32080C for ; Wed, 12 Aug 2020 21:06:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597266391; bh=z+IvouIel5n3dER5XKUajnHHewvGTcTIpL0hVAMwtco=; h=Date:From:To:Subject:Reply-To:List-ID:From; b=TkWb5R6Qb/1C5U/hqK/0bXwnio8G3JSx/oxPF0b6wsLp9xm23fB1QHgNOVISxd0nW G+df7NneLgMUuDJYjp8juppglU47k0p0T7XTXQn3eQ2WLkeBDJ6AWeondiDRP4lg5q URHUQHf4ffCUDHOQtJdORo1M0bgIRaxPCQsnFlX0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726531AbgHLVGb (ORCPT ); Wed, 12 Aug 2020 17:06:31 -0400 Received: from mail.kernel.org ([198.145.29.99]:33346 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726030AbgHLVGb (ORCPT ); Wed, 12 Aug 2020 17:06:31 -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 745242078B; Wed, 12 Aug 2020 21:06:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597266389; bh=z+IvouIel5n3dER5XKUajnHHewvGTcTIpL0hVAMwtco=; h=Date:From:To:Subject:From; b=y6qT0BcfxMAzturZ0pH2vPsVRbFdIKT0Ryp7dKswj9WwbmdrgO+AndbgVsib7mj2c QzUuYwAIIGyhOzzfWOk0tFRr1a5efJwfOqEsFS8GT2nErzf4Xx7xHaomDJ0T367pp7 LLAfR+/hmP9l8+C8eHP6mh+EhdZciief0DJ/z0Co= Date: Wed, 12 Aug 2020 14:06:29 -0700 From: akpm@linux-foundation.org To: bcain@codeaurora.org, mm-commits@vger.kernel.org, peterx@redhat.com Subject: [merged] mm-hexagon-use-general-page-fault-accounting.patch removed from -mm tree Message-ID: <20200812210629.DSsqWDR50%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/hexagon: use general page fault accounting has been removed from the -mm tree. Its filename was mm-hexagon-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/hexagon: 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-8-peterx@redhat.com Signed-off-by: Peter Xu Acked-by: Brian Cain Signed-off-by: Andrew Morton --- arch/hexagon/mm/vm_fault.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) --- a/arch/hexagon/mm/vm_fault.c~mm-hexagon-use-general-page-fault-accounting +++ a/arch/hexagon/mm/vm_fault.c @@ -18,6 +18,7 @@ #include #include #include +#include /* * Decode of hardware exception sends us to one of several @@ -53,6 +54,8 @@ void do_page_fault(unsigned long address 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); @@ -88,7 +91,7 @@ good_area: break; } - fault = handle_mm_fault(vma, address, flags, NULL); + fault = handle_mm_fault(vma, address, flags, regs); if (fault_signal_pending(fault, regs)) return; @@ -96,10 +99,6 @@ good_area: /* The most common case -- we are done. */ if (likely(!(fault & VM_FAULT_ERROR))) { if (flags & FAULT_FLAG_ALLOW_RETRY) { - if (fault & VM_FAULT_MAJOR) - current->maj_flt++; - else - current->min_flt++; if (fault & VM_FAULT_RETRY) { flags |= FAULT_FLAG_TRIED; goto retry; _ Patches currently in -mm which might be from peterx@redhat.com are