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.8 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 5AD73C433EA for ; Tue, 30 Jun 2020 20:45:53 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 1F6B820772 for ; Tue, 30 Jun 2020 20:45:53 +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="XAnxaTq3" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1F6B820772 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 CD51D6B0030; Tue, 30 Jun 2020 16:45:51 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C87736B0031; Tue, 30 Jun 2020 16:45:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AFDB66B0032; Tue, 30 Jun 2020 16:45:51 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0009.hostedemail.com [216.40.44.9]) by kanga.kvack.org (Postfix) with ESMTP id 920A06B0030 for ; Tue, 30 Jun 2020 16:45:51 -0400 (EDT) Received: from smtpin02.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 5883C2DFC for ; Tue, 30 Jun 2020 20:45:51 +0000 (UTC) X-FDA: 76987059702.02.bell29_2a1655426e7a Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin02.hostedemail.com (Postfix) with ESMTP id BD6F060001357550 for ; Tue, 30 Jun 2020 20:45:50 +0000 (UTC) X-HE-Tag: bell29_2a1655426e7a X-Filterd-Recvd-Size: 5001 Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by imf03.hostedemail.com (Postfix) with ESMTP for ; Tue, 30 Jun 2020 20:45:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593549949; 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; bh=ynnJMHDkmLB1gpQYI5LlP8bTNHn29Vusf9IRRJFn7yI=; b=XAnxaTq3AEqE7wbXoQS1Db6VqijL4CDmhdI4Lp/2UA6/2Hh9CfFC9bySAhTWUOwOVd/98j OD+X4WrfDHOXVKHegkPXGW9YFZcphpd+fyIGRlBZs9jHREgJrlIBHfIuVDWn/hMZMP9+sT fpb/UzLe278OWi9FAYzJuwWBK98SlXw= Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-4-3POnY8lnMrmMULvEuqIXhw-1; Tue, 30 Jun 2020 16:45:48 -0400 X-MC-Unique: 3POnY8lnMrmMULvEuqIXhw-1 Received: by mail-qv1-f69.google.com with SMTP id r4so14610943qvh.10 for ; Tue, 30 Jun 2020 13:45:48 -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:mime-version :content-transfer-encoding; bh=ynnJMHDkmLB1gpQYI5LlP8bTNHn29Vusf9IRRJFn7yI=; b=QUj4VD+w+nv2sHnvlJtPGI7mnRQmnkmuOPxBt1ELfvbPyRYuOq4+m1eWJYJxWidcEJ KXdY9NOd4+PfS9bdN1lSU7rIWoRsmPrDV8qNyo2eGNuCvidI7ChUVHxxC3WUeriX8Gsz kgqBQG5a6r0Flh7L7KCDmTQ3X681QI14U/iuTJvZUkin2OFSV/mQ114XGVjES+MmVcT6 VJEEx9HCnZKmb6YbLNbdT5LCcekd53jkJCZ/4lAromXEGPe/0mxiK7jVE0Ps2ElWzb8z yxylMvh2INdNPMirM2FN/lB8MwgHjgc3YjCiKErQL8esN6aWXkmUKBZIGikRGE5cCwQ4 HDEg== X-Gm-Message-State: AOAM5321qeozL5tDe30isuL/n4z7y9fjq8VcaF0QND4Tcmc90Lwf0j4b dt5NjK/tcuJaQzS5ueFFaMe8+l4ZNBFawIlJrIRaCsIk4RkgyDTEyXXB4hKpklYJ+LTnhV8faCu szeCk45ZAaTI= X-Received: by 2002:a37:6382:: with SMTP id x124mr19156401qkb.13.1593549946778; Tue, 30 Jun 2020 13:45:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxYJzOveTh/zHsoqWyRhvWa6nes5qts8kYD9+VOymtjnIw0C/lNBXFLIHdqm4iSlLEtMxrrcQ== X-Received: by 2002:a37:6382:: with SMTP id x124mr19156332qkb.13.1593549945576; Tue, 30 Jun 2020 13:45:45 -0700 (PDT) Received: from xz-x1.redhat.com ([2607:9880:19c0:32::2]) by smtp.gmail.com with ESMTPSA id y40sm4291853qtc.29.2020.06.30.13.45.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2020 13:45:44 -0700 (PDT) From: Peter Xu To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Andrew Morton , peterx@redhat.com, John Hubbard , Michael Ellerman , Gerald Schaefer , Andrea Arcangeli , Linus Torvalds , Will Deacon , Benjamin Herrenschmidt , Paul Mackerras , linuxppc-dev@lists.ozlabs.org Subject: [PATCH v4 16/26] mm/powerpc: Use general page fault accounting Date: Tue, 30 Jun 2020 16:45:43 -0400 Message-Id: <20200630204543.39245-1-peterx@redhat.com> X-Mailer: git-send-email 2.26.2 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: BD6F060001357550 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam03 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 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