Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755709Ab2JCSpp (ORCPT ); Wed, 3 Oct 2012 14:45:45 -0400 Received: from rcsinet15.oracle.com ([148.87.113.117]:49841 "EHLO rcsinet15.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751247Ab2JCSpo (ORCPT ); Wed, 3 Oct 2012 14:45:44 -0400 Date: Wed, 3 Oct 2012 21:45:02 +0300 From: Dan Carpenter To: Yinghai Lu Cc: Bjorn Helgaas , Greg Kroah-Hartman , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Don Dutile , yuvalmin@broadcom.com, bhutchings@solarflare.com, gregory.v.rose@intel.com, davem@davemloft.net--no-chain-reply-to, Jeff Kirsher , Jesse Brandeburg , "David S. Miller" , John Fastabend , e1000-devel@lists.sourceforge.net, netdev@vger.kernel.org Subject: Re: [PATCH 5/5] ixgbe: add driver set_max_vfs support Message-ID: <20121003184502.GM13767@mwanda> References: <506C3B11.9010009@redhat.com> <1349286695-26713-1-git-send-email-yinghai@kernel.org> <1349286695-26713-6-git-send-email-yinghai@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1349286695-26713-6-git-send-email-yinghai@kernel.org> User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: ucsinet21.oracle.com [156.151.31.93] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2793 Lines: 71 On Wed, Oct 03, 2012 at 10:51:35AM -0700, Yinghai Lu wrote: > Need ixgbe guys to close the loop to use set_max_vfs instead > kernel parameters. > > Signed-off-by: Yinghai Lu > Cc: Jeff Kirsher > Cc: Jesse Brandeburg > Cc: Greg Rose > Cc: "David S. Miller" > Cc: John Fastabend > Cc: e1000-devel@lists.sourceforge.net > Cc: netdev@vger.kernel.org > --- > drivers/net/ethernet/intel/ixgbe/ixgbe.h | 2 + > drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 44 +++++++++++++++++++----- > 2 files changed, 37 insertions(+), 9 deletions(-) > > diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe.h b/drivers/net/ethernet/intel/ixgbe/ixgbe.h > index b9623e9..d39d975 100644 > --- a/drivers/net/ethernet/intel/ixgbe/ixgbe.h > +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe.h > @@ -558,6 +558,8 @@ struct ixgbe_adapter { > u32 interrupt_event; > u32 led_reg; > > + struct ixgbe_info *ixgbe_info; > + > #ifdef CONFIG_IXGBE_PTP > struct ptp_clock *ptp_clock; > struct ptp_clock_info ptp_caps; > diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c > index ee61819..1c097c7 100644 > --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c > +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c > @@ -129,13 +129,6 @@ static struct notifier_block dca_notifier = { > }; > #endif > > -#ifdef CONFIG_PCI_IOV > -static unsigned int max_vfs; > -module_param(max_vfs, uint, 0); > -MODULE_PARM_DESC(max_vfs, > - "Maximum number of virtual functions to allocate per physical function - default is zero and maximum value is 63"); > -#endif /* CONFIG_PCI_IOV */ > - > static unsigned int allow_unsupported_sfp; > module_param(allow_unsupported_sfp, uint, 0); > MODULE_PARM_DESC(allow_unsupported_sfp, > @@ -4496,7 +4489,7 @@ static int __devinit ixgbe_sw_init(struct ixgbe_adapter *adapter) > #ifdef CONFIG_PCI_IOV > /* assign number of SR-IOV VFs */ > if (hw->mac.type != ixgbe_mac_82598EB) > - adapter->num_vfs = (max_vfs > 63) ? 0 : max_vfs; > + adapter->num_vfs = min_t(int, pdev->max_vfs, 63); Could we make this min_t(uint, ...); ->max_vfs is type unsigned int. We take an unsigned long from sysfs. We silently truncate it to an unsigned int. Then we cast it to a negative number and compare against 63 and take the minimum... It's root only so it's not a problem but it's a hassle to audit. regards, dan carpenter -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/