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,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 88C5CC433DF for ; Fri, 26 Jun 2020 22:31:44 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 4513E20885 for ; Fri, 26 Jun 2020 22:31:44 +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="eAxsZnzI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4513E20885 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 E3FE46B000E; Fri, 26 Jun 2020 18:31:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DC93F6B000D; Fri, 26 Jun 2020 18:31:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C429D6B000E; Fri, 26 Jun 2020 18:31:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0133.hostedemail.com [216.40.44.133]) by kanga.kvack.org (Postfix) with ESMTP id A4BBD6B000A for ; Fri, 26 Jun 2020 18:31:40 -0400 (EDT) Received: from smtpin07.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 668BF181ABE85 for ; Fri, 26 Jun 2020 22:31:40 +0000 (UTC) X-FDA: 76972811160.07.soda23_18148d526e59 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin07.hostedemail.com (Postfix) with ESMTP id 399991803F9A9 for ; Fri, 26 Jun 2020 22:31:40 +0000 (UTC) X-HE-Tag: soda23_18148d526e59 X-Filterd-Recvd-Size: 5570 Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by imf38.hostedemail.com (Postfix) with ESMTP for ; Fri, 26 Jun 2020 22:31:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593210699; 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=ZrEBS+6D6tr7sKM8RKvuVARuC8ujPdG5Fi1hrXsWHAc=; b=eAxsZnzINYTqAAZyMhO+uQCayEi+xFriNj3yml/LeEkufIpMU8BazzqDCk0XMpXWZAiomq ROwDGej3YuaGAFXwlZFR3KoytytSXT7lt14lCdPmAqz4fUyYRwCF6Gbs0U+9/Q4MCzEVD6 OjtBNMUPLjxPXG/Hm3effvQc3pXwWLg= Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-307-_lq0OobbNo-RH5ITaw52Gg-1; Fri, 26 Jun 2020 18:31:38 -0400 X-MC-Unique: _lq0OobbNo-RH5ITaw52Gg-1 Received: by mail-qv1-f71.google.com with SMTP id g17so5599120qvw.0 for ; Fri, 26 Jun 2020 15:31:37 -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=ZrEBS+6D6tr7sKM8RKvuVARuC8ujPdG5Fi1hrXsWHAc=; b=N1urR6S+KCcYltQ1MW3lB2fG4+1gO4heRAn45Aevt2nIrMA2KOtD/ZV1CNBl4rb0AL 0n+gcD6BTJ4p6JaXI1Zv0a2WuA91PSX8J04eJ8VUL1SebSuLRXK6lBR2j3CJNp+eO/8c 9BmsEIf0mhNlqZ7Px1aqaZQyi8iP//anBMviomcknPNdMPyhQzQMvxo6QSopXmdfMc6W YptgLkwvFCfbKfQA5bCilHMlNBoXlPT94RX1CSk9IXhpuL75XtXBXvgZSwkJFEGdIgyU 2NmQhvwGr/jTixSaQ7++N+2HZBDPYoQWwuqIzR8h2Qk+uIrFGG42DX7GGouLRq4rJ3rg HiEw== X-Gm-Message-State: AOAM530r5/7RE+Casrj5aubXXO+NfTUf5l3+uilG+HUvsRqP3QGhP2Pv cjL5IHtizvtdzbhZ4Iu2jZrkArtATG42s5UOUP8JWID+6xqRuSZicRH0K/CaKZQSq1nUA0JsPLj JRlw62MQKdb0= X-Received: by 2002:ac8:3438:: with SMTP id u53mr5257913qtb.102.1593210697047; Fri, 26 Jun 2020 15:31:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyypwZl81DCOa9IcPJnHElr7C3d8MHgy+sT0obHjubCfmpU7Euqfw3mBtLPdpkmWRiHkTsPYg== X-Received: by 2002:ac8:3438:: with SMTP id u53mr5257884qtb.102.1593210696782; Fri, 26 Jun 2020 15:31:36 -0700 (PDT) Received: from xz-x1.redhat.com ([2607:9880:19c0:32::2]) by smtp.gmail.com with ESMTPSA id f203sm9903311qke.135.2020.06.26.15.31.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2020 15:31:36 -0700 (PDT) From: Peter Xu To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Andrew Morton , Linus Torvalds , Gerald Schaefer , Andrea Arcangeli , Will Deacon , peterx@redhat.com, Michael Ellerman , Vineet Gupta , linux-snps-arc@lists.infradead.org Subject: [PATCH 03/26] mm/arc: Use general page fault accounting Date: Fri, 26 Jun 2020 18:31:07 -0400 Message-Id: <20200626223130.199227-4-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 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII X-Rspamd-Queue-Id: 399991803F9A9 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam03 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. Fix PERF_COUNT_SW_PAGE_FAULTS perf event manually for page fault retries,= by moving it before taking mmap_sem. CC: Vineet Gupta CC: linux-snps-arc@lists.infradead.org Signed-off-by: Peter Xu --- arch/arc/mm/fault.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/arch/arc/mm/fault.c b/arch/arc/mm/fault.c index 34380139e7a2..68e6849cf086 100644 --- a/arch/arc/mm/fault.c +++ b/arch/arc/mm/fault.c @@ -106,6 +106,7 @@ void do_page_fault(unsigned long address, struct pt_r= egs *regs) if (write) flags |=3D FAULT_FLAG_WRITE; =20 + perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, address); retry: down_read(&mm->mmap_sem); =20 @@ -131,7 +132,7 @@ void do_page_fault(unsigned long address, struct pt_r= egs *regs) goto bad_area; } =20 - fault =3D handle_mm_fault(vma, address, flags, NULL); + fault =3D handle_mm_fault(vma, address, flags, regs); =20 /* Quick path to respond to signals */ if (fault_signal_pending(fault, regs)) { @@ -156,22 +157,9 @@ void do_page_fault(unsigned long address, struct pt_= regs *regs) * Major/minor page fault accounting * (in case of retry we only land here once) */ - perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, address); - - if (likely(!(fault & VM_FAULT_ERROR))) { - if (fault & VM_FAULT_MAJOR) { - tsk->maj_flt++; - perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MAJ, 1, - regs, address); - } else { - tsk->min_flt++; - perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MIN, 1, - regs, address); - } - + if (likely(!(fault & VM_FAULT_ERROR))) /* Normal return path: fault Handled Gracefully */ return; - } =20 if (!user_mode(regs)) goto no_context; --=20 2.26.2