From patchwork Tue Jul 7 22:50:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 11650411 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B402F739 for ; Tue, 7 Jul 2020 22:51:02 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 769DA20738 for ; Tue, 7 Jul 2020 22:51:02 +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="SqUFksCE" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 769DA20738 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 6E4786B00BD; Tue, 7 Jul 2020 18:50:52 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 6707D6B00BF; Tue, 7 Jul 2020 18:50:52 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 470B16B00C0; Tue, 7 Jul 2020 18:50:52 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0092.hostedemail.com [216.40.44.92]) by kanga.kvack.org (Postfix) with ESMTP id 19D9E6B00BD for ; Tue, 7 Jul 2020 18:50:52 -0400 (EDT) Received: from smtpin18.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id D780D2C78 for ; Tue, 7 Jul 2020 22:50:51 +0000 (UTC) X-FDA: 77012776302.18.thing20_350117526eb8 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin18.hostedemail.com (Postfix) with ESMTP id B002A100EDBF7 for ; Tue, 7 Jul 2020 22:50:51 +0000 (UTC) X-Spam-Summary: 1,0,0,,d41d8cd98f00b204,peterx@redhat.com,,RULES_HIT:30003:30012:30054,0,RBL:205.139.110.120:@redhat.com:.lbl8.mailshell.net-62.18.0.100 66.10.201.10;04y8zq8m5k1oreeo1zrnz8gutq74kyp5779xypoc5n5w17ewttkfn8x4kuaic6t.tme8p4fxpupdzc7ss147s7jgh8yctddb3ngfj6emyqs789max53r8745bh3iqna.g-lbl8.mailshell.net-223.238.255.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:ft,MSBL:0,DNSBL:none,Custom_rules:0:0:0,LFtime:24,LUA_SUMMARY:none X-HE-Tag: thing20_350117526eb8 X-Filterd-Recvd-Size: 5770 Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by imf13.hostedemail.com (Postfix) with ESMTP for ; Tue, 7 Jul 2020 22:50:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594162250; 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=dSLF2JUETXiqlgMgrNmE+7rrHD1HC1gVnVSET6GUPpA=; b=SqUFksCELFLkkyoe/I63BMSgBOPSOeUYVeyQWG6jUgESPg3cX9+0CZP4wdJ7AcIffynXSh MGH8v9AbayjAOm9YJabdDroou9pQfxVkplKzDyXcR4uB1U0us9Z3riEnGFwb8vg6iZ2GJB itIepBzupQrw7fm/QFaYUexxFL+TCUk= Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-370-NFQtEMEeMkmt39Ixj5roSA-1; Tue, 07 Jul 2020 18:50:49 -0400 X-MC-Unique: NFQtEMEeMkmt39Ixj5roSA-1 Received: by mail-qk1-f200.google.com with SMTP id v16so19462572qka.18 for ; Tue, 07 Jul 2020 15:50:49 -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=dSLF2JUETXiqlgMgrNmE+7rrHD1HC1gVnVSET6GUPpA=; b=PyVkD9YZ10E387T/hs0i6JGlO+/T1A3J9xojENrlLD7E7gnaDAFwz92UeC8wa36WCU wwN6KvlcWHD0Hf4LJMm0S0gECLEulHI76O2H+/7giL6sJ+9O5YqUR0/DzkVLH3XjAMJG X9nTilXG1Q3DsYttivj1Fvv4fiyQHUoSJu7732oBTZJJgl+ybNe0QzM0sex9XiSuTqyH o3bwbFSDIETK6RAqLHE3bNC4jHykec4FnrLPzh0Ch9YAx5BGQ3819+otRHDitkJ41hHd eMS6XbUNgRAJ5juU+lAnewclnkCZfh7qt/CLcSTf2/9qEIy0MMhNS+8iRl/9jWwYvfRW lCRg== X-Gm-Message-State: AOAM53240rtbg23epFxgkwrdap3oF69q+ebDn8Qw+6JXHrGCkicm06/h mx6A81LuZT3IVaWmNaqkEi3yrk0Ov43B0aVb4yeJO//xKojTwH4edqfHk2d9ecI5u5GZf27E1ds 0RefrWOmIev0= X-Received: by 2002:ad4:5307:: with SMTP id y7mr54932489qvr.63.1594162248906; Tue, 07 Jul 2020 15:50:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxZZjK6Nn1bIXhPvAgy7jT1o0DD/8o7Kmnv40jvO5ZPTVwAW66E615v62v4cElkkeaFLjMBdA== X-Received: by 2002:ad4:5307:: with SMTP id y7mr54932474qvr.63.1594162248721; Tue, 07 Jul 2020 15:50:48 -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.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jul 2020 15:50:48 -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 , "James E . J . Bottomley" , Helge Deller , linux-parisc@vger.kernel.org Subject: [PATCH v5 15/25] mm/parisc: Use general page fault accounting Date: Tue, 7 Jul 2020 18:50:11 -0400 Message-Id: <20200707225021.200906-16-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 X-Rspamd-Queue-Id: B002A100EDBF7 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam04 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_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(). 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 e32d06928c24..4bfe2da9fbe3 100644 --- a/arch/parisc/mm/fault.c +++ b/arch/parisc/mm/fault.c @@ -18,6 +18,7 @@ #include #include #include +#include #include @@ -281,6 +282,7 @@ void do_page_fault(struct pt_regs *regs, unsigned long code, acc_type = parisc_acctyp(code, regs->iir); if (acc_type & VM_WRITE) flags |= FAULT_FLAG_WRITE; + perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, address); retry: mmap_read_lock(mm); vma = find_vma_prev(mm, address, &prev_vma); @@ -302,7 +304,7 @@ void do_page_fault(struct pt_regs *regs, unsigned long code, * fault. */ - fault = handle_mm_fault(vma, address, flags, NULL); + fault = handle_mm_fault(vma, address, flags, regs); if (fault_signal_pending(fault, regs)) return; @@ -323,10 +325,6 @@ void do_page_fault(struct pt_regs *regs, unsigned long 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 mmap_read_unlock(mm) as we would