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 B18C6C433E0 for ; Tue, 30 Jun 2020 20:51:52 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 62A9D20702 for ; Tue, 30 Jun 2020 20:51:52 +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="Vlp7QXA/" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 62A9D20702 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 1121F6B0083; Tue, 30 Jun 2020 16:51:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0C26D6B0087; Tue, 30 Jun 2020 16:51:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id ECC1F6B0088; Tue, 30 Jun 2020 16:51:51 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0122.hostedemail.com [216.40.44.122]) by kanga.kvack.org (Postfix) with ESMTP id D76EC6B0083 for ; Tue, 30 Jun 2020 16:51:51 -0400 (EDT) Received: from smtpin22.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id A3D8D180AD804 for ; Tue, 30 Jun 2020 20:51:51 +0000 (UTC) X-FDA: 76987074822.22.price02_130758c26e7b Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin22.hostedemail.com (Postfix) with ESMTP id 7489018038E60 for ; Tue, 30 Jun 2020 20:51:51 +0000 (UTC) X-HE-Tag: price02_130758c26e7b X-Filterd-Recvd-Size: 5024 Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by imf38.hostedemail.com (Postfix) with ESMTP for ; Tue, 30 Jun 2020 20:51:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593550310; 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=ZuPZYk0Ns+MCrJXk2nN23I5YsKRR2oHib+g0ZYAxJ90=; b=Vlp7QXA/9wYv4+i0j8brQMa6gb43Qu5Hoyjps36kEcYtNgsaCGd52JKuHM5TUjNXTdFQX1 kQncUu/jZ743KUBedW/qEz+NJxNX7IomPhw+7cWCNBRsoVkSO+zLcVXR/ad20HibDYTaDo ovev/3/VonnEwsXAGGVQ0mTzaG+9kko= Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-416-kUolG1jMNTisgyyweJvQFw-1; Tue, 30 Jun 2020 16:51:49 -0400 X-MC-Unique: kUolG1jMNTisgyyweJvQFw-1 Received: by mail-pf1-f200.google.com with SMTP id y69so14989836pfg.9 for ; Tue, 30 Jun 2020 13:51:48 -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=ZuPZYk0Ns+MCrJXk2nN23I5YsKRR2oHib+g0ZYAxJ90=; b=dgh6+NW00/INP/VC8U9N7rcj/5ynRcLeomUm9412WUQBx+xHh5vNiCsINT94u8k01C aZHcS++fsitnIGyIJ64m0rOY1OmmswsomUcuBmXSO+LIhTu2frAF24JNsmIf6NDe85es f/uvAFxt8ac7olYjiPqaNDWIbmWCocVhfOwTvcpykh34QrR4Ne16YnzK+9pRxx/qibd9 TmDILrjyhLY04pa28wO7YH72re7X0/h+MJQ50xoK3hXW3ze6MfcCVZ4ygqHNaft1DEch 4iGqRD2C7gItQriUKYophV3SRbbL3FGElF8r/1g73au53RT4Sm4QmF00J+WzdyzHPAYi apZQ== X-Gm-Message-State: AOAM533hdqPdZww3IU1u8I5P74yH7PoYXB6CM7bfXI20BG2Y3acaKifm ITKey7q3H4YVNBsocHeACC7CnwD8MiP0lTsfZTA7faNLk4MRucMDyOhoq7QbtT8cJMYhKK9CMhl 9sDeNnpP6VEM= X-Received: by 2002:a05:6214:1586:: with SMTP id m6mr20808928qvw.171.1593549956470; Tue, 30 Jun 2020 13:45:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyNcVTxS1nLn72PqQ6RmcgCA2jlQ+iPsG1/Q8+SmC7pwUxqSCsBS9tibh2g1OtZBBb74J0RnA== X-Received: by 2002:a05:6214:1586:: with SMTP id m6mr20808902qvw.171.1593549956202; Tue, 30 Jun 2020 13:45:56 -0700 (PDT) Received: from xz-x1.redhat.com ([2607:9880:19c0:32::2]) by smtp.gmail.com with ESMTPSA id v184sm3850652qki.12.2020.06.30.13.45.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2020 13:45:55 -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 , "David S . Miller" , sparclinux@vger.kernel.org Subject: [PATCH v4 20/26] mm/sparc32: Use general page fault accounting Date: Tue, 30 Jun 2020 16:45:53 -0400 Message-Id: <20200630204553.39442-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: 7489018038E60 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam01 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. CC: David S. Miller CC: sparclinux@vger.kernel.org Signed-off-by: Peter Xu --- arch/sparc/mm/fault_32.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c index 06af03db4417..8071bfd72349 100644 --- a/arch/sparc/mm/fault_32.c +++ b/arch/sparc/mm/fault_32.c @@ -234,7 +234,7 @@ asmlinkage void do_sparc_fault(struct pt_regs *regs, = int text_fault, int write, * 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; @@ -250,15 +250,6 @@ asmlinkage void do_sparc_fault(struct pt_regs *regs,= int text_fault, int write, } =20 if (flags & FAULT_FLAG_ALLOW_RETRY) { - if (fault & VM_FAULT_MAJOR) { - current->maj_flt++; - perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MAJ, - 1, regs, address); - } else { - current->min_flt++; - perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MIN, - 1, regs, address); - } if (fault & VM_FAULT_RETRY) { flags |=3D FAULT_FLAG_TRIED; =20 --=20 2.26.2