From patchwork Tue Jan 12 11:58:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lubomir Rintel X-Patchwork-Id: 566524 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.180.67]) by ozlabs.org (Postfix) with ESMTP id C358E140662 for ; Tue, 12 Jan 2016 22:59:36 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965025AbcALL7A (ORCPT ); Tue, 12 Jan 2016 06:59:00 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52750 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933822AbcALL66 (ORCPT ); Tue, 12 Jan 2016 06:58:58 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id 62D0BC07584E; Tue, 12 Jan 2016 11:58:58 +0000 (UTC) Received: from belphegor.brq.redhat.com (dhcp-0-167.brq.redhat.com [10.34.0.167]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u0CBwgJk016065 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 12 Jan 2016 06:58:56 -0500 From: Lubomir Rintel To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, "David S. Miller" , Jay Vosburgh , Veaceslav Falico , Andy Gospodarek , Lubomir Rintel Subject: [PATCH 3/3] bonding: make device count build-time configurable Date: Tue, 12 Jan 2016 12:58:36 +0100 Message-Id: <1452599916-27511-1-git-send-email-lkundrak@v3.sk> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The devices can be created at run-time for quite some time already and the load-time device creation collides with attempts to create the device of the same name: # rmmod bonding # ip link add bond0 type bond RTNETLINK answers: File exists This is pretty much the same situation as was with the block loop devices which was solved by adding a build-time configuration that the distributions could use as they deem fit while keeping the default for compatibility. Let's do that here as well. Signed-off-by: Lubomir Rintel --- drivers/net/Kconfig | 15 +++++++++++++++ drivers/net/bonding/bond_main.c | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index f94af69..51de664 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -55,6 +55,21 @@ config BONDING To compile this driver as a module, choose M here: the module will be called bonding. +config BONDING_COUNT + int "Number of bonding devices to pre-create at init time" + depends on BONDING + default 1 + help + Static number of bonding devices to be unconditionally pre-created + at init time. + + This default value can be overwritten on the kernel command + line or with module-parameter bonding.max_bonds. + + The historic default is 1. If a mid-2007 version of iproute2 + is used (v2.6.23 or later), it can be set to 0, since needed + bonding devices can be dynamically allocated via rtnetlink. + config DUMMY tristate "Dummy net driver support" ---help--- diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 9e0f8a7..f013cfa 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -88,7 +88,7 @@ /* monitor all links that often (in milliseconds). <=0 disables monitoring */ -static int max_bonds = BOND_DEFAULT_MAX_BONDS; +static int max_bonds = CONFIG_BONDING_COUNT; static int tx_queues = BOND_DEFAULT_TX_QUEUES; static int num_peer_notif = 1; static int miimon;