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 18865C433E0 for ; Fri, 26 Jun 2020 22:36:24 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id D0E2F208C7 for ; Fri, 26 Jun 2020 22:36:23 +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="iDO7RcC3" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D0E2F208C7 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 7ACA06B000A; Fri, 26 Jun 2020 18:36:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7371E6B000C; Fri, 26 Jun 2020 18:36:23 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 601626B000D; Fri, 26 Jun 2020 18:36:23 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0130.hostedemail.com [216.40.44.130]) by kanga.kvack.org (Postfix) with ESMTP id 3C8DA6B000A for ; Fri, 26 Jun 2020 18:36:23 -0400 (EDT) Received: from smtpin20.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 047941EE6 for ; Fri, 26 Jun 2020 22:36:23 +0000 (UTC) X-FDA: 76972823046.20.cook84_4407f4726e59 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin20.hostedemail.com (Postfix) with ESMTP id BD28A180C07AF for ; Fri, 26 Jun 2020 22:36:22 +0000 (UTC) X-HE-Tag: cook84_4407f4726e59 X-Filterd-Recvd-Size: 5714 Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by imf04.hostedemail.com (Postfix) with ESMTP for ; Fri, 26 Jun 2020 22:36:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593210981; 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=iDO7RcC37/nLGmtCWw6O71XWYtkDeQLg86IRS7F72wV3mOpiYqClNat5vzZZUy/GNEMy+W eIKNKMBpBIWVV8FcI1MBkTYnVFFupcVZtUDxu6zM2nnyblij5O5hUCMauVSMri4E35R+fJ B3lYW+PyzdbUTbMhmqjPO4E0/KUh3Mc= 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-281-Nv90AQ95PV69ymkDAnElVQ-1; Fri, 26 Jun 2020 18:36:20 -0400 X-MC-Unique: Nv90AQ95PV69ymkDAnElVQ-1 Received: by mail-qt1-f198.google.com with SMTP id l19so7516421qtp.12 for ; Fri, 26 Jun 2020 15:36:20 -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=O9ltQH/smnQP+/94HYGgEQjVcMVVjUdMoKdffKymIHHzhITdPj9Tm9G0tfqAOxFJjU u+ezMmDAtZkIjUyAUb4AXWnWf942cb6tCeEPDRiDCqILUkjEWQaRqbVvHqq/n6DvXkU9 plbwlfMMQbf30w0oDrZq8tOdIYSZ+sUkDN9brOCZEX1C4tvjuhO0exSQ5MyMWuF0C1KY o7n/PtS0ZIACBFzopq7wXeCpzkCxqeD0zYKWi2MDBAprjAAZ297AJg9V0sGxcz+2fmmk PjBO6B1K9Mpy3asKyAjqvo163r49Xx8xjZIIOXI9JmJs9il6nE3mweVXBS3yDJniKIZg pYMQ== X-Gm-Message-State: AOAM532m9svlRmawvJDHNrIdJF48h1sEbjHghNHekPq+Gdq9pUHkjO7J VVENlm+5NPMaPs0xKTEJCLfecQssTQRQhTroDsj56krBXzsq4QMLMRrdo02WG3smcby+UO3Hvkv HQt8PciAfKHs= X-Received: by 2002:a0c:da04:: with SMTP id x4mr5373451qvj.71.1593210979795; Fri, 26 Jun 2020 15:36:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyBZJGvl8YZD3UD74l3WAMRy83bIKViLR3O57/9pXVwl73+z2DH1H0MK6MkNpbyIvHsKU6sUg== X-Received: by 2002:a0c:da04:: with SMTP id x4mr5373440qvj.71.1593210979588; Fri, 26 Jun 2020 15:36:19 -0700 (PDT) Received: from xz-x1.redhat.com ([2607:9880:19c0:32::2]) by smtp.gmail.com with ESMTPSA id x26sm9633604qtr.4.2020.06.26.15.36.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2020 15:36:18 -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 , Jonas Bonn , Stefan Kristiansson , Stafford Horne , openrisc@lists.librecores.org Subject: [PATCH 14/26] mm/openrisc: Use general page fault accounting Date: Fri, 26 Jun 2020 18:36:17 -0400 Message-Id: <20200626223617.199669-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 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII X-Rspamd-Queue-Id: BD28A180C07AF X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam04 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000010, 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