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 8FCB5C433DF for ; Fri, 26 Jun 2020 22:31:58 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 44E3820FC3 for ; Fri, 26 Jun 2020 22:31:58 +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="fzoiw+Bm" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 44E3820FC3 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 DC9546B0024; Fri, 26 Jun 2020 18:31:51 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D2EC16B0025; Fri, 26 Jun 2020 18:31:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A96026B0026; Fri, 26 Jun 2020 18:31:51 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0215.hostedemail.com [216.40.44.215]) by kanga.kvack.org (Postfix) with ESMTP id 8B68E6B0024 for ; Fri, 26 Jun 2020 18:31:51 -0400 (EDT) Received: from smtpin02.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 50F792DFD for ; Fri, 26 Jun 2020 22:31:51 +0000 (UTC) X-FDA: 76972811622.02.wheel77_2e0681f26e59 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin02.hostedemail.com (Postfix) with ESMTP id 19B8E4000106D1E2 for ; Fri, 26 Jun 2020 22:31:51 +0000 (UTC) X-HE-Tag: wheel77_2e0681f26e59 X-Filterd-Recvd-Size: 5640 Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by imf01.hostedemail.com (Postfix) with ESMTP for ; Fri, 26 Jun 2020 22:31:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593210710; 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=lYOPBG0iFD9F9VjgENlAdm0PiHZqNHDJn1sXF2V/+vk=; b=fzoiw+BmyFwnJ4p2zfW9mTSUcRWicFKLQ9m51Lg72yW84f0ILRGIl4hsmjC+96tAfyUdYQ GpokkVf/PbDVYvQjxzDi8ChOk23SJ5LRZ05dGql0K6Z702DfPrdZsC+nk3xWVXiHzW238U cDKn/QzBKlnwf5RlmofcNr+HqcqwD8Q= Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-245-U1evttNcNZWcWzDRbYb6-Q-1; Fri, 26 Jun 2020 18:31:47 -0400 X-MC-Unique: U1evttNcNZWcWzDRbYb6-Q-1 Received: by mail-qv1-f72.google.com with SMTP id j18so7391149qvk.1 for ; Fri, 26 Jun 2020 15:31:47 -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=lYOPBG0iFD9F9VjgENlAdm0PiHZqNHDJn1sXF2V/+vk=; b=lnTzCk0ZFmmtlONnCi3qvmH5wdZrqhOswL/LObBsLYoyKfD6GjG2wQrwtXJCu91tsD xYmNhefHtjzrwmS0YKJut2ZlUp96Q2prZDOS1VxArjtwUJvV/rIWGGqccVnLVqWYV+ue J4GC07yko+SEq8seeVKg3f3p3lWdmJvlHmzpf5nT7lHpC+4DD5Pbf6jaYFQSJNEzgCxF AAF5Z8lRQllcvKvF+o31t9i9um0FOyheMSpjYj0Kc9JKWAB2P+GbH/AGvUpJ8IVq+3Hh B9FO4UHqbf/3C0eYRJ+5Bs3MSQ4Q03EaTDGh/yY3IoY3kQaykwHCVDOoa8Z7FMuWFWmG xSvg== X-Gm-Message-State: AOAM532VhHP0QjQC6D+PDRyNP79vzRPJm/3MELaEG2lqKh/GRPORTeqo uLV4EdGVYGOXo+t5DMShNHU5mNoOZOYarJkUaAcPvitSuVPg7hjWlNE+xMb3tgAqJg4EutG1JYZ vP5vmf2X0F0E= X-Received: by 2002:ac8:34b1:: with SMTP id w46mr5148292qtb.175.1593210706889; Fri, 26 Jun 2020 15:31:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwEsH9GTqG0Uyirbf2HfHCLkouB6MqgMm+luFGWqRBdr7XED0i0wltil1GoCMm1tUaTEq60hA== X-Received: by 2002:ac8:34b1:: with SMTP id w46mr5148270qtb.175.1593210706647; Fri, 26 Jun 2020 15:31:46 -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.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2020 15:31:46 -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 , Geert Uytterhoeven , linux-m68k@lists.linux-m68k.org Subject: [PATCH 09/26] mm/m68k: Use general page fault accounting Date: Fri, 26 Jun 2020 18:31:13 -0400 Message-Id: <20200626223130.199227-10-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: 19B8E4000106D1E2 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.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 2db38dfbc00c..983054d209bc 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: down_read(&mm->mmap_sem); =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