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.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 C414BC433DF for ; Mon, 15 Jun 2020 22:23:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A29C12078E for ; Mon, 15 Jun 2020 22:23:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="D9Jiz/e4" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726551AbgFOWX0 (ORCPT ); Mon, 15 Jun 2020 18:23:26 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:36365 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726314AbgFOWXV (ORCPT ); Mon, 15 Jun 2020 18:23:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592259800; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rD6jqofe19p826ewHi4IKOMv32t8zGceLQG6Qi0KA6A=; b=D9Jiz/e4jY6C0Zv0VytEiZPchVSQA1Ws1hArjQI3wseoLnQYZHYojCwOBq/VVLpWp8dFTQ PJo7W5xjtxLCucoOxTZK8XMSo+ScsVvBpTqzK+NRVed34bzJJs2JXq+ScaJFGd6cHTGSM7 qALBRz5qG2Z1BWj7OEF38FMOJIAqQX4= 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-411-C6Jnvll-Mtmobh4ovnxseQ-1; Mon, 15 Jun 2020 18:23:18 -0400 X-MC-Unique: C6Jnvll-Mtmobh4ovnxseQ-1 Received: by mail-qt1-f198.google.com with SMTP id l19so15184536qtp.12 for ; Mon, 15 Jun 2020 15:23: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:in-reply-to :references:mime-version:content-transfer-encoding; bh=rD6jqofe19p826ewHi4IKOMv32t8zGceLQG6Qi0KA6A=; b=ljbKTnldJC5OZ6pzoMosxBOjp6Me2/Pddp9XQH7+vGyYW2Yeil1k9bYkZtB5Q3F1PM VzQ9yLWk4WZ64D/cv44G7EC1HxYOdXaV0w86HBANA+XCqP2WsN5Eh8ezGtITkfYAgNeC +HRcC7GAk+2v+B5usNIhIit4c7z49PXU+oCblH4Om/acV+QO97fDl0n0R7TC2CBwrPD1 lvzxHxfFIhOyv3S8LSCsG0g26eK7Soh3bI2I7hs+hFn/6L1V7njVP2XJLEbzmmI1IIAl DwdgywvfuBvfHvMUUh4VmsJTCeTc/v5ULrz7zOOjko9W/C6mLH6Dv8xHBGztKsnhfm2W 4Vqw== X-Gm-Message-State: AOAM533TFBwuVbgdc1bgt6zAe++kvTzDOipue0bvhmLLcKVw1JZtfgfx pXAbNCkZZAyJmWcAWH8T1YEhsoa1aGXnMYCQzBqx9DZ9FwTelHVxOclAMLB0EXpDwmHCiGjymYS fOFtVDU0iLAJBcj+eN92SjUU4 X-Received: by 2002:ad4:4c0d:: with SMTP id bz13mr27999615qvb.164.1592259797818; Mon, 15 Jun 2020 15:23:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxoYFbvQP7f745RiHe5XpfLpFaM5rWW6QJeCE9RJ1UwqB//J+ePvEAngR737a2w3RSMKlY7Gw== X-Received: by 2002:ad4:4c0d:: with SMTP id bz13mr27999595qvb.164.1592259797560; Mon, 15 Jun 2020 15:23:17 -0700 (PDT) Received: from xz-x1.hitronhub.home ([2607:9880:19c0:32::2]) by smtp.gmail.com with ESMTPSA id k7sm12645910qth.10.2020.06.15.15.23.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jun 2020 15:23:17 -0700 (PDT) From: Peter Xu To: linux-kernel@vger.kernel.org Cc: Peter Xu , Gerald Schaefer , Andrew Morton , Linus Torvalds , Andrea Arcangeli , "David S . Miller" , sparclinux@vger.kernel.org Subject: [PATCH 21/25] mm/sparc32: Use mm_fault_accounting() Date: Mon, 15 Jun 2020 18:23:16 -0400 Message-Id: <20200615222316.8551-1-peterx@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200615221607.7764-1-peterx@redhat.com> References: <20200615221607.7764-1-peterx@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use the new mm_fault_accounting() helper for page fault accounting. Avoid doing page fault accounting multiple times if the page fault is retried. CC: David S. Miller CC: sparclinux@vger.kernel.org Signed-off-by: Peter Xu --- arch/sparc/mm/fault_32.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c index f6e0e601f857..299e6e241a1c 100644 --- a/arch/sparc/mm/fault_32.c +++ b/arch/sparc/mm/fault_32.c @@ -167,7 +167,7 @@ asmlinkage void do_sparc_fault(struct pt_regs *regs, int text_fault, int write, unsigned long g2; int from_user = !(regs->psr & PSR_PS); int code; - vm_fault_t fault; + vm_fault_t fault, major = 0; unsigned int flags = FAULT_FLAG_DEFAULT; if (text_fault) @@ -192,9 +192,6 @@ asmlinkage void do_sparc_fault(struct pt_regs *regs, int text_fault, int write, */ if (pagefault_disabled() || !mm) goto no_context; - - perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, address); - retry: down_read(&mm->mmap_sem); @@ -236,6 +233,7 @@ asmlinkage void do_sparc_fault(struct pt_regs *regs, int text_fault, int write, * the fault. */ fault = handle_mm_fault(vma, address, flags); + major |= fault & VM_FAULT_MAJOR; if (fault_signal_pending(fault, regs)) return; @@ -251,15 +249,6 @@ asmlinkage void do_sparc_fault(struct pt_regs *regs, int text_fault, int write, } if (flags & FAULT_FLAG_ALLOW_RETRY) { - if (fault & VM_FAULT_MAJOR) { - current->maj_flt++; - perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MAJ, - 1, regs, address); - } else { - current->min_flt++; - perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MIN, - 1, regs, address); - } if (fault & VM_FAULT_RETRY) { flags |= FAULT_FLAG_TRIED; @@ -273,6 +262,7 @@ asmlinkage void do_sparc_fault(struct pt_regs *regs, int text_fault, int write, } up_read(&mm->mmap_sem); + mm_fault_accounting(current, regs, address, major); return; /* -- 2.26.2