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 EFEACC433E0 for ; Fri, 19 Jun 2020 16:13:47 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id B3CB3217A0 for ; Fri, 19 Jun 2020 16:13:47 +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="YwU56Gu+" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B3CB3217A0 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 5C1B98D00C1; Fri, 19 Jun 2020 12:13:47 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 54BF18D00AD; Fri, 19 Jun 2020 12:13:47 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2654F8D00C1; Fri, 19 Jun 2020 12:13:47 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0065.hostedemail.com [216.40.44.65]) by kanga.kvack.org (Postfix) with ESMTP id 00DBB8D00AD for ; Fri, 19 Jun 2020 12:13:46 -0400 (EDT) Received: from smtpin19.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id B16A68245571 for ; Fri, 19 Jun 2020 16:13:46 +0000 (UTC) X-FDA: 76946457252.19.space74_2f1803826e1a Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin19.hostedemail.com (Postfix) with ESMTP id 802831ACDE7 for ; Fri, 19 Jun 2020 16:13:46 +0000 (UTC) X-HE-Tag: space74_2f1803826e1a X-Filterd-Recvd-Size: 5154 Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by imf32.hostedemail.com (Postfix) with ESMTP for ; Fri, 19 Jun 2020 16:13:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592583225; 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=YwU56Gu+5e6pA30A6P6F+JQEos8VTNl0Y0C+ZIGHBqtclC+aYBUSD1z2B1Ar+NNaJqvnsh ewKvi3lHOXZ41TaTOJHz0vELcoADPH7rdSRwHA36zGSgat0RZJjpQ1qaUoJ2MLuQcoPPnm eYvVYcG6w7kTMSoMLiACdhgCHJjgjGc= Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-16-5mpE-EDLMHu1bwNVtlyVbg-1; Fri, 19 Jun 2020 12:13:44 -0400 X-MC-Unique: 5mpE-EDLMHu1bwNVtlyVbg-1 Received: by mail-qv1-f69.google.com with SMTP id s20so7092421qvw.12 for ; Fri, 19 Jun 2020 09:13:43 -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=puJtGSn1PccFTgPjpJqyoIru7MFcuV3hNnlZdy3IeOwhUvSg7a+SJLsEmEw0xzWpI1 sR3pi71fnFnwztV28Eb0YCJD7000YZpZkEcJ7DPJJ0NGMv2kiiOk5TuHVjgANAEd1VID qfJNGdpTnpCWLm56Q4km0d2fCYw20nULyVSuoNdzGOBu1L9wnIwfNINW/IbuP1i9BMPa Z99vE57U2Y3e0pXlnaVUd4Hk7vxKDlSgACOLLIBvhoG3QHBZwJYTnzNCjJKlnbiBH9J5 TALfn1ycbwlsEQKh/lS3RGwxVce26FzEkt7SN7sMK/h0+PWovk3CVbOeYSUWsfCDLTAA iWNA== X-Gm-Message-State: AOAM53238e5m37WwgNj08boWqIxQOSrYR0mWVTikdObu0Df/4VJHlAaT zwro3ZBWapVAxwfwIKMuYoqHTMdRIcuNgI+uMKcwL3blqqoWda+5EouRkcGPI35cnUFu4+CxXvq eIrLvjUUPxC0= X-Received: by 2002:a37:4ac6:: with SMTP id x189mr4077386qka.323.1592583223568; Fri, 19 Jun 2020 09:13:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw6soZaP4dnoM13q0hEmGSoc9m+CP9QFqBJTTn4uB3sxC+M1N2RbKnkZrYMa4KMFGRLAMCg6A== X-Received: by 2002:a37:4ac6:: with SMTP id x189mr4077348qka.323.1592583223233; Fri, 19 Jun 2020 09:13:43 -0700 (PDT) Received: from xz-x1.redhat.com ([2607:9880:19c0:32::2]) by smtp.gmail.com with ESMTPSA id k26sm7453496qtk.55.2020.06.19.09.13.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jun 2020 09:13:42 -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 , "David S . Miller" , sparclinux@vger.kernel.org Subject: [PATCH 20/26] mm/sparc32: Use general page fault accounting Date: Fri, 19 Jun 2020 12:13:41 -0400 Message-Id: <20200619161341.9762-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: 802831ACDE7 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam02 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