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 2BF64C433E1 for ; Tue, 7 Jul 2020 22:51:06 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id DCABD2077D for ; Tue, 7 Jul 2020 22:51:05 +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="iVJuWLS5" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DCABD2077D 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 9A3DB6B00C1; Tue, 7 Jul 2020 18:50:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 842A56B00C3; Tue, 7 Jul 2020 18:50:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6E24E6B00C4; Tue, 7 Jul 2020 18:50:55 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0041.hostedemail.com [216.40.44.41]) by kanga.kvack.org (Postfix) with ESMTP id 50E986B00C1 for ; Tue, 7 Jul 2020 18:50:55 -0400 (EDT) Received: from smtpin27.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 17B0D180AD806 for ; Tue, 7 Jul 2020 22:50:55 +0000 (UTC) X-FDA: 77012776470.27.fifth33_1008ce226eb8 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin27.hostedemail.com (Postfix) with ESMTP id DCD143D668 for ; Tue, 7 Jul 2020 22:50:54 +0000 (UTC) X-HE-Tag: fifth33_1008ce226eb8 X-Filterd-Recvd-Size: 5892 Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by imf08.hostedemail.com (Postfix) with ESMTP for ; Tue, 7 Jul 2020 22:50:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594162254; 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=C2j+0prlu3q0Pnx3SiAUON88ocaozCL3GS+ha/ScH8o=; b=iVJuWLS54VtTbYY6bfFfQSVs2CZ+a6tgXWIgJW3v5MRUb8IC6j/NLcHeAGa5E4eh6yn6i1 qwrB4m9SKz0NNicedzDWWLHwEOGg/Nv3ii7cWUCTTxsF1tfrSFPQ9tS1PhHhEes3lU9mZU fJ+oeQu1+Izp5X6vtgsl39r9ywfG73s= Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-286-UsbOFGfONwif_u61YR5FjA-1; Tue, 07 Jul 2020 18:50:47 -0400 X-MC-Unique: UsbOFGfONwif_u61YR5FjA-1 Received: by mail-qv1-f70.google.com with SMTP id t12so17827202qvw.5 for ; Tue, 07 Jul 2020 15:50:47 -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=C2j+0prlu3q0Pnx3SiAUON88ocaozCL3GS+ha/ScH8o=; b=nQCQVnz63r2u6fFZoy22LSMyHR4FFvdyF6/UtkxEN9XMrPPj3aM05ZVVv1diIHmccb B0M9DkYlnkSSUWh0AFMJTqPD0nf7ttzI8RgcLTgLvnXtWHgRwqLryHRhnQfVSHOOrp3R UaItxdSmTudHIoCzmpXn3saSyROJZ0HD4YHHtVlDaa4jJ4k0K26b7XOcv1k8L0v87dLE uCeuNbx7jIoKRzXF/8ii9Tz0mYn/LaK4dFAaT8le62rrdIrWTF4qSWRakWGhz7NyWgW+ sKGwKG6k/3q6hXb/0ii4EHMtbwASlTGntky2DzLGypeYcNXnh5aTVcdgdGbjY9BiUGig Y7uA== X-Gm-Message-State: AOAM531ivc5ZYKsya8ysz6ciFyhP1cPMK0aHcmoOK734TO9pHwd6KS7P uUQLXaEmMqFmCVgD0YogBGO6E/lse9APpfJRaUuOYAJaQe55xXaEUuivuuE2sMip22z3lOPGvDs OV6VSrhVVCDE= X-Received: by 2002:a0c:da04:: with SMTP id x4mr54367802qvj.71.1594162247278; Tue, 07 Jul 2020 15:50:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz91h7dze6hXBpExvldsXu0sEfg+FT9NjBcwqSN/tOXe3f7PIXsIg7+TlKvGVkbKH0rXidC5g== X-Received: by 2002:a0c:da04:: with SMTP id x4mr54367784qvj.71.1594162247063; Tue, 07 Jul 2020 15:50:47 -0700 (PDT) Received: from xz-x1.redhat.com ([2607:9880:19c0:32::2]) by smtp.gmail.com with ESMTPSA id j16sm26267642qtp.92.2020.07.07.15.50.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jul 2020 15:50:46 -0700 (PDT) From: Peter Xu To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: Gerald Schaefer , Linus Torvalds , peterx@redhat.com, Andrew Morton , Will Deacon , Andrea Arcangeli , David Rientjes , John Hubbard , Michael Ellerman , Jonas Bonn , Stefan Kristiansson , Stafford Horne , openrisc@lists.librecores.org Subject: [PATCH v5 14/25] mm/openrisc: Use general page fault accounting Date: Tue, 7 Jul 2020 18:50:10 -0400 Message-Id: <20200707225021.200906-15-peterx@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200707225021.200906-1-peterx@redhat.com> References: <20200707225021.200906-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: DCD143D668 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. 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: Jonas Bonn CC: Stefan Kristiansson CC: Stafford Horne CC: openrisc@lists.librecores.org Acked-by: Stafford Horne Signed-off-by: Peter Xu --- arch/openrisc/mm/fault.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/arch/openrisc/mm/fault.c b/arch/openrisc/mm/fault.c index 3daa491d1edb..ca97d9baab51 100644 --- a/arch/openrisc/mm/fault.c +++ b/arch/openrisc/mm/fault.c @@ -15,6 +15,7 @@ #include #include #include +#include =20 #include #include @@ -103,6 +104,8 @@ asmlinkage void do_page_fault(struct pt_regs *regs, u= nsigned long address, if (in_interrupt() || !mm) goto no_context; =20 + perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, address); + retry: mmap_read_lock(mm); vma =3D find_vma(mm, address); @@ -159,7 +162,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, u= nsigned long address, * the fault. */ =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)) return; @@ -176,10 +179,6 @@ asmlinkage void do_page_fault(struct pt_regs *regs, = unsigned long address, =20 if (flags & FAULT_FLAG_ALLOW_RETRY) { /*RGD modeled on Cris */ - if (fault & VM_FAULT_MAJOR) - tsk->maj_flt++; - else - tsk->min_flt++; if (fault & VM_FAULT_RETRY) { flags |=3D FAULT_FLAG_TRIED; =20 --=20 2.26.2