From patchwork Mon Oct 15 16:42:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Schwidefsky X-Patchwork-Id: 10642185 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C9446925 for ; Mon, 15 Oct 2018 16:43:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B91FC299C2 for ; Mon, 15 Oct 2018 16:43:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ACA9E29A7E; Mon, 15 Oct 2018 16:43:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3890A299C2 for ; Mon, 15 Oct 2018 16:43:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 141EA6B000C; Mon, 15 Oct 2018 12:43:01 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 077DC6B000D; Mon, 15 Oct 2018 12:43:01 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DE4826B000E; Mon, 15 Oct 2018 12:43:00 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-yb1-f197.google.com (mail-yb1-f197.google.com [209.85.219.197]) by kanga.kvack.org (Postfix) with ESMTP id B2ED36B000C for ; Mon, 15 Oct 2018 12:43:00 -0400 (EDT) Received: by mail-yb1-f197.google.com with SMTP id f8-v6so10913521ybn.22 for ; Mon, 15 Oct 2018 09:43:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:in-reply-to:references:message-id :content-transfer-encoding:mime-version; bh=41BP0a+7aEgZHWhOJ0ag8aX2ghfs6RYBSlvVHzfWQtw=; b=LIpqrQHA7tilt7ihxKIGaJdXQEwH4n+mL1ypd7xGSJL6hOlwDQxdhGGDGqa5rryVmJ gy8dVsPUkhiMAZuDiSGmxD4V/4CO8lwaf92ut0pK6F6TssDFAqmrB5ku3cULx5ydKRRR X4KPWJ517SUIsg8nwWfV/CwbJCfUH2FrwVomEiAFER7S49RCuUVPW4m5chaW+7TJphQF 48/iVRaYgkm68jdpHpa43LiIrQ42xMHdVMcA/fKxe9th9VJkK02XPKduIYW3HCg2GJ67 ULZoShvHOSmVgGiDVabHj1cc+dcF6mBKR3OfqEZfjvxdlHoKoAOCSksfwP2hTWduZ4lj +X7g== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of schwidefsky@de.ibm.com designates 148.163.158.5 as permitted sender) smtp.mailfrom=schwidefsky@de.ibm.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ibm.com X-Gm-Message-State: ABuFfogThSpgZmeVnIrqzYyhiwe0vI9JRU6cCOF2xEdTxV8rzVHJJP11 Cowry6UdttMvN9/64A1Q2WOvKQvDrujlxiDi23ngdE+yUI/H2ZERpeUlJN5n4UAMJgcCF8+HsAE pgHMQf8Pal5sWKFCjQufoIRKhoompRHVvEC4YPGQtCNn8gsAhn7zAAThzfO5gfbxMRg== X-Received: by 2002:a25:c8c2:: with SMTP id y185-v6mr9384862ybf.375.1539621780322; Mon, 15 Oct 2018 09:43:00 -0700 (PDT) X-Google-Smtp-Source: ACcGV639uIVMXklKTG13DT23j0U4y9QA51wsLWFLaIlG2KY8BpVgHVnu+YAgKheihsvwBhkGGc+5 X-Received: by 2002:a25:c8c2:: with SMTP id y185-v6mr9384831ybf.375.1539621779657; Mon, 15 Oct 2018 09:42:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539621779; cv=none; d=google.com; s=arc-20160816; b=PuYeaWf+7ejN5aIto0j5P7e5N3zSrpzPl8rl/nTakirRtNlt17Rh/FY8QWRttym41Y 7VW14hWJNkIKuumhsxyLQy0k17piJFhY9rjOeGOzOcF3QWz1Rul5S8vh5r+Drr9OsRLI gYgAkJp5tcP1kLQ4jwPK0oggXuAsHvJgjMSExV1IGvLEB2Zd99PIeob80+l4655MHeEH HphHhwiRrgW270SfY/AyJWJrISu0HVxGc05Avb/3OicdW4iQiDyRV3X+MOidDo0Y13LB zby11Yra9a/1c8xV5KgcZ99fS/eb/zoaw6eA8tSrHAxTtScMbLHL6doqQJ+WE5DKnECR hoZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:message-id:references :in-reply-to:date:subject:cc:to:from; bh=41BP0a+7aEgZHWhOJ0ag8aX2ghfs6RYBSlvVHzfWQtw=; b=eNBkI3NtGWvcIr37Y8JlVucUuU+0N1GMrKJUN/0NP66lDEnm6HTH3lVyTkpsEdMpp8 +1zLu/MVLz+fJwzZxD1+LsOpC4bDkD4p0+rKMo44bJireVXCtB9Vpe53/h5yaBo4wXiX sSOux0+3vmg0Zr6Q/vT+8fRS160lbaklJjMehyvtoBKBoPJb0+R6Tdqh5yaT3Wc4ObvZ lJNheMa7YnmLRNa2Dm4JNbag11TRA+2RybhVRB7YifvfqOs2iV2Oa16B/C249/F5Kkip 1wq22KyLQUHSrNgPWust6dOzKfGm+RJP5SSBCx5luO2B85/HpdyCrrc7HmAHKLtllRMN e0oQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of schwidefsky@de.ibm.com designates 148.163.158.5 as permitted sender) smtp.mailfrom=schwidefsky@de.ibm.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com. [148.163.158.5]) by mx.google.com with ESMTPS id t136-v6si4154912ywe.315.2018.10.15.09.42.59 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Oct 2018 09:42:59 -0700 (PDT) Received-SPF: pass (google.com: domain of schwidefsky@de.ibm.com designates 148.163.158.5 as permitted sender) client-ip=148.163.158.5; Authentication-Results: mx.google.com; spf=pass (google.com: domain of schwidefsky@de.ibm.com designates 148.163.158.5 as permitted sender) smtp.mailfrom=schwidefsky@de.ibm.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: from pps.filterd (m0098416.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w9FGeS6h176440 for ; Mon, 15 Oct 2018 12:42:59 -0400 Received: from e06smtp07.uk.ibm.com (e06smtp07.uk.ibm.com [195.75.94.103]) by mx0b-001b2d01.pphosted.com with ESMTP id 2n4vr2wywd-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 15 Oct 2018 12:42:59 -0400 Received: from localhost by e06smtp07.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 15 Oct 2018 17:42:57 +0100 Received: from b06cxnps3074.portsmouth.uk.ibm.com (9.149.109.194) by e06smtp07.uk.ibm.com (192.168.101.137) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Mon, 15 Oct 2018 17:42:55 +0100 Received: from d06av24.portsmouth.uk.ibm.com (mk.ibm.com [9.149.105.60]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w9FGgsLJ60817446 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 15 Oct 2018 16:42:54 GMT Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id CB2834203F; Mon, 15 Oct 2018 19:42:27 +0100 (BST) Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7D0B842045; Mon, 15 Oct 2018 19:42:27 +0100 (BST) Received: from mschwideX1.emea.ibm.com (unknown [9.145.33.55]) by d06av24.portsmouth.uk.ibm.com (Postfix) with ESMTPS; Mon, 15 Oct 2018 19:42:27 +0100 (BST) From: Martin Schwidefsky To: Li Wang , Guenter Roeck , Janosch Frank Cc: "Kirill A. Shutemov" , Heiko Carstens , linux-kernel , Linux-MM , Martin Schwidefsky Subject: [PATCH 2/3] mm: add mm_pxd_folded checks to pgtable_bytes accounting functions Date: Mon, 15 Oct 2018 18:42:38 +0200 X-Mailer: git-send-email 2.7.4 In-Reply-To: <1539621759-5967-1-git-send-email-schwidefsky@de.ibm.com> References: <1539621759-5967-1-git-send-email-schwidefsky@de.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 18101516-0028-0000-0000-00000307ADB8 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18101516-0029-0000-0000-000023C2B51C Message-Id: <1539621759-5967-3-git-send-email-schwidefsky@de.ibm.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2018-10-15_08:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=2 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=673 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1807170000 definitions=main-1810150147 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: X-Virus-Scanned: ClamAV using ClamSMTP The common mm code calls mm_dec_nr_pmds() and mm_dec_nr_puds() in free_pgtables() if the address range spans a full pud or pmd. If mm_dec_nr_puds/mm_dec_nr_pmds are non-empty due to configuration settings they blindly subtract the size of the pmd or pud table from pgtable_bytes even if the pud or pmd page table layer is folded. Add explicit mm_[pmd|pud]_folded checks to the four pgtable_bytes accounting functions mm_inc_nr_puds, mm_inc_nr_pmds, mm_dec_nr_puds and mm_dec_nr_pmds. As the check for folded page tables can be overwritten by the architecture, this allows to keep a correct pgtable_bytes value for platforms that use a dynamic number of page table levels. Signed-off-by: Martin Schwidefsky Acked-by: Kirill A. Shutemov --- include/linux/mm.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/linux/mm.h b/include/linux/mm.h index d1029972541c..67f55c71e59a 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1764,11 +1764,15 @@ int __pud_alloc(struct mm_struct *mm, p4d_t *p4d, unsigned long address); static inline void mm_inc_nr_puds(struct mm_struct *mm) { + if (mm_pud_folded(mm)) + return; atomic_long_add(PTRS_PER_PUD * sizeof(pud_t), &mm->pgtables_bytes); } static inline void mm_dec_nr_puds(struct mm_struct *mm) { + if (mm_pud_folded(mm)) + return; atomic_long_sub(PTRS_PER_PUD * sizeof(pud_t), &mm->pgtables_bytes); } #endif @@ -1788,11 +1792,15 @@ int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address); static inline void mm_inc_nr_pmds(struct mm_struct *mm) { + if (mm_pmd_folded(mm)) + return; atomic_long_add(PTRS_PER_PMD * sizeof(pmd_t), &mm->pgtables_bytes); } static inline void mm_dec_nr_pmds(struct mm_struct *mm) { + if (mm_pmd_folded(mm)) + return; atomic_long_sub(PTRS_PER_PMD * sizeof(pmd_t), &mm->pgtables_bytes); } #endif