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 F2516C433E0 for ; Tue, 7 Jul 2020 22:50:40 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id B4E1120720 for ; Tue, 7 Jul 2020 22:50:40 +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="ZMrtCybo" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B4E1120720 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 9F6DC6B00AA; Tue, 7 Jul 2020 18:50:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 97DAB6B00A6; Tue, 7 Jul 2020 18:50:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7A8566B00AC; Tue, 7 Jul 2020 18:50:36 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0162.hostedemail.com [216.40.44.162]) by kanga.kvack.org (Postfix) with ESMTP id 5CB006B00A6 for ; Tue, 7 Jul 2020 18:50:36 -0400 (EDT) Received: from smtpin07.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 20FE62C78 for ; Tue, 7 Jul 2020 22:50:36 +0000 (UTC) X-FDA: 77012775672.07.pig27_2501ad726eb8 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin07.hostedemail.com (Postfix) with ESMTP id E420F1803F9B0 for ; Tue, 7 Jul 2020 22:50:35 +0000 (UTC) X-HE-Tag: pig27_2501ad726eb8 X-Filterd-Recvd-Size: 6847 Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by imf41.hostedemail.com (Postfix) with ESMTP for ; Tue, 7 Jul 2020 22:50:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594162234; 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=EjHuThpSN4MTMc6/ZiQrvbTE5N9rIyqvyo4j3Ae/jMQ=; b=ZMrtCyboqeuVW0ctyQFEzxAaGHSRM/y3VfdHSocghCqNQhiZ9E5Fo8kwf7+dVW8ocdd6t/ 3AAPnyhRl3HeG1vdreKffhGvgfaDHm69HBDA0bxfoZDkm8uas9CBM0wK+6UGoyFyTfqzgh KeVHsmnyybe7DjA9H4WosU9c8qqiqX8= Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-16-B6QMw0WbP-SBnBtzbL5ddw-1; Tue, 07 Jul 2020 18:50:33 -0400 X-MC-Unique: B6QMw0WbP-SBnBtzbL5ddw-1 Received: by mail-qk1-f198.google.com with SMTP id 13so14829989qks.11 for ; Tue, 07 Jul 2020 15:50:33 -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=EjHuThpSN4MTMc6/ZiQrvbTE5N9rIyqvyo4j3Ae/jMQ=; b=Oyb9f8jBTpwa6z+UpQjOYQWp/SUKs8lXQFAb/97ax856lmQ79EMKt39eibb2w+OkzF OOVq4MfNJNMJ6rkptwlCwyWpVe/fqqg3coRRGBHAdSiNw+nvJkoAiBP4UMpJyF16Ldim /maF/ajO6wx17JhPK8T30Zg+N5FyYqb/ouWtKaVKp2iB2MppK6x2Mh/LPkgiE2ON9X2b 9VUfWPkuvTN7CmZ2x4rVbXJ3KfDR7IEQ0/VD0WXddrJPlIgnNivvZvptrZMyF0p8NR1O Hgp7jeJjXI0CNl/LCTzZ0Cv8jb7EOWB4tz0iDCxE+phtOPz7oqMn5NoASImb3XH0MagI 0PRA== X-Gm-Message-State: AOAM530t/k4oNEgzjwAUoXpoThAkBZIR1jAupMKzuTV1CD0xTrFZF6Qb S9fEg7cOCrDUJ0mneYCsldiZIyPc8QetdlRQMol7xzr7PV/kJ/C+rHGnV4H9gT5tj1PRA4JBcUK o/dIJKi4T5KA= X-Received: by 2002:ac8:4d5d:: with SMTP id x29mr57898340qtv.358.1594162232810; Tue, 07 Jul 2020 15:50:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyKs84wiAnpkRkYMFU65uBv9KDGiwUMHAvWd757+lDwcSvLqmU3BsGAsJ394Lj65TO/7Bc44g== X-Received: by 2002:ac8:4d5d:: with SMTP id x29mr57898318qtv.358.1594162232589; Tue, 07 Jul 2020 15:50:32 -0700 (PDT) Received: from xz-x1.redhat.com ([2607:9880:19c0:32::2]) by smtp.gmail.com with ESMTPSA id j16sm26267642qtp.92.2020.07.07.15.50.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jul 2020 15:50:31 -0700 (PDT) From: Peter Xu To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: Gerald Schaefer , Linus Torvalds , peterx@redhat.com, Andrew Morton , Will Deacon , Andrea Arcangeli , David Rientjes , John Hubbard , Michael Ellerman , Catalin Marinas , linux-arm-kernel@lists.infradead.org Subject: [PATCH v5 05/25] mm/arm64: Use general page fault accounting Date: Tue, 7 Jul 2020 18:50:01 -0400 Message-Id: <20200707225021.200906-6-peterx@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200707225021.200906-1-peterx@redhat.com> References: <20200707225021.200906-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: E420F1803F9B0 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam01 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. To do this, we pass pt_regs pointer into __do_page_fault= (). CC: Catalin Marinas CC: Will Deacon CC: linux-arm-kernel@lists.infradead.org Acked-by: Will Deacon Signed-off-by: Peter Xu --- arch/arm64/mm/fault.c | 29 ++++++----------------------- 1 file changed, 6 insertions(+), 23 deletions(-) diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index f885940035ce..a3bd189602df 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -404,7 +404,8 @@ static void do_bad_area(unsigned long addr, unsigned = int esr, struct pt_regs *re #define VM_FAULT_BADACCESS 0x020000 =20 static vm_fault_t __do_page_fault(struct mm_struct *mm, unsigned long ad= dr, - unsigned int mm_flags, unsigned long vm_flags) + unsigned int mm_flags, unsigned long vm_flags, + struct pt_regs *regs) { struct vm_area_struct *vma =3D find_vma(mm, addr); =20 @@ -428,7 +429,7 @@ static vm_fault_t __do_page_fault(struct mm_struct *m= m, unsigned long addr, */ if (!(vma->vm_flags & vm_flags)) return VM_FAULT_BADACCESS; - return handle_mm_fault(vma, addr & PAGE_MASK, mm_flags, NULL); + return handle_mm_fault(vma, addr & PAGE_MASK, mm_flags, regs); } =20 static bool is_el0_instruction_abort(unsigned int esr) @@ -450,7 +451,7 @@ static int __kprobes do_page_fault(unsigned long addr= , unsigned int esr, { const struct fault_info *inf; struct mm_struct *mm =3D current->mm; - vm_fault_t fault, major =3D 0; + vm_fault_t fault; unsigned long vm_flags =3D VM_ACCESS_FLAGS; unsigned int mm_flags =3D FAULT_FLAG_DEFAULT; =20 @@ -516,8 +517,7 @@ static int __kprobes do_page_fault(unsigned long addr= , unsigned int esr, #endif } =20 - fault =3D __do_page_fault(mm, addr, mm_flags, vm_flags); - major |=3D fault & VM_FAULT_MAJOR; + fault =3D __do_page_fault(mm, addr, mm_flags, vm_flags, regs); =20 /* Quick path to respond to signals */ if (fault_signal_pending(fault, regs)) { @@ -538,25 +538,8 @@ static int __kprobes do_page_fault(unsigned long add= r, unsigned int esr, * Handle the "normal" (no error) case first. */ if (likely(!(fault & (VM_FAULT_ERROR | VM_FAULT_BADMAP | - VM_FAULT_BADACCESS)))) { - /* - * Major/minor page fault accounting is only done - * once. If we go through a retry, it is extremely - * likely that the page will be found in page cache at - * that point. - */ - if (major) { - current->maj_flt++; - perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MAJ, 1, regs, - addr); - } else { - current->min_flt++; - perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MIN, 1, regs, - addr); - } - + VM_FAULT_BADACCESS)))) return 0; - } =20 /* * If we are in kernel mode at this point, we have no context to --=20 2.26.2