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 D61F5C433E1 for ; Fri, 19 Jun 2020 16:08:58 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 8F63C21532 for ; Fri, 19 Jun 2020 16:08:58 +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="OlAITeyX" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8F63C21532 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 3C6738D00BD; Fri, 19 Jun 2020 12:08:58 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 376AE8D00AD; Fri, 19 Jun 2020 12:08:58 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 265FC8D00BD; Fri, 19 Jun 2020 12:08:58 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0104.hostedemail.com [216.40.44.104]) by kanga.kvack.org (Postfix) with ESMTP id 0C8108D00AD for ; Fri, 19 Jun 2020 12:08:58 -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 C4CD8180ACA37 for ; Fri, 19 Jun 2020 16:08:57 +0000 (UTC) X-FDA: 76946445114.27.bead60_38125a626e1a Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin27.hostedemail.com (Postfix) with ESMTP id 69453354D7 for ; Fri, 19 Jun 2020 16:05:48 +0000 (UTC) X-HE-Tag: bead60_38125a626e1a X-Filterd-Recvd-Size: 5563 Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by imf18.hostedemail.com (Postfix) with ESMTP for ; Fri, 19 Jun 2020 16:05:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592582747; 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=OlAITeyXpJxHtKosLZoYPXapXbzRPe4jP5/uNTmFi5xkI0B+hrqKGqpyL2QdwJMLqqQD36 ohVkZCK/n8I6TkvgTYvaCtPhZYNZrfxJdlE6Qv3wYWcLa9qME2mZsjVribXG1VazR5RoW8 tpZEd8/YV+vxyEf33OGtZYlDhvIt30A= 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-308-DVlFT6ZcNiSc-S0voy35GQ-1; Fri, 19 Jun 2020 12:05:45 -0400 X-MC-Unique: DVlFT6ZcNiSc-S0voy35GQ-1 Received: by mail-qv1-f70.google.com with SMTP id ba13so7031363qvb.15 for ; Fri, 19 Jun 2020 09:05:45 -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=bwpymz0lmFmcfq2Zehm6osLHEaQb0c51O99qVx9VXVt0Vf+ijuAFXhOP1GJn3ErrsT 73uiBsDtAghxO7t9FpW2VJklHhGKCcUGuem/Oib/XA4vGTVarT6v915nn0vbdeEIyab8 3pa5JqEqAPHDucbpa22j1e7AjIP5Jf0QEWMDo7dsgqN6w1A/u4BWJTZX2vKGw0btkys3 QHUrOSQBy606hZZ1hLlIdP/TodYsJWDOTuhbmcvMg3PebZEiFV+h0mNJs6uDISzNpxtE 1e9tUbA7hiGMUCvlDQEsC7wllm/b5/46rb3g70C6TbQOpGR2GrTyeFcumioVRI7dp66H 5UeA== X-Gm-Message-State: AOAM530IfteFEKbnZwQ/kiWU5DKre+/buzvVLDBSNtFqlrgbAgKo0jmn 27d9gtizEDq1tXfNGhed6h9bSpssQfX1uCn6dV2RKiX6q1nY88oZ4pGWCygWoxCJNhxeY7Wift9 sVYMFwgo4tqs= X-Received: by 2002:a37:6d4:: with SMTP id 203mr1558343qkg.62.1592582745459; Fri, 19 Jun 2020 09:05:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw1Ah5qSbhiFYhHGzi97I57hEEaVVSsMBbZi7Nga0UAUiVp9Ck6HGvQPSjZ83MKPB5TgG3lyw== X-Received: by 2002:a37:6d4:: with SMTP id 203mr1558310qkg.62.1592582745151; Fri, 19 Jun 2020 09:05:45 -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.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jun 2020 09:05:44 -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 , Vineet Gupta , linux-snps-arc@lists.infradead.org Subject: [PATCH 03/26] mm/arc: Use general page fault accounting Date: Fri, 19 Jun 2020 12:05:15 -0400 Message-Id: <20200619160538.8641-4-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: 69453354D7 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