From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756368AbbFSVu3 (ORCPT ); Fri, 19 Jun 2015 17:50:29 -0400 Received: from mga02.intel.com ([134.134.136.20]:46359 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756089AbbFSVu0 (ORCPT ); Fri, 19 Jun 2015 17:50:26 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,645,1427785200"; d="scan'208";a="749858078" Subject: [RFC][PATCH] fs: optimize inotify/fsnotify code for unwatched files To: dave@sr71.net Cc: dave.hansen@linux.intel.com, akpm@linux-foundation.org, jack@suse.cz, viro@zeniv.linux.org.uk, eparis@redhat.com, john@johnmccutchan.com, rlove@rlove.org, tim.c.chen@linux.intel.com, ak@linux.intel.com, linux-kernel@vger.kernel.org From: Dave Hansen Date: Fri, 19 Jun 2015 14:50:25 -0700 Message-Id: <20150619215025.4F689817@viggo.jf.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dave Hansen I have a _tiny_ microbenchmark that sits in a loop and writes single bytes to a file. Writing one byte to a tmpfs file is around 2x slower than reading one byte from a file, which is a _bit_ more than I expecte. This is a dumb benchmark, but I think it's hard to deny that write() is a hot path and we should avoid unnecessary overhead there. I did a 'perf record' of 30-second samples of read and write. The top item in a diffprofile is srcu_read_lock() from fsnotify(). There are active inotify fd's from systemd, but nothing is actually listening to the file or its part of the filesystem. I *think* we can avoid taking the srcu_read_lock() for the common case where there are no actual marks on the file being modified *or* the vfsmount. The *_fsnotify_mask is an aggregate of each of the masks from each mark. If we have nothing set in the masks at all then there are no marks and no need to do anything with 'ignored masks' since none exist. This keeps us from having to do the costly srcu_read_lock() for a check which is very cheap. This patch gave a 10.8% speedup in writes/second on my test. Signed-off-by: Dave Hansen Cc: Andrew Morton Cc: Jan Kara Cc: Al Viro Cc: Eric Paris Cc: John McCutchan Cc: Robert Love Cc: Tim Chen Cc: Andi Kleen Cc: linux-kernel@vger.kernel.org --- b/fs/notify/fsnotify.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff -puN fs/notify/fsnotify.c~optimize-fsnotify fs/notify/fsnotify.c --- a/fs/notify/fsnotify.c~optimize-fsnotify 2015-06-19 13:29:53.117283581 -0700 +++ b/fs/notify/fsnotify.c 2015-06-19 13:29:53.123283853 -0700 @@ -213,6 +213,16 @@ int fsnotify(struct inode *to_tell, __u3 !(test_mask & to_tell->i_fsnotify_mask) && !(mnt && test_mask & mnt->mnt_fsnotify_mask)) return 0; + /* + * Optimization: The *_fsnotify_mask is an aggregate of each of the + * masks from each mark. If we have nothing set in the masks at + * all then there are no marks and no need to do anything with + * 'ignored masks' since none exist. This keeps us from having to + * do the costly srcu_read_lock() for a check which is very cheap. + */ + if (!to_tell->i_fsnotify_mask && + (!mnt || !mnt->mnt_fsnotify_mask)) + return 0; idx = srcu_read_lock(&fsnotify_mark_srcu); _ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in Please read the FAQ at http://www.tux.org/lkml/