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 7A40AC433E1 for ; Fri, 19 Jun 2020 16:07:22 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 3F13E21532 for ; Fri, 19 Jun 2020 16:07:22 +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="TDjtEJkd" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3F13E21532 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 D16B28D00B5; Fri, 19 Jun 2020 12:07:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CC5FC8D00AD; Fri, 19 Jun 2020 12:07:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B8EE08D00B5; Fri, 19 Jun 2020 12:07:21 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0186.hostedemail.com [216.40.44.186]) by kanga.kvack.org (Postfix) with ESMTP id 9D8588D00AD for ; Fri, 19 Jun 2020 12:07:21 -0400 (EDT) Received: from smtpin08.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 624B010EE4 for ; Fri, 19 Jun 2020 16:07:21 +0000 (UTC) X-FDA: 76946441082.08.tramp56_0115c9a26e1a Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin08.hostedemail.com (Postfix) with ESMTP id 7E8D318129828 for ; Fri, 19 Jun 2020 16:05:54 +0000 (UTC) X-HE-Tag: tramp56_0115c9a26e1a X-Filterd-Recvd-Size: 6616 Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by imf27.hostedemail.com (Postfix) with ESMTP for ; Fri, 19 Jun 2020 16:05:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592582753; 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=u3Vh1HVYE5zmkqw2sOdn8zxGKpBRt5nL/FWkJRhYB9o=; b=TDjtEJkdDk1dTQ+ykdPL5B3fP0U55u6/GLfkiDaRm/qYa5WAy/D3S2ZuqTy4bLxyjzlrug C6OunT0nG4RzbWY+V8XBXtkU0jLsaIhIEokXnVS/r1aER1ZR81q5HuQdD62XWc6bPQ1dxW wck6+6xsLzN0HNgla9MOy68RkMoWkmQ= Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-482-dO7QboDVNd-WnCGm32CCeg-1; Fri, 19 Jun 2020 12:05:49 -0400 X-MC-Unique: dO7QboDVNd-WnCGm32CCeg-1 Received: by mail-qk1-f197.google.com with SMTP id w14so7499244qkb.0 for ; Fri, 19 Jun 2020 09:05:49 -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=u3Vh1HVYE5zmkqw2sOdn8zxGKpBRt5nL/FWkJRhYB9o=; b=B/Fz1AB1N69OvPyQLBVXHPzKIb/AFYGm0W5I85V4abCY0aQf44ccXQgoMrVAqQ5VzM 4DCZrv6ATOOylCN3bDQXAsMhwWwIiEK4vC8AJgym3fQkSvWeIK1IEiVZvmfQXqUp97sS nkC/3/yxMFaU6vbeiFjADlcebbCsY2kuroHAHa0qSBtZeucxgfmnlCZJwRNnwK4fYkY0 rLJ+s/G6f2Vf//E5c0+BPQQpbrK9TFVTQcTd4UTS2/Axw6Afi5SARRLKTagTTwLwHf2E WeH+S6X7zBINb2BlmNe4Syxib6azcf/YGOrGiN+6vtxa0+7P+T+kxKVX0L1mcULmXNCk sToA== X-Gm-Message-State: AOAM530Iqtty+Ou+ClyxKLoa4g35EZZ97S2M/v225u4BcCud5BwI/9QX BuabjbLZV0g1KGUIajtEEj7DF9a2faU9fD6K/WyartBLrf1FXuM8QP66oGt3osiDPNLpODu8g94 6gOxHlmYj9c4= X-Received: by 2002:ae9:e841:: with SMTP id a62mr4262425qkg.497.1592582749502; Fri, 19 Jun 2020 09:05:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJySpRUMhXyNfEl10XktKVgqTs3uRy85zxUDqvWPGZZNqeyiCaJtUfJ8ugLHtIHHC9pHiVb8gQ== X-Received: by 2002:ae9:e841:: with SMTP id a62mr4262393qkg.497.1592582749242; Fri, 19 Jun 2020 09:05:49 -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.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jun 2020 09:05:48 -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 , Catalin Marinas , linux-arm-kernel@lists.infradead.org Subject: [PATCH 05/26] mm/arm64: Use general page fault accounting Date: Fri, 19 Jun 2020 12:05:17 -0400 Message-Id: <20200619160538.8641-6-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: 7E8D318129828 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 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 5f6607b951b8..09b206521559 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -398,7 +398,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 @@ -422,7 +423,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) @@ -444,7 +445,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 @@ -510,8 +511,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)) { @@ -532,25 +532,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