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 63C8BC433DF for ; Tue, 7 Jul 2020 22:51:26 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 1BDA32075B for ; Tue, 7 Jul 2020 22:51:26 +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="GG1unZHQ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1BDA32075B 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 6B9CF6B00D3; Tue, 7 Jul 2020 18:51:20 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 66DA16B00D5; Tue, 7 Jul 2020 18:51:20 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 50DCD6B00D6; Tue, 7 Jul 2020 18:51:20 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0035.hostedemail.com [216.40.44.35]) by kanga.kvack.org (Postfix) with ESMTP id 3A2AB6B00D3 for ; Tue, 7 Jul 2020 18:51:20 -0400 (EDT) Received: from smtpin10.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 02BA88248D52 for ; Tue, 7 Jul 2020 22:51:20 +0000 (UTC) X-FDA: 77012777520.10.plot97_3311a0326eb8 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin10.hostedemail.com (Postfix) with ESMTP id 777D516A4A4 for ; Tue, 7 Jul 2020 22:51:12 +0000 (UTC) X-HE-Tag: plot97_3311a0326eb8 X-Filterd-Recvd-Size: 7932 Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by imf30.hostedemail.com (Postfix) with ESMTP for ; Tue, 7 Jul 2020 22:51:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594162271; 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=NJjL1mXsjMkVQ/047kV0rS5FUrA3V1hN/izl2cQ6Ufs=; b=GG1unZHQYOu5/OIcTgMHaktbGetwsQnGIt2aIr2jZUT1dJ9hE9Sopie3qOQ+SnajpiMxxk Jj59aMBZ9FlJTlzPnOx9djx0z47gTq00MUH2a42ImoexiqnsMv+xxQnjRGau/ALg6MeWcc Rn7py1cJuHIT0rl8lbTzsXPohNuW9BY= Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-2-3jwOfW2JMJyRIWkfrJoT8g-1; Tue, 07 Jul 2020 18:51:04 -0400 X-MC-Unique: 3jwOfW2JMJyRIWkfrJoT8g-1 Received: by mail-qk1-f199.google.com with SMTP id 124so21326565qko.8 for ; Tue, 07 Jul 2020 15:51:04 -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=NJjL1mXsjMkVQ/047kV0rS5FUrA3V1hN/izl2cQ6Ufs=; b=iZ/PtnDWxcWDnkdCyw++A7ToUATwGp9u3dVuDJDx+6z4CTKFK1EBRb8ijPVb4p2tUu nPFzERZ/PBwMkPsHsE7R8efamjQPzEDrUz1c2PtR3spY2Sh6DxY5i/xaeVoPtOEsUtTH pYeLqRFwPtMsK9OFiAOOndcqttemSjrsxx+jFdX24372yfbFgFRx0jXVpOCkaBr3aSVM +P99ql0gQIDhFITU6lQ+m/I9exkNNPP/MXAnbNt9wwZh+7dMnWj5AnCCzNnqwXMsKv0+ rIG4t+1J+0HmO5yzkyLV7ZOsPNuWRDUlJSbe9DzVX98L9KcqDSPv+S5xNVMAzIHO6y0L aWqA== X-Gm-Message-State: AOAM531YeXRZTkW/bsJlRQN0FC6ofYuHLfQN2tEeQU5qV4MOkRIRyP84 w8BLMdX0J1QKd+aLZfvzuApt2fYiVXWY94ZWwV+5dNtN3giz+mYUKSGmQSHtHwyspQJoNr8wLH0 uo5k4lP/A6kk= X-Received: by 2002:a37:957:: with SMTP id 84mr47902830qkj.392.1594162264308; Tue, 07 Jul 2020 15:51:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxbMGUDN8sNnAct7snfAr0tVsXTTFuHRnFviDLy5w3hPtrLVevs9DuyV/XuSR75xBh7Bx9u7A== X-Received: by 2002:a37:957:: with SMTP id 84mr47902815qkj.392.1594162264014; Tue, 07 Jul 2020 15:51:04 -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.51.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jul 2020 15:51:03 -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 Subject: [PATCH v5 24/25] mm: Clean up the last pieces of page fault accountings Date: Tue, 7 Jul 2020 18:50:20 -0400 Message-Id: <20200707225021.200906-25-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: 777D516A4A4 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: 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 | 17 ++++++++++------- 4 files changed, 10 insertions(+), 29 deletions(-) diff --git a/arch/powerpc/mm/copro_fault.c b/arch/powerpc/mm/copro_fault.= c index 2d0276abe0a6..8acd00178956 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: mmap_read_unlock(mm); return ret; diff --git a/arch/um/kernel/trap.c b/arch/um/kernel/trap.c index 8d9870d76da1..ad12f78bda7e 100644 --- a/arch/um/kernel/trap.c +++ b/arch/um/kernel/trap.c @@ -88,10 +88,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 80fd1610d43e..71e1d501a1d3 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -893,13 +893,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; @@ -1255,12 +1248,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 bb7ba127661a..ad5eca9dd1ed 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -4404,20 +4404,23 @@ static inline void mm_account_fault(struct pt_reg= s *regs, */ major =3D (ret & VM_FAULT_MAJOR) || (flags & FAULT_FLAG_TRIED); =20 + if (major) + current->maj_flt++; + else + current->min_flt++; + /* - * If the fault is done for GUP, regs will be NULL, and we will skip - * the fault accounting. + * If the fault is done for GUP, regs will be NULL. We only do the + * accounting for the per thread fault counters who triggered the + * fault, and we skip the perf event updates. */ 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 /* --=20 2.26.2