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 A84C7C433E1 for ; Fri, 19 Jun 2020 16:14:35 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 6AEC22168B for ; Fri, 19 Jun 2020 16:14:35 +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="KL2XOkNP" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6AEC22168B 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 17B368D00C7; Fri, 19 Jun 2020 12:14:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 12AD28D00AD; Fri, 19 Jun 2020 12:14:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 019958D00C7; Fri, 19 Jun 2020 12:14:34 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0226.hostedemail.com [216.40.44.226]) by kanga.kvack.org (Postfix) with ESMTP id D953B8D00AD for ; Fri, 19 Jun 2020 12:14:34 -0400 (EDT) Received: from smtpin11.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 92578824556B for ; Fri, 19 Jun 2020 16:14:34 +0000 (UTC) X-FDA: 76946459268.11.rod70_1906f1d26e1a Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin11.hostedemail.com (Postfix) with ESMTP id 51AD5180FA157 for ; Fri, 19 Jun 2020 16:13:24 +0000 (UTC) X-HE-Tag: rod70_1906f1d26e1a X-Filterd-Recvd-Size: 5684 Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by imf41.hostedemail.com (Postfix) with ESMTP for ; Fri, 19 Jun 2020 16:13:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592583203; 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=eYfbH2Z9PmFD3YC1EEjF5e5lSljD0oX0ZInZG0GJcWM=; b=KL2XOkNPJP02gVz/DwNXigj9Iel2PGbHa/2UgtgnWcykRA788u5On7kj6eNstDzndSYQo2 8wvLcIaIgL2b0kwp72mj2hA6g9KrZ1p/jS2+AG7fFeGIlAv9OrAEzFHjXFwnmLkslicqnl c6o+XBcePIIU6tNqZ91D3/iVcT+ucb4= Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-7-CQ82RJCrPTaVPegexl3JXw-1; Fri, 19 Jun 2020 12:13:21 -0400 X-MC-Unique: CQ82RJCrPTaVPegexl3JXw-1 Received: by mail-qt1-f199.google.com with SMTP id u48so7449880qth.17 for ; Fri, 19 Jun 2020 09:13:21 -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=eYfbH2Z9PmFD3YC1EEjF5e5lSljD0oX0ZInZG0GJcWM=; b=G8Gux38dG1FbL8XTJObM9HruQl0yh3GAtb9arUjG7UQp6pwvmYmQub3DwVMdPsdA60 wiNbaENzxYevCXdXYt3BeVdzsxAlj9Wb+Lu5ad7tHDiSZTuGv7FHX98dous0KYc0IOYs WF/vltCJhD4gIzp3ZUenSGHbvf4TNf749mGM261wWSrN/Bupl/C35pyHIkXKOxI830ha n9WAFZfivFiRxbFI8eI1hros6uwYfxSAaVPi2dXw1GuipFLezkhkPiGL+00LAmQMyPZE VBceJ92K0UB26nYMR7VQY5vfFXupWZvZYCM70H2k9tZ0nQ29L1oix+Gnm2iIwUPLKmNR fIYQ== X-Gm-Message-State: AOAM530hwjqEZlIBFuySjk7qMs+nbPBP0i9oeH0yL9gonl0GLOrOr59b uyvT29Eh3ebrz+wQlbuyWNI78CQ/FEXyQrDSs4EyFtpixxv3DISfqxjIQQL/hrlue7XZYbDwDAa u4d65YOWPSaM= X-Received: by 2002:a37:5d6:: with SMTP id 205mr4101500qkf.46.1592583200925; Fri, 19 Jun 2020 09:13:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx+/kXn6XM9J3AHchJ11d9906jc9OEfvlqbxTG9lTxQJaaFL7aW/z0ASmv5F6WdZBp/RES2MA== X-Received: by 2002:a37:5d6:: with SMTP id 205mr4101475qkf.46.1592583200713; Fri, 19 Jun 2020 09:13:20 -0700 (PDT) Received: from xz-x1.redhat.com ([2607:9880:19c0:32::2]) by smtp.gmail.com with ESMTPSA id c83sm7040588qkb.75.2020.06.19.09.13.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jun 2020 09:13:20 -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 , "James E . J . Bottomley" , Helge Deller , linux-parisc@vger.kernel.org Subject: [PATCH 15/26] mm/parisc: Use general page fault accounting Date: Fri, 19 Jun 2020 12:13:18 -0400 Message-Id: <20200619161318.9492-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 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: 51AD5180FA157 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. 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: 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 c10908ea8803..65661e22678e 100644 --- a/arch/parisc/mm/fault.c +++ b/arch/parisc/mm/fault.c @@ -18,6 +18,7 @@ #include #include #include +#include =20 #include =20 @@ -281,6 +282,7 @@ void do_page_fault(struct pt_regs *regs, unsigned lon= g code, acc_type =3D parisc_acctyp(code, regs->iir); if (acc_type & VM_WRITE) flags |=3D FAULT_FLAG_WRITE; + perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, address); retry: down_read(&mm->mmap_sem); vma =3D find_vma_prev(mm, address, &prev_vma); @@ -302,7 +304,7 @@ void do_page_fault(struct pt_regs *regs, unsigned lon= g code, * 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; @@ -323,10 +325,6 @@ void do_page_fault(struct pt_regs *regs, unsigned lo= ng 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 up_read(&mm->mmap_sem) as we would --=20 2.26.2