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 15849C433EC for ; Tue, 30 Jun 2020 20:46:08 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id CB6CC20772 for ; Tue, 30 Jun 2020 20:46:07 +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="gg0gPidi" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CB6CC20772 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 692FF6B006E; Tue, 30 Jun 2020 16:46:07 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 669176B0071; Tue, 30 Jun 2020 16:46:07 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 582126B0072; Tue, 30 Jun 2020 16:46:07 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0090.hostedemail.com [216.40.44.90]) by kanga.kvack.org (Postfix) with ESMTP id 4399C6B006E for ; Tue, 30 Jun 2020 16:46:07 -0400 (EDT) Received: from smtpin19.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 0A8A9180AD806 for ; Tue, 30 Jun 2020 20:46:07 +0000 (UTC) X-FDA: 76987060374.19.club74_250412526e7a Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin19.hostedemail.com (Postfix) with ESMTP id C90711ACEBC for ; Tue, 30 Jun 2020 20:46:06 +0000 (UTC) X-HE-Tag: club74_250412526e7a X-Filterd-Recvd-Size: 4943 Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by imf19.hostedemail.com (Postfix) with ESMTP for ; Tue, 30 Jun 2020 20:46:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593549965; 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=nRL7j1WwZNqVLuKE8r33la3T5z/V/hLFvWs36l0m98c=; b=gg0gPidiG8TcbxMOpyay9XdoSEe6JKL9I5h6MaZ2NgXTAZ0hMTDVoAAlgUCw87PNxiYK3g ylSSoxNaLXfTJ/hSlo9hDLwDBazSMt/MjGK9etA0BovjLPHIthwap8MyEYm+By7m6KPSGL mX8kxdfNGFfr5HkFDljxutiX732nY1M= Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-475-g0-7aSdpP827qGUS6ZIP5g-1; Tue, 30 Jun 2020 16:46:04 -0400 X-MC-Unique: g0-7aSdpP827qGUS6ZIP5g-1 Received: by mail-qk1-f200.google.com with SMTP id 13so667804qks.11 for ; Tue, 30 Jun 2020 13:46:04 -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=nRL7j1WwZNqVLuKE8r33la3T5z/V/hLFvWs36l0m98c=; b=G+0SSgqXSPvGi0bhncp24+p7nTv/sBI64SFu9/SMyv5AF6ls18otTktV9rxjdj7qNV Q0SyFpsggUBdSUeHGsuyIo02ir8588cmmuSYlQ5WynqQ/cvZhYFlokWkRQi9iG0ktMc6 9oFGwxRXwKJZUQrlOYFksmYFwX/qnThd6kEpap6bfmwT0q8FcmlH6bQPCu2d9ckACavG 0Qu0dV/zH/6w6i9uCinpfFJwTMS688ZMti6KwBXy6PPEw+ufJ7ouJL5UlyGgOmPSsUlW ICm/qmuULNDBXkpaxcQvFOMWkiozmegbNHtqgRqG+aLaBsZIlStOHnXPyja43QaueHoI HzlQ== X-Gm-Message-State: AOAM5324pTs6FkOeA8+hJ4ELW+yd4QCB45xJXBrrrqktm/j1zBlqDYeA VAQ1WF4T3OW+4rjq/oOcl56MKu5U43puReoL/bxnEpAZJf358qaoaIJOLUBIlRkp0Tc3jk/8P+R WoE9g8nSkkBw= X-Received: by 2002:a05:620a:635:: with SMTP id 21mr22244595qkv.491.1593549962000; Tue, 30 Jun 2020 13:46:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwlUPsr/W+WeZFM6KWdqEHBVB5RxdLgehVJ6NhUZN7D0mYiZYTZhpM7moIljz6u9XaYXW1fJQ== X-Received: by 2002:a05:620a:635:: with SMTP id 21mr22244374qkv.491.1593549958835; Tue, 30 Jun 2020 13:45:58 -0700 (PDT) Received: from xz-x1.redhat.com ([2607:9880:19c0:32::2]) by smtp.gmail.com with ESMTPSA id f18sm4467263qtc.28.2020.06.30.13.45.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2020 13:45:58 -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 21/26] mm/sparc64: Use general page fault accounting Date: Tue, 30 Jun 2020 16:45:56 -0400 Message-Id: <20200630204556.39491-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: C90711ACEBC X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam05 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_64.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c index 9ebee14ee893..0a6bcc85fba7 100644 --- a/arch/sparc/mm/fault_64.c +++ b/arch/sparc/mm/fault_64.c @@ -422,7 +422,7 @@ asmlinkage void __kprobes do_sparc64_fault(struct pt_= regs *regs) goto bad_area; } =20 - 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)) goto exit_exception; @@ -438,15 +438,6 @@ asmlinkage void __kprobes do_sparc64_fault(struct pt= _regs *regs) } =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