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 E5F2EC433E1 for ; Fri, 26 Jun 2020 22:36:26 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 9B8CF2089D for ; Fri, 26 Jun 2020 22:36:26 +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="bIh0+X2o" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9B8CF2089D 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 477FA6B000D; Fri, 26 Jun 2020 18:36:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 42B6D6B000E; Fri, 26 Jun 2020 18:36:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3425C6B0010; Fri, 26 Jun 2020 18:36:26 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0044.hostedemail.com [216.40.44.44]) by kanga.kvack.org (Postfix) with ESMTP id 194806B000D for ; Fri, 26 Jun 2020 18:36:26 -0400 (EDT) Received: from smtpin28.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id D6E802DFD for ; Fri, 26 Jun 2020 22:36:25 +0000 (UTC) X-FDA: 76972823130.28.beam73_5f0df4726e59 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin28.hostedemail.com (Postfix) with ESMTP id AEB626D78 for ; Fri, 26 Jun 2020 22:36:25 +0000 (UTC) X-HE-Tag: beam73_5f0df4726e59 X-Filterd-Recvd-Size: 5712 Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by imf28.hostedemail.com (Postfix) with ESMTP for ; Fri, 26 Jun 2020 22:36:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593210984; 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=eYfbH2Z9PmFD3YC1EEjF5e5lSljD0oX0ZInZG0GJcWM=; b=bIh0+X2omWFdyEM1tCfHX1KbtNerfLganmCFql4GfYHzQAubjWp+ygpwCu1mp5tp8cJm/e VtgjSEgxa26c/B8dpoP5zaEDIUItEq1hisbltA5poIoq88C+aC9zb7N0WFjrQiG0M2VrK0 XJjvfxdq1+J5ALHqC8T2HN1FWZDRnhs= Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-18-07ot8u7rOVawIGd0ceO8bw-1; Fri, 26 Jun 2020 18:36:23 -0400 X-MC-Unique: 07ot8u7rOVawIGd0ceO8bw-1 Received: by mail-qt1-f200.google.com with SMTP id o11so7503551qti.23 for ; Fri, 26 Jun 2020 15:36:23 -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=eYfbH2Z9PmFD3YC1EEjF5e5lSljD0oX0ZInZG0GJcWM=; b=Odkw1uh8rhcjgvD7ga1UJffiYhGNbZOOiDR50erwEGFqhJvAyJiEnbpnXfd+VwHTwr V225fT4r6OA9hbKb8jYMyO10M3DJhz4fYQ2s0pvzS7lsaKM2YbqVGtbZMaGJodq+GQ1W Sy2QMjpr2HcWSW5gM+5m/QD15onMGv6H0hvf3KmomcalPQKGBGO7J8vMok0I5KXbgmRR Wr0khg+P3Cwo1Amyco/VJC+bDhrloVUllHdniUHtC2G2dASBmEdPFefXmr9mwsOVfTgW fx/s4ag1IRDYlv3ncOLDKARPbk4+/N9V0o13bwL259iScpFiNkD6G3ZUm+hIMkE0f/Wl RMCw== X-Gm-Message-State: AOAM533Nr+rMXTq8sA3Wgi9CFK9GmDDKGq6aBbadv0ScuJX+DVIPlZAt 7Oh4sADNcZEKwQEJUPYDNdvKdlumtC6K4Shclzap/hUTqX0Nn7BEdCufiEt2CIyi0MK0xjl3JEG +nN+UKJqCpHk= X-Received: by 2002:a05:6214:1543:: with SMTP id t3mr5519102qvw.89.1593210982455; Fri, 26 Jun 2020 15:36:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzl3mgTYzAchfuJraPE8dLa9XFZmdj1PMxdhHvQ42A6yqkEgqYM5QwOpt7P688Ahd9QfaIH2g== X-Received: by 2002:a05:6214:1543:: with SMTP id t3mr5519084qvw.89.1593210982236; Fri, 26 Jun 2020 15:36:22 -0700 (PDT) Received: from xz-x1.redhat.com ([2607:9880:19c0:32::2]) by smtp.gmail.com with ESMTPSA id j24sm7981634qkl.79.2020.06.26.15.36.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2020 15:36:21 -0700 (PDT) From: Peter Xu To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Peter Xu , Andrew Morton , Linus Torvalds , Gerald Schaefer , Andrea Arcangeli , Will Deacon , Michael Ellerman , "James E . J . Bottomley" , Helge Deller , linux-parisc@vger.kernel.org Subject: [PATCH 15/26] mm/parisc: Use general page fault accounting Date: Fri, 26 Jun 2020 18:36:20 -0400 Message-Id: <20200626223620.199717-1-peterx@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200626223130.199227-1-peterx@redhat.com> References: <20200626223130.199227-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: AEB626D78 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(). 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 oth= er two perf events (PERF_COUNT_SW_PAGE_FAULTS_[MAJ|MIN]) were done in handle_mm_= fault(). CC: James E.J. Bottomley CC: Helge Deller CC: linux-parisc@vger.kernel.org Signed-off-by: Peter Xu --- arch/parisc/mm/fault.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c index c10908ea8803..65661e22678e 100644 --- a/arch/parisc/mm/fault.c +++ b/arch/parisc/mm/fault.c @@ -18,6 +18,7 @@ #include #include #include +#include =20 #include =20 @@ -281,6 +282,7 @@ void do_page_fault(struct pt_regs *regs, unsigned lon= g code, acc_type =3D parisc_acctyp(code, regs->iir); if (acc_type & VM_WRITE) flags |=3D FAULT_FLAG_WRITE; + perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, address); retry: down_read(&mm->mmap_sem); vma =3D find_vma_prev(mm, address, &prev_vma); @@ -302,7 +304,7 @@ void do_page_fault(struct pt_regs *regs, unsigned lon= g code, * fault. */ =20 - fault =3D handle_mm_fault(vma, address, flags, NULL); + fault =3D handle_mm_fault(vma, address, flags, regs); =20 if (fault_signal_pending(fault, regs)) return; @@ -323,10 +325,6 @@ void do_page_fault(struct pt_regs *regs, unsigned lo= ng code, BUG(); } if (flags & FAULT_FLAG_ALLOW_RETRY) { - if (fault & VM_FAULT_MAJOR) - current->maj_flt++; - else - current->min_flt++; if (fault & VM_FAULT_RETRY) { /* * No need to up_read(&mm->mmap_sem) as we would --=20 2.26.2