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=-9.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 9540AC433E2 for ; Tue, 7 Jul 2020 22:51:03 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 4DACA20738 for ; Tue, 7 Jul 2020 22:51:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="fAM/Wzsj" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4DACA20738 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id D72BF6B00BF; Tue, 7 Jul 2020 18:50:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CD3C36B00C1; Tue, 7 Jul 2020 18:50:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B77706B00C2; Tue, 7 Jul 2020 18:50:53 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0113.hostedemail.com [216.40.44.113]) by kanga.kvack.org (Postfix) with ESMTP id 990E76B00BF for ; Tue, 7 Jul 2020 18:50:53 -0400 (EDT) Received: from smtpin13.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 5C2A4181AEF09 for ; Tue, 7 Jul 2020 22:50:53 +0000 (UTC) X-FDA: 77012776386.13.comb13_5b0a11726eb8 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin13.hostedemail.com (Postfix) with ESMTP id 2DF9B18140B70 for ; Tue, 7 Jul 2020 22:50:53 +0000 (UTC) X-HE-Tag: comb13_5b0a11726eb8 X-Filterd-Recvd-Size: 5293 Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by imf28.hostedemail.com (Postfix) with ESMTP for ; Tue, 7 Jul 2020 22:50:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594162252; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LmLZf6AJOqhj6CgptEYub+5PD04MI0cndAP6UETZVFY=; b=fAM/Wzsj93eChTz1FpqgzKwfvmtc4jqsGSSxJeVXr74LD24tARcOenEolPeTbc/DD0x87q oWydYYogwjFCZtmb4i3Oy0ZdWM515f8FIH/OrisBBj1NFF3v7E2V4PGLmQ41LjVuXKP2Ql i1vlyo34LxZ+pR0Zeb8/WBbdjhz1nJo= Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-239-gucqXCONMk2gYutPpPo9Og-1; Tue, 07 Jul 2020 18:50:50 -0400 X-MC-Unique: gucqXCONMk2gYutPpPo9Og-1 Received: by mail-qt1-f199.google.com with SMTP id c5so31790360qtv.20 for ; Tue, 07 Jul 2020 15:50:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LmLZf6AJOqhj6CgptEYub+5PD04MI0cndAP6UETZVFY=; b=GOCdXPccIJtHOnxxf+eiiKQL+CvR1cT+Ehu8xX0e5DjGkZkZaEpmoFTRHGO0V4vo1v uyHsAXoy0aMvDiGuE31VQ30DLtld523R+lnWDaMXzCb1wvhfUPOYulOZtkr4jM1GEBEa Pjt8CUZibpOP9fMM49uK144o7hiAymTB/76DdRBiN6ih4NFW40u3dRKyW4WQvF/DbIqq zKabW46+fICtGbZXjt9BEjKmYjVRXLEhGpVhVHxR5LqSa/cPIXSCjSHsJLocWRDAq4MH Wfndf9LSsH6FNBPW/V9j9sv+N/j8MWHbmTX3rcS3Kqqgt+MN9cB7bhvGmQzGH/owQfn3 uSyA== X-Gm-Message-State: AOAM530ev7hlDjvcGezsVYGbp8ovbSp1aChkgM+XTxYCjLGuzFqmpu11 elXygV52hjt7SPNQOslRUxENB5N2wY3MYIUD7A/2G4CeRACTfnNlKDjCRVwUIEkeK+BTC4Bg348 hOxFQuwcbO08= X-Received: by 2002:a0c:b88d:: with SMTP id y13mr48924486qvf.82.1594162250468; Tue, 07 Jul 2020 15:50:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwiL/ertHlMtVAwiEgBsckzbOTj5OmrrUyC7CcF266qmLzt4w9AsKT415R55VH7drOKCUmHHA== X-Received: by 2002:a0c:b88d:: with SMTP id y13mr48924470qvf.82.1594162250236; Tue, 07 Jul 2020 15:50:50 -0700 (PDT) Received: from xz-x1.redhat.com ([2607:9880:19c0:32::2]) by smtp.gmail.com with ESMTPSA id j16sm26267642qtp.92.2020.07.07.15.50.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jul 2020 15:50:49 -0700 (PDT) From: Peter Xu To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: Gerald Schaefer , Linus Torvalds , peterx@redhat.com, Andrew Morton , Will Deacon , Andrea Arcangeli , David Rientjes , John Hubbard , Michael Ellerman , Benjamin Herrenschmidt , Paul Mackerras , linuxppc-dev@lists.ozlabs.org Subject: [PATCH v5 16/25] mm/powerpc: Use general page fault accounting Date: Tue, 7 Jul 2020 18:50:12 -0400 Message-Id: <20200707225021.200906-17-peterx@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200707225021.200906-1-peterx@redhat.com> References: <20200707225021.200906-1-peterx@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=peterx@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII X-Rspamd-Queue-Id: 2DF9B18140B70 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam05 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Use the general page fault accounting by passing regs into handle_mm_faul= t(). CC: Michael Ellerman CC: Benjamin Herrenschmidt CC: Paul Mackerras CC: linuxppc-dev@lists.ozlabs.org Acked-by: Michael Ellerman 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 25dee001d8e1..00259e9b452d 100644 --- a/arch/powerpc/mm/fault.c +++ b/arch/powerpc/mm/fault.c @@ -607,7 +607,7 @@ static int __do_page_fault(struct pt_regs *regs, unsi= gned long address, * make sure we exit gracefully rather than endlessly redo * the fault. */ - fault =3D handle_mm_fault(vma, address, flags, NULL); + fault =3D handle_mm_fault(vma, address, flags, regs); =20 major |=3D fault & VM_FAULT_MAJOR; =20 @@ -633,14 +633,9 @@ static int __do_page_fault(struct pt_regs *regs, uns= igned 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); --=20 2.26.2