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 58680C433E1 for ; Tue, 30 Jun 2020 20:45:17 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 0C0EF20663 for ; Tue, 30 Jun 2020 20:45:17 +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="aYZjDzWP" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0C0EF20663 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 A89946B000C; Tue, 30 Jun 2020 16:45:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A3A3F6B000D; Tue, 30 Jun 2020 16:45:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 950A16B000E; Tue, 30 Jun 2020 16:45:16 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0172.hostedemail.com [216.40.44.172]) by kanga.kvack.org (Postfix) with ESMTP id 7F92C6B000C for ; Tue, 30 Jun 2020 16:45:16 -0400 (EDT) Received: from smtpin27.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 3B13E8248076 for ; Tue, 30 Jun 2020 20:45:16 +0000 (UTC) X-FDA: 76987058232.27.spade43_260a53026e7a Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin27.hostedemail.com (Postfix) with ESMTP id 0DDFF3D663 for ; Tue, 30 Jun 2020 20:45:16 +0000 (UTC) X-HE-Tag: spade43_260a53026e7a X-Filterd-Recvd-Size: 5556 Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by imf33.hostedemail.com (Postfix) with ESMTP for ; Tue, 30 Jun 2020 20:45:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593549915; 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; bh=9zINhPgn0dLU827u0kCMWiXWqm1EOoX2bkCYV8BQtz4=; b=aYZjDzWPn4mJIroxTeybKyEEzU4h0811cZwDsuiBPlsqdoKWZd+xN6we57Uc7JXGRvAvFn Yk82nSmvdJ6CZpv4mkG+IuZGWTgQBHggZeAlGvbr6P6MEEzKS6WUH1OcQ1VFOps0DT/Gh3 t8VdQuLEok4rZJVy2h6pVND3cBJg+p0= 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-258-EmCr4dA1PcCL2THNz09jVA-1; Tue, 30 Jun 2020 16:45:13 -0400 X-MC-Unique: EmCr4dA1PcCL2THNz09jVA-1 Received: by mail-qt1-f199.google.com with SMTP id g6so15326488qtr.0 for ; Tue, 30 Jun 2020 13:45:13 -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:mime-version :content-transfer-encoding; bh=9zINhPgn0dLU827u0kCMWiXWqm1EOoX2bkCYV8BQtz4=; b=mU4nflvTIwtztA2XGQlUg0IQYijW5mcZXFnAhagvuzSlYXHJ7Bl5AkIrIOY2fVHHdk +5fQVTpNmGHmzwMbuCCOFgcX1WsKMJdiIEH3YWiIYczMh5tfD8n3vXHJZegJamevVUES QI7pbP8xCFe9RWS/6QkAUKcOm0hS9BeFZarWidF8rUvYdckwguYAxkgXQLXFI+mN0dam tN1Mi4EXya6xBlE0RdnWg4w6SD3PtJ0ogynoI80vOfOU4ooZ2hvtSUxvBdak+l0gPygu EduvsOt4uC0G3beD+kP6o5V33Y1XN5VSmdu6XZseqRPj7T9RojoSWHC0UGFGnxBoP+3V Tcsg== X-Gm-Message-State: AOAM533t/3cWczPrr0Ijw4vikJEtLyPaucOHkQpZsMtWvwX2ljx3U4TZ oSv7e99SWe2GOQE5wJZzNb4YY/Y/Gzyp/yQuO2+Rv/b0MTW/WNPgDLd9eUWxN6XC/jitdnOHGMh 28SBIrGS4WeQ= X-Received: by 2002:ac8:100b:: with SMTP id z11mr23499532qti.157.1593549911382; Tue, 30 Jun 2020 13:45:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx0yAgQnRD/5TZveHkpZPXLU358GLo0DpfJwL9wdYY6bw9cMFV6GaGklDvsflsay5ajX+3TFA== X-Received: by 2002:ac8:100b:: with SMTP id z11mr23499328qti.157.1593549908970; Tue, 30 Jun 2020 13:45:08 -0700 (PDT) Received: from xz-x1.redhat.com ([2607:9880:19c0:32::2]) by smtp.gmail.com with ESMTPSA id o145sm3987048qke.2.2020.06.30.13.45.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2020 13:45:08 -0700 (PDT) From: Peter Xu To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Andrew Morton , peterx@redhat.com, John Hubbard , Michael Ellerman , Gerald Schaefer , Andrea Arcangeli , Linus Torvalds , Will Deacon , Richard Henderson , Ivan Kokshaysky , Matt Turner , linux-alpha@vger.kernel.org Subject: [PATCH v4 02/26] mm/alpha: Use general page fault accounting Date: Tue, 30 Jun 2020 16:45:06 -0400 Message-Id: <20200630204506.38567-1-peterx@redhat.com> X-Mailer: git-send-email 2.26.2 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: 0DDFF3D663 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(). 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: Richard Henderson CC: Ivan Kokshaysky CC: Matt Turner CC: linux-alpha@vger.kernel.org Signed-off-by: Peter Xu --- arch/alpha/mm/fault.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c index 1983e43a5e2f..09172f017efc 100644 --- a/arch/alpha/mm/fault.c +++ b/arch/alpha/mm/fault.c @@ -25,6 +25,7 @@ #include #include #include +#include =20 extern void die_if_kernel(char *,struct pt_regs *,long, unsigned long *)= ; =20 @@ -116,6 +117,7 @@ do_page_fault(unsigned long address, unsigned long mm= csr, #endif if (user_mode(regs)) flags |=3D FAULT_FLAG_USER; + perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, address); retry: mmap_read_lock(mm); vma =3D find_vma(mm, address); @@ -148,7 +150,7 @@ do_page_fault(unsigned long address, unsigned long mm= csr, /* If for any reason at all we couldn't handle the fault, make sure we exit gracefully rather than endlessly redo the fault. */ - 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; @@ -164,10 +166,6 @@ do_page_fault(unsigned long address, unsigned long m= mcsr, } =20 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