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 C2FB4C433E1 for ; Fri, 19 Jun 2020 16:12:57 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 7D28C21707 for ; Fri, 19 Jun 2020 16:12:57 +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="hPUHWbxC" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7D28C21707 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 1C9458D00BF; Fri, 19 Jun 2020 12:12:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1531B8D00AD; Fri, 19 Jun 2020 12:12:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 01B568D00BF; Fri, 19 Jun 2020 12:12:56 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0241.hostedemail.com [216.40.44.241]) by kanga.kvack.org (Postfix) with ESMTP id DA8F68D00AD for ; Fri, 19 Jun 2020 12:12:56 -0400 (EDT) Received: from smtpin21.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 5B787180ADD05 for ; Fri, 19 Jun 2020 16:12:56 +0000 (UTC) X-FDA: 76946455152.21.fear86_580c30226e1a Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin21.hostedemail.com (Postfix) with ESMTP id 2BD7E18044735 for ; Fri, 19 Jun 2020 16:12:56 +0000 (UTC) X-HE-Tag: fear86_580c30226e1a X-Filterd-Recvd-Size: 5714 Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by imf03.hostedemail.com (Postfix) with ESMTP for ; Fri, 19 Jun 2020 16:12:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592583175; 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=QEacpwhabx4oqP5P1sDsSQYEJDVmYeAmQf6kbwzkxic=; b=hPUHWbxCCm4Buu/7MsG+f5mJXjiaqnoonYBVvlQP0xgsywuTVuVvFHTxSXuP12tHBOTJMa Wgs341e1PNLxxDP3sobyxAXOHSzeaeQHMpPQHzsRaWgRt/RBKkg+eWEwZ+aLTN1YJ37ZZ7 rjBH9LqZuDcPXUyN+mJPLCmB7U3EF0M= 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-445-jat-oHifP6-EuOGVkV4Mpg-1; Fri, 19 Jun 2020 12:12:53 -0400 X-MC-Unique: jat-oHifP6-EuOGVkV4Mpg-1 Received: by mail-qt1-f200.google.com with SMTP id e8so7432211qtq.22 for ; Fri, 19 Jun 2020 09:12:53 -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=QEacpwhabx4oqP5P1sDsSQYEJDVmYeAmQf6kbwzkxic=; b=sLNMUhw/+S8X1XZfCtzTbfdtOvw4I3r9WneYgYgUpHO/KicIzAmuGfnyeGDBfpR6ZM vm9fR3Aagy23Z8f9k3iqpXFk5BlHtY3o3RlKDm4NOzMMXA8FyIgPaqzJ1Q+38eyLSPbt N1wb09wiQeKCmNmcARR+SAOGtJCV0l7A5csjyp63Ennb9+48mFoSHTYpRsS+WycWldbt O7k4MuYnv4fwdPHKCIT2Ae7AbTEDrOsiLY+2strMTzSqaJH1HdUNref/qlFDBDWtOQ9I IMz7/HnGnxKdVL2gwt4nTETi42pEb83el0KwleDO8zCyubpSJTWUvYOx/8BqEsMvpIPJ m1xw== X-Gm-Message-State: AOAM532QN7n9vqCg/boQprLR5UMQZ7aa8GdORVkrKiJjZSwiCGZZ4w4u ZYnrtnelopWxEizG5Beg7jXA12zhIVAlfos7A2PFmSgHgJn1UWgDhTlHKpM1JMQGqXc+JMt+x7P 2BWTEjQ7ZZog= X-Received: by 2002:a0c:ea4a:: with SMTP id u10mr9341635qvp.225.1592583173005; Fri, 19 Jun 2020 09:12:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw/KbzvQf8GbrVk0E0Lv5jPmHcSh5JxBeheLHw2C8ZFelbbsjI3LhaiwkF4VxKMOl5dF8XE/g== X-Received: by 2002:a0c:ea4a:: with SMTP id u10mr9341584qvp.225.1592583172386; Fri, 19 Jun 2020 09:12:52 -0700 (PDT) Received: from xz-x1.redhat.com ([2607:9880:19c0:32::2]) by smtp.gmail.com with ESMTPSA id f203sm499961qke.135.2020.06.19.09.12.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jun 2020 09:12:51 -0700 (PDT) From: Peter Xu To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: Peter Xu , Gerald Schaefer , Andrew Morton , Andrea Arcangeli , Will Deacon , Michael Ellerman , Linus Torvalds , Jonas Bonn , Stefan Kristiansson , Stafford Horne , openrisc@lists.librecores.org Subject: [PATCH 14/26] mm/openrisc: Use general page fault accounting Date: Fri, 19 Jun 2020 12:12:50 -0400 Message-Id: <20200619161250.9443-1-peterx@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200619160538.8641-1-peterx@redhat.com> References: <20200619160538.8641-1-peterx@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII X-Rspamd-Queue-Id: 2BD7E18044735 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(). 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: Jonas Bonn CC: Stefan Kristiansson CC: Stafford Horne CC: openrisc@lists.librecores.org Acked-by: Stafford Horne Signed-off-by: Peter Xu --- arch/openrisc/mm/fault.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/arch/openrisc/mm/fault.c b/arch/openrisc/mm/fault.c index 45aedc572361..5255d73ce180 100644 --- a/arch/openrisc/mm/fault.c +++ b/arch/openrisc/mm/fault.c @@ -15,6 +15,7 @@ #include #include #include +#include =20 #include #include @@ -103,6 +104,8 @@ asmlinkage void do_page_fault(struct pt_regs *regs, u= nsigned long address, if (in_interrupt() || !mm) goto no_context; =20 + perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, address); + retry: down_read(&mm->mmap_sem); vma =3D find_vma(mm, address); @@ -159,7 +162,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, u= nsigned long address, * the 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; @@ -176,10 +179,6 @@ asmlinkage void do_page_fault(struct pt_regs *regs, = unsigned long address, =20 if (flags & FAULT_FLAG_ALLOW_RETRY) { /*RGD modeled on Cris */ - if (fault & VM_FAULT_MAJOR) - tsk->maj_flt++; - else - tsk->min_flt++; if (fault & VM_FAULT_RETRY) { flags |=3D FAULT_FLAG_TRIED; =20 --=20 2.26.2