From patchwork Sun Nov 1 16:33:09 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin LaHaise X-Patchwork-Id: 37390 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 4B505B7C06 for ; Mon, 2 Nov 2009 03:33:16 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752941AbZKAQdG (ORCPT ); Sun, 1 Nov 2009 11:33:06 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752935AbZKAQdE (ORCPT ); Sun, 1 Nov 2009 11:33:04 -0500 Received: from kanga.kvack.org ([205.233.56.17]:55771 "EHLO kanga.kvack.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752933AbZKAQdE (ORCPT ); Sun, 1 Nov 2009 11:33:04 -0500 Received: by kanga.kvack.org (Postfix, from userid 63042) id 276EF6B0078; Sun, 1 Nov 2009 11:33:09 -0500 (EST) Date: Sun, 1 Nov 2009 11:33:09 -0500 From: Benjamin LaHaise To: Eric Dumazet , Greg Kroah-Hartman Cc: "Eric W. Biederman" , Octavian Purdila , netdev@vger.kernel.org, Cosmin Ratiu , linux-kernel@vger.kernel.org Subject: [PATCH 2/3] sysfs directory scaling: count number of children dirs Message-ID: <20091101163309.GC7911@kvack.org> References: <20091101163130.GA7911@kvack.org> <20091101163230.GB7911@kvack.org> Mime-Version: 1.0 Content-Disposition: inline In-Reply-To: <20091101163230.GB7911@kvack.org> User-Agent: Mutt/1.4.2.2i Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org sysfs_count_nlink() is a bottleneck during mass bring up of network interfaces. Eliminate this problem by tracking the number of directories. Signed-off-by: Benjamin LaHaise --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff -u b/fs/sysfs/dir.c b/fs/sysfs/dir.c --- b/fs/sysfs/dir.c +++ b/fs/sysfs/dir.c @@ -70,6 +70,7 @@ sd->s_sibling = *pos; sd->s_sibling_prev = prev; *pos = sd; + parent_sd->s_nr_children_dir += (sysfs_type(sd) == SYSFS_DIR); // rb tree insert new = &(parent_sd->s_dir.child_rb_root.rb_node); @@ -118,6 +119,7 @@ if (sd->s_sibling) sd->s_sibling->s_sibling_prev = prev; + sd->s_parent->s_nr_children_dir -= (sysfs_type(sd) == SYSFS_DIR); sd->s_sibling_prev = NULL; rb_erase(&sd->s_rb_node, &sd->s_parent->s_dir.child_rb_root); } diff -u b/fs/sysfs/sysfs.h b/fs/sysfs/sysfs.h --- b/fs/sysfs/sysfs.h +++ b/fs/sysfs/sysfs.h @@ -71,6 +71,8 @@ ino_t s_ino; umode_t s_mode; struct sysfs_inode_attrs *s_iattr; + + int s_nr_children_dir; }; #define SD_DEACTIVATED_BIAS INT_MIN only in patch2: unchanged: --- a/fs/sysfs/inode.c +++ b/fs/sysfs/inode.c @@ -191,14 +191,7 @@ static struct lock_class_key sysfs_inode_imutex_key; static int sysfs_count_nlink(struct sysfs_dirent *sd) { - struct sysfs_dirent *child; - int nr = 0; - - for (child = sd->s_dir.children; child; child = child->s_sibling) - if (sysfs_type(child) == SYSFS_DIR) - nr++; - - return nr + 2; + return sd->s_nr_children_dir + 2; } static void sysfs_init_inode(struct sysfs_dirent *sd, struct inode *inode)