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 AABC7C433E0 for ; Fri, 26 Jun 2020 22:36:29 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 65D7A2089D for ; Fri, 26 Jun 2020 22:36:29 +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="RIpITbH7" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 65D7A2089D 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 16BEB6B0010; Fri, 26 Jun 2020 18:36:29 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 11E986B0022; Fri, 26 Jun 2020 18:36:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 031ED6B0023; Fri, 26 Jun 2020 18:36:28 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0048.hostedemail.com [216.40.44.48]) by kanga.kvack.org (Postfix) with ESMTP id DAC476B0010 for ; Fri, 26 Jun 2020 18:36:28 -0400 (EDT) Received: from smtpin20.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id A2970824556B for ; Fri, 26 Jun 2020 22:36:28 +0000 (UTC) X-FDA: 76972823256.20.boys49_5f0079f26e59 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin20.hostedemail.com (Postfix) with ESMTP id 77A26180C0609 for ; Fri, 26 Jun 2020 22:36:28 +0000 (UTC) X-HE-Tag: boys49_5f0079f26e59 X-Filterd-Recvd-Size: 5171 Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by imf40.hostedemail.com (Postfix) with ESMTP for ; Fri, 26 Jun 2020 22:36:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593210987; 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=RIpITbH7svrXy+/T6dgKE+cCoViK5yC/1koVCu/dySZw08mSAxf5pkXUPDeNLdm0eGE2SJ ab7qrMpHwIttHMUXWCSf0TYtC4gH3+1nDgb9ZzI8psAHUATKEMrDVdQ/kC2tHAXm5eHI5O lqeGu5vk7PcufeqoYPdtZE2y01Z7a2U= Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-103-wRhnRf1vNTaLZhF902LoRw-1; Fri, 26 Jun 2020 18:36:25 -0400 X-MC-Unique: wRhnRf1vNTaLZhF902LoRw-1 Received: by mail-qt1-f199.google.com with SMTP id u93so7530793qtd.8 for ; Fri, 26 Jun 2020 15:36:25 -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=CfSb3web67/gX+gd6+rFo3YIHzWybaP5bVlys5scy1G0O+Ej5tnpwiDaZdfW6wTEsc BDP62JtwF9UXZaMIESlEavkvgznRjZQOSk6bq2Mv6H56zfvOBVX3RKJUqqKjPUdHpAFd W8Xbb7D5mpQawMXjOYgE8dg7ZQgdbav/2RffUInwNEh87lKQv2NOjLK+HUHcdBK3sVis HrlMu4ZbmOR61opzYO5Jmdn1i40GwIAS513sCy13+m4lY8jjpVrH0ekwLS1bnf9nKRq6 je9Uebf8AsrU2Uqvl58Uk2KMwvHV36sJqno3jPNoha7x5Zv2Lt/cEkhxEkmYZutVWhtZ 9E/A== X-Gm-Message-State: AOAM532ujNPv5n6+LPpEtISvxnx6QB6l6B/S9a3B+EbCZES34tgi5BWj qjF6Op5Cva3Pd73ZRwttqMHmK2LPsl/q8eobJp09uJBXkoYaXs+3iarHYIIS5cXcEJbQ8gzQf4z RP4ymNa5NPr4= X-Received: by 2002:a37:dcc3:: with SMTP id v186mr4839636qki.393.1593210985198; Fri, 26 Jun 2020 15:36:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxCBCcJ2UOlHKiOErZOy/wQGbA8OVSFmjMRFnS3kp8IUFptdYH3jiRcE+pFBOUD78E2vWdkxQ== X-Received: by 2002:a37:dcc3:: with SMTP id v186mr4839619qki.393.1593210984950; Fri, 26 Jun 2020 15:36:24 -0700 (PDT) Received: from xz-x1.redhat.com ([2607:9880:19c0:32::2]) by smtp.gmail.com with ESMTPSA id p125sm9108324qke.78.2020.06.26.15.36.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2020 15:36:24 -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 , Benjamin Herrenschmidt , Paul Mackerras , linuxppc-dev@lists.ozlabs.org Subject: [PATCH 16/26] mm/powerpc: Use general page fault accounting Date: Fri, 26 Jun 2020 18:36:22 -0400 Message-Id: <20200626223622.199765-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 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: 77A26180C0609 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