From patchwork Thu Apr 12 15:07:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miklos Szeredi X-Patchwork-Id: 10338887 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E63C0604D4 for ; Thu, 12 Apr 2018 15:25:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DA9001FE82 for ; Thu, 12 Apr 2018 15:25:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CD0372000A; Thu, 12 Apr 2018 15:25:53 +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=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 57F221FE82 for ; Thu, 12 Apr 2018 15:25:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753139AbeDLPZu (ORCPT ); Thu, 12 Apr 2018 11:25:50 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:33726 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753168AbeDLPIh (ORCPT ); Thu, 12 Apr 2018 11:08:37 -0400 Received: by mail-wm0-f65.google.com with SMTP id o23so3539412wmf.0 for ; Thu, 12 Apr 2018 08:08:36 -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; bh=eyD22L2VYZw+M8sRtmxVMhw0YICOReC5iNEZd8O++u8=; b=qyXAg2e+8nt4ai4Qrw0CS4v67f5K/8VGosgbIrwOd3ygfcltqOf8DWgibILWyEDGLE PSduEKpsOqY9q1ytnd8Ej4yBlOfdsDSj6corAD5yXfS73HoAkfp0kbeawj7ZIstyBX9G g6VZXaooK3dhkhSGx8VZSpLp9O+J6Di1Vco88uzXl+Z7VuPsgV+TKkx4Wt8k5v5wkP4f d0h++997CgZFfq58ULUsSFhHrztmv7a1I402FJ9JkxPZ2mU8jqk9KlebBINWpijXVYLz eUDStLWJKgy8QAMG/ZWGKt5Ko9zqtZft5R3+LgoMtjXgwpMDYUXC/yV1sAZS5/WjKx3A L7IA== X-Gm-Message-State: ALQs6tC9dtZ5lLScgPVPRiR4DWyHadq7HrwmAes4bgM2EVg+EsiSY8Xt 20GtcWGTmzd/SbPNfKne3tOuRTnrFtM= X-Google-Smtp-Source: AIpwx498YvaILPXOgksmdQyqpvErxrRwx7jtzK295aD7D/1P4AIh6tjsr55ULhF8xPEejE3N2WmAvg== X-Received: by 10.28.238.19 with SMTP id m19mr1022327wmh.126.1523545715200; Thu, 12 Apr 2018 08:08:35 -0700 (PDT) Received: from veci.piliscsaba.redhat.com (catv-176-63-54-97.catv.broadband.hu. [176.63.54.97]) by smtp.gmail.com with ESMTPSA id p197sm2621783wme.43.2018.04.12.08.08.34 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 12 Apr 2018 08:08:34 -0700 (PDT) From: Miklos Szeredi To: linux-unionfs@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RFC PATCH 03/35] vfs: optionally don't account file in nr_files Date: Thu, 12 Apr 2018 17:07:54 +0200 Message-Id: <20180412150826.20988-4-mszeredi@redhat.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180412150826.20988-1-mszeredi@redhat.com> References: <20180412150826.20988-1-mszeredi@redhat.com> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Stacking file operations in overlay will store an extra open file for each overlay file opened. The overhead is just that of "struct file" which is about 256bytes, because overlay already pins an extra dentry and inode when the file is open, which add up to a much larger overhead. For fear of breaking working setups, don't start accounting the extra file. The implementation adds a bool argument to path_open() to control whether the returned file is to be accounted or not. If the file is not accounted, f_mode will contain FMODE_NOACCOUNT, so that when freeing the file the count is not decremented. Signed-off-by: Miklos Szeredi --- fs/file_table.c | 13 +++++++++---- fs/internal.h | 7 ++++++- fs/open.c | 10 +++++----- include/linux/fs.h | 5 ++++- 4 files changed, 24 insertions(+), 11 deletions(-) diff --git a/fs/file_table.c b/fs/file_table.c index 7ec0b3e5f05d..60376bfa04cf 100644 --- a/fs/file_table.c +++ b/fs/file_table.c @@ -51,7 +51,8 @@ static void file_free_rcu(struct rcu_head *head) static inline void file_free(struct file *f) { - percpu_counter_dec(&nr_files); + if (!(f->f_mode & FMODE_NOACCOUNT)) + percpu_counter_dec(&nr_files); call_rcu(&f->f_u.fu_rcuhead, file_free_rcu); } @@ -100,7 +101,7 @@ int proc_nr_files(struct ctl_table *table, int write, * done, you will imbalance int the mount's writer count * and a warning at __fput() time. */ -struct file *get_empty_filp(void) +struct file *__get_empty_filp(bool account) { const struct cred *cred = current_cred(); static long old_max; @@ -110,7 +111,8 @@ struct file *get_empty_filp(void) /* * Privileged users can go above max_files */ - if (get_nr_files() >= files_stat.max_files && !capable(CAP_SYS_ADMIN)) { + if (account && + get_nr_files() >= files_stat.max_files && !capable(CAP_SYS_ADMIN)) { /* * percpu_counters are inaccurate. Do an expensive check before * we go and fail. @@ -123,7 +125,10 @@ struct file *get_empty_filp(void) if (unlikely(!f)) return ERR_PTR(-ENOMEM); - percpu_counter_inc(&nr_files); + if (account) + percpu_counter_inc(&nr_files); + else + f->f_mode = FMODE_NOACCOUNT; f->f_cred = get_cred(cred); error = security_file_alloc(f); if (unlikely(error)) { diff --git a/fs/internal.h b/fs/internal.h index df262f41a0ef..3319bf39e339 100644 --- a/fs/internal.h +++ b/fs/internal.h @@ -85,7 +85,12 @@ extern void chroot_fs_refs(const struct path *, const struct path *); /* * file_table.c */ -extern struct file *get_empty_filp(void); +extern struct file *__get_empty_filp(bool account); + +static inline struct file *get_empty_filp(void) +{ + return __get_empty_filp(true); +} /* * super.c diff --git a/fs/open.c b/fs/open.c index 8c315f9ec2f6..d509705d5740 100644 --- a/fs/open.c +++ b/fs/open.c @@ -700,8 +700,8 @@ static int do_dentry_open(struct file *f, static const struct file_operations empty_fops = {}; int error; - f->f_mode = OPEN_FMODE(f->f_flags) | FMODE_LSEEK | - FMODE_PREAD | FMODE_PWRITE; + f->f_mode = (f->f_mode & FMODE_NOACCOUNT) | OPEN_FMODE(f->f_flags) | + FMODE_LSEEK | FMODE_PREAD | FMODE_PWRITE; path_get(&f->f_path); f->f_inode = inode; @@ -711,7 +711,7 @@ static int do_dentry_open(struct file *f, f->f_wb_err = filemap_sample_wb_err(f->f_mapping); if (unlikely(f->f_flags & O_PATH)) { - f->f_mode = FMODE_PATH; + f->f_mode = (f->f_mode & FMODE_NOACCOUNT) | FMODE_PATH; f->f_op = &empty_fops; return 0; } @@ -867,12 +867,12 @@ int vfs_open(const struct path *path, struct file *file, } struct file *path_open(const struct path *path, int flags, struct inode *inode, - const struct cred *cred) + const struct cred *cred, bool account) { struct file *file; int retval; - file = get_empty_filp(); + file = __get_empty_filp(account); if (!IS_ERR(file)) { file->f_flags = flags; file->f_path = *path; diff --git a/include/linux/fs.h b/include/linux/fs.h index c6d7e3b00163..0b215faa30ae 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -152,6 +152,9 @@ typedef int (dio_iodone_t)(struct kiocb *iocb, loff_t offset, /* File is capable of returning -EAGAIN if I/O will block */ #define FMODE_NOWAIT ((__force fmode_t)0x8000000) +/* File does not contribute to nr_files count */ +#define FMODE_NOACCOUNT ((__force fmode_t)0x10000000) + /* * Flag for rw_copy_check_uvector and compat_rw_copy_check_uvector * that indicates that they should check the contents of the iovec are @@ -2402,7 +2405,7 @@ extern struct file *file_open_root(struct dentry *, struct vfsmount *, const char *, int, umode_t); extern struct file * dentry_open(const struct path *, int, const struct cred *); extern struct file *path_open(const struct path *, int, struct inode *, - const struct cred *); + const struct cred *, bool); extern int filp_close(struct file *, fl_owner_t id); extern struct filename *getname_flags(const char __user *, int, int *);