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 D179FC433E7 for ; Tue, 30 Jun 2020 20:45:33 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 947F120772 for ; Tue, 30 Jun 2020 20:45:33 +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="V8Q979Gm" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 947F120772 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 077466B0027; Tue, 30 Jun 2020 16:45:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 029526B0028; Tue, 30 Jun 2020 16:45:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E34A66B0029; Tue, 30 Jun 2020 16:45:32 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0094.hostedemail.com [216.40.44.94]) by kanga.kvack.org (Postfix) with ESMTP id C9DDF6B0027 for ; Tue, 30 Jun 2020 16:45:32 -0400 (EDT) Received: from smtpin06.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 8E8BA181AC9CC for ; Tue, 30 Jun 2020 20:45:32 +0000 (UTC) X-FDA: 76987058904.06.rule89_33078e026e7a Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin06.hostedemail.com (Postfix) with ESMTP id 680BA100347D5 for ; Tue, 30 Jun 2020 20:45:32 +0000 (UTC) X-HE-Tag: rule89_33078e026e7a X-Filterd-Recvd-Size: 5601 Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by imf04.hostedemail.com (Postfix) with ESMTP for ; Tue, 30 Jun 2020 20:45:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593549931; 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=Q+9vkARh0QAhoC5rVpcauEcS1HmAJvkVoHtpMHMdH44=; b=V8Q979GmqEWVrII5w3jmWG0C4rRfFQUhb+GUkXXnzepPjafbeE3qw9fwfR+IcU+3pmU39c OmhwdMg9HhTfG3/65r/EwqUBt5Zq6pSO/xAz6nJa2GAe9dTR6Okw9vEDL7Bt1UoYPWKUDj djR1mYtFVQwE2jUZMI6fTONrRn3oNeM= Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-358-rrjTIFJCMoSEWKtFP1A7eA-1; Tue, 30 Jun 2020 16:45:28 -0400 X-MC-Unique: rrjTIFJCMoSEWKtFP1A7eA-1 Received: by mail-qt1-f198.google.com with SMTP id 71so7293637qte.5 for ; Tue, 30 Jun 2020 13:45:28 -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=Q+9vkARh0QAhoC5rVpcauEcS1HmAJvkVoHtpMHMdH44=; b=ImXSzlVJYh4DeMBaykhmn26amhenorws1vHQpsKcZmaGPxdlwmo3vfHzOxOG8z+T6c kEJ910Agu7oXm2soaQd75LSH6f4Iom04mYlDb63SAxMvhMv0K5Dlirwt5SvMFwTcC/n8 N53ak/Ob2+/UPQdXNM613ourlf/dPKXC3iI48W7iom3Xt48zvaTsJAmAjsMmSED8cFhg jczOJVSSbxrKVExJkfb3mBxOx1BEsMhqQScwIlcWojNPrK/YGzTvOHZxcOBPI3iztuHY 7CqdTMpGLtix70vc5GxNnClrWdDKhduaSMd6OmHik8qumsUCCoeu/8xVDkSiU1umMzHC JhcQ== X-Gm-Message-State: AOAM532Rkan93sSUWr2lSsqfOougfua7HPwL2bpnNqQz6uzq8scY6VVc S91N2RxyMl0J//m6d7MF3HKWIi8Zrhq9xF+STA8Rwuog7sZO4NPKSvBS3hTTRU1EIAUAciSVAPL NvgFewbCRzhk= X-Received: by 2002:a37:af41:: with SMTP id y62mr20874894qke.385.1593549927708; Tue, 30 Jun 2020 13:45:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw/9f/7q91pxPuT3m4Vf6AMh7F1XsjTpGX1SRngMV0Mt26KohAGiffe7X1KyPB+Pvn5KcloYw== X-Received: by 2002:a37:af41:: with SMTP id y62mr20874868qke.385.1593549927383; Tue, 30 Jun 2020 13:45:27 -0700 (PDT) Received: from xz-x1.redhat.com ([2607:9880:19c0:32::2]) by smtp.gmail.com with ESMTPSA id k194sm3755819qke.100.2020.06.30.13.45.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2020 13:45:26 -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 , Geert Uytterhoeven , linux-m68k@lists.linux-m68k.org Subject: [PATCH v4 09/26] mm/m68k: Use general page fault accounting Date: Tue, 30 Jun 2020 16:45:25 -0400 Message-Id: <20200630204525.38906-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: 680BA100347D5 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam02 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: Geert Uytterhoeven CC: linux-m68k@lists.linux-m68k.org Signed-off-by: Peter Xu --- arch/m68k/mm/fault.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/arch/m68k/mm/fault.c b/arch/m68k/mm/fault.c index 738fff2a16f4..d9c22e24d585 100644 --- a/arch/m68k/mm/fault.c +++ b/arch/m68k/mm/fault.c @@ -12,6 +12,7 @@ #include #include #include +#include =20 #include #include @@ -85,6 +86,8 @@ int do_page_fault(struct pt_regs *regs, unsigned long a= ddress, =20 if (user_mode(regs)) flags |=3D FAULT_FLAG_USER; + + perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, address); retry: mmap_read_lock(mm); =20 @@ -135,7 +138,7 @@ int do_page_fault(struct pt_regs *regs, unsigned long= address, * the fault. */ =20 - fault =3D handle_mm_fault(vma, address, flags, NULL); + fault =3D handle_mm_fault(vma, address, flags, regs); pr_debug("handle_mm_fault returns %x\n", fault); =20 if (fault_signal_pending(fault, regs)) @@ -151,16 +154,7 @@ int do_page_fault(struct pt_regs *regs, unsigned lon= g address, BUG(); } =20 - /* - * Major/minor page fault accounting is only done on the - * initial attempt. If we go through a retry, it is extremely - * likely that the page will be found in page cache at that point. - */ if (flags & FAULT_FLAG_ALLOW_RETRY) { - if (fault & VM_FAULT_MAJOR) - current->maj_flt++; - else - current->min_flt++; if (fault & VM_FAULT_RETRY) { flags |=3D FAULT_FLAG_TRIED; =20 --=20 2.26.2