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 83CFFC433DF for ; Fri, 26 Jun 2020 22:36:41 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 41CD920FC3 for ; Fri, 26 Jun 2020 22:36:41 +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="AE9R/v+Y" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 41CD920FC3 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 BA6636B002C; Fri, 26 Jun 2020 18:36:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B7C716B002D; Fri, 26 Jun 2020 18:36:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A1E4B6B002E; Fri, 26 Jun 2020 18:36:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0085.hostedemail.com [216.40.44.85]) by kanga.kvack.org (Postfix) with ESMTP id 84F116B002C for ; Fri, 26 Jun 2020 18:36:40 -0400 (EDT) Received: from smtpin24.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 4D8782DFD for ; Fri, 26 Jun 2020 22:36:40 +0000 (UTC) X-FDA: 76972823760.24.knot21_4d0ec4226e59 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin24.hostedemail.com (Postfix) with ESMTP id 265BC1A4A0 for ; Fri, 26 Jun 2020 22:36:40 +0000 (UTC) X-HE-Tag: knot21_4d0ec4226e59 X-Filterd-Recvd-Size: 5059 Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by imf10.hostedemail.com (Postfix) with ESMTP for ; Fri, 26 Jun 2020 22:36:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593210999; 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=+T4PahBLwp+qMqIXI+a8sKJL/5YpPnDyt5GJ45wieOk=; b=AE9R/v+Yn3qW1vVzhV/EyL9LMK6keBXuCpVXK4y8UexWhaVkBUPIhh5hBeIfI5Nu5jRHgO C3YX52bctpUS4cU+IFUSNgmfkR9yAQECyqTEGskUUBsXYkgvsmMB9rChTMNDeO/Ww0PyLK AkOf4OqJkTCf0RL/pv0DDUkUK/Vv+Q4= Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-477-su16ocxFMees6Kh34R7oyw-1; Fri, 26 Jun 2020 18:36:36 -0400 X-MC-Unique: su16ocxFMees6Kh34R7oyw-1 Received: by mail-qk1-f199.google.com with SMTP id s75so7708177qka.1 for ; Fri, 26 Jun 2020 15:36:36 -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=+T4PahBLwp+qMqIXI+a8sKJL/5YpPnDyt5GJ45wieOk=; b=ER+dH42WK7ZdTJhO8Me+OKU3z7WDASR61IXPd/w+HmjYqzpk/i6Yhl7uocnZh6IwBD NMzTz5PJ+yHCu+Q2fNf+DNZi4w+o/xrpC5p5UOQSJK7ts7RV6t5or2sUKSZe+2OmIHMT NhS2Y9cjCk2ZPvDxq6EQqBvAZG8nk49FODp5rp8QeDsoSaxXmF43awT/gCe7ldeQ4MBy OytWEfy+UmN1Nby8YizLrf1fTr8uHN9t0r61Xa9I3IGVFHhXff99qICIxzHNW13EeA1f huW3i9P+vpc3IycVfKC0xjT7alfmYv3McP3zvwZUEKp9j2bRvmG5lag37traSfdOdWK/ vnkQ== X-Gm-Message-State: AOAM531z08XMihblXbAi0sBkJzQo6ryIdoecb5bXrwcnjETR/yeOkPxx aKCPWEHiYSykJKtU7XbrQhn4pOTu0wZqKxEyPitd+Dxak/SCgvdIrKBKzwCPAQXCIKVWDHT4/oK MPqxEVbcBpxY= X-Received: by 2002:a0c:b5db:: with SMTP id o27mr5409118qvf.205.1593210995318; Fri, 26 Jun 2020 15:36:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzlD82Q8cmc5NmNE8445OCDFJdhANJej0rzVbZKfEZCyzpK7wCQulyA+sPy13MiOQo1jaWdnA== X-Received: by 2002:a0c:b5db:: with SMTP id o27mr5409095qvf.205.1593210995113; Fri, 26 Jun 2020 15:36:35 -0700 (PDT) Received: from xz-x1.redhat.com ([2607:9880:19c0:32::2]) by smtp.gmail.com with ESMTPSA id s71sm9636682qke.0.2020.06.26.15.36.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2020 15:36:34 -0700 (PDT) From: Peter Xu To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Peter Xu , Andrew Morton , Linus Torvalds , Gerald Schaefer , Andrea Arcangeli , Will Deacon , Michael Ellerman , "David S . Miller" , sparclinux@vger.kernel.org Subject: [PATCH 20/26] mm/sparc32: Use general page fault accounting Date: Fri, 26 Jun 2020 18:36:32 -0400 Message-Id: <20200626223632.199958-1-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: 265BC1A4A0 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(). 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 61524d284706..542bf034962f 100644 --- a/arch/sparc/mm/fault_32.c +++ b/arch/sparc/mm/fault_32.c @@ -235,7 +235,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; @@ -251,15 +251,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