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,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 3D35DC433E0 for ; Fri, 26 Jun 2020 22:32:04 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id F0B7C20FC3 for ; Fri, 26 Jun 2020 22:32:03 +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="B7tqzMQe" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F0B7C20FC3 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 AE7296B0027; Fri, 26 Jun 2020 18:31:58 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9D4A26B0028; Fri, 26 Jun 2020 18:31:58 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7D6296B0029; Fri, 26 Jun 2020 18:31:58 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0041.hostedemail.com [216.40.44.41]) by kanga.kvack.org (Postfix) with ESMTP id 6071E6B0027 for ; Fri, 26 Jun 2020 18:31:58 -0400 (EDT) Received: from smtpin26.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 1EE95180AD806 for ; Fri, 26 Jun 2020 22:31:58 +0000 (UTC) X-FDA: 76972811916.26.plate48_0c033e126e59 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin26.hostedemail.com (Postfix) with ESMTP id E64541804B670 for ; Fri, 26 Jun 2020 22:31:57 +0000 (UTC) X-HE-Tag: plate48_0c033e126e59 X-Filterd-Recvd-Size: 5786 Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by imf26.hostedemail.com (Postfix) with ESMTP for ; Fri, 26 Jun 2020 22:31:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593210717; 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=JN+es+8H1l3agmqz1OlDugYxis3rubXdkuh1XRgK5Rw=; b=B7tqzMQehNSETH8HhnVpaU/dJnT/7XqJz1oWEmrbQcEi8U6oLo/spvGTcftwj4BfDsyw0r 7j59+PC+JISGnODkx44gIO5UWVSLhj9eaRqK7k+ylSOr4aG7qOh7RFJ/qrfpmgQuhL0eMJ Nh4Cj66//bECy403a2gUB6YhqbGfRu8= Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-135-3obNcBrOPC-iWHdYZdjSnw-1; Fri, 26 Jun 2020 18:31:54 -0400 X-MC-Unique: 3obNcBrOPC-iWHdYZdjSnw-1 Received: by mail-qv1-f69.google.com with SMTP id j4so7355893qvt.20 for ; Fri, 26 Jun 2020 15:31:54 -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=JN+es+8H1l3agmqz1OlDugYxis3rubXdkuh1XRgK5Rw=; b=Zmau1PjRgrkGUGwRSubOC1H/T608Z8L4Yu6joRWq4049aKr/5vX+PGMI/+vxKlT46f UBpu6slilZfSwdErHzgyJuAzHvPg+7V1QT+jdtZjnEe1hyH9l5EH73UTQdLCs1Rw6cie mnTNnKt2tphBfL4spLQLp7a80UqoNay1rAVSWc6NKeaXhMFxj1IEhaxuH8r7s3gaRpdd ELxTD8+U36g1Gb+PZ6YByllMFHRCNkTAtcwlOpPy85h0ay8kMnYsJECuY4ZxrtZj565W kqFEHfe1L7itMNBxEGfXX52sGqEX5JlSxG3ylU4OK1Wmx+NQfRHQtPzf+uVeNFyfWo2z DFSQ== X-Gm-Message-State: AOAM531NCu9PCzL5skuagpUcDONZJwlqMw7PDbqaKw4q6T2ghi4+gcck ne3OM6HN8xhSp9nb8sqIi4MqMfwTPio/SL6KuFFT1kHkYiEnPCSgLdnl5agPXh+nk6kLejvMw77 zpPqMvL4ziXk= X-Received: by 2002:ac8:674c:: with SMTP id n12mr1721365qtp.312.1593210711923; Fri, 26 Jun 2020 15:31:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwcYijJTVlPSIFEtT8ShfjkY00t4KQvgkEFr4fOdkWNwDI2R4lPmULH0n33oNjlV6dOmHz7zw== X-Received: by 2002:ac8:674c:: with SMTP id n12mr1721343qtp.312.1593210711649; Fri, 26 Jun 2020 15:31:51 -0700 (PDT) Received: from xz-x1.redhat.com ([2607:9880:19c0:32::2]) by smtp.gmail.com with ESMTPSA id f203sm9903311qke.135.2020.06.26.15.31.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2020 15:31:51 -0700 (PDT) From: Peter Xu To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Andrew Morton , Linus Torvalds , Gerald Schaefer , Andrea Arcangeli , Will Deacon , peterx@redhat.com, Michael Ellerman , Nick Hu , Greentime Hu , Vincent Chen Subject: [PATCH 12/26] mm/nds32: Use general page fault accounting Date: Fri, 26 Jun 2020 18:31:16 -0400 Message-Id: <20200626223130.199227-13-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: E64541804B670 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. Fix PERF_COUNT_SW_PAGE_FAULTS perf event manually for page fault retries,= by moving it before taking mmap_sem. CC: Nick Hu CC: Greentime Hu CC: Vincent Chen Signed-off-by: Peter Xu --- arch/nds32/mm/fault.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/arch/nds32/mm/fault.c b/arch/nds32/mm/fault.c index 22527129025c..e7344440623c 100644 --- a/arch/nds32/mm/fault.c +++ b/arch/nds32/mm/fault.c @@ -122,6 +122,8 @@ void do_page_fault(unsigned long entry, unsigned long= addr, if (unlikely(faulthandler_disabled() || !mm)) goto no_context; =20 + perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, addr); + /* * As per x86, we may deadlock here. However, since the kernel only * validly references user space from well defined areas of the code, @@ -207,7 +209,7 @@ void do_page_fault(unsigned long entry, unsigned long= addr, * the fault. */ =20 - fault =3D handle_mm_fault(vma, addr, flags, NULL); + fault =3D handle_mm_fault(vma, addr, flags, regs); =20 /* * If we need to retry but a fatal signal is pending, handle the @@ -229,22 +231,7 @@ void do_page_fault(unsigned long entry, unsigned lon= g addr, goto bad_area; } =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. - */ - perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, addr); if (flags & FAULT_FLAG_ALLOW_RETRY) { - if (fault & VM_FAULT_MAJOR) { - tsk->maj_flt++; - perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MAJ, - 1, regs, addr); - } else { - tsk->min_flt++; - perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MIN, - 1, regs, addr); - } if (fault & VM_FAULT_RETRY) { flags |=3D FAULT_FLAG_TRIED; =20 --=20 2.26.2