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 D6834C433DF for ; Fri, 19 Jun 2020 16:13:53 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 8D97D2168B for ; Fri, 19 Jun 2020 16:13:53 +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="EqHl4ycS" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8D97D2168B 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 3C53C8D00C2; Fri, 19 Jun 2020 12:13:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 374B18D00AD; Fri, 19 Jun 2020 12:13:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 263CB8D00C2; Fri, 19 Jun 2020 12:13:53 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0080.hostedemail.com [216.40.44.80]) by kanga.kvack.org (Postfix) with ESMTP id 08E468D00AD for ; Fri, 19 Jun 2020 12:13:53 -0400 (EDT) Received: from smtpin10.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 9E8122EC43 for ; Fri, 19 Jun 2020 16:13:52 +0000 (UTC) X-FDA: 76946457504.10.game87_350a1c226e1a Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin10.hostedemail.com (Postfix) with ESMTP id 2679B2D4D9 for ; Fri, 19 Jun 2020 16:13:34 +0000 (UTC) X-HE-Tag: game87_350a1c226e1a X-Filterd-Recvd-Size: 5045 Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by imf24.hostedemail.com (Postfix) with ESMTP for ; Fri, 19 Jun 2020 16:13:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592583213; 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=8qSToaPYAxy41TNCcRoZVJZv9P7/HBXlbwWJ2Rk2g+I=; b=EqHl4ycSS5u2oU9hPLnzBKqPSF0s90WDgz9l4AOYVRMd8XHIzCkERMJ+kpckAqJjW5xq7R /4uCjQJ7t7YRLRnx/mNYuKHbqfGILzfKazHoUS8PELrXS5sGbKrdCyQReqR1M5xiOALI5r iq4kuw3HB4XTxkwRSiM5U9jv28isXIg= 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-381-htguvb4cNbiLFEpoRyeCMw-1; Fri, 19 Jun 2020 12:13:31 -0400 X-MC-Unique: htguvb4cNbiLFEpoRyeCMw-1 Received: by mail-qv1-f70.google.com with SMTP id g13so359436qvp.5 for ; Fri, 19 Jun 2020 09:13:31 -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=8qSToaPYAxy41TNCcRoZVJZv9P7/HBXlbwWJ2Rk2g+I=; b=R3tyDbkUhBTkIKJCeFcS5K3EJ3s/MnAak71MTNBgb+3UmxZUtnow3HUGh9DUKgnTB2 29wlK5crV5GK/KGtAoYKK+/L1bZndNKr1UTDatYqOk35l+EMO7g7Nmuzqr9OO+NsPdjD hRy/F+PP620s5b9zfYEbMX8c2SmRPxVw8C6yspsy0FruCWGnVkCb0jBzbUW25rv4ds/h 4ioWv0SPPW0QH48JD9pp0aExpy0fnqAxkqY7+9SSlLCT8zbKRRM3r46Xyww2Fdg3KnhO 1e8wWhwUm19lIuVJoKEaEZUmRstzeurPZY84676FcU12gzQfxlhbAonw/mP/PGn1s7L2 9TWg== X-Gm-Message-State: AOAM5307BDj5veQw8oOfpMTjWq/ykofhntOJqYWeYhODDLDBkhvMf0Eu AzrDx9htPHfdWrfL4W9oc0mDhPh8oHGF51rZ1ZIzN88JJigASwhkIIrO35FkHkur/LXdZTfAbEp TExklKbYKTU4= X-Received: by 2002:ac8:46d6:: with SMTP id h22mr4171901qto.145.1592583211170; Fri, 19 Jun 2020 09:13:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxPf3L9dwnzhcKrCo1xqDr8zLwbACSJhy9YaZ+W+WiIy3zkGSSlH37gZSMbp9D62VN2NzGxsA== X-Received: by 2002:ac8:46d6:: with SMTP id h22mr4171872qto.145.1592583210896; Fri, 19 Jun 2020 09:13:30 -0700 (PDT) Received: from xz-x1.redhat.com ([2607:9880:19c0:32::2]) by smtp.gmail.com with ESMTPSA id s52sm7597075qtb.3.2020.06.19.09.13.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jun 2020 09:13:30 -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 , Benjamin Herrenschmidt , Paul Mackerras , linuxppc-dev@lists.ozlabs.org Subject: [PATCH 16/26] mm/powerpc: Use general page fault accounting Date: Fri, 19 Jun 2020 12:13:27 -0400 Message-Id: <20200619161327.9564-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 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII X-Rspamd-Queue-Id: 2679B2D4D9 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(). CC: Michael Ellerman CC: Benjamin Herrenschmidt CC: Paul Mackerras CC: linuxppc-dev@lists.ozlabs.org Signed-off-by: Peter Xu --- arch/powerpc/mm/fault.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c index 992b10c3761c..e325d13efaf5 100644 --- a/arch/powerpc/mm/fault.c +++ b/arch/powerpc/mm/fault.c @@ -563,7 +563,7 @@ static int __do_page_fault(struct pt_regs *regs, unsi= gned long address, * 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 #ifdef CONFIG_PPC_MEM_KEYS /* @@ -604,14 +604,9 @@ static int __do_page_fault(struct pt_regs *regs, uns= igned long address, /* * Major/minor page fault accounting. */ - if (major) { - current->maj_flt++; - perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MAJ, 1, regs, address); + if (major) cmo_account_page_fault(); - } else { - current->min_flt++; - perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MIN, 1, regs, address); - } + return 0; } NOKPROBE_SYMBOL(__do_page_fault); --=20 2.26.2