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.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham 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 6AF1AC433E0 for ; Fri, 3 Jul 2020 11:06:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 412A6207DA for ; Fri, 3 Jul 2020 11:06:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=ellerman.id.au header.i=@ellerman.id.au header.b="Fi4uP/tp" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726318AbgGCLGE (ORCPT ); Fri, 3 Jul 2020 07:06:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40128 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726112AbgGCLGD (ORCPT ); Fri, 3 Jul 2020 07:06:03 -0400 Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6251AC08C5C1 for ; Fri, 3 Jul 2020 04:06:03 -0700 (PDT) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 49ysZx13mnz9sQt; Fri, 3 Jul 2020 21:06:01 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ellerman.id.au; s=201909; t=1593774361; bh=dUPdbtgxlOrO8YOKYa9VhV+73OznK9Ay07Mrhb8Bzt4=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=Fi4uP/tpU0aCuwNpZcS+08damb57Eh6KSucK83/Q6cWIlO3lAY9gEwctRz01rZGit 39aCb3nJt6C2ZVNoXcxGwySqCjZigR43ZWkz+DBzo/jfPW655yerWYl4wIB8vOrSLw jh9OuUDb6rNgjTty6TbOU7djk8ugm4BLQtbMtkF3t+SQabf4KdwQI8/F6Ef0AMJxRN gyz+UwO2864pPwHgsZALXDXoPrbR6OsHzoM39isoJnfinl9PmTBH+0lm7mTDh0ztxD Jy0wBft8XOZE0aDwaQCsobPoWvkZzml/jRBbCUSTFwtLyvjxGTTdd7AfztQou+CmA4 pe12et9Y/E5UQ== From: Michael Ellerman To: Peter Xu , linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Peter Xu , Andrew Morton , Linus Torvalds , Gerald Schaefer , Andrea Arcangeli , Will Deacon , Benjamin Herrenschmidt , Paul Mackerras , linuxppc-dev@lists.ozlabs.org Subject: Re: [PATCH 16/26] mm/powerpc: Use general page fault accounting In-Reply-To: <20200626223622.199765-1-peterx@redhat.com> References: <20200626223130.199227-1-peterx@redhat.com> <20200626223622.199765-1-peterx@redhat.com> Date: Fri, 03 Jul 2020 21:08:15 +1000 Message-ID: <875zb47t5s.fsf@mpe.ellerman.id.au> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Peter Xu writes: > Use the general page fault accounting by passing regs into handle_mm_fault(). > > CC: Michael Ellerman > CC: Benjamin Herrenschmidt > CC: Paul Mackerras > CC: linuxppc-dev@lists.ozlabs.org > Signed-off-by: Peter Xu > --- > arch/powerpc/mm/fault.c | 11 +++-------- > 1 file changed, 3 insertions(+), 8 deletions(-) > > diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c > index 992b10c3761c..e325d13efaf5 100644 > --- a/arch/powerpc/mm/fault.c > +++ b/arch/powerpc/mm/fault.c > @@ -563,7 +563,7 @@ static int __do_page_fault(struct pt_regs *regs, unsigned long address, > * 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); > > #ifdef CONFIG_PPC_MEM_KEYS > /* > @@ -604,14 +604,9 @@ static int __do_page_fault(struct pt_regs *regs, unsigned long address, > /* > * Major/minor page fault accounting. > */ > - if (major) { > - current->maj_flt++; > - perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MAJ, 1, regs, address); > + if (major) > cmo_account_page_fault(); > - } else { > - current->min_flt++; > - perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MIN, 1, regs, address); > - } > + > return 0; > } > NOKPROBE_SYMBOL(__do_page_fault); You do change the logic a bit if regs is NULL (in mm_account_fault()), but regs can never be NULL in this path, so it looks OK to me. Acked-by: Michael Ellerman cheers