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.8 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 D9D7BC433E5 for ; Tue, 30 Jun 2020 20:45:22 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 9C07E20663 for ; Tue, 30 Jun 2020 20:45: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="NcSq7uwh" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9C07E20663 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 1405B6B0022; Tue, 30 Jun 2020 16:45:22 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0C7376B0023; Tue, 30 Jun 2020 16:45:22 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DE4CB6B0024; Tue, 30 Jun 2020 16:45:21 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0139.hostedemail.com [216.40.44.139]) by kanga.kvack.org (Postfix) with ESMTP id C72346B0022 for ; Tue, 30 Jun 2020 16:45:21 -0400 (EDT) Received: from smtpin17.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 8DE7F180AD80F for ; Tue, 30 Jun 2020 20:45:21 +0000 (UTC) X-FDA: 76987058442.17.sense56_2c16c9626e7a Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin17.hostedemail.com (Postfix) with ESMTP id 5DC2C180D0180 for ; Tue, 30 Jun 2020 20:45:21 +0000 (UTC) X-HE-Tag: sense56_2c16c9626e7a X-Filterd-Recvd-Size: 6581 Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by imf49.hostedemail.com (Postfix) with ESMTP for ; Tue, 30 Jun 2020 20:45:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593549920; 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; bh=fUO3NS9psrO0Jdd2xoJCjexzJ/aoni+i2MbifOTNg00=; b=NcSq7uwh51f2Z9VYX3tA4qDIFtVeICqJC51luYBuJlb/7kMdjACgCz2H6zS0DXT/nKTR5d SwVVAjuzk15Pfy280q5bCGhEqbl0o3EGXSV5eBjCPgnnD8gvBBcGcH8ix2RycmfkzT3EJc 9eR6Eiek79o9a3qRVw0S4ojbL46bWbs= Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-74-UcEMuduDOEe5ZCgs_nhQfQ-1; Tue, 30 Jun 2020 16:45:18 -0400 X-MC-Unique: UcEMuduDOEe5ZCgs_nhQfQ-1 Received: by mail-qt1-f198.google.com with SMTP id r25so15289937qtj.11 for ; Tue, 30 Jun 2020 13:45:18 -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:mime-version :content-transfer-encoding; bh=fUO3NS9psrO0Jdd2xoJCjexzJ/aoni+i2MbifOTNg00=; b=VH7IKpDjTciakaPSigGMoD600j+f54bKhhtK+yzWXBNpW4an//2YuFr4yxj9MLdM3E SzT6WcvUEXq42fiBQmg2H2r/us6k11BY3AbQz4w+nHJu9EfEB7blm7benfS8I/NN7Im/ jZPM/5pTUf4d0QBpiP/Nr42pMgpVestX8YvBeO5hWZ0dhNfwtkHaHXoOoicFa0CJkQ81 Jep3igbXxcUl7UhJuie97v03+jd15uc96VNGoreVAVZyZwQ73a6SF2i3lNUVfGzZU6jX RL2nRZr6JApx3+W2/c7srgf20bmwxkOay/2CC8viLfkMnB/Actx/xBcct62mKkKmXmPx 1ecg== X-Gm-Message-State: AOAM532KPk2QuNrDXL8+jR1VDEQQzzVtAVPlgaMJ2ZQlhTJ72nkF2mA+ S8foA0dNatmSwwasCBsvJ+5rM70qaRZ0ljmTt9zXLRYIxlv9SvmwnJnm0o9G/gSgdpHayluZcXk nsplRkIsaf3k= X-Received: by 2002:ac8:27c9:: with SMTP id x9mr2655042qtx.172.1593549917114; Tue, 30 Jun 2020 13:45:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxM45GnPoMoskFnro4SYt1oRyRPA5o85g+uNQHWZT+8Z2bvlk/KPFB1VULzepW16SEXqoxiIw== X-Received: by 2002:ac8:27c9:: with SMTP id x9mr2655012qtx.172.1593549916828; Tue, 30 Jun 2020 13:45:16 -0700 (PDT) Received: from xz-x1.redhat.com ([2607:9880:19c0:32::2]) by smtp.gmail.com with ESMTPSA id m7sm3926577qti.6.2020.06.30.13.45.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2020 13:45:16 -0700 (PDT) From: Peter Xu To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Andrew Morton , peterx@redhat.com, John Hubbard , Michael Ellerman , Gerald Schaefer , Andrea Arcangeli , Linus Torvalds , Will Deacon , Catalin Marinas , linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 05/26] mm/arm64: Use general page fault accounting Date: Tue, 30 Jun 2020 16:45:14 -0400 Message-Id: <20200630204514.38711-1-peterx@redhat.com> X-Mailer: git-send-email 2.26.2 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: 5DC2C180D0180 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam02 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 be29f4076fe3..f07333e86c2f 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