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 5A752C433DF for ; Fri, 19 Jun 2020 16:14:09 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 163E4217A0 for ; Fri, 19 Jun 2020 16:14:09 +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="I/6GWipW" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 163E4217A0 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 B67B48D00C4; Fri, 19 Jun 2020 12:14:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B15CC8D00AD; Fri, 19 Jun 2020 12:14:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9B6CC8D00C4; Fri, 19 Jun 2020 12:14:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0107.hostedemail.com [216.40.44.107]) by kanga.kvack.org (Postfix) with ESMTP id 7FCE18D00AD for ; Fri, 19 Jun 2020 12:14:08 -0400 (EDT) Received: from smtpin30.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 40CE4180ADD1A for ; Fri, 19 Jun 2020 16:14:08 +0000 (UTC) X-FDA: 76946458176.30.wheel41_4e0fe1c26e1a Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin30.hostedemail.com (Postfix) with ESMTP id 0BC0318215133 for ; Fri, 19 Jun 2020 16:14:08 +0000 (UTC) X-HE-Tag: wheel41_4e0fe1c26e1a X-Filterd-Recvd-Size: 8663 Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by imf46.hostedemail.com (Postfix) with ESMTP for ; Fri, 19 Jun 2020 16:14:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592583247; 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=ceY5WUXlxKdkNl2ZPUhmC7i0B7kz37sYu0bxG24wxmk=; b=I/6GWipWw5wITgbXGTR5YicREojIQY2Qcs/nCmEhYDq09OigWO4alXrChz0/EHFUkZSJ3n B8/PQAN3N99696rNFU/9f/+6u7sckqvc/VQi3kwBzK3dGYHUawY2SA7mw7O+JWZ58bXlai rs9Fb9FMT5aXRDOeEwu3lwFyDmEFMs4= 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-40-qpKhPLJBODWLOyxgxRsD4w-1; Fri, 19 Jun 2020 12:14:05 -0400 X-MC-Unique: qpKhPLJBODWLOyxgxRsD4w-1 Received: by mail-qv1-f72.google.com with SMTP id t20so7081257qvy.16 for ; Fri, 19 Jun 2020 09:14:05 -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=ceY5WUXlxKdkNl2ZPUhmC7i0B7kz37sYu0bxG24wxmk=; b=Z5hDs0nKw5dABpnqV7KeOy62tYowJngMBux67oeNM2w569m65WUQvgIIwwApvijz9V pjkCw/h5ED/uD4dzzr5O3SEgMWXsG7jXoZmFU1Y6T+4Ituon3ZMIu8hphxscsWnyLjLh jfGjWqO1IF/o3gF/BzW+xRrJ/4b9ysF+ERxrK1gmBOP6CZw7zUEzsJoX9c1TWcR5v9Kv iOox03Pa0gHbxlISkqcTsNlXAbU/UOkqMM9U+bLHxc3TRXrMawXGL0WpGGUGCGjEHyEW Rl2iPT+Wk2+6QLKt61uu2EW06fh2vAnOKDZYfTTOM1DbzYeHmHFbuQXRDhiymHTX4Tw4 t3Rg== X-Gm-Message-State: AOAM532hvM5ydYVZ64YIUhbqh8vgT7YEHV5wdk7+EMk6d1zmQwC1NiDv 0M0NRa9YjIcnXYOypzeE80LZ0Sa5L1D6+CNNdCPDUaN/SmM8GYawBWnIog0SipNlPycfT4vMfln MGvXieOnzyhU= X-Received: by 2002:a0c:ee41:: with SMTP id m1mr9169864qvs.95.1592583245030; Fri, 19 Jun 2020 09:14:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy0zCecxV9JtXknOOZNLR2+6hLoId0LmwX50hMH84sIFNjeC89K0w8Jv2AYP2pWScsHfroN5Q== X-Received: by 2002:a0c:ee41:: with SMTP id m1mr9169833qvs.95.1592583244707; Fri, 19 Jun 2020 09:14:04 -0700 (PDT) Received: from xz-x1.redhat.com ([2607:9880:19c0:32::2]) by smtp.gmail.com with ESMTPSA id s4sm6383847qkh.120.2020.06.19.09.14.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jun 2020 09:14:04 -0700 (PDT) From: Peter Xu To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: Peter Xu , Gerald Schaefer , Andrew Morton , Andrea Arcangeli , Will Deacon , Michael Ellerman , Linus Torvalds Subject: [PATCH 25/26] mm: Clean up the last pieces of page fault accountings Date: Fri, 19 Jun 2020 12:14:02 -0400 Message-Id: <20200619161402.10004-1-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 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: 0BC0318215133 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam04 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: Here're the last pieces of page fault accounting that were still done out= side handle_mm_fault() where we still have regs=3D=3DNULL when calling handle_= mm_fault(): arch/powerpc/mm/copro_fault.c: copro_handle_mm_fault arch/sparc/mm/fault_32.c: force_user_fault arch/um/kernel/trap.c: handle_page_fault mm/gup.c: faultin_page fixup_user_fault mm/hmm.c: hmm_vma_fault mm/ksm.c: break_ksm Some of them has the issue of duplicated accounting for page fault retrie= s. Some of them didn't do the accounting at all. This patch cleans all these up by letting handle_mm_fault() to do per-tas= k page fault accounting even if regs=3D=3DNULL (though we'll still skip the perf= event accountings). With that, we can safely remove all the outliers now. There's another functional change in that now we account the page faults = to the caller of gup, rather than the task_struct that passed into the gup code.= More information of this can be found at [1]. After this patch, below things should never be touched again outside handle_mm_fault(): - task_struct.[maj|min]_flt - PERF_COUNT_SW_PAGE_FAULTS_[MAJ|MIN] [1] https://lore.kernel.org/lkml/CAHk-=3Dwj_V2Tps2QrMn20_W0OJF9xqNh52XSGA= 42s-ZJ8Y+GyKw@mail.gmail.com/ Signed-off-by: Peter Xu --- arch/powerpc/mm/copro_fault.c | 5 ----- arch/um/kernel/trap.c | 4 ---- mm/gup.c | 13 ------------- mm/memory.c | 20 ++++++++++++-------- 4 files changed, 12 insertions(+), 30 deletions(-) diff --git a/arch/powerpc/mm/copro_fault.c b/arch/powerpc/mm/copro_fault.= c index c0478bef1f14..2e59be1a9359 100644 --- a/arch/powerpc/mm/copro_fault.c +++ b/arch/powerpc/mm/copro_fault.c @@ -76,11 +76,6 @@ int copro_handle_mm_fault(struct mm_struct *mm, unsign= ed long ea, BUG(); } =20 - if (*flt & VM_FAULT_MAJOR) - current->maj_flt++; - else - current->min_flt++; - out_unlock: up_read(&mm->mmap_sem); return ret; diff --git a/arch/um/kernel/trap.c b/arch/um/kernel/trap.c index 32cc8f59322b..c881831de357 100644 --- a/arch/um/kernel/trap.c +++ b/arch/um/kernel/trap.c @@ -92,10 +92,6 @@ int handle_page_fault(unsigned long address, unsigned = long ip, BUG(); } 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 diff --git a/mm/gup.c b/mm/gup.c index 1a48c639ea49..17b4d0c45a6b 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -885,13 +885,6 @@ static int faultin_page(struct task_struct *tsk, str= uct vm_area_struct *vma, BUG(); } =20 - if (tsk) { - if (ret & VM_FAULT_MAJOR) - tsk->maj_flt++; - else - tsk->min_flt++; - } - if (ret & VM_FAULT_RETRY) { if (locked && !(fault_flags & FAULT_FLAG_RETRY_NOWAIT)) *locked =3D 0; @@ -1239,12 +1232,6 @@ int fixup_user_fault(struct task_struct *tsk, stru= ct mm_struct *mm, goto retry; } =20 - if (tsk) { - if (major) - tsk->maj_flt++; - else - tsk->min_flt++; - } return 0; } EXPORT_SYMBOL_GPL(fixup_user_fault); diff --git a/mm/memory.c b/mm/memory.c index 23c738b3756e..59a2989231fa 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -4350,6 +4350,8 @@ static vm_fault_t __handle_mm_fault(struct vm_area_= struct *vma, /** * mm_account_fault - Do page fault accountings * @regs: the pt_regs struct pointer. When set to NULL, will skip accou= nting + * of perf event counters, but we'll still do the per-task accoun= ting to + * the task who triggered this page fault. * @address: faulted address. * @major: whether this is a major fault. * @@ -4365,16 +4367,18 @@ static vm_fault_t __handle_mm_fault(struct vm_are= a_struct *vma, static inline void mm_account_fault(struct pt_regs *regs, unsigned long address, bool major) { + if (major) + current->maj_flt++; + else + current->min_flt++; + if (!regs) return; =20 - if (major) { - current->maj_flt++; + if (major) perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MAJ, 1, regs, address); - } else { - current->min_flt++; + else perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MIN, 1, regs, address); - } } =20 /* @@ -4450,9 +4454,9 @@ vm_fault_t handle_mm_fault(struct vm_area_struct *v= ma, unsigned long address, * immediately previously). * * - if the fault is done for GUP, regs wil be NULL and - * no accounting will be done (but you _could_ pass in - * your own regs and it would be accounted to the thread - * doing the fault, not to the target!) + * we only do the accounting for the per thread fault + * counters who triggered the fault, and we skip the + * perf event updates. */ mm_account_fault(regs, address, (ret & VM_FAULT_MAJOR) || (flags & FAULT_FLAG_TRIED)); --=20 2.26.2