From patchwork Thu Jun 20 17:27:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Song Liu X-Patchwork-Id: 11007535 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 E214C76 for ; Thu, 20 Jun 2019 17:28:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D17B91FFBD for ; Thu, 20 Jun 2019 17:28:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C57CF28710; Thu, 20 Jun 2019 17:28:29 +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=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 966BE1FFBD for ; Thu, 20 Jun 2019 17:28:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0D7166B000D; Thu, 20 Jun 2019 13:28:24 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id F2B888E0002; Thu, 20 Jun 2019 13:28:23 -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 DF3518E0001; Thu, 20 Jun 2019 13:28:23 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-yb1-f199.google.com (mail-yb1-f199.google.com [209.85.219.199]) by kanga.kvack.org (Postfix) with ESMTP id BDC8B6B000D for ; Thu, 20 Jun 2019 13:28:23 -0400 (EDT) Received: by mail-yb1-f199.google.com with SMTP id v83so3209495ybv.17 for ; Thu, 20 Jun 2019 10:28:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:smtp-origin-hostprefix:from :smtp-origin-hostname:to:cc:smtp-origin-cluster:subject:date :message-id:in-reply-to:references:mime-version; bh=hD2kmpWpjDtZ0Sd5qjALN5Ckzd1PVypTF/Ew4nsBLJo=; b=Rx3AIerdXf6Bw+8uaMBGsoWyFENeVlyzR20Z8j20O9zaJgVFjS80pjF5HrIQ/14U72 QMhKBmT4G28oFyoJ8C0R6Su47us9+uvtVEwfTiZ80eNopy1z7QFtf7Kz+ai1fGPQVWI8 nFFoFrqhUPOIx4Z+2/mOd3k61wADa4gLlkl9YG6dtH5scwt6D43gMoQlyiuJXAszz1MQ 5/UVh1/KrqRdzohFlIT4An4i5VbwS1xNahkha7JF9ny9KYnMHsUPDXusfYfk4Dfpl55d uHMbibaI0Tnz4bgEedkXxiuqvp/eQKx3nHniKtWmUQ/j/HfrVia11As3NumSpxZYW+zc 4UXw== X-Gm-Message-State: APjAAAWUhp2/vk+CPkxoJ0FtxFkrGBhM6KURqjS9GkwFtloKYyyZpE0t NyMe9wD2vhR4zbaTdJo/A4FSlRv/4qxr5ygbLEALNMYLCLE3A93AGcXEaNuZitX/VGacJXDn+9g ZrDj4zdYGAFcPGuFXrB2DOqukPHz7yJqXGMmhQPFw03OAXxR7OGkOFHsZcyBVAfFIhQ== X-Received: by 2002:a25:bb0e:: with SMTP id z14mr38358381ybg.82.1561051703456; Thu, 20 Jun 2019 10:28:23 -0700 (PDT) X-Google-Smtp-Source: APXvYqyPslqJRhNnp/8CfCHtARon3BaOvjNdAy39QEs5eQuAQOX73dNQONJrW1BOQy1DoMGpGsra X-Received: by 2002:a25:bb0e:: with SMTP id z14mr38358343ybg.82.1561051702722; Thu, 20 Jun 2019 10:28:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561051702; cv=none; d=google.com; s=arc-20160816; b=GHQqN3s+CcN/y9lxLXzgTAoLwBnYhfSF8mTFc2Aq68/l278TJbW3R9nkSWJUP2r9oM aVGHxEf3KfC56uVktyflBelGPUoWjfwGpmJNleLNeRjNQ4gHG2vRthpwAOKybWW/4diZ 5UxS5mpYYxM2JqcntwCK5Qc/R3zpIx4jZAEdXWZDAEHTZm1LCrhy3dRBhVq/sDCRywVq 1E+GOvIqmceDcwGsDWG1En60g6iHw1Gt6UOLzhOYG3OgtTKlG3nQtqJhWcqLSnLZBX+r UcXD1k9hh+9J7LDXS502fAzWF+zmGmQlGKU8bJATGFjF+UAj/wMFxqVPK5z+tZU1V+d3 CecA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:references:in-reply-to:message-id:date:subject :smtp-origin-cluster:cc:to:smtp-origin-hostname:from :smtp-origin-hostprefix:dkim-signature; bh=hD2kmpWpjDtZ0Sd5qjALN5Ckzd1PVypTF/Ew4nsBLJo=; b=WbMXpSCrEgcijFtqGWt8MF2K4J1OHyXmmPntO+rgKByI8DvYeggXNIhZLcIOiy8Ixw 1jJgS+L8y4UlpdFUW1GF1KIuzmkUSBmjIFhZ585yEoeDZahyBxitfG0xQ8pa0ywHn8rZ YhULHImfDkk5RoJurb2azVMVcT1LnHi7fqwqs06Z53Zufg/9B2Y3k9xXm5XjZ1OJcYQh pUSS4rdksWzy1RwhG6Q5WDIP/DEM3QRvRutvnMC5HAqRX++bXIb12X3Alfr9Nt5Xg+Au bPsGniVNkuMDkMweSRCMMHbfXyASOh+u5RIp9bREcQ/CF8jJgcmZiApp488S6vigJsHa 59XQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@fb.com header.s=facebook header.b=kTITvPU+; spf=pass (google.com: domain of prvs=107476d203=songliubraving@fb.com designates 67.231.153.30 as permitted sender) smtp.mailfrom="prvs=107476d203=songliubraving@fb.com"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=fb.com Received: from mx0a-00082601.pphosted.com (mx0b-00082601.pphosted.com. [67.231.153.30]) by mx.google.com with ESMTPS id 134si25945ybd.375.2019.06.20.10.28.22 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Jun 2019 10:28:22 -0700 (PDT) Received-SPF: pass (google.com: domain of prvs=107476d203=songliubraving@fb.com designates 67.231.153.30 as permitted sender) client-ip=67.231.153.30; Authentication-Results: mx.google.com; dkim=pass header.i=@fb.com header.s=facebook header.b=kTITvPU+; spf=pass (google.com: domain of prvs=107476d203=songliubraving@fb.com designates 67.231.153.30 as permitted sender) smtp.mailfrom="prvs=107476d203=songliubraving@fb.com"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=fb.com Received: from pps.filterd (m0089730.ppops.net [127.0.0.1]) by m0089730.ppops.net (8.16.0.27/8.16.0.27) with SMTP id x5KHJimr014684 for ; Thu, 20 Jun 2019 10:28:22 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=facebook; bh=hD2kmpWpjDtZ0Sd5qjALN5Ckzd1PVypTF/Ew4nsBLJo=; b=kTITvPU+VLMLvfdbMFDyZifEq4QY77unhvF7ZNsPRIYRVmsaTTAczOkMqjQbrW4KkNyx WRfB20b5+cNT/Nla5uSLnfp54+53I10+wQTxJ6BmSDrwxxjWvi59igHtflD1vYawgI+G 1bHjUCkL41VroygCaOla9CU8Q2cjtAL1Z0U= Received: from maileast.thefacebook.com ([163.114.130.16]) by m0089730.ppops.net with ESMTP id 2t8dffr8yf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 20 Jun 2019 10:28:22 -0700 Received: from mx-out.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:83::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Thu, 20 Jun 2019 10:28:21 -0700 Received: by devbig006.ftw2.facebook.com (Postfix, from userid 4523) id 51AB362E2004; Thu, 20 Jun 2019 10:28:20 -0700 (PDT) Smtp-Origin-Hostprefix: devbig From: Song Liu Smtp-Origin-Hostname: devbig006.ftw2.facebook.com To: , , CC: , , , , , Song Liu Smtp-Origin-Cluster: ftw2c04 Subject: [PATCH v4 6/6] mm,thp: avoid writes to file with THP in pagecache Date: Thu, 20 Jun 2019 10:27:52 -0700 Message-ID: <20190620172752.3300742-7-songliubraving@fb.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190620172752.3300742-1-songliubraving@fb.com> References: <20190620172752.3300742-1-songliubraving@fb.com> X-FB-Internal: Safe MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-06-20_12:,, signatures=0 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=789 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1906200124 X-FB-Internal: deliver 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 In previous patch, an application could put part of its text section in THP via madvise(). These THPs will be protected from writes when the application is still running (TXTBSY). However, after the application exits, the file is available for writes. This patch avoids writes to file THP by dropping page cache for the file when the last vma with VM_DENYWRITE is removed. A new counter nr_thps is added to struct address_space. In exit_mmap(), if nr_thps is non-zero, we drop page cache for the whole file. Signed-off-by: Song Liu --- fs/inode.c | 3 +++ include/linux/fs.h | 31 +++++++++++++++++++++++++++++++ mm/filemap.c | 1 + mm/khugepaged.c | 4 +++- mm/mmap.c | 14 ++++++++++++++ 5 files changed, 52 insertions(+), 1 deletion(-) diff --git a/fs/inode.c b/fs/inode.c index df6542ec3b88..518113a4e219 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -181,6 +181,9 @@ int inode_init_always(struct super_block *sb, struct inode *inode) mapping->flags = 0; mapping->wb_err = 0; atomic_set(&mapping->i_mmap_writable, 0); +#ifdef CONFIG_READ_ONLY_THP_FOR_FS + atomic_set(&mapping->nr_thps, 0); +#endif mapping_set_gfp_mask(mapping, GFP_HIGHUSER_MOVABLE); mapping->private_data = NULL; mapping->writeback_index = 0; diff --git a/include/linux/fs.h b/include/linux/fs.h index f7fdfe93e25d..3edf4ee42eee 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -444,6 +444,10 @@ struct address_space { struct xarray i_pages; gfp_t gfp_mask; atomic_t i_mmap_writable; +#ifdef CONFIG_READ_ONLY_THP_FOR_FS + /* number of thp, only for non-shmem files */ + atomic_t nr_thps; +#endif struct rb_root_cached i_mmap; struct rw_semaphore i_mmap_rwsem; unsigned long nrpages; @@ -2790,6 +2794,33 @@ static inline errseq_t filemap_sample_wb_err(struct address_space *mapping) return errseq_sample(&mapping->wb_err); } +static inline int filemap_nr_thps(struct address_space *mapping) +{ +#ifdef CONFIG_READ_ONLY_THP_FOR_FS + return atomic_read(&mapping->nr_thps); +#else + return 0; +#endif +} + +static inline void filemap_nr_thps_inc(struct address_space *mapping) +{ +#ifdef CONFIG_READ_ONLY_THP_FOR_FS + atomic_inc(&mapping->nr_thps); +#else + WARN_ON_ONCE(1); +#endif +} + +static inline void filemap_nr_thps_dec(struct address_space *mapping) +{ +#ifdef CONFIG_READ_ONLY_THP_FOR_FS + atomic_dec(&mapping->nr_thps); +#else + WARN_ON_ONCE(1); +#endif +} + extern int vfs_fsync_range(struct file *file, loff_t start, loff_t end, int datasync); extern int vfs_fsync(struct file *file, int datasync); diff --git a/mm/filemap.c b/mm/filemap.c index e79ceccdc6df..a8e86c136381 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -205,6 +205,7 @@ static void unaccount_page_cache_page(struct address_space *mapping, __dec_node_page_state(page, NR_SHMEM_THPS); } else if (PageTransHuge(page)) { __dec_node_page_state(page, NR_FILE_THPS); + filemap_nr_thps_dec(mapping); } /* diff --git a/mm/khugepaged.c b/mm/khugepaged.c index fbcff5a1d65a..17ebe9da56ce 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -1500,8 +1500,10 @@ static void collapse_file(struct vm_area_struct *vma, if (is_shmem) __inc_node_page_state(new_page, NR_SHMEM_THPS); - else + else { __inc_node_page_state(new_page, NR_FILE_THPS); + filemap_nr_thps_inc(mapping); + } if (nr_none) { struct zone *zone = page_zone(new_page); diff --git a/mm/mmap.c b/mm/mmap.c index 7e8c3e8ae75f..8094ce028d74 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -3088,6 +3088,18 @@ int vm_brk(unsigned long addr, unsigned long len) } EXPORT_SYMBOL(vm_brk); +static inline void release_file_thp(struct vm_area_struct *vma) +{ +#ifdef CONFIG_READ_ONLY_THP_FOR_FS + struct file *file = vma->vm_file; + + if (file && (vma->vm_flags & VM_DENYWRITE) && + atomic_read(&file_inode(file)->i_writecount) == 0 && + filemap_nr_thps(file_inode(file)->i_mapping)) + truncate_pagecache(file_inode(file), 0); +#endif +} + /* Release all mmaps. */ void exit_mmap(struct mm_struct *mm) { @@ -3153,6 +3165,8 @@ void exit_mmap(struct mm_struct *mm) while (vma) { if (vma->vm_flags & VM_ACCOUNT) nr_accounted += vma_pages(vma); + + release_file_thp(vma); vma = remove_vma(vma); } vm_unacct_memory(nr_accounted);