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 C9547C433DF for ; Fri, 19 Jun 2020 16:08:16 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 8F2F12158C for ; Fri, 19 Jun 2020 16:08:16 +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="awbdOBXE" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8F2F12158C 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 3A02D8D00BA; Fri, 19 Jun 2020 12:08:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 350898D00AD; Fri, 19 Jun 2020 12:08:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 265568D00BA; Fri, 19 Jun 2020 12:08:16 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0022.hostedemail.com [216.40.44.22]) by kanga.kvack.org (Postfix) with ESMTP id 0BA1F8D00AD for ; Fri, 19 Jun 2020 12:08:16 -0400 (EDT) Received: from smtpin26.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id A3710824556B for ; Fri, 19 Jun 2020 16:08:15 +0000 (UTC) X-FDA: 76946443350.26.berry01_290f1e726e1a Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin26.hostedemail.com (Postfix) with ESMTP id B923018074312 for ; Fri, 19 Jun 2020 16:05:54 +0000 (UTC) X-HE-Tag: berry01_290f1e726e1a X-Filterd-Recvd-Size: 4897 Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by imf35.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=nYKuiXa6JqSlFakb02F9N/z/khfKW7nv0ZKU3o10xCg=; b=awbdOBXE5BlzdHkjXyMjsSIUz9K69oRKmmMSElM33wRi8DBW1sdbgYjm8jr/ekKTCj7Xjk nZDh0jftu/ZWhVzatIMmnXclq3k7VbGQIUS3AmoP3AqV1Z8r6JFmlU5WRhTaZpaskvUgsh AbdRCPDVs2ZDAnipqDmpnEKn/4LIvXM= 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-458-UiCdIQ0JPQyWUkqfUOX7pw-1; Fri, 19 Jun 2020 12:05:52 -0400 X-MC-Unique: UiCdIQ0JPQyWUkqfUOX7pw-1 Received: by mail-qv1-f72.google.com with SMTP id y2so7066111qvp.1 for ; Fri, 19 Jun 2020 09:05:52 -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=nYKuiXa6JqSlFakb02F9N/z/khfKW7nv0ZKU3o10xCg=; b=e4lm3Q64+nWl7aVHA8Gai+uNzHfWv09VYCbh2wPgQwGv+qjRy73mpJM6YyqEIF6w6Z dlrMS6Io+ZHpPBDNsrcHa72xBmA4H+cUFI9GSVk7fml8lH9lvDWeviL2c4JAdVavjpzw t+C5QKrId1D9dPaPXhTaR0R1ORYsjpX5RJXbTh3MGcI9aW0RagQg9pQbB2v+WVJBfBaM OlVifm6WAW/7Bsglz1rPmjFcaMo+za0zKyHAty1RChv5A9MNNSZU56glpR86r2BufXIe w+x/HWREKmvqKo8mgMvCfTd9qwlDT1RlUK2GzMn28TuPBo5zG3ebd+ytLoefZ3adjVJo 0I1Q== X-Gm-Message-State: AOAM531FmJ6YoQHEkGQiHPGUcl7ewxRh2bcqi2dBUN5VON2eiaPIBGAp fUPFkeqsfQmai+oYqWEyFWIfJS6H7taSz19FAJQHofwZpR2fh4SasEyx93RUzORftBCEJb+ncWb ySTrfOn86Wc0= X-Received: by 2002:a05:620a:3cc:: with SMTP id r12mr4302284qkm.44.1592582751558; Fri, 19 Jun 2020 09:05:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJySAqeFc3bvWBPkc6npddWja9I+KCezM5DnLrSAgO76qm+hQxaisHscRU59a9ognA5IwopVqQ== X-Received: by 2002:a05:620a:3cc:: with SMTP id r12mr4302251qkm.44.1592582751313; Fri, 19 Jun 2020 09:05:51 -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.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jun 2020 09:05:50 -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 , Guo Ren , linux-csky@vger.kernel.org Subject: [PATCH 06/26] mm/csky: Use general page fault accounting Date: Fri, 19 Jun 2020 12:05:18 -0400 Message-Id: <20200619160538.8641-7-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: B923018074312 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam05 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. CC: Guo Ren CC: linux-csky@vger.kernel.org Signed-off-by: Peter Xu --- arch/csky/mm/fault.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/arch/csky/mm/fault.c b/arch/csky/mm/fault.c index b14f97d3cb15..a3e0aa3ebb79 100644 --- a/arch/csky/mm/fault.c +++ b/arch/csky/mm/fault.c @@ -151,7 +151,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, u= nsigned long write, * the fault. */ fault =3D handle_mm_fault(vma, address, write ? FAULT_FLAG_WRITE : 0, - NULL); + regs); if (unlikely(fault & VM_FAULT_ERROR)) { if (fault & VM_FAULT_OOM) goto out_of_memory; @@ -161,16 +161,6 @@ asmlinkage void do_page_fault(struct pt_regs *regs, = unsigned long write, goto bad_area; BUG(); } - if (fault & VM_FAULT_MAJOR) { - tsk->maj_flt++; - perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MAJ, 1, regs, - address); - } else { - tsk->min_flt++; - perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MIN, 1, regs, - address); - } - up_read(&mm->mmap_sem); return; =20 --=20 2.26.2