From patchwork Thu Apr 27 19:10:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sandhya Bankar X-Patchwork-Id: 9705699 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 A7F59602BE for ; Sat, 29 Apr 2017 07:43:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 95CB028671 for ; Sat, 29 Apr 2017 07:43:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 890F728681; Sat, 29 Apr 2017 07:43:54 +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=-5.2 required=2.0 tests=BAYES_00, DATE_IN_PAST_24_48, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM 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 2294A28671 for ; Sat, 29 Apr 2017 07:43:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1423177AbdD2Hnu (ORCPT ); Sat, 29 Apr 2017 03:43:50 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:36491 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1422965AbdD2Hnu (ORCPT ); Sat, 29 Apr 2017 03:43:50 -0400 Received: by mail-pf0-f196.google.com with SMTP id v14so20531440pfd.3; Sat, 29 Apr 2017 00:43:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=P/Ct+nDT2vxrQmeDEcbDGdtsnBbw4RChjWd0qlcXTx8=; b=XY8HpQv2UJ63okONGeVkgTIWVaVoxYtOBkOndIQ4IdIFPc4/RRCca0Y5lmyJuZ+eGx XADlOpGKzhV+aL+xgFaoeeYFPLy0McVgV7zHb509yaRBQuGRj5zKitMJxZPvINUHDiPM pzUYmcQAW3O92YwtsKM8P+DHI9j19d6nNqXULPSI3hZVH4OAKeP7OqZff6YluuhhYpHd 3NbttGLKZ0wHf8lyJee0MwR8u3nN8+ng4QRje5Qg1HiRmH0zQnnYTqz5km65DedVu6fF SP8jbG5QU58rQlrujMF3wPTGVP0iGKtfSuiuKbioFkh6uR991nOHNyFIg+G/tfM67LI4 Rvqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=P/Ct+nDT2vxrQmeDEcbDGdtsnBbw4RChjWd0qlcXTx8=; b=SwTQPypJs7YnG0ZAgb7YzfQs0FimwNpeoIZZU/Z8xXJSBkOjoBGix3U5N8B4s9EdLz wdMddhHe4C7YZ0CYSOkwX0w2MnIy0BqgXd6B8cxlvC2kSAGkuYJbYnL/JQ58zBTeMMMA /j90uU/rYDWdDpnNEThAyAJkiveRcgxem1uy8Pk+EJtN1S3/UfuM1B9OjNc7SaWyhwOy 9z/qjryIBUpgCeRJfi58GPK43SVDuh3c7qcUGZFkiN1I+ja4z6iqWf9lOVx3XPzOR5aF xKPnIlikj0u7P/81L3HV/Isr5iqhPFuLHD4rEVpyv7KJ9QrnIfLGN1N1EOKwiTqi0lGJ f7bw== X-Gm-Message-State: AN3rC/4ZdEnJrjW1OEVCzBgaGVzoPmgCr0M5EJkjxP2yO9jCJWTGnp99 oxBxBMsonGicAg== X-Received: by 10.84.218.205 with SMTP id g13mr3084187plm.38.1493451829319; Sat, 29 Apr 2017 00:43:49 -0700 (PDT) Received: from localhost.localdomain ([223.229.187.11]) by smtp.gmail.com with ESMTPSA id u23sm15628205pfd.63.2017.04.29.00.43.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 29 Apr 2017 00:43:48 -0700 (PDT) Date: Fri, 28 Apr 2017 00:40:33 +0530 From: Sandhya Bankar To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, viro@zeniv.linux.org.uk, mawmilcox@microsoft.com, keescook@chromium.org, adobriyan@gmail.com, re.emese@gmail.com, riel@surriel.com Subject: [PATCH 07/13] vfs: Remove full_fds_bits from fd allocation code path. Message-ID: <6d8d204ec98c0d083a3c0633f029ad65ad032dca.1493315290.git.bankarsandhya512@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) 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 The IDR has removed the need to have full_fds_bits hence removing it. Signed-off-by: Sandhya Bankar Signed-off-by: Matthew Wilcox --- fs/file.c | 18 +----------------- include/linux/fdtable.h | 2 -- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/fs/file.c b/fs/file.c index da3a35b..e8c6ada 100644 --- a/fs/file.c +++ b/fs/file.c @@ -56,9 +56,6 @@ static void free_fdtable_rcu(struct rcu_head *rcu) __free_fdtable(container_of(rcu, struct fdtable, rcu)); } -#define BITBIT_NR(nr) BITS_TO_LONGS(BITS_TO_LONGS(nr)) -#define BITBIT_SIZE(nr) (BITBIT_NR(nr) * sizeof(long)) - /* * Copy 'count' fd bits from the old table to the new table and clear the extra * space if any. This does not copy the file pointers. Called with the files @@ -75,11 +72,6 @@ static void copy_fd_bitmaps(struct fdtable *nfdt, struct fdtable *ofdt, memset((char *)nfdt->open_fds + cpy, 0, set); memcpy(nfdt->close_on_exec, ofdt->close_on_exec, cpy); memset((char *)nfdt->close_on_exec + cpy, 0, set); - - cpy = BITBIT_SIZE(count); - set = BITBIT_SIZE(nfdt->max_fds) - cpy; - memcpy(nfdt->full_fds_bits, ofdt->full_fds_bits, cpy); - memset((char *)nfdt->full_fds_bits + cpy, 0, set); } /* @@ -124,14 +116,12 @@ static struct fdtable * alloc_fdtable(unsigned int nr) fdt->max_fds = nr; data = alloc_fdmem(max_t(size_t, - 2 * nr / BITS_PER_BYTE + BITBIT_SIZE(nr), L1_CACHE_BYTES)); + 2 * nr / BITS_PER_BYTE, L1_CACHE_BYTES)); if (!data) goto out_fdt; fdt->open_fds = data; data += nr / BITS_PER_BYTE; fdt->close_on_exec = data; - data += nr / BITS_PER_BYTE; - fdt->full_fds_bits = data; return fdt; @@ -246,15 +236,11 @@ static inline void __clear_close_on_exec(unsigned int fd, struct fdtable *fdt) static inline void __set_open_fd(unsigned int fd, struct fdtable *fdt) { __set_bit(fd, fdt->open_fds); - fd /= BITS_PER_LONG; - if (!~fdt->open_fds[fd]) - __set_bit(fd, fdt->full_fds_bits); } static inline void __clear_open_fd(unsigned int fd, struct fdtable *fdt) { __clear_bit(fd, fdt->open_fds); - __clear_bit(fd / BITS_PER_LONG, fdt->full_fds_bits); } static unsigned int count_open_files(struct fdtable *fdt) @@ -298,7 +284,6 @@ struct files_struct *dup_fd(struct files_struct *oldf, int *errorp) new_fdt->max_fds = NR_OPEN_DEFAULT; new_fdt->close_on_exec = newf->close_on_exec_init; new_fdt->open_fds = newf->open_fds_init; - new_fdt->full_fds_bits = newf->full_fds_bits_init; restart: idr_copy_preload(&oldf->fd_idr, GFP_KERNEL); @@ -472,7 +457,6 @@ struct files_struct init_files = { .max_fds = NR_OPEN_DEFAULT, .close_on_exec = init_files.close_on_exec_init, .open_fds = init_files.open_fds_init, - .full_fds_bits = init_files.full_fds_bits_init, }, .file_lock = __SPIN_LOCK_UNLOCKED(init_files.file_lock), .fd_idr = IDR_INIT, diff --git a/include/linux/fdtable.h b/include/linux/fdtable.h index c2a53b6..6bece35 100644 --- a/include/linux/fdtable.h +++ b/include/linux/fdtable.h @@ -26,7 +26,6 @@ struct fdtable { unsigned int max_fds; unsigned long *close_on_exec; unsigned long *open_fds; - unsigned long *full_fds_bits; struct rcu_head rcu; }; @@ -60,7 +59,6 @@ struct files_struct { spinlock_t file_lock ____cacheline_aligned_in_smp; unsigned long close_on_exec_init[1]; unsigned long open_fds_init[1]; - unsigned long full_fds_bits_init[1]; }; struct file_operations;