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.6 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,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 200C8C433DF for ; Fri, 19 Jun 2020 16:09:39 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id CC1A621532 for ; Fri, 19 Jun 2020 16:09:38 +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="JrVGhmK4" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CC1A621532 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 76F888D00BE; Fri, 19 Jun 2020 12:09:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 720568D00AD; Fri, 19 Jun 2020 12:09:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 635BB8D00BE; Fri, 19 Jun 2020 12:09:38 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0059.hostedemail.com [216.40.44.59]) by kanga.kvack.org (Postfix) with ESMTP id 4BF618D00AD for ; Fri, 19 Jun 2020 12:09:38 -0400 (EDT) Received: from smtpin15.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 0B50C181AC9C6 for ; Fri, 19 Jun 2020 16:09:38 +0000 (UTC) X-FDA: 76946446836.15.coal31_3813b8e26e1a Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin15.hostedemail.com (Postfix) with ESMTP id 7146018037FC3 for ; Fri, 19 Jun 2020 16:05:58 +0000 (UTC) X-HE-Tag: coal31_3813b8e26e1a X-Filterd-Recvd-Size: 5348 Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by imf35.hostedemail.com (Postfix) with ESMTP for ; Fri, 19 Jun 2020 16:05:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592582757; 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=YX1SShq6O2x1DHMP88Y+7d3iXwbELhsA/dlQ5QIA45o=; b=JrVGhmK45U7Zr05Lb8W8+nfyy7YYyWntBTjQKCstCqJ6AAAAF7UN7JGmSm87KW3tmkgGkg aAPr1ef8qB+zNze4oTWCQkpWCbaAQdYZWxj0QN/zD6o/DJPEm6n2HOd8iUFPCVpLl2StCu uQQSONQ8C93Qw0F4ZuqedXKEO7WmINA= Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-422-Ux-veNLeOmiKetCkI3tMoA-1; Fri, 19 Jun 2020 12:05:56 -0400 X-MC-Unique: Ux-veNLeOmiKetCkI3tMoA-1 Received: by mail-qv1-f72.google.com with SMTP id ba13so7032858qvb.15 for ; Fri, 19 Jun 2020 09:05:55 -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=YX1SShq6O2x1DHMP88Y+7d3iXwbELhsA/dlQ5QIA45o=; b=huQMEDiPfRkExtGRPWVIqC1ok9QcCzUtTfEtS3maV72jROAgOYLN9KhKwyF6hYqics DRfal9nKBtN1Y+oe6GDi1S2f/hWBT7YBrVSGNqxyAbtDp+a2TJLKC7tK8oZzk9p4tnZG 3BAksBWs6QPkJuWeOB9wJxHKRj5EPPR+14W+zJ1QXTTcsDA9XbVBSjtY9BXmxpg12+6W w+STYOM7E6HGay1lCYD2pqaDx45E0IeRWQCAz4pbwAFba9ftzmLI4Hl9DHCOflkvLF/+ Wh+IGfVL53z7cGT5fX+HVE6YsWo0q8tSmET8cKaZnB3FJ+nPtZYds0phge1GPd3cMFEl CIuQ== X-Gm-Message-State: AOAM5337jRJbmcHqWeqWSC7EReyKobnX6luY14bbF6MGJjueX4nyZGTU K96x9oSJnmfrnm0Z1e4l3O6Esvm3Pwa9xlKv4UbpsSprW+XBDhQ748l5J75toMehiDt/CuPQYSp wwjBatlu6K0c= X-Received: by 2002:ac8:260b:: with SMTP id u11mr4105555qtu.380.1592582755372; Fri, 19 Jun 2020 09:05:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw8QwZZxkgEFmPt6AZgLJp9Xz1I4hFPFifumyMXU4bDr2uo3ojnJGbh+6QgvE5DO5po/9pEuw== X-Received: by 2002:ac8:260b:: with SMTP id u11mr4105527qtu.380.1592582755088; Fri, 19 Jun 2020 09:05:55 -0700 (PDT) Received: from xz-x1.redhat.com ([2607:9880:19c0:32::2]) by smtp.gmail.com with ESMTPSA id g11sm6412604qkk.123.2020.06.19.09.05.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jun 2020 09:05:54 -0700 (PDT) From: Peter Xu To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: Gerald Schaefer , peterx@redhat.com, Andrew Morton , Andrea Arcangeli , Will Deacon , Michael Ellerman , Linus Torvalds Subject: [PATCH 08/26] mm/ia64: Use general page fault accounting Date: Fri, 19 Jun 2020 12:05:20 -0400 Message-Id: <20200619160538.8641-9-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: 7146018037FC3 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(). Signed-off-by: Peter Xu --- arch/ia64/mm/fault.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c index caa93e083c9d..613255e947a8 100644 --- a/arch/ia64/mm/fault.c +++ b/arch/ia64/mm/fault.c @@ -14,6 +14,7 @@ #include #include #include +#include =20 #include #include @@ -101,6 +102,8 @@ ia64_do_page_fault (unsigned long address, unsigned l= ong isr, struct pt_regs *re flags |=3D FAULT_FLAG_USER; if (mask & VM_WRITE) flags |=3D FAULT_FLAG_WRITE; + + perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, address); retry: down_read(&mm->mmap_sem); =20 @@ -139,7 +142,7 @@ ia64_do_page_fault (unsigned long address, unsigned l= ong isr, struct pt_regs *re * 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; @@ -162,10 +165,6 @@ ia64_do_page_fault (unsigned long address, unsigned = long isr, struct pt_regs *re } =20 if (flags & FAULT_FLAG_ALLOW_RETRY) { - if (fault & VM_FAULT_MAJOR) - current->maj_flt++; - else - current->min_flt++; if (fault & VM_FAULT_RETRY) { flags |=3D FAULT_FLAG_TRIED; =20 --=20 2.26.2