2010-09-04 02:29:30 +08:00
|
|
|
/*
|
2010-09-04 02:29:53 +08:00
|
|
|
* IBM Power Virtual Ethernet Device Driver
|
2010-09-04 02:29:30 +08:00
|
|
|
*
|
2010-09-04 02:29:53 +08:00
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
* (at your option) any later version.
|
2010-09-04 02:29:30 +08:00
|
|
|
*
|
2010-09-04 02:29:53 +08:00
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
2010-09-04 02:29:30 +08:00
|
|
|
*
|
2010-09-04 02:29:53 +08:00
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
2010-09-04 02:29:30 +08:00
|
|
|
*
|
2010-09-04 02:29:53 +08:00
|
|
|
* Copyright (C) IBM Corporation, 2003, 2010
|
|
|
|
*
|
|
|
|
* Authors: Dave Larson <larson1@us.ibm.com>
|
|
|
|
* Santiago Leon <santil@linux.vnet.ibm.com>
|
|
|
|
* Brian King <brking@linux.vnet.ibm.com>
|
|
|
|
* Robert Jennings <rcj@linux.vnet.ibm.com>
|
|
|
|
* Anton Blanchard <anton@au.ibm.com>
|
2010-09-04 02:29:30 +08:00
|
|
|
*/
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
#include <linux/module.h>
|
2008-07-24 02:34:52 +08:00
|
|
|
#include <linux/moduleparam.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
#include <linux/types.h>
|
|
|
|
#include <linux/errno.h>
|
|
|
|
#include <linux/dma-mapping.h>
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/netdevice.h>
|
|
|
|
#include <linux/etherdevice.h>
|
|
|
|
#include <linux/skbuff.h>
|
|
|
|
#include <linux/init.h>
|
|
|
|
#include <linux/mm.h>
|
2010-05-07 16:56:08 +08:00
|
|
|
#include <linux/pm.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
#include <linux/ethtool.h>
|
2007-09-16 04:36:07 +08:00
|
|
|
#include <linux/in.h>
|
|
|
|
#include <linux/ip.h>
|
2010-09-04 02:28:52 +08:00
|
|
|
#include <linux/ipv6.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 16:04:11 +08:00
|
|
|
#include <linux/slab.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
#include <asm/hvcall.h>
|
|
|
|
#include <asm/atomic.h>
|
|
|
|
#include <asm/vio.h>
|
2008-07-24 02:34:52 +08:00
|
|
|
#include <asm/iommu.h>
|
|
|
|
#include <asm/firmware.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
#include "ibmveth.h"
|
|
|
|
|
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.
The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around. On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).
Where appropriate, an arch may override the generic storage facility and do
something different with the variable. On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.
Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions. Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller. A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.
I've build this code with allyesconfig for x86_64 and i386. I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.
This will affect all archs. Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
struct pt_regs *old_regs = set_irq_regs(regs);
And put the old one back at the end:
set_irq_regs(old_regs);
Don't pass regs through to generic_handle_irq() or __do_IRQ().
In timer_interrupt(), this sort of change will be necessary:
- update_process_times(user_mode(regs));
- profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(get_irq_regs()));
+ profile_tick(CPU_PROFILING);
I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().
Some notes on the interrupt handling in the drivers:
(*) input_dev() is now gone entirely. The regs pointer is no longer stored in
the input_dev struct.
(*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
something different depending on whether it's been supplied with a regs
pointer or not.
(*) Various IRQ handler function pointers have been moved to type
irq_handler_t.
Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
2006-10-05 21:55:46 +08:00
|
|
|
static irqreturn_t ibmveth_interrupt(int irq, void *dev_instance);
|
2007-04-17 11:12:55 +08:00
|
|
|
static void ibmveth_rxq_harvest_buffer(struct ibmveth_adapter *adapter);
|
2008-07-24 02:34:52 +08:00
|
|
|
static unsigned long ibmveth_get_desired_dma(struct vio_dev *vdev);
|
2010-09-04 02:29:08 +08:00
|
|
|
|
[PATCH] ibmveth change buffer pools dynamically
This patch provides a sysfs interface to change some properties of the
ibmveth buffer pools (size of the buffers, number of buffers per pool,
and whether a pool is active). Ethernet drivers use ethtool to provide
this type of functionality. However, the buffers in the ibmveth driver
can have an arbitrary size (not only regular, mini, and jumbo which are
the only sizes that ethtool can change), and also ibmveth can have an
arbitrary number of buffer pools
Under heavy load we have seen dropped packets which obviously kills TCP
performance. We have created several fixes that mitigate this issue,
but we definitely need a way of changing the number of buffers for an
adapter dynamically. Also, changing the size of the buffers allows
users to change the MTU to something big (bigger than a jumbo frame)
greatly improving performance on partition to partition transfers.
The patch creates directories pool1...pool4 in the device directory in
sysfs, each with files: num, size, and active (which default to the
values in the mainline version).
Comments and suggestions are welcome...
--
Santiago A. Leon
Power Linux Development
IBM Linux Technology Center
Signed-off-by: Jeff Garzik <jeff@garzik.org>
2006-04-26 00:19:59 +08:00
|
|
|
static struct kobj_type ktype_veth_pool;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2008-07-24 02:34:52 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
static const char ibmveth_driver_name[] = "ibmveth";
|
2010-09-04 02:29:53 +08:00
|
|
|
static const char ibmveth_driver_string[] = "IBM Power Virtual Ethernet Driver";
|
|
|
|
#define ibmveth_driver_version "1.04"
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2010-09-04 02:29:53 +08:00
|
|
|
MODULE_AUTHOR("Santiago Leon <santil@linux.vnet.ibm.com>");
|
|
|
|
MODULE_DESCRIPTION("IBM Power Virtual Ethernet Driver");
|
2005-04-17 06:20:36 +08:00
|
|
|
MODULE_LICENSE("GPL");
|
|
|
|
MODULE_VERSION(ibmveth_driver_version);
|
|
|
|
|
2010-09-04 02:28:20 +08:00
|
|
|
static unsigned int tx_copybreak __read_mostly = 128;
|
|
|
|
module_param(tx_copybreak, uint, 0644);
|
|
|
|
MODULE_PARM_DESC(tx_copybreak,
|
|
|
|
"Maximum size of packet that is copied to a new buffer on transmit");
|
|
|
|
|
2010-09-04 02:28:25 +08:00
|
|
|
static unsigned int rx_copybreak __read_mostly = 128;
|
|
|
|
module_param(rx_copybreak, uint, 0644);
|
|
|
|
MODULE_PARM_DESC(rx_copybreak,
|
|
|
|
"Maximum size of packet that is copied to a new buffer on receive");
|
|
|
|
|
2010-09-04 02:28:41 +08:00
|
|
|
static unsigned int rx_flush __read_mostly = 0;
|
|
|
|
module_param(rx_flush, uint, 0644);
|
|
|
|
MODULE_PARM_DESC(rx_flush, "Flush receive buffers before use");
|
|
|
|
|
2007-08-17 22:16:43 +08:00
|
|
|
struct ibmveth_stat {
|
|
|
|
char name[ETH_GSTRING_LEN];
|
|
|
|
int offset;
|
|
|
|
};
|
|
|
|
|
|
|
|
#define IBMVETH_STAT_OFF(stat) offsetof(struct ibmveth_adapter, stat)
|
|
|
|
#define IBMVETH_GET_STAT(a, off) *((u64 *)(((unsigned long)(a)) + off))
|
|
|
|
|
|
|
|
struct ibmveth_stat ibmveth_stats[] = {
|
|
|
|
{ "replenish_task_cycles", IBMVETH_STAT_OFF(replenish_task_cycles) },
|
|
|
|
{ "replenish_no_mem", IBMVETH_STAT_OFF(replenish_no_mem) },
|
2010-09-04 02:29:30 +08:00
|
|
|
{ "replenish_add_buff_failure",
|
|
|
|
IBMVETH_STAT_OFF(replenish_add_buff_failure) },
|
|
|
|
{ "replenish_add_buff_success",
|
|
|
|
IBMVETH_STAT_OFF(replenish_add_buff_success) },
|
2007-08-17 22:16:43 +08:00
|
|
|
{ "rx_invalid_buffer", IBMVETH_STAT_OFF(rx_invalid_buffer) },
|
|
|
|
{ "rx_no_buffer", IBMVETH_STAT_OFF(rx_no_buffer) },
|
|
|
|
{ "tx_map_failed", IBMVETH_STAT_OFF(tx_map_failed) },
|
|
|
|
{ "tx_send_failed", IBMVETH_STAT_OFF(tx_send_failed) },
|
2010-09-04 02:28:52 +08:00
|
|
|
{ "fw_enabled_ipv4_csum", IBMVETH_STAT_OFF(fw_ipv4_csum_support) },
|
|
|
|
{ "fw_enabled_ipv6_csum", IBMVETH_STAT_OFF(fw_ipv6_csum_support) },
|
2007-08-17 22:16:43 +08:00
|
|
|
};
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/* simple methods of getting data from the current rxq entry */
|
2007-08-17 22:16:56 +08:00
|
|
|
static inline u32 ibmveth_rxq_flags(struct ibmveth_adapter *adapter)
|
|
|
|
{
|
|
|
|
return adapter->rx_queue.queue_addr[adapter->rx_queue.index].flags_off;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline int ibmveth_rxq_toggle(struct ibmveth_adapter *adapter)
|
|
|
|
{
|
2010-09-04 02:29:30 +08:00
|
|
|
return (ibmveth_rxq_flags(adapter) & IBMVETH_RXQ_TOGGLE) >>
|
|
|
|
IBMVETH_RXQ_TOGGLE_SHIFT;
|
2007-08-17 22:16:56 +08:00
|
|
|
}
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
static inline int ibmveth_rxq_pending_buffer(struct ibmveth_adapter *adapter)
|
|
|
|
{
|
2010-09-04 02:29:30 +08:00
|
|
|
return ibmveth_rxq_toggle(adapter) == adapter->rx_queue.toggle;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static inline int ibmveth_rxq_buffer_valid(struct ibmveth_adapter *adapter)
|
|
|
|
{
|
2010-09-04 02:29:30 +08:00
|
|
|
return ibmveth_rxq_flags(adapter) & IBMVETH_RXQ_VALID;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static inline int ibmveth_rxq_frame_offset(struct ibmveth_adapter *adapter)
|
|
|
|
{
|
2010-09-04 02:29:30 +08:00
|
|
|
return ibmveth_rxq_flags(adapter) & IBMVETH_RXQ_OFF_MASK;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static inline int ibmveth_rxq_frame_length(struct ibmveth_adapter *adapter)
|
|
|
|
{
|
2010-09-04 02:29:30 +08:00
|
|
|
return adapter->rx_queue.queue_addr[adapter->rx_queue.index].length;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2007-09-16 04:36:07 +08:00
|
|
|
static inline int ibmveth_rxq_csum_good(struct ibmveth_adapter *adapter)
|
|
|
|
{
|
2010-09-04 02:29:30 +08:00
|
|
|
return ibmveth_rxq_flags(adapter) & IBMVETH_RXQ_CSUM_GOOD;
|
2007-09-16 04:36:07 +08:00
|
|
|
}
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/* setup the initial settings for a buffer pool */
|
2010-09-04 02:29:30 +08:00
|
|
|
static void ibmveth_init_buffer_pool(struct ibmveth_buff_pool *pool,
|
|
|
|
u32 pool_index, u32 pool_size,
|
|
|
|
u32 buff_size, u32 pool_active)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
pool->size = pool_size;
|
|
|
|
pool->index = pool_index;
|
|
|
|
pool->buff_size = buff_size;
|
2010-09-04 02:28:09 +08:00
|
|
|
pool->threshold = pool_size * 7 / 8;
|
[PATCH] ibmveth change buffer pools dynamically
This patch provides a sysfs interface to change some properties of the
ibmveth buffer pools (size of the buffers, number of buffers per pool,
and whether a pool is active). Ethernet drivers use ethtool to provide
this type of functionality. However, the buffers in the ibmveth driver
can have an arbitrary size (not only regular, mini, and jumbo which are
the only sizes that ethtool can change), and also ibmveth can have an
arbitrary number of buffer pools
Under heavy load we have seen dropped packets which obviously kills TCP
performance. We have created several fixes that mitigate this issue,
but we definitely need a way of changing the number of buffers for an
adapter dynamically. Also, changing the size of the buffers allows
users to change the MTU to something big (bigger than a jumbo frame)
greatly improving performance on partition to partition transfers.
The patch creates directories pool1...pool4 in the device directory in
sysfs, each with files: num, size, and active (which default to the
values in the mainline version).
Comments and suggestions are welcome...
--
Santiago A. Leon
Power Linux Development
IBM Linux Technology Center
Signed-off-by: Jeff Garzik <jeff@garzik.org>
2006-04-26 00:19:59 +08:00
|
|
|
pool->active = pool_active;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/* allocate and setup an buffer pool - called during open */
|
|
|
|
static int ibmveth_alloc_buffer_pool(struct ibmveth_buff_pool *pool)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
2006-05-24 13:31:14 +08:00
|
|
|
pool->free_map = kmalloc(sizeof(u16) * pool->size, GFP_KERNEL);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2010-09-04 02:29:30 +08:00
|
|
|
if (!pool->free_map)
|
2005-04-17 06:20:36 +08:00
|
|
|
return -1;
|
|
|
|
|
2006-05-24 13:31:14 +08:00
|
|
|
pool->dma_addr = kmalloc(sizeof(dma_addr_t) * pool->size, GFP_KERNEL);
|
2010-09-04 02:29:30 +08:00
|
|
|
if (!pool->dma_addr) {
|
2005-04-17 06:20:36 +08:00
|
|
|
kfree(pool->free_map);
|
|
|
|
pool->free_map = NULL;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
drivers/net: Use kcalloc or kzalloc
Use kcalloc or kzalloc rather than the combination of kmalloc and memset.
The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/)
// <smpl>
@@
expression x,y,flags;
statement S;
type T;
@@
x =
- kmalloc
+ kcalloc
(
- y * sizeof(T),
+ y, sizeof(T),
flags);
if (x == NULL) S
-memset(x, 0, y * sizeof(T));
@@
expression x,size,flags;
statement S;
@@
-x = kmalloc(size,flags);
+x = kzalloc(size,flags);
if (x == NULL) S
-memset(x, 0, size);
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-05-13 18:06:01 +08:00
|
|
|
pool->skbuff = kcalloc(pool->size, sizeof(void *), GFP_KERNEL);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2010-09-04 02:29:30 +08:00
|
|
|
if (!pool->skbuff) {
|
2005-04-17 06:20:36 +08:00
|
|
|
kfree(pool->dma_addr);
|
|
|
|
pool->dma_addr = NULL;
|
|
|
|
|
|
|
|
kfree(pool->free_map);
|
|
|
|
pool->free_map = NULL;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
memset(pool->dma_addr, 0, sizeof(dma_addr_t) * pool->size);
|
|
|
|
|
2010-09-04 02:29:30 +08:00
|
|
|
for (i = 0; i < pool->size; ++i)
|
2005-04-17 06:20:36 +08:00
|
|
|
pool->free_map[i] = i;
|
|
|
|
|
|
|
|
atomic_set(&pool->available, 0);
|
|
|
|
pool->producer_index = 0;
|
|
|
|
pool->consumer_index = 0;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-09-04 02:28:41 +08:00
|
|
|
static inline void ibmveth_flush_buffer(void *addr, unsigned long length)
|
|
|
|
{
|
|
|
|
unsigned long offset;
|
|
|
|
|
|
|
|
for (offset = 0; offset < length; offset += SMP_CACHE_BYTES)
|
|
|
|
asm("dcbfl %0,%1" :: "b" (addr), "r" (offset));
|
|
|
|
}
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/* replenish the buffers for a pool. note that we don't need to
|
|
|
|
* skb_reserve these since they are used for incoming...
|
|
|
|
*/
|
2010-09-04 02:29:30 +08:00
|
|
|
static void ibmveth_replenish_buffer_pool(struct ibmveth_adapter *adapter,
|
|
|
|
struct ibmveth_buff_pool *pool)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
u32 i;
|
|
|
|
u32 count = pool->size - atomic_read(&pool->available);
|
|
|
|
u32 buffers_added = 0;
|
2008-07-24 02:34:52 +08:00
|
|
|
struct sk_buff *skb;
|
|
|
|
unsigned int free_index, index;
|
|
|
|
u64 correlator;
|
|
|
|
unsigned long lpar_rc;
|
|
|
|
dma_addr_t dma_addr;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
mb();
|
|
|
|
|
2010-09-04 02:29:30 +08:00
|
|
|
for (i = 0; i < count; ++i) {
|
2005-04-17 06:20:36 +08:00
|
|
|
union ibmveth_buf_desc desc;
|
|
|
|
|
2010-09-04 02:29:03 +08:00
|
|
|
skb = netdev_alloc_skb(adapter->netdev, pool->buff_size);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2010-09-04 02:29:30 +08:00
|
|
|
if (!skb) {
|
2010-09-04 02:29:14 +08:00
|
|
|
netdev_dbg(adapter->netdev,
|
|
|
|
"replenish: unable to allocate skb\n");
|
2005-04-17 06:20:36 +08:00
|
|
|
adapter->replenish_no_mem++;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2006-10-22 01:24:13 +08:00
|
|
|
free_index = pool->consumer_index;
|
2010-09-04 02:28:04 +08:00
|
|
|
pool->consumer_index++;
|
|
|
|
if (pool->consumer_index >= pool->size)
|
|
|
|
pool->consumer_index = 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
index = pool->free_map[free_index];
|
2006-05-24 13:31:14 +08:00
|
|
|
|
2010-09-04 02:29:41 +08:00
|
|
|
BUG_ON(index == IBM_VETH_INVALID_MAP);
|
|
|
|
BUG_ON(pool->skbuff[index] != NULL);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
dma_addr = dma_map_single(&adapter->vdev->dev, skb->data,
|
|
|
|
pool->buff_size, DMA_FROM_DEVICE);
|
|
|
|
|
2008-07-28 00:14:24 +08:00
|
|
|
if (dma_mapping_error(&adapter->vdev->dev, dma_addr))
|
2008-07-24 02:34:52 +08:00
|
|
|
goto failure;
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
pool->free_map[free_index] = IBM_VETH_INVALID_MAP;
|
|
|
|
pool->dma_addr[index] = dma_addr;
|
|
|
|
pool->skbuff[index] = skb;
|
|
|
|
|
|
|
|
correlator = ((u64)pool->index << 32) | index;
|
2010-09-04 02:29:30 +08:00
|
|
|
*(u64 *)skb->data = correlator;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2007-08-17 22:16:56 +08:00
|
|
|
desc.fields.flags_len = IBMVETH_BUF_VALID | pool->buff_size;
|
2006-05-24 13:31:14 +08:00
|
|
|
desc.fields.address = dma_addr;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2010-09-04 02:28:41 +08:00
|
|
|
if (rx_flush) {
|
|
|
|
unsigned int len = min(pool->buff_size,
|
|
|
|
adapter->netdev->mtu +
|
|
|
|
IBMVETH_BUFF_OH);
|
|
|
|
ibmveth_flush_buffer(skb->data, len);
|
|
|
|
}
|
2010-09-04 02:29:30 +08:00
|
|
|
lpar_rc = h_add_logical_lan_buffer(adapter->vdev->unit_address,
|
|
|
|
desc.desc);
|
2006-05-24 13:31:14 +08:00
|
|
|
|
2010-09-04 02:29:30 +08:00
|
|
|
if (lpar_rc != H_SUCCESS) {
|
2008-07-24 02:34:52 +08:00
|
|
|
goto failure;
|
2010-09-04 02:29:30 +08:00
|
|
|
} else {
|
2005-04-17 06:20:36 +08:00
|
|
|
buffers_added++;
|
|
|
|
adapter->replenish_add_buff_success++;
|
|
|
|
}
|
|
|
|
}
|
2006-05-24 13:31:14 +08:00
|
|
|
|
2008-07-24 02:34:52 +08:00
|
|
|
mb();
|
|
|
|
atomic_add(buffers_added, &(pool->available));
|
|
|
|
return;
|
|
|
|
|
|
|
|
failure:
|
|
|
|
pool->free_map[free_index] = index;
|
|
|
|
pool->skbuff[index] = NULL;
|
|
|
|
if (pool->consumer_index == 0)
|
|
|
|
pool->consumer_index = pool->size - 1;
|
|
|
|
else
|
|
|
|
pool->consumer_index--;
|
2008-07-28 00:14:24 +08:00
|
|
|
if (!dma_mapping_error(&adapter->vdev->dev, dma_addr))
|
2008-07-24 02:34:52 +08:00
|
|
|
dma_unmap_single(&adapter->vdev->dev,
|
|
|
|
pool->dma_addr[index], pool->buff_size,
|
|
|
|
DMA_FROM_DEVICE);
|
|
|
|
dev_kfree_skb_any(skb);
|
|
|
|
adapter->replenish_add_buff_failure++;
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
mb();
|
|
|
|
atomic_add(buffers_added, &(pool->available));
|
|
|
|
}
|
|
|
|
|
2005-10-27 00:47:08 +08:00
|
|
|
/* replenish routine */
|
2006-05-24 13:31:14 +08:00
|
|
|
static void ibmveth_replenish_task(struct ibmveth_adapter *adapter)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2005-10-27 00:47:01 +08:00
|
|
|
int i;
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
adapter->replenish_task_cycles++;
|
|
|
|
|
2010-09-04 02:29:25 +08:00
|
|
|
for (i = (IBMVETH_NUM_BUFF_POOLS - 1); i >= 0; i--) {
|
2010-09-04 02:28:09 +08:00
|
|
|
struct ibmveth_buff_pool *pool = &adapter->rx_buff_pool[i];
|
|
|
|
|
|
|
|
if (pool->active &&
|
|
|
|
(atomic_read(&pool->available) < pool->threshold))
|
|
|
|
ibmveth_replenish_buffer_pool(adapter, pool);
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2010-09-04 02:29:30 +08:00
|
|
|
adapter->rx_no_buffer = *(u64 *)(((char*)adapter->buffer_list_addr) +
|
|
|
|
4096 - 8);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/* empty and free ana buffer pool - also used to do cleanup in error paths */
|
2010-09-04 02:29:30 +08:00
|
|
|
static void ibmveth_free_buffer_pool(struct ibmveth_adapter *adapter,
|
|
|
|
struct ibmveth_buff_pool *pool)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
2005-10-29 04:53:13 +08:00
|
|
|
kfree(pool->free_map);
|
|
|
|
pool->free_map = NULL;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2010-09-04 02:29:30 +08:00
|
|
|
if (pool->skbuff && pool->dma_addr) {
|
|
|
|
for (i = 0; i < pool->size; ++i) {
|
2005-04-17 06:20:36 +08:00
|
|
|
struct sk_buff *skb = pool->skbuff[i];
|
2010-09-04 02:29:30 +08:00
|
|
|
if (skb) {
|
2005-04-17 06:20:36 +08:00
|
|
|
dma_unmap_single(&adapter->vdev->dev,
|
|
|
|
pool->dma_addr[i],
|
|
|
|
pool->buff_size,
|
|
|
|
DMA_FROM_DEVICE);
|
|
|
|
dev_kfree_skb_any(skb);
|
|
|
|
pool->skbuff[i] = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-09-04 02:29:30 +08:00
|
|
|
if (pool->dma_addr) {
|
2005-04-17 06:20:36 +08:00
|
|
|
kfree(pool->dma_addr);
|
|
|
|
pool->dma_addr = NULL;
|
|
|
|
}
|
|
|
|
|
2010-09-04 02:29:30 +08:00
|
|
|
if (pool->skbuff) {
|
2005-04-17 06:20:36 +08:00
|
|
|
kfree(pool->skbuff);
|
|
|
|
pool->skbuff = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* remove a buffer from a pool */
|
2010-09-04 02:29:30 +08:00
|
|
|
static void ibmveth_remove_buffer_from_pool(struct ibmveth_adapter *adapter,
|
|
|
|
u64 correlator)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
unsigned int pool = correlator >> 32;
|
|
|
|
unsigned int index = correlator & 0xffffffffUL;
|
|
|
|
unsigned int free_index;
|
|
|
|
struct sk_buff *skb;
|
|
|
|
|
2010-09-04 02:29:41 +08:00
|
|
|
BUG_ON(pool >= IBMVETH_NUM_BUFF_POOLS);
|
|
|
|
BUG_ON(index >= adapter->rx_buff_pool[pool].size);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
skb = adapter->rx_buff_pool[pool].skbuff[index];
|
|
|
|
|
2010-09-04 02:29:41 +08:00
|
|
|
BUG_ON(skb == NULL);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
adapter->rx_buff_pool[pool].skbuff[index] = NULL;
|
|
|
|
|
|
|
|
dma_unmap_single(&adapter->vdev->dev,
|
|
|
|
adapter->rx_buff_pool[pool].dma_addr[index],
|
|
|
|
adapter->rx_buff_pool[pool].buff_size,
|
|
|
|
DMA_FROM_DEVICE);
|
|
|
|
|
2006-10-22 01:24:13 +08:00
|
|
|
free_index = adapter->rx_buff_pool[pool].producer_index;
|
2010-09-04 02:28:04 +08:00
|
|
|
adapter->rx_buff_pool[pool].producer_index++;
|
|
|
|
if (adapter->rx_buff_pool[pool].producer_index >=
|
|
|
|
adapter->rx_buff_pool[pool].size)
|
|
|
|
adapter->rx_buff_pool[pool].producer_index = 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
adapter->rx_buff_pool[pool].free_map[free_index] = index;
|
|
|
|
|
|
|
|
mb();
|
|
|
|
|
|
|
|
atomic_dec(&(adapter->rx_buff_pool[pool].available));
|
|
|
|
}
|
|
|
|
|
|
|
|
/* get the current buffer on the rx queue */
|
|
|
|
static inline struct sk_buff *ibmveth_rxq_get_buffer(struct ibmveth_adapter *adapter)
|
|
|
|
{
|
|
|
|
u64 correlator = adapter->rx_queue.queue_addr[adapter->rx_queue.index].correlator;
|
|
|
|
unsigned int pool = correlator >> 32;
|
|
|
|
unsigned int index = correlator & 0xffffffffUL;
|
|
|
|
|
2010-09-04 02:29:41 +08:00
|
|
|
BUG_ON(pool >= IBMVETH_NUM_BUFF_POOLS);
|
|
|
|
BUG_ON(index >= adapter->rx_buff_pool[pool].size);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
return adapter->rx_buff_pool[pool].skbuff[index];
|
|
|
|
}
|
|
|
|
|
|
|
|
/* recycle the current buffer on the rx queue */
|
|
|
|
static void ibmveth_rxq_recycle_buffer(struct ibmveth_adapter *adapter)
|
|
|
|
{
|
|
|
|
u32 q_index = adapter->rx_queue.index;
|
|
|
|
u64 correlator = adapter->rx_queue.queue_addr[q_index].correlator;
|
|
|
|
unsigned int pool = correlator >> 32;
|
|
|
|
unsigned int index = correlator & 0xffffffffUL;
|
|
|
|
union ibmveth_buf_desc desc;
|
|
|
|
unsigned long lpar_rc;
|
|
|
|
|
2010-09-04 02:29:41 +08:00
|
|
|
BUG_ON(pool >= IBMVETH_NUM_BUFF_POOLS);
|
|
|
|
BUG_ON(index >= adapter->rx_buff_pool[pool].size);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2010-09-04 02:29:30 +08:00
|
|
|
if (!adapter->rx_buff_pool[pool].active) {
|
2005-10-27 00:47:01 +08:00
|
|
|
ibmveth_rxq_harvest_buffer(adapter);
|
|
|
|
ibmveth_free_buffer_pool(adapter, &adapter->rx_buff_pool[pool]);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2007-08-17 22:16:56 +08:00
|
|
|
desc.fields.flags_len = IBMVETH_BUF_VALID |
|
|
|
|
adapter->rx_buff_pool[pool].buff_size;
|
2005-04-17 06:20:36 +08:00
|
|
|
desc.fields.address = adapter->rx_buff_pool[pool].dma_addr[index];
|
|
|
|
|
|
|
|
lpar_rc = h_add_logical_lan_buffer(adapter->vdev->unit_address, desc.desc);
|
2006-05-24 13:31:14 +08:00
|
|
|
|
2010-09-04 02:29:30 +08:00
|
|
|
if (lpar_rc != H_SUCCESS) {
|
2010-09-04 02:29:14 +08:00
|
|
|
netdev_dbg(adapter->netdev, "h_add_logical_lan_buffer failed "
|
|
|
|
"during recycle rc=%ld", lpar_rc);
|
2005-04-17 06:20:36 +08:00
|
|
|
ibmveth_remove_buffer_from_pool(adapter, adapter->rx_queue.queue_addr[adapter->rx_queue.index].correlator);
|
|
|
|
}
|
|
|
|
|
2010-09-04 02:29:30 +08:00
|
|
|
if (++adapter->rx_queue.index == adapter->rx_queue.num_slots) {
|
2005-04-17 06:20:36 +08:00
|
|
|
adapter->rx_queue.index = 0;
|
|
|
|
adapter->rx_queue.toggle = !adapter->rx_queue.toggle;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-04-17 11:12:55 +08:00
|
|
|
static void ibmveth_rxq_harvest_buffer(struct ibmveth_adapter *adapter)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
ibmveth_remove_buffer_from_pool(adapter, adapter->rx_queue.queue_addr[adapter->rx_queue.index].correlator);
|
|
|
|
|
2010-09-04 02:29:30 +08:00
|
|
|
if (++adapter->rx_queue.index == adapter->rx_queue.num_slots) {
|
2005-04-17 06:20:36 +08:00
|
|
|
adapter->rx_queue.index = 0;
|
|
|
|
adapter->rx_queue.toggle = !adapter->rx_queue.toggle;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void ibmveth_cleanup(struct ibmveth_adapter *adapter)
|
|
|
|
{
|
2005-10-27 00:47:01 +08:00
|
|
|
int i;
|
2008-07-26 10:44:49 +08:00
|
|
|
struct device *dev = &adapter->vdev->dev;
|
2005-10-27 00:47:01 +08:00
|
|
|
|
2010-09-04 02:29:30 +08:00
|
|
|
if (adapter->buffer_list_addr != NULL) {
|
2008-07-26 10:44:49 +08:00
|
|
|
if (!dma_mapping_error(dev, adapter->buffer_list_dma)) {
|
|
|
|
dma_unmap_single(dev, adapter->buffer_list_dma, 4096,
|
2005-04-17 06:20:36 +08:00
|
|
|
DMA_BIDIRECTIONAL);
|
|
|
|
adapter->buffer_list_dma = DMA_ERROR_CODE;
|
|
|
|
}
|
|
|
|
free_page((unsigned long)adapter->buffer_list_addr);
|
|
|
|
adapter->buffer_list_addr = NULL;
|
2006-05-24 13:31:14 +08:00
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2010-09-04 02:29:30 +08:00
|
|
|
if (adapter->filter_list_addr != NULL) {
|
2008-07-26 10:44:49 +08:00
|
|
|
if (!dma_mapping_error(dev, adapter->filter_list_dma)) {
|
|
|
|
dma_unmap_single(dev, adapter->filter_list_dma, 4096,
|
2005-04-17 06:20:36 +08:00
|
|
|
DMA_BIDIRECTIONAL);
|
|
|
|
adapter->filter_list_dma = DMA_ERROR_CODE;
|
|
|
|
}
|
|
|
|
free_page((unsigned long)adapter->filter_list_addr);
|
|
|
|
adapter->filter_list_addr = NULL;
|
|
|
|
}
|
|
|
|
|
2010-09-04 02:29:30 +08:00
|
|
|
if (adapter->rx_queue.queue_addr != NULL) {
|
2008-07-26 10:44:49 +08:00
|
|
|
if (!dma_mapping_error(dev, adapter->rx_queue.queue_dma)) {
|
|
|
|
dma_unmap_single(dev,
|
2005-04-17 06:20:36 +08:00
|
|
|
adapter->rx_queue.queue_dma,
|
|
|
|
adapter->rx_queue.queue_len,
|
|
|
|
DMA_BIDIRECTIONAL);
|
|
|
|
adapter->rx_queue.queue_dma = DMA_ERROR_CODE;
|
|
|
|
}
|
|
|
|
kfree(adapter->rx_queue.queue_addr);
|
|
|
|
adapter->rx_queue.queue_addr = NULL;
|
|
|
|
}
|
|
|
|
|
2010-09-04 02:29:30 +08:00
|
|
|
for (i = 0; i < IBMVETH_NUM_BUFF_POOLS; i++)
|
[PATCH] ibmveth change buffer pools dynamically
This patch provides a sysfs interface to change some properties of the
ibmveth buffer pools (size of the buffers, number of buffers per pool,
and whether a pool is active). Ethernet drivers use ethtool to provide
this type of functionality. However, the buffers in the ibmveth driver
can have an arbitrary size (not only regular, mini, and jumbo which are
the only sizes that ethtool can change), and also ibmveth can have an
arbitrary number of buffer pools
Under heavy load we have seen dropped packets which obviously kills TCP
performance. We have created several fixes that mitigate this issue,
but we definitely need a way of changing the number of buffers for an
adapter dynamically. Also, changing the size of the buffers allows
users to change the MTU to something big (bigger than a jumbo frame)
greatly improving performance on partition to partition transfers.
The patch creates directories pool1...pool4 in the device directory in
sysfs, each with files: num, size, and active (which default to the
values in the mainline version).
Comments and suggestions are welcome...
--
Santiago A. Leon
Power Linux Development
IBM Linux Technology Center
Signed-off-by: Jeff Garzik <jeff@garzik.org>
2006-04-26 00:19:59 +08:00
|
|
|
if (adapter->rx_buff_pool[i].active)
|
2006-05-24 13:31:14 +08:00
|
|
|
ibmveth_free_buffer_pool(adapter,
|
[PATCH] ibmveth change buffer pools dynamically
This patch provides a sysfs interface to change some properties of the
ibmveth buffer pools (size of the buffers, number of buffers per pool,
and whether a pool is active). Ethernet drivers use ethtool to provide
this type of functionality. However, the buffers in the ibmveth driver
can have an arbitrary size (not only regular, mini, and jumbo which are
the only sizes that ethtool can change), and also ibmveth can have an
arbitrary number of buffer pools
Under heavy load we have seen dropped packets which obviously kills TCP
performance. We have created several fixes that mitigate this issue,
but we definitely need a way of changing the number of buffers for an
adapter dynamically. Also, changing the size of the buffers allows
users to change the MTU to something big (bigger than a jumbo frame)
greatly improving performance on partition to partition transfers.
The patch creates directories pool1...pool4 in the device directory in
sysfs, each with files: num, size, and active (which default to the
values in the mainline version).
Comments and suggestions are welcome...
--
Santiago A. Leon
Power Linux Development
IBM Linux Technology Center
Signed-off-by: Jeff Garzik <jeff@garzik.org>
2006-04-26 00:19:59 +08:00
|
|
|
&adapter->rx_buff_pool[i]);
|
2008-07-24 02:34:52 +08:00
|
|
|
|
|
|
|
if (adapter->bounce_buffer != NULL) {
|
2008-07-28 00:14:24 +08:00
|
|
|
if (!dma_mapping_error(dev, adapter->bounce_buffer_dma)) {
|
2008-07-24 02:34:52 +08:00
|
|
|
dma_unmap_single(&adapter->vdev->dev,
|
|
|
|
adapter->bounce_buffer_dma,
|
|
|
|
adapter->netdev->mtu + IBMVETH_BUFF_OH,
|
|
|
|
DMA_BIDIRECTIONAL);
|
|
|
|
adapter->bounce_buffer_dma = DMA_ERROR_CODE;
|
|
|
|
}
|
|
|
|
kfree(adapter->bounce_buffer);
|
|
|
|
adapter->bounce_buffer = NULL;
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2006-10-04 01:24:23 +08:00
|
|
|
static int ibmveth_register_logical_lan(struct ibmveth_adapter *adapter,
|
|
|
|
union ibmveth_buf_desc rxq_desc, u64 mac_address)
|
|
|
|
{
|
|
|
|
int rc, try_again = 1;
|
|
|
|
|
2010-09-04 02:29:30 +08:00
|
|
|
/*
|
|
|
|
* After a kexec the adapter will still be open, so our attempt to
|
|
|
|
* open it will fail. So if we get a failure we free the adapter and
|
|
|
|
* try again, but only once.
|
|
|
|
*/
|
2006-10-04 01:24:23 +08:00
|
|
|
retry:
|
|
|
|
rc = h_register_logical_lan(adapter->vdev->unit_address,
|
|
|
|
adapter->buffer_list_dma, rxq_desc.desc,
|
|
|
|
adapter->filter_list_dma, mac_address);
|
|
|
|
|
|
|
|
if (rc != H_SUCCESS && try_again) {
|
|
|
|
do {
|
|
|
|
rc = h_free_logical_lan(adapter->vdev->unit_address);
|
|
|
|
} while (H_IS_LONG_BUSY(rc) || (rc == H_BUSY));
|
|
|
|
|
|
|
|
try_again = 0;
|
|
|
|
goto retry;
|
|
|
|
}
|
|
|
|
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
static int ibmveth_open(struct net_device *netdev)
|
|
|
|
{
|
2008-11-13 15:38:14 +08:00
|
|
|
struct ibmveth_adapter *adapter = netdev_priv(netdev);
|
2005-04-17 06:20:36 +08:00
|
|
|
u64 mac_address = 0;
|
2005-10-27 00:47:01 +08:00
|
|
|
int rxq_entries = 1;
|
2005-04-17 06:20:36 +08:00
|
|
|
unsigned long lpar_rc;
|
|
|
|
int rc;
|
|
|
|
union ibmveth_buf_desc rxq_desc;
|
2005-10-27 00:47:01 +08:00
|
|
|
int i;
|
2008-07-26 10:44:49 +08:00
|
|
|
struct device *dev;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2010-09-04 02:29:14 +08:00
|
|
|
netdev_dbg(netdev, "open starting\n");
|
2005-04-17 06:20:36 +08:00
|
|
|
|
[NET]: Make NAPI polling independent of struct net_device objects.
Several devices have multiple independant RX queues per net
device, and some have a single interrupt doorbell for several
queues.
In either case, it's easier to support layouts like that if the
structure representing the poll is independant from the net
device itself.
The signature of the ->poll() call back goes from:
int foo_poll(struct net_device *dev, int *budget)
to
int foo_poll(struct napi_struct *napi, int budget)
The caller is returned the number of RX packets processed (or
the number of "NAPI credits" consumed if you want to get
abstract). The callee no longer messes around bumping
dev->quota, *budget, etc. because that is all handled in the
caller upon return.
The napi_struct is to be embedded in the device driver private data
structures.
Furthermore, it is the driver's responsibility to disable all NAPI
instances in it's ->stop() device close handler. Since the
napi_struct is privatized into the driver's private data structures,
only the driver knows how to get at all of the napi_struct instances
it may have per-device.
With lots of help and suggestions from Rusty Russell, Roland Dreier,
Michael Chan, Jeff Garzik, and Jamal Hadi Salim.
Bug fixes from Thomas Graf, Roland Dreier, Peter Zijlstra,
Joseph Fannin, Scott Wood, Hans J. Koch, and Michael Chan.
[ Ported to current tree and all drivers converted. Integrated
Stephen's follow-on kerneldoc additions, and restored poll_list
handling to the old style to fix mutual exclusion issues. -DaveM ]
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-10-04 07:41:36 +08:00
|
|
|
napi_enable(&adapter->napi);
|
|
|
|
|
2010-09-04 02:29:25 +08:00
|
|
|
for(i = 0; i < IBMVETH_NUM_BUFF_POOLS; i++)
|
2005-10-27 00:47:01 +08:00
|
|
|
rxq_entries += adapter->rx_buff_pool[i].size;
|
2006-05-24 13:31:14 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
adapter->buffer_list_addr = (void*) get_zeroed_page(GFP_KERNEL);
|
|
|
|
adapter->filter_list_addr = (void*) get_zeroed_page(GFP_KERNEL);
|
2006-05-24 13:31:14 +08:00
|
|
|
|
2010-09-04 02:29:30 +08:00
|
|
|
if (!adapter->buffer_list_addr || !adapter->filter_list_addr) {
|
2010-09-04 02:29:19 +08:00
|
|
|
netdev_err(netdev, "unable to allocate filter or buffer list "
|
|
|
|
"pages\n");
|
2010-10-20 12:21:13 +08:00
|
|
|
rc = -ENOMEM;
|
|
|
|
goto err_out;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2010-09-04 02:29:30 +08:00
|
|
|
adapter->rx_queue.queue_len = sizeof(struct ibmveth_rx_q_entry) *
|
|
|
|
rxq_entries;
|
|
|
|
adapter->rx_queue.queue_addr = kmalloc(adapter->rx_queue.queue_len,
|
|
|
|
GFP_KERNEL);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2010-09-04 02:29:30 +08:00
|
|
|
if (!adapter->rx_queue.queue_addr) {
|
2010-09-04 02:29:19 +08:00
|
|
|
netdev_err(netdev, "unable to allocate rx queue pages\n");
|
2010-10-20 12:21:13 +08:00
|
|
|
rc = -ENOMEM;
|
|
|
|
goto err_out;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2008-07-26 10:44:49 +08:00
|
|
|
dev = &adapter->vdev->dev;
|
|
|
|
|
|
|
|
adapter->buffer_list_dma = dma_map_single(dev,
|
2005-04-17 06:20:36 +08:00
|
|
|
adapter->buffer_list_addr, 4096, DMA_BIDIRECTIONAL);
|
2008-07-26 10:44:49 +08:00
|
|
|
adapter->filter_list_dma = dma_map_single(dev,
|
2005-04-17 06:20:36 +08:00
|
|
|
adapter->filter_list_addr, 4096, DMA_BIDIRECTIONAL);
|
2008-07-26 10:44:49 +08:00
|
|
|
adapter->rx_queue.queue_dma = dma_map_single(dev,
|
2005-04-17 06:20:36 +08:00
|
|
|
adapter->rx_queue.queue_addr,
|
|
|
|
adapter->rx_queue.queue_len, DMA_BIDIRECTIONAL);
|
|
|
|
|
2008-07-26 10:44:49 +08:00
|
|
|
if ((dma_mapping_error(dev, adapter->buffer_list_dma)) ||
|
|
|
|
(dma_mapping_error(dev, adapter->filter_list_dma)) ||
|
|
|
|
(dma_mapping_error(dev, adapter->rx_queue.queue_dma))) {
|
2010-09-04 02:29:19 +08:00
|
|
|
netdev_err(netdev, "unable to map filter or buffer list "
|
|
|
|
"pages\n");
|
2010-10-20 12:21:13 +08:00
|
|
|
rc = -ENOMEM;
|
|
|
|
goto err_out;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
adapter->rx_queue.index = 0;
|
|
|
|
adapter->rx_queue.num_slots = rxq_entries;
|
|
|
|
adapter->rx_queue.toggle = 1;
|
|
|
|
|
|
|
|
memcpy(&mac_address, netdev->dev_addr, netdev->addr_len);
|
|
|
|
mac_address = mac_address >> 16;
|
|
|
|
|
2010-09-04 02:29:30 +08:00
|
|
|
rxq_desc.fields.flags_len = IBMVETH_BUF_VALID |
|
|
|
|
adapter->rx_queue.queue_len;
|
2005-04-17 06:20:36 +08:00
|
|
|
rxq_desc.fields.address = adapter->rx_queue.queue_dma;
|
|
|
|
|
2010-09-04 02:29:14 +08:00
|
|
|
netdev_dbg(netdev, "buffer list @ 0x%p\n", adapter->buffer_list_addr);
|
|
|
|
netdev_dbg(netdev, "filter list @ 0x%p\n", adapter->filter_list_addr);
|
|
|
|
netdev_dbg(netdev, "receive q @ 0x%p\n", adapter->rx_queue.queue_addr);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2006-10-04 01:24:34 +08:00
|
|
|
h_vio_signal(adapter->vdev->unit_address, VIO_IRQ_DISABLE);
|
|
|
|
|
2006-10-04 01:24:23 +08:00
|
|
|
lpar_rc = ibmveth_register_logical_lan(adapter, rxq_desc, mac_address);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2010-09-04 02:29:30 +08:00
|
|
|
if (lpar_rc != H_SUCCESS) {
|
2010-09-04 02:29:19 +08:00
|
|
|
netdev_err(netdev, "h_register_logical_lan failed with %ld\n",
|
|
|
|
lpar_rc);
|
|
|
|
netdev_err(netdev, "buffer TCE:0x%llx filter TCE:0x%llx rxq "
|
|
|
|
"desc:0x%llx MAC:0x%llx\n",
|
2005-04-17 06:20:36 +08:00
|
|
|
adapter->buffer_list_dma,
|
|
|
|
adapter->filter_list_dma,
|
|
|
|
rxq_desc.desc,
|
|
|
|
mac_address);
|
2010-10-20 12:21:13 +08:00
|
|
|
rc = -ENONET;
|
|
|
|
goto err_out;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2010-09-04 02:29:30 +08:00
|
|
|
for (i = 0; i < IBMVETH_NUM_BUFF_POOLS; i++) {
|
|
|
|
if (!adapter->rx_buff_pool[i].active)
|
[PATCH] ibmveth change buffer pools dynamically
This patch provides a sysfs interface to change some properties of the
ibmveth buffer pools (size of the buffers, number of buffers per pool,
and whether a pool is active). Ethernet drivers use ethtool to provide
this type of functionality. However, the buffers in the ibmveth driver
can have an arbitrary size (not only regular, mini, and jumbo which are
the only sizes that ethtool can change), and also ibmveth can have an
arbitrary number of buffer pools
Under heavy load we have seen dropped packets which obviously kills TCP
performance. We have created several fixes that mitigate this issue,
but we definitely need a way of changing the number of buffers for an
adapter dynamically. Also, changing the size of the buffers allows
users to change the MTU to something big (bigger than a jumbo frame)
greatly improving performance on partition to partition transfers.
The patch creates directories pool1...pool4 in the device directory in
sysfs, each with files: num, size, and active (which default to the
values in the mainline version).
Comments and suggestions are welcome...
--
Santiago A. Leon
Power Linux Development
IBM Linux Technology Center
Signed-off-by: Jeff Garzik <jeff@garzik.org>
2006-04-26 00:19:59 +08:00
|
|
|
continue;
|
|
|
|
if (ibmveth_alloc_buffer_pool(&adapter->rx_buff_pool[i])) {
|
2010-09-04 02:29:19 +08:00
|
|
|
netdev_err(netdev, "unable to alloc pool\n");
|
[PATCH] ibmveth change buffer pools dynamically
This patch provides a sysfs interface to change some properties of the
ibmveth buffer pools (size of the buffers, number of buffers per pool,
and whether a pool is active). Ethernet drivers use ethtool to provide
this type of functionality. However, the buffers in the ibmveth driver
can have an arbitrary size (not only regular, mini, and jumbo which are
the only sizes that ethtool can change), and also ibmveth can have an
arbitrary number of buffer pools
Under heavy load we have seen dropped packets which obviously kills TCP
performance. We have created several fixes that mitigate this issue,
but we definitely need a way of changing the number of buffers for an
adapter dynamically. Also, changing the size of the buffers allows
users to change the MTU to something big (bigger than a jumbo frame)
greatly improving performance on partition to partition transfers.
The patch creates directories pool1...pool4 in the device directory in
sysfs, each with files: num, size, and active (which default to the
values in the mainline version).
Comments and suggestions are welcome...
--
Santiago A. Leon
Power Linux Development
IBM Linux Technology Center
Signed-off-by: Jeff Garzik <jeff@garzik.org>
2006-04-26 00:19:59 +08:00
|
|
|
adapter->rx_buff_pool[i].active = 0;
|
2010-10-20 12:21:13 +08:00
|
|
|
rc = -ENOMEM;
|
|
|
|
goto err_out;
|
[PATCH] ibmveth change buffer pools dynamically
This patch provides a sysfs interface to change some properties of the
ibmveth buffer pools (size of the buffers, number of buffers per pool,
and whether a pool is active). Ethernet drivers use ethtool to provide
this type of functionality. However, the buffers in the ibmveth driver
can have an arbitrary size (not only regular, mini, and jumbo which are
the only sizes that ethtool can change), and also ibmveth can have an
arbitrary number of buffer pools
Under heavy load we have seen dropped packets which obviously kills TCP
performance. We have created several fixes that mitigate this issue,
but we definitely need a way of changing the number of buffers for an
adapter dynamically. Also, changing the size of the buffers allows
users to change the MTU to something big (bigger than a jumbo frame)
greatly improving performance on partition to partition transfers.
The patch creates directories pool1...pool4 in the device directory in
sysfs, each with files: num, size, and active (which default to the
values in the mainline version).
Comments and suggestions are welcome...
--
Santiago A. Leon
Power Linux Development
IBM Linux Technology Center
Signed-off-by: Jeff Garzik <jeff@garzik.org>
2006-04-26 00:19:59 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-09-04 02:29:14 +08:00
|
|
|
netdev_dbg(netdev, "registering irq 0x%x\n", netdev->irq);
|
2010-09-04 02:29:30 +08:00
|
|
|
rc = request_irq(netdev->irq, ibmveth_interrupt, 0, netdev->name,
|
|
|
|
netdev);
|
|
|
|
if (rc != 0) {
|
2010-09-04 02:29:19 +08:00
|
|
|
netdev_err(netdev, "unable to request irq 0x%x, rc %d\n",
|
|
|
|
netdev->irq, rc);
|
2005-04-17 06:20:36 +08:00
|
|
|
do {
|
|
|
|
rc = h_free_logical_lan(adapter->vdev->unit_address);
|
2006-03-30 20:49:40 +08:00
|
|
|
} while (H_IS_LONG_BUSY(rc) || (rc == H_BUSY));
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2010-10-20 12:21:13 +08:00
|
|
|
goto err_out;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2008-07-24 02:34:52 +08:00
|
|
|
adapter->bounce_buffer =
|
|
|
|
kmalloc(netdev->mtu + IBMVETH_BUFF_OH, GFP_KERNEL);
|
|
|
|
if (!adapter->bounce_buffer) {
|
2010-09-04 02:29:19 +08:00
|
|
|
netdev_err(netdev, "unable to allocate bounce buffer\n");
|
2010-10-20 12:21:13 +08:00
|
|
|
rc = -ENOMEM;
|
2010-10-20 12:21:51 +08:00
|
|
|
goto err_out_free_irq;
|
2008-07-24 02:34:52 +08:00
|
|
|
}
|
|
|
|
adapter->bounce_buffer_dma =
|
|
|
|
dma_map_single(&adapter->vdev->dev, adapter->bounce_buffer,
|
|
|
|
netdev->mtu + IBMVETH_BUFF_OH, DMA_BIDIRECTIONAL);
|
2008-07-26 10:44:49 +08:00
|
|
|
if (dma_mapping_error(dev, adapter->bounce_buffer_dma)) {
|
2010-09-04 02:29:19 +08:00
|
|
|
netdev_err(netdev, "unable to map bounce buffer\n");
|
2010-10-20 12:21:13 +08:00
|
|
|
rc = -ENOMEM;
|
2010-10-20 12:21:51 +08:00
|
|
|
goto err_out_free_irq;
|
2008-07-24 02:34:52 +08:00
|
|
|
}
|
|
|
|
|
2010-09-04 02:29:14 +08:00
|
|
|
netdev_dbg(netdev, "initial replenish cycle\n");
|
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.
The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around. On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).
Where appropriate, an arch may override the generic storage facility and do
something different with the variable. On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.
Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions. Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller. A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.
I've build this code with allyesconfig for x86_64 and i386. I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.
This will affect all archs. Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
struct pt_regs *old_regs = set_irq_regs(regs);
And put the old one back at the end:
set_irq_regs(old_regs);
Don't pass regs through to generic_handle_irq() or __do_IRQ().
In timer_interrupt(), this sort of change will be necessary:
- update_process_times(user_mode(regs));
- profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(get_irq_regs()));
+ profile_tick(CPU_PROFILING);
I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().
Some notes on the interrupt handling in the drivers:
(*) input_dev() is now gone entirely. The regs pointer is no longer stored in
the input_dev struct.
(*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
something different depending on whether it's been supplied with a regs
pointer or not.
(*) Various IRQ handler function pointers have been moved to type
irq_handler_t.
Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
2006-10-05 21:55:46 +08:00
|
|
|
ibmveth_interrupt(netdev->irq, netdev);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2005-10-27 00:47:08 +08:00
|
|
|
netif_start_queue(netdev);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2010-09-04 02:29:14 +08:00
|
|
|
netdev_dbg(netdev, "open complete\n");
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
return 0;
|
2010-10-20 12:21:13 +08:00
|
|
|
|
2010-10-20 12:21:51 +08:00
|
|
|
err_out_free_irq:
|
|
|
|
free_irq(netdev->irq, netdev);
|
2010-10-20 12:21:13 +08:00
|
|
|
err_out:
|
|
|
|
ibmveth_cleanup(adapter);
|
|
|
|
napi_disable(&adapter->napi);
|
|
|
|
return rc;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static int ibmveth_close(struct net_device *netdev)
|
|
|
|
{
|
2008-11-13 15:38:14 +08:00
|
|
|
struct ibmveth_adapter *adapter = netdev_priv(netdev);
|
2005-04-17 06:20:36 +08:00
|
|
|
long lpar_rc;
|
2006-05-24 13:31:14 +08:00
|
|
|
|
2010-09-04 02:29:14 +08:00
|
|
|
netdev_dbg(netdev, "close starting\n");
|
2005-04-17 06:20:36 +08:00
|
|
|
|
[NET]: Make NAPI polling independent of struct net_device objects.
Several devices have multiple independant RX queues per net
device, and some have a single interrupt doorbell for several
queues.
In either case, it's easier to support layouts like that if the
structure representing the poll is independant from the net
device itself.
The signature of the ->poll() call back goes from:
int foo_poll(struct net_device *dev, int *budget)
to
int foo_poll(struct napi_struct *napi, int budget)
The caller is returned the number of RX packets processed (or
the number of "NAPI credits" consumed if you want to get
abstract). The callee no longer messes around bumping
dev->quota, *budget, etc. because that is all handled in the
caller upon return.
The napi_struct is to be embedded in the device driver private data
structures.
Furthermore, it is the driver's responsibility to disable all NAPI
instances in it's ->stop() device close handler. Since the
napi_struct is privatized into the driver's private data structures,
only the driver knows how to get at all of the napi_struct instances
it may have per-device.
With lots of help and suggestions from Rusty Russell, Roland Dreier,
Michael Chan, Jeff Garzik, and Jamal Hadi Salim.
Bug fixes from Thomas Graf, Roland Dreier, Peter Zijlstra,
Joseph Fannin, Scott Wood, Hans J. Koch, and Michael Chan.
[ Ported to current tree and all drivers converted. Integrated
Stephen's follow-on kerneldoc additions, and restored poll_list
handling to the old style to fix mutual exclusion issues. -DaveM ]
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-10-04 07:41:36 +08:00
|
|
|
napi_disable(&adapter->napi);
|
|
|
|
|
[PATCH] ibmveth change buffer pools dynamically
This patch provides a sysfs interface to change some properties of the
ibmveth buffer pools (size of the buffers, number of buffers per pool,
and whether a pool is active). Ethernet drivers use ethtool to provide
this type of functionality. However, the buffers in the ibmveth driver
can have an arbitrary size (not only regular, mini, and jumbo which are
the only sizes that ethtool can change), and also ibmveth can have an
arbitrary number of buffer pools
Under heavy load we have seen dropped packets which obviously kills TCP
performance. We have created several fixes that mitigate this issue,
but we definitely need a way of changing the number of buffers for an
adapter dynamically. Also, changing the size of the buffers allows
users to change the MTU to something big (bigger than a jumbo frame)
greatly improving performance on partition to partition transfers.
The patch creates directories pool1...pool4 in the device directory in
sysfs, each with files: num, size, and active (which default to the
values in the mainline version).
Comments and suggestions are welcome...
--
Santiago A. Leon
Power Linux Development
IBM Linux Technology Center
Signed-off-by: Jeff Garzik <jeff@garzik.org>
2006-04-26 00:19:59 +08:00
|
|
|
if (!adapter->pool_config)
|
|
|
|
netif_stop_queue(netdev);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2010-07-16 12:57:25 +08:00
|
|
|
h_vio_signal(adapter->vdev->unit_address, VIO_IRQ_DISABLE);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
do {
|
|
|
|
lpar_rc = h_free_logical_lan(adapter->vdev->unit_address);
|
2006-03-30 20:49:40 +08:00
|
|
|
} while (H_IS_LONG_BUSY(lpar_rc) || (lpar_rc == H_BUSY));
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2010-09-04 02:29:30 +08:00
|
|
|
if (lpar_rc != H_SUCCESS) {
|
2010-09-04 02:29:19 +08:00
|
|
|
netdev_err(netdev, "h_free_logical_lan failed with %lx, "
|
|
|
|
"continuing with close\n", lpar_rc);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2010-07-16 12:57:25 +08:00
|
|
|
free_irq(netdev->irq, netdev);
|
|
|
|
|
2010-09-04 02:29:30 +08:00
|
|
|
adapter->rx_no_buffer = *(u64 *)(((char *)adapter->buffer_list_addr) +
|
|
|
|
4096 - 8);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
ibmveth_cleanup(adapter);
|
|
|
|
|
2010-09-04 02:29:14 +08:00
|
|
|
netdev_dbg(netdev, "close complete\n");
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-09-04 02:29:30 +08:00
|
|
|
static int netdev_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
|
|
|
|
{
|
|
|
|
cmd->supported = (SUPPORTED_1000baseT_Full | SUPPORTED_Autoneg |
|
|
|
|
SUPPORTED_FIBRE);
|
|
|
|
cmd->advertising = (ADVERTISED_1000baseT_Full | ADVERTISED_Autoneg |
|
|
|
|
ADVERTISED_FIBRE);
|
2005-04-17 06:20:36 +08:00
|
|
|
cmd->speed = SPEED_1000;
|
|
|
|
cmd->duplex = DUPLEX_FULL;
|
|
|
|
cmd->port = PORT_FIBRE;
|
|
|
|
cmd->phy_address = 0;
|
|
|
|
cmd->transceiver = XCVR_INTERNAL;
|
|
|
|
cmd->autoneg = AUTONEG_ENABLE;
|
|
|
|
cmd->maxtxpkt = 0;
|
|
|
|
cmd->maxrxpkt = 1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-09-04 02:29:30 +08:00
|
|
|
static void netdev_get_drvinfo(struct net_device *dev,
|
|
|
|
struct ethtool_drvinfo *info)
|
|
|
|
{
|
2005-04-17 06:20:36 +08:00
|
|
|
strncpy(info->driver, ibmveth_driver_name, sizeof(info->driver) - 1);
|
2010-09-04 02:29:30 +08:00
|
|
|
strncpy(info->version, ibmveth_driver_version,
|
|
|
|
sizeof(info->version) - 1);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2011-04-19 10:14:25 +08:00
|
|
|
static u32 ibmveth_fix_features(struct net_device *dev, u32 features)
|
2007-08-17 22:16:31 +08:00
|
|
|
{
|
2011-04-19 10:14:25 +08:00
|
|
|
/*
|
|
|
|
* Since the ibmveth firmware interface does not have the
|
|
|
|
* concept of separate tx/rx checksum offload enable, if rx
|
|
|
|
* checksum is disabled we also have to disable tx checksum
|
|
|
|
* offload. Once we disable rx checksum offload, we are no
|
|
|
|
* longer allowed to send tx buffers that are not properly
|
|
|
|
* checksummed.
|
|
|
|
*/
|
2007-08-17 22:16:31 +08:00
|
|
|
|
2011-04-19 10:14:25 +08:00
|
|
|
if (!(features & NETIF_F_RXCSUM))
|
|
|
|
features &= ~NETIF_F_ALL_CSUM;
|
2007-08-17 22:16:31 +08:00
|
|
|
|
2011-04-19 10:14:25 +08:00
|
|
|
return features;
|
2007-08-17 22:16:31 +08:00
|
|
|
}
|
|
|
|
|
2011-04-19 10:14:25 +08:00
|
|
|
static int ibmveth_set_csum_offload(struct net_device *dev, u32 data)
|
2007-08-17 22:16:31 +08:00
|
|
|
{
|
2008-11-13 15:38:14 +08:00
|
|
|
struct ibmveth_adapter *adapter = netdev_priv(dev);
|
2009-01-07 02:47:44 +08:00
|
|
|
unsigned long set_attr, clr_attr, ret_attr;
|
2010-09-04 02:28:52 +08:00
|
|
|
unsigned long set_attr6, clr_attr6;
|
|
|
|
long ret, ret6;
|
2007-08-17 22:16:31 +08:00
|
|
|
int rc1 = 0, rc2 = 0;
|
|
|
|
int restart = 0;
|
|
|
|
|
|
|
|
if (netif_running(dev)) {
|
|
|
|
restart = 1;
|
|
|
|
adapter->pool_config = 1;
|
|
|
|
ibmveth_close(dev);
|
|
|
|
adapter->pool_config = 0;
|
|
|
|
}
|
|
|
|
|
2007-08-17 22:16:56 +08:00
|
|
|
set_attr = 0;
|
|
|
|
clr_attr = 0;
|
2007-08-17 22:16:31 +08:00
|
|
|
|
2010-09-04 02:28:52 +08:00
|
|
|
if (data) {
|
2007-08-17 22:16:56 +08:00
|
|
|
set_attr = IBMVETH_ILLAN_IPV4_TCP_CSUM;
|
2010-09-04 02:28:52 +08:00
|
|
|
set_attr6 = IBMVETH_ILLAN_IPV6_TCP_CSUM;
|
|
|
|
} else {
|
2007-08-17 22:16:56 +08:00
|
|
|
clr_attr = IBMVETH_ILLAN_IPV4_TCP_CSUM;
|
2010-09-04 02:28:52 +08:00
|
|
|
clr_attr6 = IBMVETH_ILLAN_IPV6_TCP_CSUM;
|
|
|
|
}
|
2007-08-17 22:16:31 +08:00
|
|
|
|
2007-08-17 22:16:56 +08:00
|
|
|
ret = h_illan_attributes(adapter->vdev->unit_address, 0, 0, &ret_attr);
|
2007-08-17 22:16:31 +08:00
|
|
|
|
2007-08-17 22:16:56 +08:00
|
|
|
if (ret == H_SUCCESS && !(ret_attr & IBMVETH_ILLAN_ACTIVE_TRUNK) &&
|
|
|
|
!(ret_attr & IBMVETH_ILLAN_TRUNK_PRI_MASK) &&
|
|
|
|
(ret_attr & IBMVETH_ILLAN_PADDED_PKT_CSUM)) {
|
|
|
|
ret = h_illan_attributes(adapter->vdev->unit_address, clr_attr,
|
|
|
|
set_attr, &ret_attr);
|
2007-08-17 22:16:31 +08:00
|
|
|
|
|
|
|
if (ret != H_SUCCESS) {
|
2010-09-04 02:29:19 +08:00
|
|
|
netdev_err(dev, "unable to change IPv4 checksum "
|
|
|
|
"offload settings. %d rc=%ld\n",
|
|
|
|
data, ret);
|
2007-08-17 22:16:31 +08:00
|
|
|
|
|
|
|
ret = h_illan_attributes(adapter->vdev->unit_address,
|
2007-08-17 22:16:56 +08:00
|
|
|
set_attr, clr_attr, &ret_attr);
|
2010-09-04 02:29:30 +08:00
|
|
|
} else {
|
2010-09-04 02:28:52 +08:00
|
|
|
adapter->fw_ipv4_csum_support = data;
|
2010-09-04 02:29:30 +08:00
|
|
|
}
|
2010-09-04 02:28:52 +08:00
|
|
|
|
|
|
|
ret6 = h_illan_attributes(adapter->vdev->unit_address,
|
|
|
|
clr_attr6, set_attr6, &ret_attr);
|
|
|
|
|
|
|
|
if (ret6 != H_SUCCESS) {
|
2010-09-04 02:29:19 +08:00
|
|
|
netdev_err(dev, "unable to change IPv6 checksum "
|
|
|
|
"offload settings. %d rc=%ld\n",
|
|
|
|
data, ret);
|
2010-09-04 02:28:52 +08:00
|
|
|
|
|
|
|
ret = h_illan_attributes(adapter->vdev->unit_address,
|
|
|
|
set_attr6, clr_attr6,
|
|
|
|
&ret_attr);
|
|
|
|
} else
|
|
|
|
adapter->fw_ipv6_csum_support = data;
|
|
|
|
|
2011-04-19 10:14:25 +08:00
|
|
|
if (ret != H_SUCCESS || ret6 != H_SUCCESS)
|
|
|
|
adapter->rx_csum = data;
|
2010-09-04 02:28:52 +08:00
|
|
|
else
|
|
|
|
rc1 = -EIO;
|
2007-08-17 22:16:31 +08:00
|
|
|
} else {
|
|
|
|
rc1 = -EIO;
|
2010-09-04 02:29:19 +08:00
|
|
|
netdev_err(dev, "unable to change checksum offload settings."
|
|
|
|
" %d rc=%ld ret_attr=%lx\n", data, ret,
|
|
|
|
ret_attr);
|
2007-08-17 22:16:31 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
if (restart)
|
|
|
|
rc2 = ibmveth_open(dev);
|
|
|
|
|
|
|
|
return rc1 ? rc1 : rc2;
|
|
|
|
}
|
|
|
|
|
2011-04-19 10:14:25 +08:00
|
|
|
static int ibmveth_set_features(struct net_device *dev, u32 features)
|
2007-08-17 22:16:31 +08:00
|
|
|
{
|
2008-11-13 15:38:14 +08:00
|
|
|
struct ibmveth_adapter *adapter = netdev_priv(dev);
|
2011-04-19 10:14:25 +08:00
|
|
|
int rx_csum = !!(features & NETIF_F_RXCSUM);
|
|
|
|
int rc;
|
2007-08-17 22:16:31 +08:00
|
|
|
|
2011-04-19 10:14:25 +08:00
|
|
|
if (rx_csum == adapter->rx_csum)
|
2007-08-17 22:16:31 +08:00
|
|
|
return 0;
|
|
|
|
|
2011-04-19 10:14:25 +08:00
|
|
|
rc = ibmveth_set_csum_offload(dev, rx_csum);
|
|
|
|
if (rc && !adapter->rx_csum)
|
|
|
|
dev->features = features & ~(NETIF_F_ALL_CSUM | NETIF_F_RXCSUM);
|
2007-08-17 22:16:31 +08:00
|
|
|
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2007-08-17 22:16:43 +08:00
|
|
|
static void ibmveth_get_strings(struct net_device *dev, u32 stringset, u8 *data)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (stringset != ETH_SS_STATS)
|
|
|
|
return;
|
|
|
|
|
|
|
|
for (i = 0; i < ARRAY_SIZE(ibmveth_stats); i++, data += ETH_GSTRING_LEN)
|
|
|
|
memcpy(data, ibmveth_stats[i].name, ETH_GSTRING_LEN);
|
|
|
|
}
|
|
|
|
|
2007-10-04 09:07:32 +08:00
|
|
|
static int ibmveth_get_sset_count(struct net_device *dev, int sset)
|
2007-08-17 22:16:43 +08:00
|
|
|
{
|
2007-10-04 09:07:32 +08:00
|
|
|
switch (sset) {
|
|
|
|
case ETH_SS_STATS:
|
|
|
|
return ARRAY_SIZE(ibmveth_stats);
|
|
|
|
default:
|
|
|
|
return -EOPNOTSUPP;
|
|
|
|
}
|
2007-08-17 22:16:43 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void ibmveth_get_ethtool_stats(struct net_device *dev,
|
|
|
|
struct ethtool_stats *stats, u64 *data)
|
|
|
|
{
|
|
|
|
int i;
|
2008-11-13 15:38:14 +08:00
|
|
|
struct ibmveth_adapter *adapter = netdev_priv(dev);
|
2007-08-17 22:16:43 +08:00
|
|
|
|
|
|
|
for (i = 0; i < ARRAY_SIZE(ibmveth_stats); i++)
|
|
|
|
data[i] = IBMVETH_GET_STAT(adapter, ibmveth_stats[i].offset);
|
|
|
|
}
|
|
|
|
|
2006-09-14 02:30:00 +08:00
|
|
|
static const struct ethtool_ops netdev_ethtool_ops = {
|
2005-04-17 06:20:36 +08:00
|
|
|
.get_drvinfo = netdev_get_drvinfo,
|
|
|
|
.get_settings = netdev_get_settings,
|
2010-12-09 20:10:25 +08:00
|
|
|
.get_link = ethtool_op_get_link,
|
2007-08-17 22:16:43 +08:00
|
|
|
.get_strings = ibmveth_get_strings,
|
2007-10-04 09:07:32 +08:00
|
|
|
.get_sset_count = ibmveth_get_sset_count,
|
2007-08-17 22:16:43 +08:00
|
|
|
.get_ethtool_stats = ibmveth_get_ethtool_stats,
|
2005-04-17 06:20:36 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
static int ibmveth_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
|
|
|
|
{
|
|
|
|
return -EOPNOTSUPP;
|
|
|
|
}
|
|
|
|
|
|
|
|
#define page_offset(v) ((unsigned long)(v) & ((1 << 12) - 1))
|
|
|
|
|
2010-09-04 02:28:36 +08:00
|
|
|
static int ibmveth_send(struct ibmveth_adapter *adapter,
|
|
|
|
union ibmveth_buf_desc *descs)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
unsigned long correlator;
|
|
|
|
unsigned int retry_count;
|
2010-09-04 02:28:36 +08:00
|
|
|
unsigned long ret;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The retry count sets a maximum for the number of broadcast and
|
|
|
|
* multicast destinations within the system.
|
|
|
|
*/
|
|
|
|
retry_count = 1024;
|
|
|
|
correlator = 0;
|
|
|
|
do {
|
|
|
|
ret = h_send_logical_lan(adapter->vdev->unit_address,
|
|
|
|
descs[0].desc, descs[1].desc,
|
|
|
|
descs[2].desc, descs[3].desc,
|
|
|
|
descs[4].desc, descs[5].desc,
|
|
|
|
correlator, &correlator);
|
|
|
|
} while ((ret == H_BUSY) && (retry_count--));
|
|
|
|
|
|
|
|
if (ret != H_SUCCESS && ret != H_DROPPED) {
|
2010-09-04 02:29:19 +08:00
|
|
|
netdev_err(adapter->netdev, "tx: h_send_logical_lan failed "
|
|
|
|
"with rc=%ld\n", ret);
|
2010-09-04 02:28:36 +08:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
2005-10-27 00:47:16 +08:00
|
|
|
|
2010-09-04 02:28:36 +08:00
|
|
|
static netdev_tx_t ibmveth_start_xmit(struct sk_buff *skb,
|
|
|
|
struct net_device *netdev)
|
|
|
|
{
|
|
|
|
struct ibmveth_adapter *adapter = netdev_priv(netdev);
|
|
|
|
unsigned int desc_flags;
|
|
|
|
union ibmveth_buf_desc descs[6];
|
|
|
|
int last, i;
|
|
|
|
int force_bounce = 0;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* veth handles a maximum of 6 segments including the header, so
|
|
|
|
* we have to linearize the skb if there are more than this.
|
|
|
|
*/
|
|
|
|
if (skb_shinfo(skb)->nr_frags > 5 && __skb_linearize(skb)) {
|
|
|
|
netdev->stats.tx_dropped++;
|
|
|
|
goto out;
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2010-09-04 02:28:36 +08:00
|
|
|
/* veth can't checksum offload UDP */
|
2007-09-16 04:36:07 +08:00
|
|
|
if (skb->ip_summed == CHECKSUM_PARTIAL &&
|
2010-09-04 02:28:52 +08:00
|
|
|
((skb->protocol == htons(ETH_P_IP) &&
|
|
|
|
ip_hdr(skb)->protocol != IPPROTO_TCP) ||
|
|
|
|
(skb->protocol == htons(ETH_P_IPV6) &&
|
|
|
|
ipv6_hdr(skb)->nexthdr != IPPROTO_TCP)) &&
|
|
|
|
skb_checksum_help(skb)) {
|
|
|
|
|
2010-09-04 02:29:19 +08:00
|
|
|
netdev_err(netdev, "tx: failed to checksum packet\n");
|
2010-09-04 02:28:36 +08:00
|
|
|
netdev->stats.tx_dropped++;
|
2007-09-16 04:36:07 +08:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2010-09-04 02:28:36 +08:00
|
|
|
desc_flags = IBMVETH_BUF_VALID;
|
|
|
|
|
2007-09-16 04:36:07 +08:00
|
|
|
if (skb->ip_summed == CHECKSUM_PARTIAL) {
|
2010-09-04 02:28:36 +08:00
|
|
|
unsigned char *buf = skb_transport_header(skb) +
|
|
|
|
skb->csum_offset;
|
2007-09-16 04:36:07 +08:00
|
|
|
|
2010-09-04 02:28:36 +08:00
|
|
|
desc_flags |= (IBMVETH_BUF_NO_CSUM | IBMVETH_BUF_CSUM_GOOD);
|
2007-09-16 04:36:07 +08:00
|
|
|
|
|
|
|
/* Need to zero out the checksum */
|
|
|
|
buf[0] = 0;
|
|
|
|
buf[1] = 0;
|
|
|
|
}
|
|
|
|
|
2010-09-04 02:28:36 +08:00
|
|
|
retry_bounce:
|
|
|
|
memset(descs, 0, sizeof(descs));
|
2010-09-04 02:28:20 +08:00
|
|
|
|
2010-09-04 02:28:36 +08:00
|
|
|
/*
|
|
|
|
* If a linear packet is below the rx threshold then
|
|
|
|
* copy it into the static bounce buffer. This avoids the
|
|
|
|
* cost of a TCE insert and remove.
|
|
|
|
*/
|
|
|
|
if (force_bounce || (!skb_is_nonlinear(skb) &&
|
|
|
|
(skb->len < tx_copybreak))) {
|
2008-07-24 02:34:52 +08:00
|
|
|
skb_copy_from_linear_data(skb, adapter->bounce_buffer,
|
|
|
|
skb->len);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2010-09-04 02:28:36 +08:00
|
|
|
descs[0].fields.flags_len = desc_flags | skb->len;
|
|
|
|
descs[0].fields.address = adapter->bounce_buffer_dma;
|
|
|
|
|
|
|
|
if (ibmveth_send(adapter, descs)) {
|
|
|
|
adapter->tx_send_failed++;
|
|
|
|
netdev->stats.tx_dropped++;
|
|
|
|
} else {
|
|
|
|
netdev->stats.tx_packets++;
|
|
|
|
netdev->stats.tx_bytes += skb->len;
|
|
|
|
}
|
|
|
|
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Map the header */
|
|
|
|
descs[0].fields.address = dma_map_single(&adapter->vdev->dev, skb->data,
|
|
|
|
skb_headlen(skb),
|
|
|
|
DMA_TO_DEVICE);
|
|
|
|
if (dma_mapping_error(&adapter->vdev->dev, descs[0].fields.address))
|
|
|
|
goto map_failed;
|
|
|
|
|
|
|
|
descs[0].fields.flags_len = desc_flags | skb_headlen(skb);
|
|
|
|
|
|
|
|
/* Map the frags */
|
|
|
|
for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
|
|
|
|
unsigned long dma_addr;
|
|
|
|
skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
|
|
|
|
|
|
|
|
dma_addr = dma_map_page(&adapter->vdev->dev, frag->page,
|
|
|
|
frag->page_offset, frag->size,
|
|
|
|
DMA_TO_DEVICE);
|
|
|
|
|
|
|
|
if (dma_mapping_error(&adapter->vdev->dev, dma_addr))
|
|
|
|
goto map_failed_frags;
|
|
|
|
|
|
|
|
descs[i+1].fields.flags_len = desc_flags | frag->size;
|
|
|
|
descs[i+1].fields.address = dma_addr;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ibmveth_send(adapter, descs)) {
|
|
|
|
adapter->tx_send_failed++;
|
|
|
|
netdev->stats.tx_dropped++;
|
2005-04-17 06:20:36 +08:00
|
|
|
} else {
|
2010-09-04 02:28:36 +08:00
|
|
|
netdev->stats.tx_packets++;
|
|
|
|
netdev->stats.tx_bytes += skb->len;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2010-09-04 02:28:36 +08:00
|
|
|
for (i = 0; i < skb_shinfo(skb)->nr_frags + 1; i++)
|
|
|
|
dma_unmap_page(&adapter->vdev->dev, descs[i].fields.address,
|
|
|
|
descs[i].fields.flags_len & IBMVETH_BUF_LEN_MASK,
|
|
|
|
DMA_TO_DEVICE);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2010-09-04 02:28:15 +08:00
|
|
|
out:
|
2005-04-17 06:20:36 +08:00
|
|
|
dev_kfree_skb(skb);
|
2009-06-23 14:03:08 +08:00
|
|
|
return NETDEV_TX_OK;
|
2010-09-04 02:28:36 +08:00
|
|
|
|
|
|
|
map_failed_frags:
|
|
|
|
last = i+1;
|
|
|
|
for (i = 0; i < last; i++)
|
|
|
|
dma_unmap_page(&adapter->vdev->dev, descs[i].fields.address,
|
|
|
|
descs[i].fields.flags_len & IBMVETH_BUF_LEN_MASK,
|
|
|
|
DMA_TO_DEVICE);
|
|
|
|
|
|
|
|
map_failed:
|
|
|
|
if (!firmware_has_feature(FW_FEATURE_CMO))
|
2010-09-04 02:29:19 +08:00
|
|
|
netdev_err(netdev, "tx: unable to map xmit buffer\n");
|
2010-09-04 02:28:36 +08:00
|
|
|
adapter->tx_map_failed++;
|
|
|
|
skb_linearize(skb);
|
|
|
|
force_bounce = 1;
|
|
|
|
goto retry_bounce;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
[NET]: Make NAPI polling independent of struct net_device objects.
Several devices have multiple independant RX queues per net
device, and some have a single interrupt doorbell for several
queues.
In either case, it's easier to support layouts like that if the
structure representing the poll is independant from the net
device itself.
The signature of the ->poll() call back goes from:
int foo_poll(struct net_device *dev, int *budget)
to
int foo_poll(struct napi_struct *napi, int budget)
The caller is returned the number of RX packets processed (or
the number of "NAPI credits" consumed if you want to get
abstract). The callee no longer messes around bumping
dev->quota, *budget, etc. because that is all handled in the
caller upon return.
The napi_struct is to be embedded in the device driver private data
structures.
Furthermore, it is the driver's responsibility to disable all NAPI
instances in it's ->stop() device close handler. Since the
napi_struct is privatized into the driver's private data structures,
only the driver knows how to get at all of the napi_struct instances
it may have per-device.
With lots of help and suggestions from Rusty Russell, Roland Dreier,
Michael Chan, Jeff Garzik, and Jamal Hadi Salim.
Bug fixes from Thomas Graf, Roland Dreier, Peter Zijlstra,
Joseph Fannin, Scott Wood, Hans J. Koch, and Michael Chan.
[ Ported to current tree and all drivers converted. Integrated
Stephen's follow-on kerneldoc additions, and restored poll_list
handling to the old style to fix mutual exclusion issues. -DaveM ]
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-10-04 07:41:36 +08:00
|
|
|
static int ibmveth_poll(struct napi_struct *napi, int budget)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2010-09-04 02:29:30 +08:00
|
|
|
struct ibmveth_adapter *adapter =
|
|
|
|
container_of(napi, struct ibmveth_adapter, napi);
|
[NET]: Make NAPI polling independent of struct net_device objects.
Several devices have multiple independant RX queues per net
device, and some have a single interrupt doorbell for several
queues.
In either case, it's easier to support layouts like that if the
structure representing the poll is independant from the net
device itself.
The signature of the ->poll() call back goes from:
int foo_poll(struct net_device *dev, int *budget)
to
int foo_poll(struct napi_struct *napi, int budget)
The caller is returned the number of RX packets processed (or
the number of "NAPI credits" consumed if you want to get
abstract). The callee no longer messes around bumping
dev->quota, *budget, etc. because that is all handled in the
caller upon return.
The napi_struct is to be embedded in the device driver private data
structures.
Furthermore, it is the driver's responsibility to disable all NAPI
instances in it's ->stop() device close handler. Since the
napi_struct is privatized into the driver's private data structures,
only the driver knows how to get at all of the napi_struct instances
it may have per-device.
With lots of help and suggestions from Rusty Russell, Roland Dreier,
Michael Chan, Jeff Garzik, and Jamal Hadi Salim.
Bug fixes from Thomas Graf, Roland Dreier, Peter Zijlstra,
Joseph Fannin, Scott Wood, Hans J. Koch, and Michael Chan.
[ Ported to current tree and all drivers converted. Integrated
Stephen's follow-on kerneldoc additions, and restored poll_list
handling to the old style to fix mutual exclusion issues. -DaveM ]
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-10-04 07:41:36 +08:00
|
|
|
struct net_device *netdev = adapter->netdev;
|
2005-04-17 06:20:36 +08:00
|
|
|
int frames_processed = 0;
|
|
|
|
unsigned long lpar_rc;
|
|
|
|
|
2010-09-04 02:29:30 +08:00
|
|
|
restart_poll:
|
2005-04-17 06:20:36 +08:00
|
|
|
do {
|
[NET]: Make NAPI polling independent of struct net_device objects.
Several devices have multiple independant RX queues per net
device, and some have a single interrupt doorbell for several
queues.
In either case, it's easier to support layouts like that if the
structure representing the poll is independant from the net
device itself.
The signature of the ->poll() call back goes from:
int foo_poll(struct net_device *dev, int *budget)
to
int foo_poll(struct napi_struct *napi, int budget)
The caller is returned the number of RX packets processed (or
the number of "NAPI credits" consumed if you want to get
abstract). The callee no longer messes around bumping
dev->quota, *budget, etc. because that is all handled in the
caller upon return.
The napi_struct is to be embedded in the device driver private data
structures.
Furthermore, it is the driver's responsibility to disable all NAPI
instances in it's ->stop() device close handler. Since the
napi_struct is privatized into the driver's private data structures,
only the driver knows how to get at all of the napi_struct instances
it may have per-device.
With lots of help and suggestions from Rusty Russell, Roland Dreier,
Michael Chan, Jeff Garzik, and Jamal Hadi Salim.
Bug fixes from Thomas Graf, Roland Dreier, Peter Zijlstra,
Joseph Fannin, Scott Wood, Hans J. Koch, and Michael Chan.
[ Ported to current tree and all drivers converted. Integrated
Stephen's follow-on kerneldoc additions, and restored poll_list
handling to the old style to fix mutual exclusion issues. -DaveM ]
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-10-04 07:41:36 +08:00
|
|
|
if (!ibmveth_rxq_pending_buffer(adapter))
|
|
|
|
break;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2010-09-07 09:21:41 +08:00
|
|
|
smp_rmb();
|
[NET]: Make NAPI polling independent of struct net_device objects.
Several devices have multiple independant RX queues per net
device, and some have a single interrupt doorbell for several
queues.
In either case, it's easier to support layouts like that if the
structure representing the poll is independant from the net
device itself.
The signature of the ->poll() call back goes from:
int foo_poll(struct net_device *dev, int *budget)
to
int foo_poll(struct napi_struct *napi, int budget)
The caller is returned the number of RX packets processed (or
the number of "NAPI credits" consumed if you want to get
abstract). The callee no longer messes around bumping
dev->quota, *budget, etc. because that is all handled in the
caller upon return.
The napi_struct is to be embedded in the device driver private data
structures.
Furthermore, it is the driver's responsibility to disable all NAPI
instances in it's ->stop() device close handler. Since the
napi_struct is privatized into the driver's private data structures,
only the driver knows how to get at all of the napi_struct instances
it may have per-device.
With lots of help and suggestions from Rusty Russell, Roland Dreier,
Michael Chan, Jeff Garzik, and Jamal Hadi Salim.
Bug fixes from Thomas Graf, Roland Dreier, Peter Zijlstra,
Joseph Fannin, Scott Wood, Hans J. Koch, and Michael Chan.
[ Ported to current tree and all drivers converted. Integrated
Stephen's follow-on kerneldoc additions, and restored poll_list
handling to the old style to fix mutual exclusion issues. -DaveM ]
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-10-04 07:41:36 +08:00
|
|
|
if (!ibmveth_rxq_buffer_valid(adapter)) {
|
|
|
|
wmb(); /* suggested by larson1 */
|
|
|
|
adapter->rx_invalid_buffer++;
|
2010-09-04 02:29:14 +08:00
|
|
|
netdev_dbg(netdev, "recycling invalid buffer\n");
|
[NET]: Make NAPI polling independent of struct net_device objects.
Several devices have multiple independant RX queues per net
device, and some have a single interrupt doorbell for several
queues.
In either case, it's easier to support layouts like that if the
structure representing the poll is independant from the net
device itself.
The signature of the ->poll() call back goes from:
int foo_poll(struct net_device *dev, int *budget)
to
int foo_poll(struct napi_struct *napi, int budget)
The caller is returned the number of RX packets processed (or
the number of "NAPI credits" consumed if you want to get
abstract). The callee no longer messes around bumping
dev->quota, *budget, etc. because that is all handled in the
caller upon return.
The napi_struct is to be embedded in the device driver private data
structures.
Furthermore, it is the driver's responsibility to disable all NAPI
instances in it's ->stop() device close handler. Since the
napi_struct is privatized into the driver's private data structures,
only the driver knows how to get at all of the napi_struct instances
it may have per-device.
With lots of help and suggestions from Rusty Russell, Roland Dreier,
Michael Chan, Jeff Garzik, and Jamal Hadi Salim.
Bug fixes from Thomas Graf, Roland Dreier, Peter Zijlstra,
Joseph Fannin, Scott Wood, Hans J. Koch, and Michael Chan.
[ Ported to current tree and all drivers converted. Integrated
Stephen's follow-on kerneldoc additions, and restored poll_list
handling to the old style to fix mutual exclusion issues. -DaveM ]
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-10-04 07:41:36 +08:00
|
|
|
ibmveth_rxq_recycle_buffer(adapter);
|
|
|
|
} else {
|
2010-09-04 02:28:25 +08:00
|
|
|
struct sk_buff *skb, *new_skb;
|
[NET]: Make NAPI polling independent of struct net_device objects.
Several devices have multiple independant RX queues per net
device, and some have a single interrupt doorbell for several
queues.
In either case, it's easier to support layouts like that if the
structure representing the poll is independant from the net
device itself.
The signature of the ->poll() call back goes from:
int foo_poll(struct net_device *dev, int *budget)
to
int foo_poll(struct napi_struct *napi, int budget)
The caller is returned the number of RX packets processed (or
the number of "NAPI credits" consumed if you want to get
abstract). The callee no longer messes around bumping
dev->quota, *budget, etc. because that is all handled in the
caller upon return.
The napi_struct is to be embedded in the device driver private data
structures.
Furthermore, it is the driver's responsibility to disable all NAPI
instances in it's ->stop() device close handler. Since the
napi_struct is privatized into the driver's private data structures,
only the driver knows how to get at all of the napi_struct instances
it may have per-device.
With lots of help and suggestions from Rusty Russell, Roland Dreier,
Michael Chan, Jeff Garzik, and Jamal Hadi Salim.
Bug fixes from Thomas Graf, Roland Dreier, Peter Zijlstra,
Joseph Fannin, Scott Wood, Hans J. Koch, and Michael Chan.
[ Ported to current tree and all drivers converted. Integrated
Stephen's follow-on kerneldoc additions, and restored poll_list
handling to the old style to fix mutual exclusion issues. -DaveM ]
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-10-04 07:41:36 +08:00
|
|
|
int length = ibmveth_rxq_frame_length(adapter);
|
|
|
|
int offset = ibmveth_rxq_frame_offset(adapter);
|
2007-09-16 04:36:07 +08:00
|
|
|
int csum_good = ibmveth_rxq_csum_good(adapter);
|
|
|
|
|
[NET]: Make NAPI polling independent of struct net_device objects.
Several devices have multiple independant RX queues per net
device, and some have a single interrupt doorbell for several
queues.
In either case, it's easier to support layouts like that if the
structure representing the poll is independant from the net
device itself.
The signature of the ->poll() call back goes from:
int foo_poll(struct net_device *dev, int *budget)
to
int foo_poll(struct napi_struct *napi, int budget)
The caller is returned the number of RX packets processed (or
the number of "NAPI credits" consumed if you want to get
abstract). The callee no longer messes around bumping
dev->quota, *budget, etc. because that is all handled in the
caller upon return.
The napi_struct is to be embedded in the device driver private data
structures.
Furthermore, it is the driver's responsibility to disable all NAPI
instances in it's ->stop() device close handler. Since the
napi_struct is privatized into the driver's private data structures,
only the driver knows how to get at all of the napi_struct instances
it may have per-device.
With lots of help and suggestions from Rusty Russell, Roland Dreier,
Michael Chan, Jeff Garzik, and Jamal Hadi Salim.
Bug fixes from Thomas Graf, Roland Dreier, Peter Zijlstra,
Joseph Fannin, Scott Wood, Hans J. Koch, and Michael Chan.
[ Ported to current tree and all drivers converted. Integrated
Stephen's follow-on kerneldoc additions, and restored poll_list
handling to the old style to fix mutual exclusion issues. -DaveM ]
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-10-04 07:41:36 +08:00
|
|
|
skb = ibmveth_rxq_get_buffer(adapter);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2010-09-04 02:28:25 +08:00
|
|
|
new_skb = NULL;
|
|
|
|
if (length < rx_copybreak)
|
|
|
|
new_skb = netdev_alloc_skb(netdev, length);
|
|
|
|
|
|
|
|
if (new_skb) {
|
|
|
|
skb_copy_to_linear_data(new_skb,
|
|
|
|
skb->data + offset,
|
|
|
|
length);
|
2010-09-04 02:28:41 +08:00
|
|
|
if (rx_flush)
|
|
|
|
ibmveth_flush_buffer(skb->data,
|
|
|
|
length + offset);
|
2010-09-04 02:28:25 +08:00
|
|
|
skb = new_skb;
|
|
|
|
ibmveth_rxq_recycle_buffer(adapter);
|
|
|
|
} else {
|
|
|
|
ibmveth_rxq_harvest_buffer(adapter);
|
|
|
|
skb_reserve(skb, offset);
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
[NET]: Make NAPI polling independent of struct net_device objects.
Several devices have multiple independant RX queues per net
device, and some have a single interrupt doorbell for several
queues.
In either case, it's easier to support layouts like that if the
structure representing the poll is independant from the net
device itself.
The signature of the ->poll() call back goes from:
int foo_poll(struct net_device *dev, int *budget)
to
int foo_poll(struct napi_struct *napi, int budget)
The caller is returned the number of RX packets processed (or
the number of "NAPI credits" consumed if you want to get
abstract). The callee no longer messes around bumping
dev->quota, *budget, etc. because that is all handled in the
caller upon return.
The napi_struct is to be embedded in the device driver private data
structures.
Furthermore, it is the driver's responsibility to disable all NAPI
instances in it's ->stop() device close handler. Since the
napi_struct is privatized into the driver's private data structures,
only the driver knows how to get at all of the napi_struct instances
it may have per-device.
With lots of help and suggestions from Rusty Russell, Roland Dreier,
Michael Chan, Jeff Garzik, and Jamal Hadi Salim.
Bug fixes from Thomas Graf, Roland Dreier, Peter Zijlstra,
Joseph Fannin, Scott Wood, Hans J. Koch, and Michael Chan.
[ Ported to current tree and all drivers converted. Integrated
Stephen's follow-on kerneldoc additions, and restored poll_list
handling to the old style to fix mutual exclusion issues. -DaveM ]
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-10-04 07:41:36 +08:00
|
|
|
skb_put(skb, length);
|
|
|
|
skb->protocol = eth_type_trans(skb, netdev);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2010-09-04 02:28:25 +08:00
|
|
|
if (csum_good)
|
|
|
|
skb->ip_summed = CHECKSUM_UNNECESSARY;
|
|
|
|
|
[NET]: Make NAPI polling independent of struct net_device objects.
Several devices have multiple independant RX queues per net
device, and some have a single interrupt doorbell for several
queues.
In either case, it's easier to support layouts like that if the
structure representing the poll is independant from the net
device itself.
The signature of the ->poll() call back goes from:
int foo_poll(struct net_device *dev, int *budget)
to
int foo_poll(struct napi_struct *napi, int budget)
The caller is returned the number of RX packets processed (or
the number of "NAPI credits" consumed if you want to get
abstract). The callee no longer messes around bumping
dev->quota, *budget, etc. because that is all handled in the
caller upon return.
The napi_struct is to be embedded in the device driver private data
structures.
Furthermore, it is the driver's responsibility to disable all NAPI
instances in it's ->stop() device close handler. Since the
napi_struct is privatized into the driver's private data structures,
only the driver knows how to get at all of the napi_struct instances
it may have per-device.
With lots of help and suggestions from Rusty Russell, Roland Dreier,
Michael Chan, Jeff Garzik, and Jamal Hadi Salim.
Bug fixes from Thomas Graf, Roland Dreier, Peter Zijlstra,
Joseph Fannin, Scott Wood, Hans J. Koch, and Michael Chan.
[ Ported to current tree and all drivers converted. Integrated
Stephen's follow-on kerneldoc additions, and restored poll_list
handling to the old style to fix mutual exclusion issues. -DaveM ]
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-10-04 07:41:36 +08:00
|
|
|
netif_receive_skb(skb); /* send it up */
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2007-10-04 08:41:50 +08:00
|
|
|
netdev->stats.rx_packets++;
|
|
|
|
netdev->stats.rx_bytes += length;
|
[NET]: Make NAPI polling independent of struct net_device objects.
Several devices have multiple independant RX queues per net
device, and some have a single interrupt doorbell for several
queues.
In either case, it's easier to support layouts like that if the
structure representing the poll is independant from the net
device itself.
The signature of the ->poll() call back goes from:
int foo_poll(struct net_device *dev, int *budget)
to
int foo_poll(struct napi_struct *napi, int budget)
The caller is returned the number of RX packets processed (or
the number of "NAPI credits" consumed if you want to get
abstract). The callee no longer messes around bumping
dev->quota, *budget, etc. because that is all handled in the
caller upon return.
The napi_struct is to be embedded in the device driver private data
structures.
Furthermore, it is the driver's responsibility to disable all NAPI
instances in it's ->stop() device close handler. Since the
napi_struct is privatized into the driver's private data structures,
only the driver knows how to get at all of the napi_struct instances
it may have per-device.
With lots of help and suggestions from Rusty Russell, Roland Dreier,
Michael Chan, Jeff Garzik, and Jamal Hadi Salim.
Bug fixes from Thomas Graf, Roland Dreier, Peter Zijlstra,
Joseph Fannin, Scott Wood, Hans J. Koch, and Michael Chan.
[ Ported to current tree and all drivers converted. Integrated
Stephen's follow-on kerneldoc additions, and restored poll_list
handling to the old style to fix mutual exclusion issues. -DaveM ]
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-10-04 07:41:36 +08:00
|
|
|
frames_processed++;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
[NET]: Make NAPI polling independent of struct net_device objects.
Several devices have multiple independant RX queues per net
device, and some have a single interrupt doorbell for several
queues.
In either case, it's easier to support layouts like that if the
structure representing the poll is independant from the net
device itself.
The signature of the ->poll() call back goes from:
int foo_poll(struct net_device *dev, int *budget)
to
int foo_poll(struct napi_struct *napi, int budget)
The caller is returned the number of RX packets processed (or
the number of "NAPI credits" consumed if you want to get
abstract). The callee no longer messes around bumping
dev->quota, *budget, etc. because that is all handled in the
caller upon return.
The napi_struct is to be embedded in the device driver private data
structures.
Furthermore, it is the driver's responsibility to disable all NAPI
instances in it's ->stop() device close handler. Since the
napi_struct is privatized into the driver's private data structures,
only the driver knows how to get at all of the napi_struct instances
it may have per-device.
With lots of help and suggestions from Rusty Russell, Roland Dreier,
Michael Chan, Jeff Garzik, and Jamal Hadi Salim.
Bug fixes from Thomas Graf, Roland Dreier, Peter Zijlstra,
Joseph Fannin, Scott Wood, Hans J. Koch, and Michael Chan.
[ Ported to current tree and all drivers converted. Integrated
Stephen's follow-on kerneldoc additions, and restored poll_list
handling to the old style to fix mutual exclusion issues. -DaveM ]
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-10-04 07:41:36 +08:00
|
|
|
} while (frames_processed < budget);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2005-10-27 00:47:08 +08:00
|
|
|
ibmveth_replenish_task(adapter);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
[NET]: Make NAPI polling independent of struct net_device objects.
Several devices have multiple independant RX queues per net
device, and some have a single interrupt doorbell for several
queues.
In either case, it's easier to support layouts like that if the
structure representing the poll is independant from the net
device itself.
The signature of the ->poll() call back goes from:
int foo_poll(struct net_device *dev, int *budget)
to
int foo_poll(struct napi_struct *napi, int budget)
The caller is returned the number of RX packets processed (or
the number of "NAPI credits" consumed if you want to get
abstract). The callee no longer messes around bumping
dev->quota, *budget, etc. because that is all handled in the
caller upon return.
The napi_struct is to be embedded in the device driver private data
structures.
Furthermore, it is the driver's responsibility to disable all NAPI
instances in it's ->stop() device close handler. Since the
napi_struct is privatized into the driver's private data structures,
only the driver knows how to get at all of the napi_struct instances
it may have per-device.
With lots of help and suggestions from Rusty Russell, Roland Dreier,
Michael Chan, Jeff Garzik, and Jamal Hadi Salim.
Bug fixes from Thomas Graf, Roland Dreier, Peter Zijlstra,
Joseph Fannin, Scott Wood, Hans J. Koch, and Michael Chan.
[ Ported to current tree and all drivers converted. Integrated
Stephen's follow-on kerneldoc additions, and restored poll_list
handling to the old style to fix mutual exclusion issues. -DaveM ]
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-10-04 07:41:36 +08:00
|
|
|
if (frames_processed < budget) {
|
|
|
|
/* We think we are done - reenable interrupts,
|
|
|
|
* then check once more to make sure we are done.
|
|
|
|
*/
|
|
|
|
lpar_rc = h_vio_signal(adapter->vdev->unit_address,
|
|
|
|
VIO_IRQ_ENABLE);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2010-09-04 02:29:41 +08:00
|
|
|
BUG_ON(lpar_rc != H_SUCCESS);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2009-01-20 08:43:59 +08:00
|
|
|
napi_complete(napi);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
[NET]: Make NAPI polling independent of struct net_device objects.
Several devices have multiple independant RX queues per net
device, and some have a single interrupt doorbell for several
queues.
In either case, it's easier to support layouts like that if the
structure representing the poll is independant from the net
device itself.
The signature of the ->poll() call back goes from:
int foo_poll(struct net_device *dev, int *budget)
to
int foo_poll(struct napi_struct *napi, int budget)
The caller is returned the number of RX packets processed (or
the number of "NAPI credits" consumed if you want to get
abstract). The callee no longer messes around bumping
dev->quota, *budget, etc. because that is all handled in the
caller upon return.
The napi_struct is to be embedded in the device driver private data
structures.
Furthermore, it is the driver's responsibility to disable all NAPI
instances in it's ->stop() device close handler. Since the
napi_struct is privatized into the driver's private data structures,
only the driver knows how to get at all of the napi_struct instances
it may have per-device.
With lots of help and suggestions from Rusty Russell, Roland Dreier,
Michael Chan, Jeff Garzik, and Jamal Hadi Salim.
Bug fixes from Thomas Graf, Roland Dreier, Peter Zijlstra,
Joseph Fannin, Scott Wood, Hans J. Koch, and Michael Chan.
[ Ported to current tree and all drivers converted. Integrated
Stephen's follow-on kerneldoc additions, and restored poll_list
handling to the old style to fix mutual exclusion issues. -DaveM ]
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-10-04 07:41:36 +08:00
|
|
|
if (ibmveth_rxq_pending_buffer(adapter) &&
|
2009-01-20 08:43:59 +08:00
|
|
|
napi_reschedule(napi)) {
|
[NET]: Make NAPI polling independent of struct net_device objects.
Several devices have multiple independant RX queues per net
device, and some have a single interrupt doorbell for several
queues.
In either case, it's easier to support layouts like that if the
structure representing the poll is independant from the net
device itself.
The signature of the ->poll() call back goes from:
int foo_poll(struct net_device *dev, int *budget)
to
int foo_poll(struct napi_struct *napi, int budget)
The caller is returned the number of RX packets processed (or
the number of "NAPI credits" consumed if you want to get
abstract). The callee no longer messes around bumping
dev->quota, *budget, etc. because that is all handled in the
caller upon return.
The napi_struct is to be embedded in the device driver private data
structures.
Furthermore, it is the driver's responsibility to disable all NAPI
instances in it's ->stop() device close handler. Since the
napi_struct is privatized into the driver's private data structures,
only the driver knows how to get at all of the napi_struct instances
it may have per-device.
With lots of help and suggestions from Rusty Russell, Roland Dreier,
Michael Chan, Jeff Garzik, and Jamal Hadi Salim.
Bug fixes from Thomas Graf, Roland Dreier, Peter Zijlstra,
Joseph Fannin, Scott Wood, Hans J. Koch, and Michael Chan.
[ Ported to current tree and all drivers converted. Integrated
Stephen's follow-on kerneldoc additions, and restored poll_list
handling to the old style to fix mutual exclusion issues. -DaveM ]
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-10-04 07:41:36 +08:00
|
|
|
lpar_rc = h_vio_signal(adapter->vdev->unit_address,
|
|
|
|
VIO_IRQ_DISABLE);
|
|
|
|
goto restart_poll;
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
[NET]: Make NAPI polling independent of struct net_device objects.
Several devices have multiple independant RX queues per net
device, and some have a single interrupt doorbell for several
queues.
In either case, it's easier to support layouts like that if the
structure representing the poll is independant from the net
device itself.
The signature of the ->poll() call back goes from:
int foo_poll(struct net_device *dev, int *budget)
to
int foo_poll(struct napi_struct *napi, int budget)
The caller is returned the number of RX packets processed (or
the number of "NAPI credits" consumed if you want to get
abstract). The callee no longer messes around bumping
dev->quota, *budget, etc. because that is all handled in the
caller upon return.
The napi_struct is to be embedded in the device driver private data
structures.
Furthermore, it is the driver's responsibility to disable all NAPI
instances in it's ->stop() device close handler. Since the
napi_struct is privatized into the driver's private data structures,
only the driver knows how to get at all of the napi_struct instances
it may have per-device.
With lots of help and suggestions from Rusty Russell, Roland Dreier,
Michael Chan, Jeff Garzik, and Jamal Hadi Salim.
Bug fixes from Thomas Graf, Roland Dreier, Peter Zijlstra,
Joseph Fannin, Scott Wood, Hans J. Koch, and Michael Chan.
[ Ported to current tree and all drivers converted. Integrated
Stephen's follow-on kerneldoc additions, and restored poll_list
handling to the old style to fix mutual exclusion issues. -DaveM ]
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-10-04 07:41:36 +08:00
|
|
|
return frames_processed;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.
The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around. On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).
Where appropriate, an arch may override the generic storage facility and do
something different with the variable. On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.
Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions. Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller. A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.
I've build this code with allyesconfig for x86_64 and i386. I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.
This will affect all archs. Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
struct pt_regs *old_regs = set_irq_regs(regs);
And put the old one back at the end:
set_irq_regs(old_regs);
Don't pass regs through to generic_handle_irq() or __do_IRQ().
In timer_interrupt(), this sort of change will be necessary:
- update_process_times(user_mode(regs));
- profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(get_irq_regs()));
+ profile_tick(CPU_PROFILING);
I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().
Some notes on the interrupt handling in the drivers:
(*) input_dev() is now gone entirely. The regs pointer is no longer stored in
the input_dev struct.
(*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
something different depending on whether it's been supplied with a regs
pointer or not.
(*) Various IRQ handler function pointers have been moved to type
irq_handler_t.
Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
2006-10-05 21:55:46 +08:00
|
|
|
static irqreturn_t ibmveth_interrupt(int irq, void *dev_instance)
|
2006-05-24 13:31:14 +08:00
|
|
|
{
|
2005-04-17 06:20:36 +08:00
|
|
|
struct net_device *netdev = dev_instance;
|
2008-11-13 15:38:14 +08:00
|
|
|
struct ibmveth_adapter *adapter = netdev_priv(netdev);
|
2005-04-17 06:20:36 +08:00
|
|
|
unsigned long lpar_rc;
|
|
|
|
|
2009-01-20 08:43:59 +08:00
|
|
|
if (napi_schedule_prep(&adapter->napi)) {
|
[NET]: Make NAPI polling independent of struct net_device objects.
Several devices have multiple independant RX queues per net
device, and some have a single interrupt doorbell for several
queues.
In either case, it's easier to support layouts like that if the
structure representing the poll is independant from the net
device itself.
The signature of the ->poll() call back goes from:
int foo_poll(struct net_device *dev, int *budget)
to
int foo_poll(struct napi_struct *napi, int budget)
The caller is returned the number of RX packets processed (or
the number of "NAPI credits" consumed if you want to get
abstract). The callee no longer messes around bumping
dev->quota, *budget, etc. because that is all handled in the
caller upon return.
The napi_struct is to be embedded in the device driver private data
structures.
Furthermore, it is the driver's responsibility to disable all NAPI
instances in it's ->stop() device close handler. Since the
napi_struct is privatized into the driver's private data structures,
only the driver knows how to get at all of the napi_struct instances
it may have per-device.
With lots of help and suggestions from Rusty Russell, Roland Dreier,
Michael Chan, Jeff Garzik, and Jamal Hadi Salim.
Bug fixes from Thomas Graf, Roland Dreier, Peter Zijlstra,
Joseph Fannin, Scott Wood, Hans J. Koch, and Michael Chan.
[ Ported to current tree and all drivers converted. Integrated
Stephen's follow-on kerneldoc additions, and restored poll_list
handling to the old style to fix mutual exclusion issues. -DaveM ]
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-10-04 07:41:36 +08:00
|
|
|
lpar_rc = h_vio_signal(adapter->vdev->unit_address,
|
|
|
|
VIO_IRQ_DISABLE);
|
2010-09-04 02:29:41 +08:00
|
|
|
BUG_ON(lpar_rc != H_SUCCESS);
|
2009-01-20 08:43:59 +08:00
|
|
|
__napi_schedule(&adapter->napi);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
return IRQ_HANDLED;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void ibmveth_set_multicast_list(struct net_device *netdev)
|
|
|
|
{
|
2008-11-13 15:38:14 +08:00
|
|
|
struct ibmveth_adapter *adapter = netdev_priv(netdev);
|
2005-04-17 06:20:36 +08:00
|
|
|
unsigned long lpar_rc;
|
|
|
|
|
2010-02-08 12:30:35 +08:00
|
|
|
if ((netdev->flags & IFF_PROMISC) ||
|
|
|
|
(netdev_mc_count(netdev) > adapter->mcastFilterSize)) {
|
2005-04-17 06:20:36 +08:00
|
|
|
lpar_rc = h_multicast_ctrl(adapter->vdev->unit_address,
|
|
|
|
IbmVethMcastEnableRecv |
|
|
|
|
IbmVethMcastDisableFiltering,
|
|
|
|
0);
|
2010-09-04 02:29:30 +08:00
|
|
|
if (lpar_rc != H_SUCCESS) {
|
2010-09-04 02:29:19 +08:00
|
|
|
netdev_err(netdev, "h_multicast_ctrl rc=%ld when "
|
|
|
|
"entering promisc mode\n", lpar_rc);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
} else {
|
2010-04-02 05:22:57 +08:00
|
|
|
struct netdev_hw_addr *ha;
|
2005-04-17 06:20:36 +08:00
|
|
|
/* clear the filter table & disable filtering */
|
|
|
|
lpar_rc = h_multicast_ctrl(adapter->vdev->unit_address,
|
|
|
|
IbmVethMcastEnableRecv |
|
|
|
|
IbmVethMcastDisableFiltering |
|
|
|
|
IbmVethMcastClearFilterTable,
|
|
|
|
0);
|
2010-09-04 02:29:30 +08:00
|
|
|
if (lpar_rc != H_SUCCESS) {
|
2010-09-04 02:29:19 +08:00
|
|
|
netdev_err(netdev, "h_multicast_ctrl rc=%ld when "
|
|
|
|
"attempting to clear filter table\n",
|
|
|
|
lpar_rc);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
/* add the addresses to the filter table */
|
2010-04-02 05:22:57 +08:00
|
|
|
netdev_for_each_mc_addr(ha, netdev) {
|
2010-09-04 02:29:30 +08:00
|
|
|
/* add the multicast address to the filter table */
|
2005-04-17 06:20:36 +08:00
|
|
|
unsigned long mcast_addr = 0;
|
2010-04-02 05:22:57 +08:00
|
|
|
memcpy(((char *)&mcast_addr)+2, ha->addr, 6);
|
2005-04-17 06:20:36 +08:00
|
|
|
lpar_rc = h_multicast_ctrl(adapter->vdev->unit_address,
|
|
|
|
IbmVethMcastAddFilter,
|
|
|
|
mcast_addr);
|
2010-09-04 02:29:30 +08:00
|
|
|
if (lpar_rc != H_SUCCESS) {
|
2010-09-04 02:29:19 +08:00
|
|
|
netdev_err(netdev, "h_multicast_ctrl rc=%ld "
|
|
|
|
"when adding an entry to the filter "
|
|
|
|
"table\n", lpar_rc);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
}
|
2006-05-24 13:31:14 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/* re-enable filtering */
|
|
|
|
lpar_rc = h_multicast_ctrl(adapter->vdev->unit_address,
|
|
|
|
IbmVethMcastEnableFiltering,
|
|
|
|
0);
|
2010-09-04 02:29:30 +08:00
|
|
|
if (lpar_rc != H_SUCCESS) {
|
2010-09-04 02:29:19 +08:00
|
|
|
netdev_err(netdev, "h_multicast_ctrl rc=%ld when "
|
|
|
|
"enabling filtering\n", lpar_rc);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static int ibmveth_change_mtu(struct net_device *dev, int new_mtu)
|
|
|
|
{
|
2008-11-13 15:38:14 +08:00
|
|
|
struct ibmveth_adapter *adapter = netdev_priv(dev);
|
2008-07-24 02:34:52 +08:00
|
|
|
struct vio_dev *viodev = adapter->vdev;
|
[PATCH] ibmveth change buffer pools dynamically
This patch provides a sysfs interface to change some properties of the
ibmveth buffer pools (size of the buffers, number of buffers per pool,
and whether a pool is active). Ethernet drivers use ethtool to provide
this type of functionality. However, the buffers in the ibmveth driver
can have an arbitrary size (not only regular, mini, and jumbo which are
the only sizes that ethtool can change), and also ibmveth can have an
arbitrary number of buffer pools
Under heavy load we have seen dropped packets which obviously kills TCP
performance. We have created several fixes that mitigate this issue,
but we definitely need a way of changing the number of buffers for an
adapter dynamically. Also, changing the size of the buffers allows
users to change the MTU to something big (bigger than a jumbo frame)
greatly improving performance on partition to partition transfers.
The patch creates directories pool1...pool4 in the device directory in
sysfs, each with files: num, size, and active (which default to the
values in the mainline version).
Comments and suggestions are welcome...
--
Santiago A. Leon
Power Linux Development
IBM Linux Technology Center
Signed-off-by: Jeff Garzik <jeff@garzik.org>
2006-04-26 00:19:59 +08:00
|
|
|
int new_mtu_oh = new_mtu + IBMVETH_BUFF_OH;
|
2010-08-17 17:15:45 +08:00
|
|
|
int i, rc;
|
|
|
|
int need_restart = 0;
|
2005-10-27 00:47:01 +08:00
|
|
|
|
2010-09-04 02:29:25 +08:00
|
|
|
if (new_mtu < IBMVETH_MIN_MTU)
|
2005-04-17 06:20:36 +08:00
|
|
|
return -EINVAL;
|
2005-10-27 00:47:01 +08:00
|
|
|
|
2010-09-04 02:29:25 +08:00
|
|
|
for (i = 0; i < IBMVETH_NUM_BUFF_POOLS; i++)
|
2007-06-09 03:05:17 +08:00
|
|
|
if (new_mtu_oh < adapter->rx_buff_pool[i].buff_size)
|
|
|
|
break;
|
|
|
|
|
2010-09-04 02:29:25 +08:00
|
|
|
if (i == IBMVETH_NUM_BUFF_POOLS)
|
2007-06-09 03:05:17 +08:00
|
|
|
return -EINVAL;
|
|
|
|
|
2008-07-24 02:34:23 +08:00
|
|
|
/* Deactivate all the buffer pools so that the next loop can activate
|
|
|
|
only the buffer pools necessary to hold the new MTU */
|
2010-08-17 17:15:45 +08:00
|
|
|
if (netif_running(adapter->netdev)) {
|
|
|
|
need_restart = 1;
|
|
|
|
adapter->pool_config = 1;
|
|
|
|
ibmveth_close(adapter->netdev);
|
|
|
|
adapter->pool_config = 0;
|
|
|
|
}
|
2008-07-24 02:34:23 +08:00
|
|
|
|
[PATCH] ibmveth change buffer pools dynamically
This patch provides a sysfs interface to change some properties of the
ibmveth buffer pools (size of the buffers, number of buffers per pool,
and whether a pool is active). Ethernet drivers use ethtool to provide
this type of functionality. However, the buffers in the ibmveth driver
can have an arbitrary size (not only regular, mini, and jumbo which are
the only sizes that ethtool can change), and also ibmveth can have an
arbitrary number of buffer pools
Under heavy load we have seen dropped packets which obviously kills TCP
performance. We have created several fixes that mitigate this issue,
but we definitely need a way of changing the number of buffers for an
adapter dynamically. Also, changing the size of the buffers allows
users to change the MTU to something big (bigger than a jumbo frame)
greatly improving performance on partition to partition transfers.
The patch creates directories pool1...pool4 in the device directory in
sysfs, each with files: num, size, and active (which default to the
values in the mainline version).
Comments and suggestions are welcome...
--
Santiago A. Leon
Power Linux Development
IBM Linux Technology Center
Signed-off-by: Jeff Garzik <jeff@garzik.org>
2006-04-26 00:19:59 +08:00
|
|
|
/* Look for an active buffer pool that can hold the new MTU */
|
2010-09-04 02:29:30 +08:00
|
|
|
for (i = 0; i < IBMVETH_NUM_BUFF_POOLS; i++) {
|
2008-07-24 02:34:23 +08:00
|
|
|
adapter->rx_buff_pool[i].active = 1;
|
2007-06-09 03:05:17 +08:00
|
|
|
|
[PATCH] ibmveth change buffer pools dynamically
This patch provides a sysfs interface to change some properties of the
ibmveth buffer pools (size of the buffers, number of buffers per pool,
and whether a pool is active). Ethernet drivers use ethtool to provide
this type of functionality. However, the buffers in the ibmveth driver
can have an arbitrary size (not only regular, mini, and jumbo which are
the only sizes that ethtool can change), and also ibmveth can have an
arbitrary number of buffer pools
Under heavy load we have seen dropped packets which obviously kills TCP
performance. We have created several fixes that mitigate this issue,
but we definitely need a way of changing the number of buffers for an
adapter dynamically. Also, changing the size of the buffers allows
users to change the MTU to something big (bigger than a jumbo frame)
greatly improving performance on partition to partition transfers.
The patch creates directories pool1...pool4 in the device directory in
sysfs, each with files: num, size, and active (which default to the
values in the mainline version).
Comments and suggestions are welcome...
--
Santiago A. Leon
Power Linux Development
IBM Linux Technology Center
Signed-off-by: Jeff Garzik <jeff@garzik.org>
2006-04-26 00:19:59 +08:00
|
|
|
if (new_mtu_oh < adapter->rx_buff_pool[i].buff_size) {
|
2008-07-24 02:34:52 +08:00
|
|
|
dev->mtu = new_mtu;
|
|
|
|
vio_cmo_set_dev_desired(viodev,
|
|
|
|
ibmveth_get_desired_dma
|
|
|
|
(viodev));
|
2010-08-17 17:15:45 +08:00
|
|
|
if (need_restart) {
|
|
|
|
return ibmveth_open(adapter->netdev);
|
|
|
|
}
|
[PATCH] ibmveth change buffer pools dynamically
This patch provides a sysfs interface to change some properties of the
ibmveth buffer pools (size of the buffers, number of buffers per pool,
and whether a pool is active). Ethernet drivers use ethtool to provide
this type of functionality. However, the buffers in the ibmveth driver
can have an arbitrary size (not only regular, mini, and jumbo which are
the only sizes that ethtool can change), and also ibmveth can have an
arbitrary number of buffer pools
Under heavy load we have seen dropped packets which obviously kills TCP
performance. We have created several fixes that mitigate this issue,
but we definitely need a way of changing the number of buffers for an
adapter dynamically. Also, changing the size of the buffers allows
users to change the MTU to something big (bigger than a jumbo frame)
greatly improving performance on partition to partition transfers.
The patch creates directories pool1...pool4 in the device directory in
sysfs, each with files: num, size, and active (which default to the
values in the mainline version).
Comments and suggestions are welcome...
--
Santiago A. Leon
Power Linux Development
IBM Linux Technology Center
Signed-off-by: Jeff Garzik <jeff@garzik.org>
2006-04-26 00:19:59 +08:00
|
|
|
return 0;
|
2005-10-27 00:47:01 +08:00
|
|
|
}
|
|
|
|
}
|
2010-08-17 17:15:45 +08:00
|
|
|
|
|
|
|
if (need_restart && (rc = ibmveth_open(adapter->netdev)))
|
|
|
|
return rc;
|
|
|
|
|
[PATCH] ibmveth change buffer pools dynamically
This patch provides a sysfs interface to change some properties of the
ibmveth buffer pools (size of the buffers, number of buffers per pool,
and whether a pool is active). Ethernet drivers use ethtool to provide
this type of functionality. However, the buffers in the ibmveth driver
can have an arbitrary size (not only regular, mini, and jumbo which are
the only sizes that ethtool can change), and also ibmveth can have an
arbitrary number of buffer pools
Under heavy load we have seen dropped packets which obviously kills TCP
performance. We have created several fixes that mitigate this issue,
but we definitely need a way of changing the number of buffers for an
adapter dynamically. Also, changing the size of the buffers allows
users to change the MTU to something big (bigger than a jumbo frame)
greatly improving performance on partition to partition transfers.
The patch creates directories pool1...pool4 in the device directory in
sysfs, each with files: num, size, and active (which default to the
values in the mainline version).
Comments and suggestions are welcome...
--
Santiago A. Leon
Power Linux Development
IBM Linux Technology Center
Signed-off-by: Jeff Garzik <jeff@garzik.org>
2006-04-26 00:19:59 +08:00
|
|
|
return -EINVAL;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2006-10-04 01:24:28 +08:00
|
|
|
#ifdef CONFIG_NET_POLL_CONTROLLER
|
|
|
|
static void ibmveth_poll_controller(struct net_device *dev)
|
|
|
|
{
|
2008-11-13 15:38:14 +08:00
|
|
|
ibmveth_replenish_task(netdev_priv(dev));
|
2006-10-11 05:33:30 +08:00
|
|
|
ibmveth_interrupt(dev->irq, dev);
|
2006-10-04 01:24:28 +08:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2008-07-24 02:34:52 +08:00
|
|
|
/**
|
|
|
|
* ibmveth_get_desired_dma - Calculate IO memory desired by the driver
|
|
|
|
*
|
|
|
|
* @vdev: struct vio_dev for the device whose desired IO mem is to be returned
|
|
|
|
*
|
|
|
|
* Return value:
|
|
|
|
* Number of bytes of IO data the driver will need to perform well.
|
|
|
|
*/
|
|
|
|
static unsigned long ibmveth_get_desired_dma(struct vio_dev *vdev)
|
|
|
|
{
|
|
|
|
struct net_device *netdev = dev_get_drvdata(&vdev->dev);
|
|
|
|
struct ibmveth_adapter *adapter;
|
|
|
|
unsigned long ret;
|
|
|
|
int i;
|
|
|
|
int rxqentries = 1;
|
|
|
|
|
|
|
|
/* netdev inits at probe time along with the structures we need below*/
|
|
|
|
if (netdev == NULL)
|
|
|
|
return IOMMU_PAGE_ALIGN(IBMVETH_IO_ENTITLEMENT_DEFAULT);
|
|
|
|
|
|
|
|
adapter = netdev_priv(netdev);
|
|
|
|
|
|
|
|
ret = IBMVETH_BUFF_LIST_SIZE + IBMVETH_FILT_LIST_SIZE;
|
|
|
|
ret += IOMMU_PAGE_ALIGN(netdev->mtu);
|
|
|
|
|
2010-09-04 02:29:25 +08:00
|
|
|
for (i = 0; i < IBMVETH_NUM_BUFF_POOLS; i++) {
|
2008-07-24 02:34:52 +08:00
|
|
|
/* add the size of the active receive buffers */
|
|
|
|
if (adapter->rx_buff_pool[i].active)
|
|
|
|
ret +=
|
|
|
|
adapter->rx_buff_pool[i].size *
|
|
|
|
IOMMU_PAGE_ALIGN(adapter->rx_buff_pool[i].
|
|
|
|
buff_size);
|
|
|
|
rxqentries += adapter->rx_buff_pool[i].size;
|
|
|
|
}
|
|
|
|
/* add the size of the receive queue entries */
|
|
|
|
ret += IOMMU_PAGE_ALIGN(rxqentries * sizeof(struct ibmveth_rx_q_entry));
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2009-04-15 20:52:39 +08:00
|
|
|
static const struct net_device_ops ibmveth_netdev_ops = {
|
|
|
|
.ndo_open = ibmveth_open,
|
|
|
|
.ndo_stop = ibmveth_close,
|
|
|
|
.ndo_start_xmit = ibmveth_start_xmit,
|
|
|
|
.ndo_set_multicast_list = ibmveth_set_multicast_list,
|
|
|
|
.ndo_do_ioctl = ibmveth_ioctl,
|
|
|
|
.ndo_change_mtu = ibmveth_change_mtu,
|
2011-04-19 10:14:25 +08:00
|
|
|
.ndo_fix_features = ibmveth_fix_features,
|
|
|
|
.ndo_set_features = ibmveth_set_features,
|
2009-04-15 20:52:39 +08:00
|
|
|
.ndo_validate_addr = eth_validate_addr,
|
|
|
|
.ndo_set_mac_address = eth_mac_addr,
|
|
|
|
#ifdef CONFIG_NET_POLL_CONTROLLER
|
|
|
|
.ndo_poll_controller = ibmveth_poll_controller,
|
|
|
|
#endif
|
|
|
|
};
|
|
|
|
|
2010-09-04 02:29:30 +08:00
|
|
|
static int __devinit ibmveth_probe(struct vio_dev *dev,
|
|
|
|
const struct vio_device_id *id)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2005-10-27 00:47:01 +08:00
|
|
|
int rc, i;
|
2005-04-17 06:20:36 +08:00
|
|
|
struct net_device *netdev;
|
2007-08-07 05:44:03 +08:00
|
|
|
struct ibmveth_adapter *adapter;
|
2005-04-17 06:20:36 +08:00
|
|
|
unsigned char *mac_addr_p;
|
|
|
|
unsigned int *mcastFilterSize_p;
|
|
|
|
|
2010-09-04 02:29:14 +08:00
|
|
|
dev_dbg(&dev->dev, "entering ibmveth_probe for UA 0x%x\n",
|
|
|
|
dev->unit_address);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2010-09-04 02:29:30 +08:00
|
|
|
mac_addr_p = (unsigned char *)vio_get_attribute(dev, VETH_MAC_ADDR,
|
|
|
|
NULL);
|
|
|
|
if (!mac_addr_p) {
|
2010-09-04 02:29:19 +08:00
|
|
|
dev_err(&dev->dev, "Can't find VETH_MAC_ADDR attribute\n");
|
2010-09-04 02:29:36 +08:00
|
|
|
return -EINVAL;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
2006-05-24 13:31:14 +08:00
|
|
|
|
2010-09-04 02:29:30 +08:00
|
|
|
mcastFilterSize_p = (unsigned int *)vio_get_attribute(dev,
|
2007-04-17 11:12:55 +08:00
|
|
|
VETH_MCAST_FILTER_SIZE, NULL);
|
2010-09-04 02:29:30 +08:00
|
|
|
if (!mcastFilterSize_p) {
|
2010-09-04 02:29:19 +08:00
|
|
|
dev_err(&dev->dev, "Can't find VETH_MCAST_FILTER_SIZE "
|
|
|
|
"attribute\n");
|
2010-09-04 02:29:36 +08:00
|
|
|
return -EINVAL;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
2006-05-24 13:31:14 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
netdev = alloc_etherdev(sizeof(struct ibmveth_adapter));
|
|
|
|
|
2010-09-04 02:29:30 +08:00
|
|
|
if (!netdev)
|
2005-04-17 06:20:36 +08:00
|
|
|
return -ENOMEM;
|
|
|
|
|
2008-11-13 15:38:14 +08:00
|
|
|
adapter = netdev_priv(netdev);
|
2009-05-05 12:33:19 +08:00
|
|
|
dev_set_drvdata(&dev->dev, netdev);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
adapter->vdev = dev;
|
|
|
|
adapter->netdev = netdev;
|
2010-09-04 02:29:30 +08:00
|
|
|
adapter->mcastFilterSize = *mcastFilterSize_p;
|
[PATCH] ibmveth change buffer pools dynamically
This patch provides a sysfs interface to change some properties of the
ibmveth buffer pools (size of the buffers, number of buffers per pool,
and whether a pool is active). Ethernet drivers use ethtool to provide
this type of functionality. However, the buffers in the ibmveth driver
can have an arbitrary size (not only regular, mini, and jumbo which are
the only sizes that ethtool can change), and also ibmveth can have an
arbitrary number of buffer pools
Under heavy load we have seen dropped packets which obviously kills TCP
performance. We have created several fixes that mitigate this issue,
but we definitely need a way of changing the number of buffers for an
adapter dynamically. Also, changing the size of the buffers allows
users to change the MTU to something big (bigger than a jumbo frame)
greatly improving performance on partition to partition transfers.
The patch creates directories pool1...pool4 in the device directory in
sysfs, each with files: num, size, and active (which default to the
values in the mainline version).
Comments and suggestions are welcome...
--
Santiago A. Leon
Power Linux Development
IBM Linux Technology Center
Signed-off-by: Jeff Garzik <jeff@garzik.org>
2006-04-26 00:19:59 +08:00
|
|
|
adapter->pool_config = 0;
|
2006-05-24 13:31:14 +08:00
|
|
|
|
[NET]: Make NAPI polling independent of struct net_device objects.
Several devices have multiple independant RX queues per net
device, and some have a single interrupt doorbell for several
queues.
In either case, it's easier to support layouts like that if the
structure representing the poll is independant from the net
device itself.
The signature of the ->poll() call back goes from:
int foo_poll(struct net_device *dev, int *budget)
to
int foo_poll(struct napi_struct *napi, int budget)
The caller is returned the number of RX packets processed (or
the number of "NAPI credits" consumed if you want to get
abstract). The callee no longer messes around bumping
dev->quota, *budget, etc. because that is all handled in the
caller upon return.
The napi_struct is to be embedded in the device driver private data
structures.
Furthermore, it is the driver's responsibility to disable all NAPI
instances in it's ->stop() device close handler. Since the
napi_struct is privatized into the driver's private data structures,
only the driver knows how to get at all of the napi_struct instances
it may have per-device.
With lots of help and suggestions from Rusty Russell, Roland Dreier,
Michael Chan, Jeff Garzik, and Jamal Hadi Salim.
Bug fixes from Thomas Graf, Roland Dreier, Peter Zijlstra,
Joseph Fannin, Scott Wood, Hans J. Koch, and Michael Chan.
[ Ported to current tree and all drivers converted. Integrated
Stephen's follow-on kerneldoc additions, and restored poll_list
handling to the old style to fix mutual exclusion issues. -DaveM ]
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-10-04 07:41:36 +08:00
|
|
|
netif_napi_add(netdev, &adapter->napi, ibmveth_poll, 16);
|
|
|
|
|
2010-09-04 02:29:30 +08:00
|
|
|
/*
|
|
|
|
* Some older boxes running PHYP non-natively have an OF that returns
|
|
|
|
* a 8-byte local-mac-address field (and the first 2 bytes have to be
|
|
|
|
* ignored) while newer boxes' OF return a 6-byte field. Note that
|
|
|
|
* IEEE 1275 specifies that local-mac-address must be a 6-byte field.
|
|
|
|
* The RPA doc specifies that the first byte must be 10b, so we'll
|
|
|
|
* just look for it to solve this 8 vs. 6 byte field issue
|
|
|
|
*/
|
2005-04-17 06:20:36 +08:00
|
|
|
if ((*mac_addr_p & 0x3) != 0x02)
|
|
|
|
mac_addr_p += 2;
|
|
|
|
|
|
|
|
adapter->mac_addr = 0;
|
|
|
|
memcpy(&adapter->mac_addr, mac_addr_p, 6);
|
|
|
|
|
|
|
|
netdev->irq = dev->irq;
|
2009-04-15 20:52:39 +08:00
|
|
|
netdev->netdev_ops = &ibmveth_netdev_ops;
|
|
|
|
netdev->ethtool_ops = &netdev_ethtool_ops;
|
2005-04-17 06:20:36 +08:00
|
|
|
SET_NETDEV_DEV(netdev, &dev->dev);
|
2011-04-19 10:14:25 +08:00
|
|
|
netdev->hw_features = NETIF_F_SG | NETIF_F_RXCSUM |
|
|
|
|
NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM;
|
|
|
|
netdev->features |= netdev->hw_features;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2009-05-12 05:44:51 +08:00
|
|
|
memcpy(netdev->dev_addr, &adapter->mac_addr, netdev->addr_len);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2010-09-04 02:29:30 +08:00
|
|
|
for (i = 0; i < IBMVETH_NUM_BUFF_POOLS; i++) {
|
[PATCH] ibmveth change buffer pools dynamically
This patch provides a sysfs interface to change some properties of the
ibmveth buffer pools (size of the buffers, number of buffers per pool,
and whether a pool is active). Ethernet drivers use ethtool to provide
this type of functionality. However, the buffers in the ibmveth driver
can have an arbitrary size (not only regular, mini, and jumbo which are
the only sizes that ethtool can change), and also ibmveth can have an
arbitrary number of buffer pools
Under heavy load we have seen dropped packets which obviously kills TCP
performance. We have created several fixes that mitigate this issue,
but we definitely need a way of changing the number of buffers for an
adapter dynamically. Also, changing the size of the buffers allows
users to change the MTU to something big (bigger than a jumbo frame)
greatly improving performance on partition to partition transfers.
The patch creates directories pool1...pool4 in the device directory in
sysfs, each with files: num, size, and active (which default to the
values in the mainline version).
Comments and suggestions are welcome...
--
Santiago A. Leon
Power Linux Development
IBM Linux Technology Center
Signed-off-by: Jeff Garzik <jeff@garzik.org>
2006-04-26 00:19:59 +08:00
|
|
|
struct kobject *kobj = &adapter->rx_buff_pool[i].kobj;
|
2007-12-18 03:54:39 +08:00
|
|
|
int error;
|
|
|
|
|
2006-05-24 13:31:14 +08:00
|
|
|
ibmveth_init_buffer_pool(&adapter->rx_buff_pool[i], i,
|
|
|
|
pool_count[i], pool_size[i],
|
[PATCH] ibmveth change buffer pools dynamically
This patch provides a sysfs interface to change some properties of the
ibmveth buffer pools (size of the buffers, number of buffers per pool,
and whether a pool is active). Ethernet drivers use ethtool to provide
this type of functionality. However, the buffers in the ibmveth driver
can have an arbitrary size (not only regular, mini, and jumbo which are
the only sizes that ethtool can change), and also ibmveth can have an
arbitrary number of buffer pools
Under heavy load we have seen dropped packets which obviously kills TCP
performance. We have created several fixes that mitigate this issue,
but we definitely need a way of changing the number of buffers for an
adapter dynamically. Also, changing the size of the buffers allows
users to change the MTU to something big (bigger than a jumbo frame)
greatly improving performance on partition to partition transfers.
The patch creates directories pool1...pool4 in the device directory in
sysfs, each with files: num, size, and active (which default to the
values in the mainline version).
Comments and suggestions are welcome...
--
Santiago A. Leon
Power Linux Development
IBM Linux Technology Center
Signed-off-by: Jeff Garzik <jeff@garzik.org>
2006-04-26 00:19:59 +08:00
|
|
|
pool_active[i]);
|
2007-12-18 03:54:39 +08:00
|
|
|
error = kobject_init_and_add(kobj, &ktype_veth_pool,
|
|
|
|
&dev->dev.kobj, "pool%d", i);
|
|
|
|
if (!error)
|
|
|
|
kobject_uevent(kobj, KOBJ_ADD);
|
[PATCH] ibmveth change buffer pools dynamically
This patch provides a sysfs interface to change some properties of the
ibmveth buffer pools (size of the buffers, number of buffers per pool,
and whether a pool is active). Ethernet drivers use ethtool to provide
this type of functionality. However, the buffers in the ibmveth driver
can have an arbitrary size (not only regular, mini, and jumbo which are
the only sizes that ethtool can change), and also ibmveth can have an
arbitrary number of buffer pools
Under heavy load we have seen dropped packets which obviously kills TCP
performance. We have created several fixes that mitigate this issue,
but we definitely need a way of changing the number of buffers for an
adapter dynamically. Also, changing the size of the buffers allows
users to change the MTU to something big (bigger than a jumbo frame)
greatly improving performance on partition to partition transfers.
The patch creates directories pool1...pool4 in the device directory in
sysfs, each with files: num, size, and active (which default to the
values in the mainline version).
Comments and suggestions are welcome...
--
Santiago A. Leon
Power Linux Development
IBM Linux Technology Center
Signed-off-by: Jeff Garzik <jeff@garzik.org>
2006-04-26 00:19:59 +08:00
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2010-09-04 02:29:14 +08:00
|
|
|
netdev_dbg(netdev, "adapter @ 0x%p\n", adapter);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
adapter->buffer_list_dma = DMA_ERROR_CODE;
|
|
|
|
adapter->filter_list_dma = DMA_ERROR_CODE;
|
|
|
|
adapter->rx_queue.queue_dma = DMA_ERROR_CODE;
|
|
|
|
|
2010-09-04 02:29:14 +08:00
|
|
|
netdev_dbg(netdev, "registering netdev...\n");
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
rc = register_netdev(netdev);
|
|
|
|
|
2010-09-04 02:29:30 +08:00
|
|
|
if (rc) {
|
2010-09-04 02:29:14 +08:00
|
|
|
netdev_dbg(netdev, "failed to register netdev rc=%d\n", rc);
|
2005-04-17 06:20:36 +08:00
|
|
|
free_netdev(netdev);
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2010-09-04 02:29:14 +08:00
|
|
|
netdev_dbg(netdev, "registered\n");
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int __devexit ibmveth_remove(struct vio_dev *dev)
|
|
|
|
{
|
2009-05-05 12:33:19 +08:00
|
|
|
struct net_device *netdev = dev_get_drvdata(&dev->dev);
|
2008-11-13 15:38:14 +08:00
|
|
|
struct ibmveth_adapter *adapter = netdev_priv(netdev);
|
[PATCH] ibmveth change buffer pools dynamically
This patch provides a sysfs interface to change some properties of the
ibmveth buffer pools (size of the buffers, number of buffers per pool,
and whether a pool is active). Ethernet drivers use ethtool to provide
this type of functionality. However, the buffers in the ibmveth driver
can have an arbitrary size (not only regular, mini, and jumbo which are
the only sizes that ethtool can change), and also ibmveth can have an
arbitrary number of buffer pools
Under heavy load we have seen dropped packets which obviously kills TCP
performance. We have created several fixes that mitigate this issue,
but we definitely need a way of changing the number of buffers for an
adapter dynamically. Also, changing the size of the buffers allows
users to change the MTU to something big (bigger than a jumbo frame)
greatly improving performance on partition to partition transfers.
The patch creates directories pool1...pool4 in the device directory in
sysfs, each with files: num, size, and active (which default to the
values in the mainline version).
Comments and suggestions are welcome...
--
Santiago A. Leon
Power Linux Development
IBM Linux Technology Center
Signed-off-by: Jeff Garzik <jeff@garzik.org>
2006-04-26 00:19:59 +08:00
|
|
|
int i;
|
|
|
|
|
2010-09-04 02:29:30 +08:00
|
|
|
for (i = 0; i < IBMVETH_NUM_BUFF_POOLS; i++)
|
2007-12-21 00:13:05 +08:00
|
|
|
kobject_put(&adapter->rx_buff_pool[i].kobj);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
unregister_netdev(netdev);
|
|
|
|
|
|
|
|
free_netdev(netdev);
|
2008-07-24 02:34:52 +08:00
|
|
|
dev_set_drvdata(&dev->dev, NULL);
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
[PATCH] ibmveth change buffer pools dynamically
This patch provides a sysfs interface to change some properties of the
ibmveth buffer pools (size of the buffers, number of buffers per pool,
and whether a pool is active). Ethernet drivers use ethtool to provide
this type of functionality. However, the buffers in the ibmveth driver
can have an arbitrary size (not only regular, mini, and jumbo which are
the only sizes that ethtool can change), and also ibmveth can have an
arbitrary number of buffer pools
Under heavy load we have seen dropped packets which obviously kills TCP
performance. We have created several fixes that mitigate this issue,
but we definitely need a way of changing the number of buffers for an
adapter dynamically. Also, changing the size of the buffers allows
users to change the MTU to something big (bigger than a jumbo frame)
greatly improving performance on partition to partition transfers.
The patch creates directories pool1...pool4 in the device directory in
sysfs, each with files: num, size, and active (which default to the
values in the mainline version).
Comments and suggestions are welcome...
--
Santiago A. Leon
Power Linux Development
IBM Linux Technology Center
Signed-off-by: Jeff Garzik <jeff@garzik.org>
2006-04-26 00:19:59 +08:00
|
|
|
static struct attribute veth_active_attr;
|
|
|
|
static struct attribute veth_num_attr;
|
|
|
|
static struct attribute veth_size_attr;
|
|
|
|
|
2010-09-04 02:29:30 +08:00
|
|
|
static ssize_t veth_pool_show(struct kobject *kobj,
|
|
|
|
struct attribute *attr, char *buf)
|
[PATCH] ibmveth change buffer pools dynamically
This patch provides a sysfs interface to change some properties of the
ibmveth buffer pools (size of the buffers, number of buffers per pool,
and whether a pool is active). Ethernet drivers use ethtool to provide
this type of functionality. However, the buffers in the ibmveth driver
can have an arbitrary size (not only regular, mini, and jumbo which are
the only sizes that ethtool can change), and also ibmveth can have an
arbitrary number of buffer pools
Under heavy load we have seen dropped packets which obviously kills TCP
performance. We have created several fixes that mitigate this issue,
but we definitely need a way of changing the number of buffers for an
adapter dynamically. Also, changing the size of the buffers allows
users to change the MTU to something big (bigger than a jumbo frame)
greatly improving performance on partition to partition transfers.
The patch creates directories pool1...pool4 in the device directory in
sysfs, each with files: num, size, and active (which default to the
values in the mainline version).
Comments and suggestions are welcome...
--
Santiago A. Leon
Power Linux Development
IBM Linux Technology Center
Signed-off-by: Jeff Garzik <jeff@garzik.org>
2006-04-26 00:19:59 +08:00
|
|
|
{
|
2006-05-24 13:31:14 +08:00
|
|
|
struct ibmveth_buff_pool *pool = container_of(kobj,
|
[PATCH] ibmveth change buffer pools dynamically
This patch provides a sysfs interface to change some properties of the
ibmveth buffer pools (size of the buffers, number of buffers per pool,
and whether a pool is active). Ethernet drivers use ethtool to provide
this type of functionality. However, the buffers in the ibmveth driver
can have an arbitrary size (not only regular, mini, and jumbo which are
the only sizes that ethtool can change), and also ibmveth can have an
arbitrary number of buffer pools
Under heavy load we have seen dropped packets which obviously kills TCP
performance. We have created several fixes that mitigate this issue,
but we definitely need a way of changing the number of buffers for an
adapter dynamically. Also, changing the size of the buffers allows
users to change the MTU to something big (bigger than a jumbo frame)
greatly improving performance on partition to partition transfers.
The patch creates directories pool1...pool4 in the device directory in
sysfs, each with files: num, size, and active (which default to the
values in the mainline version).
Comments and suggestions are welcome...
--
Santiago A. Leon
Power Linux Development
IBM Linux Technology Center
Signed-off-by: Jeff Garzik <jeff@garzik.org>
2006-04-26 00:19:59 +08:00
|
|
|
struct ibmveth_buff_pool,
|
|
|
|
kobj);
|
|
|
|
|
|
|
|
if (attr == &veth_active_attr)
|
|
|
|
return sprintf(buf, "%d\n", pool->active);
|
|
|
|
else if (attr == &veth_num_attr)
|
|
|
|
return sprintf(buf, "%d\n", pool->size);
|
|
|
|
else if (attr == &veth_size_attr)
|
|
|
|
return sprintf(buf, "%d\n", pool->buff_size);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-09-04 02:29:30 +08:00
|
|
|
static ssize_t veth_pool_store(struct kobject *kobj, struct attribute *attr,
|
|
|
|
const char *buf, size_t count)
|
[PATCH] ibmveth change buffer pools dynamically
This patch provides a sysfs interface to change some properties of the
ibmveth buffer pools (size of the buffers, number of buffers per pool,
and whether a pool is active). Ethernet drivers use ethtool to provide
this type of functionality. However, the buffers in the ibmveth driver
can have an arbitrary size (not only regular, mini, and jumbo which are
the only sizes that ethtool can change), and also ibmveth can have an
arbitrary number of buffer pools
Under heavy load we have seen dropped packets which obviously kills TCP
performance. We have created several fixes that mitigate this issue,
but we definitely need a way of changing the number of buffers for an
adapter dynamically. Also, changing the size of the buffers allows
users to change the MTU to something big (bigger than a jumbo frame)
greatly improving performance on partition to partition transfers.
The patch creates directories pool1...pool4 in the device directory in
sysfs, each with files: num, size, and active (which default to the
values in the mainline version).
Comments and suggestions are welcome...
--
Santiago A. Leon
Power Linux Development
IBM Linux Technology Center
Signed-off-by: Jeff Garzik <jeff@garzik.org>
2006-04-26 00:19:59 +08:00
|
|
|
{
|
2006-05-24 13:31:14 +08:00
|
|
|
struct ibmveth_buff_pool *pool = container_of(kobj,
|
[PATCH] ibmveth change buffer pools dynamically
This patch provides a sysfs interface to change some properties of the
ibmveth buffer pools (size of the buffers, number of buffers per pool,
and whether a pool is active). Ethernet drivers use ethtool to provide
this type of functionality. However, the buffers in the ibmveth driver
can have an arbitrary size (not only regular, mini, and jumbo which are
the only sizes that ethtool can change), and also ibmveth can have an
arbitrary number of buffer pools
Under heavy load we have seen dropped packets which obviously kills TCP
performance. We have created several fixes that mitigate this issue,
but we definitely need a way of changing the number of buffers for an
adapter dynamically. Also, changing the size of the buffers allows
users to change the MTU to something big (bigger than a jumbo frame)
greatly improving performance on partition to partition transfers.
The patch creates directories pool1...pool4 in the device directory in
sysfs, each with files: num, size, and active (which default to the
values in the mainline version).
Comments and suggestions are welcome...
--
Santiago A. Leon
Power Linux Development
IBM Linux Technology Center
Signed-off-by: Jeff Garzik <jeff@garzik.org>
2006-04-26 00:19:59 +08:00
|
|
|
struct ibmveth_buff_pool,
|
|
|
|
kobj);
|
2009-05-05 12:33:19 +08:00
|
|
|
struct net_device *netdev = dev_get_drvdata(
|
|
|
|
container_of(kobj->parent, struct device, kobj));
|
2008-11-13 15:38:14 +08:00
|
|
|
struct ibmveth_adapter *adapter = netdev_priv(netdev);
|
[PATCH] ibmveth change buffer pools dynamically
This patch provides a sysfs interface to change some properties of the
ibmveth buffer pools (size of the buffers, number of buffers per pool,
and whether a pool is active). Ethernet drivers use ethtool to provide
this type of functionality. However, the buffers in the ibmveth driver
can have an arbitrary size (not only regular, mini, and jumbo which are
the only sizes that ethtool can change), and also ibmveth can have an
arbitrary number of buffer pools
Under heavy load we have seen dropped packets which obviously kills TCP
performance. We have created several fixes that mitigate this issue,
but we definitely need a way of changing the number of buffers for an
adapter dynamically. Also, changing the size of the buffers allows
users to change the MTU to something big (bigger than a jumbo frame)
greatly improving performance on partition to partition transfers.
The patch creates directories pool1...pool4 in the device directory in
sysfs, each with files: num, size, and active (which default to the
values in the mainline version).
Comments and suggestions are welcome...
--
Santiago A. Leon
Power Linux Development
IBM Linux Technology Center
Signed-off-by: Jeff Garzik <jeff@garzik.org>
2006-04-26 00:19:59 +08:00
|
|
|
long value = simple_strtol(buf, NULL, 10);
|
|
|
|
long rc;
|
|
|
|
|
|
|
|
if (attr == &veth_active_attr) {
|
|
|
|
if (value && !pool->active) {
|
2007-06-09 03:05:16 +08:00
|
|
|
if (netif_running(netdev)) {
|
2010-09-04 02:29:30 +08:00
|
|
|
if (ibmveth_alloc_buffer_pool(pool)) {
|
2010-09-04 02:29:19 +08:00
|
|
|
netdev_err(netdev,
|
|
|
|
"unable to alloc pool\n");
|
2007-06-09 03:05:16 +08:00
|
|
|
return -ENOMEM;
|
|
|
|
}
|
|
|
|
pool->active = 1;
|
|
|
|
adapter->pool_config = 1;
|
|
|
|
ibmveth_close(netdev);
|
|
|
|
adapter->pool_config = 0;
|
|
|
|
if ((rc = ibmveth_open(netdev)))
|
|
|
|
return rc;
|
2010-09-04 02:29:30 +08:00
|
|
|
} else {
|
2007-06-09 03:05:16 +08:00
|
|
|
pool->active = 1;
|
2010-09-04 02:29:30 +08:00
|
|
|
}
|
[PATCH] ibmveth change buffer pools dynamically
This patch provides a sysfs interface to change some properties of the
ibmveth buffer pools (size of the buffers, number of buffers per pool,
and whether a pool is active). Ethernet drivers use ethtool to provide
this type of functionality. However, the buffers in the ibmveth driver
can have an arbitrary size (not only regular, mini, and jumbo which are
the only sizes that ethtool can change), and also ibmveth can have an
arbitrary number of buffer pools
Under heavy load we have seen dropped packets which obviously kills TCP
performance. We have created several fixes that mitigate this issue,
but we definitely need a way of changing the number of buffers for an
adapter dynamically. Also, changing the size of the buffers allows
users to change the MTU to something big (bigger than a jumbo frame)
greatly improving performance on partition to partition transfers.
The patch creates directories pool1...pool4 in the device directory in
sysfs, each with files: num, size, and active (which default to the
values in the mainline version).
Comments and suggestions are welcome...
--
Santiago A. Leon
Power Linux Development
IBM Linux Technology Center
Signed-off-by: Jeff Garzik <jeff@garzik.org>
2006-04-26 00:19:59 +08:00
|
|
|
} else if (!value && pool->active) {
|
|
|
|
int mtu = netdev->mtu + IBMVETH_BUFF_OH;
|
|
|
|
int i;
|
|
|
|
/* Make sure there is a buffer pool with buffers that
|
|
|
|
can hold a packet of the size of the MTU */
|
2010-09-04 02:29:25 +08:00
|
|
|
for (i = 0; i < IBMVETH_NUM_BUFF_POOLS; i++) {
|
[PATCH] ibmveth change buffer pools dynamically
This patch provides a sysfs interface to change some properties of the
ibmveth buffer pools (size of the buffers, number of buffers per pool,
and whether a pool is active). Ethernet drivers use ethtool to provide
this type of functionality. However, the buffers in the ibmveth driver
can have an arbitrary size (not only regular, mini, and jumbo which are
the only sizes that ethtool can change), and also ibmveth can have an
arbitrary number of buffer pools
Under heavy load we have seen dropped packets which obviously kills TCP
performance. We have created several fixes that mitigate this issue,
but we definitely need a way of changing the number of buffers for an
adapter dynamically. Also, changing the size of the buffers allows
users to change the MTU to something big (bigger than a jumbo frame)
greatly improving performance on partition to partition transfers.
The patch creates directories pool1...pool4 in the device directory in
sysfs, each with files: num, size, and active (which default to the
values in the mainline version).
Comments and suggestions are welcome...
--
Santiago A. Leon
Power Linux Development
IBM Linux Technology Center
Signed-off-by: Jeff Garzik <jeff@garzik.org>
2006-04-26 00:19:59 +08:00
|
|
|
if (pool == &adapter->rx_buff_pool[i])
|
|
|
|
continue;
|
|
|
|
if (!adapter->rx_buff_pool[i].active)
|
|
|
|
continue;
|
2007-08-03 11:55:19 +08:00
|
|
|
if (mtu <= adapter->rx_buff_pool[i].buff_size)
|
|
|
|
break;
|
[PATCH] ibmveth change buffer pools dynamically
This patch provides a sysfs interface to change some properties of the
ibmveth buffer pools (size of the buffers, number of buffers per pool,
and whether a pool is active). Ethernet drivers use ethtool to provide
this type of functionality. However, the buffers in the ibmveth driver
can have an arbitrary size (not only regular, mini, and jumbo which are
the only sizes that ethtool can change), and also ibmveth can have an
arbitrary number of buffer pools
Under heavy load we have seen dropped packets which obviously kills TCP
performance. We have created several fixes that mitigate this issue,
but we definitely need a way of changing the number of buffers for an
adapter dynamically. Also, changing the size of the buffers allows
users to change the MTU to something big (bigger than a jumbo frame)
greatly improving performance on partition to partition transfers.
The patch creates directories pool1...pool4 in the device directory in
sysfs, each with files: num, size, and active (which default to the
values in the mainline version).
Comments and suggestions are welcome...
--
Santiago A. Leon
Power Linux Development
IBM Linux Technology Center
Signed-off-by: Jeff Garzik <jeff@garzik.org>
2006-04-26 00:19:59 +08:00
|
|
|
}
|
2007-08-03 11:55:19 +08:00
|
|
|
|
2010-09-04 02:29:25 +08:00
|
|
|
if (i == IBMVETH_NUM_BUFF_POOLS) {
|
2010-09-04 02:29:19 +08:00
|
|
|
netdev_err(netdev, "no active pool >= MTU\n");
|
[PATCH] ibmveth change buffer pools dynamically
This patch provides a sysfs interface to change some properties of the
ibmveth buffer pools (size of the buffers, number of buffers per pool,
and whether a pool is active). Ethernet drivers use ethtool to provide
this type of functionality. However, the buffers in the ibmveth driver
can have an arbitrary size (not only regular, mini, and jumbo which are
the only sizes that ethtool can change), and also ibmveth can have an
arbitrary number of buffer pools
Under heavy load we have seen dropped packets which obviously kills TCP
performance. We have created several fixes that mitigate this issue,
but we definitely need a way of changing the number of buffers for an
adapter dynamically. Also, changing the size of the buffers allows
users to change the MTU to something big (bigger than a jumbo frame)
greatly improving performance on partition to partition transfers.
The patch creates directories pool1...pool4 in the device directory in
sysfs, each with files: num, size, and active (which default to the
values in the mainline version).
Comments and suggestions are welcome...
--
Santiago A. Leon
Power Linux Development
IBM Linux Technology Center
Signed-off-by: Jeff Garzik <jeff@garzik.org>
2006-04-26 00:19:59 +08:00
|
|
|
return -EPERM;
|
|
|
|
}
|
2007-08-03 11:55:19 +08:00
|
|
|
|
|
|
|
if (netif_running(netdev)) {
|
|
|
|
adapter->pool_config = 1;
|
|
|
|
ibmveth_close(netdev);
|
2008-07-24 02:34:23 +08:00
|
|
|
pool->active = 0;
|
2007-08-03 11:55:19 +08:00
|
|
|
adapter->pool_config = 0;
|
|
|
|
if ((rc = ibmveth_open(netdev)))
|
|
|
|
return rc;
|
|
|
|
}
|
2008-07-24 02:34:23 +08:00
|
|
|
pool->active = 0;
|
[PATCH] ibmveth change buffer pools dynamically
This patch provides a sysfs interface to change some properties of the
ibmveth buffer pools (size of the buffers, number of buffers per pool,
and whether a pool is active). Ethernet drivers use ethtool to provide
this type of functionality. However, the buffers in the ibmveth driver
can have an arbitrary size (not only regular, mini, and jumbo which are
the only sizes that ethtool can change), and also ibmveth can have an
arbitrary number of buffer pools
Under heavy load we have seen dropped packets which obviously kills TCP
performance. We have created several fixes that mitigate this issue,
but we definitely need a way of changing the number of buffers for an
adapter dynamically. Also, changing the size of the buffers allows
users to change the MTU to something big (bigger than a jumbo frame)
greatly improving performance on partition to partition transfers.
The patch creates directories pool1...pool4 in the device directory in
sysfs, each with files: num, size, and active (which default to the
values in the mainline version).
Comments and suggestions are welcome...
--
Santiago A. Leon
Power Linux Development
IBM Linux Technology Center
Signed-off-by: Jeff Garzik <jeff@garzik.org>
2006-04-26 00:19:59 +08:00
|
|
|
}
|
|
|
|
} else if (attr == &veth_num_attr) {
|
2010-09-04 02:29:30 +08:00
|
|
|
if (value <= 0 || value > IBMVETH_MAX_POOL_COUNT) {
|
[PATCH] ibmveth change buffer pools dynamically
This patch provides a sysfs interface to change some properties of the
ibmveth buffer pools (size of the buffers, number of buffers per pool,
and whether a pool is active). Ethernet drivers use ethtool to provide
this type of functionality. However, the buffers in the ibmveth driver
can have an arbitrary size (not only regular, mini, and jumbo which are
the only sizes that ethtool can change), and also ibmveth can have an
arbitrary number of buffer pools
Under heavy load we have seen dropped packets which obviously kills TCP
performance. We have created several fixes that mitigate this issue,
but we definitely need a way of changing the number of buffers for an
adapter dynamically. Also, changing the size of the buffers allows
users to change the MTU to something big (bigger than a jumbo frame)
greatly improving performance on partition to partition transfers.
The patch creates directories pool1...pool4 in the device directory in
sysfs, each with files: num, size, and active (which default to the
values in the mainline version).
Comments and suggestions are welcome...
--
Santiago A. Leon
Power Linux Development
IBM Linux Technology Center
Signed-off-by: Jeff Garzik <jeff@garzik.org>
2006-04-26 00:19:59 +08:00
|
|
|
return -EINVAL;
|
2010-09-04 02:29:30 +08:00
|
|
|
} else {
|
2007-06-09 03:05:16 +08:00
|
|
|
if (netif_running(netdev)) {
|
|
|
|
adapter->pool_config = 1;
|
|
|
|
ibmveth_close(netdev);
|
|
|
|
adapter->pool_config = 0;
|
|
|
|
pool->size = value;
|
|
|
|
if ((rc = ibmveth_open(netdev)))
|
|
|
|
return rc;
|
2010-09-04 02:29:30 +08:00
|
|
|
} else {
|
2007-06-09 03:05:16 +08:00
|
|
|
pool->size = value;
|
2010-09-04 02:29:30 +08:00
|
|
|
}
|
[PATCH] ibmveth change buffer pools dynamically
This patch provides a sysfs interface to change some properties of the
ibmveth buffer pools (size of the buffers, number of buffers per pool,
and whether a pool is active). Ethernet drivers use ethtool to provide
this type of functionality. However, the buffers in the ibmveth driver
can have an arbitrary size (not only regular, mini, and jumbo which are
the only sizes that ethtool can change), and also ibmveth can have an
arbitrary number of buffer pools
Under heavy load we have seen dropped packets which obviously kills TCP
performance. We have created several fixes that mitigate this issue,
but we definitely need a way of changing the number of buffers for an
adapter dynamically. Also, changing the size of the buffers allows
users to change the MTU to something big (bigger than a jumbo frame)
greatly improving performance on partition to partition transfers.
The patch creates directories pool1...pool4 in the device directory in
sysfs, each with files: num, size, and active (which default to the
values in the mainline version).
Comments and suggestions are welcome...
--
Santiago A. Leon
Power Linux Development
IBM Linux Technology Center
Signed-off-by: Jeff Garzik <jeff@garzik.org>
2006-04-26 00:19:59 +08:00
|
|
|
}
|
|
|
|
} else if (attr == &veth_size_attr) {
|
2010-09-04 02:29:30 +08:00
|
|
|
if (value <= IBMVETH_BUFF_OH || value > IBMVETH_MAX_BUF_SIZE) {
|
[PATCH] ibmveth change buffer pools dynamically
This patch provides a sysfs interface to change some properties of the
ibmveth buffer pools (size of the buffers, number of buffers per pool,
and whether a pool is active). Ethernet drivers use ethtool to provide
this type of functionality. However, the buffers in the ibmveth driver
can have an arbitrary size (not only regular, mini, and jumbo which are
the only sizes that ethtool can change), and also ibmveth can have an
arbitrary number of buffer pools
Under heavy load we have seen dropped packets which obviously kills TCP
performance. We have created several fixes that mitigate this issue,
but we definitely need a way of changing the number of buffers for an
adapter dynamically. Also, changing the size of the buffers allows
users to change the MTU to something big (bigger than a jumbo frame)
greatly improving performance on partition to partition transfers.
The patch creates directories pool1...pool4 in the device directory in
sysfs, each with files: num, size, and active (which default to the
values in the mainline version).
Comments and suggestions are welcome...
--
Santiago A. Leon
Power Linux Development
IBM Linux Technology Center
Signed-off-by: Jeff Garzik <jeff@garzik.org>
2006-04-26 00:19:59 +08:00
|
|
|
return -EINVAL;
|
2010-09-04 02:29:30 +08:00
|
|
|
} else {
|
2007-06-09 03:05:16 +08:00
|
|
|
if (netif_running(netdev)) {
|
|
|
|
adapter->pool_config = 1;
|
|
|
|
ibmveth_close(netdev);
|
|
|
|
adapter->pool_config = 0;
|
|
|
|
pool->buff_size = value;
|
|
|
|
if ((rc = ibmveth_open(netdev)))
|
|
|
|
return rc;
|
2010-09-04 02:29:30 +08:00
|
|
|
} else {
|
2007-06-09 03:05:16 +08:00
|
|
|
pool->buff_size = value;
|
2010-09-04 02:29:30 +08:00
|
|
|
}
|
[PATCH] ibmveth change buffer pools dynamically
This patch provides a sysfs interface to change some properties of the
ibmveth buffer pools (size of the buffers, number of buffers per pool,
and whether a pool is active). Ethernet drivers use ethtool to provide
this type of functionality. However, the buffers in the ibmveth driver
can have an arbitrary size (not only regular, mini, and jumbo which are
the only sizes that ethtool can change), and also ibmveth can have an
arbitrary number of buffer pools
Under heavy load we have seen dropped packets which obviously kills TCP
performance. We have created several fixes that mitigate this issue,
but we definitely need a way of changing the number of buffers for an
adapter dynamically. Also, changing the size of the buffers allows
users to change the MTU to something big (bigger than a jumbo frame)
greatly improving performance on partition to partition transfers.
The patch creates directories pool1...pool4 in the device directory in
sysfs, each with files: num, size, and active (which default to the
values in the mainline version).
Comments and suggestions are welcome...
--
Santiago A. Leon
Power Linux Development
IBM Linux Technology Center
Signed-off-by: Jeff Garzik <jeff@garzik.org>
2006-04-26 00:19:59 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* kick the interrupt handler to allocate/deallocate pools */
|
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.
The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around. On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).
Where appropriate, an arch may override the generic storage facility and do
something different with the variable. On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.
Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions. Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller. A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.
I've build this code with allyesconfig for x86_64 and i386. I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.
This will affect all archs. Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
struct pt_regs *old_regs = set_irq_regs(regs);
And put the old one back at the end:
set_irq_regs(old_regs);
Don't pass regs through to generic_handle_irq() or __do_IRQ().
In timer_interrupt(), this sort of change will be necessary:
- update_process_times(user_mode(regs));
- profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(get_irq_regs()));
+ profile_tick(CPU_PROFILING);
I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().
Some notes on the interrupt handling in the drivers:
(*) input_dev() is now gone entirely. The regs pointer is no longer stored in
the input_dev struct.
(*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
something different depending on whether it's been supplied with a regs
pointer or not.
(*) Various IRQ handler function pointers have been moved to type
irq_handler_t.
Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
2006-10-05 21:55:46 +08:00
|
|
|
ibmveth_interrupt(netdev->irq, netdev);
|
[PATCH] ibmveth change buffer pools dynamically
This patch provides a sysfs interface to change some properties of the
ibmveth buffer pools (size of the buffers, number of buffers per pool,
and whether a pool is active). Ethernet drivers use ethtool to provide
this type of functionality. However, the buffers in the ibmveth driver
can have an arbitrary size (not only regular, mini, and jumbo which are
the only sizes that ethtool can change), and also ibmveth can have an
arbitrary number of buffer pools
Under heavy load we have seen dropped packets which obviously kills TCP
performance. We have created several fixes that mitigate this issue,
but we definitely need a way of changing the number of buffers for an
adapter dynamically. Also, changing the size of the buffers allows
users to change the MTU to something big (bigger than a jumbo frame)
greatly improving performance on partition to partition transfers.
The patch creates directories pool1...pool4 in the device directory in
sysfs, each with files: num, size, and active (which default to the
values in the mainline version).
Comments and suggestions are welcome...
--
Santiago A. Leon
Power Linux Development
IBM Linux Technology Center
Signed-off-by: Jeff Garzik <jeff@garzik.org>
2006-04-26 00:19:59 +08:00
|
|
|
return count;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-09-04 02:29:30 +08:00
|
|
|
#define ATTR(_name, _mode) \
|
|
|
|
struct attribute veth_##_name##_attr = { \
|
|
|
|
.name = __stringify(_name), .mode = _mode, \
|
|
|
|
};
|
[PATCH] ibmveth change buffer pools dynamically
This patch provides a sysfs interface to change some properties of the
ibmveth buffer pools (size of the buffers, number of buffers per pool,
and whether a pool is active). Ethernet drivers use ethtool to provide
this type of functionality. However, the buffers in the ibmveth driver
can have an arbitrary size (not only regular, mini, and jumbo which are
the only sizes that ethtool can change), and also ibmveth can have an
arbitrary number of buffer pools
Under heavy load we have seen dropped packets which obviously kills TCP
performance. We have created several fixes that mitigate this issue,
but we definitely need a way of changing the number of buffers for an
adapter dynamically. Also, changing the size of the buffers allows
users to change the MTU to something big (bigger than a jumbo frame)
greatly improving performance on partition to partition transfers.
The patch creates directories pool1...pool4 in the device directory in
sysfs, each with files: num, size, and active (which default to the
values in the mainline version).
Comments and suggestions are welcome...
--
Santiago A. Leon
Power Linux Development
IBM Linux Technology Center
Signed-off-by: Jeff Garzik <jeff@garzik.org>
2006-04-26 00:19:59 +08:00
|
|
|
|
|
|
|
static ATTR(active, 0644);
|
|
|
|
static ATTR(num, 0644);
|
|
|
|
static ATTR(size, 0644);
|
|
|
|
|
2010-09-04 02:29:30 +08:00
|
|
|
static struct attribute *veth_pool_attrs[] = {
|
[PATCH] ibmveth change buffer pools dynamically
This patch provides a sysfs interface to change some properties of the
ibmveth buffer pools (size of the buffers, number of buffers per pool,
and whether a pool is active). Ethernet drivers use ethtool to provide
this type of functionality. However, the buffers in the ibmveth driver
can have an arbitrary size (not only regular, mini, and jumbo which are
the only sizes that ethtool can change), and also ibmveth can have an
arbitrary number of buffer pools
Under heavy load we have seen dropped packets which obviously kills TCP
performance. We have created several fixes that mitigate this issue,
but we definitely need a way of changing the number of buffers for an
adapter dynamically. Also, changing the size of the buffers allows
users to change the MTU to something big (bigger than a jumbo frame)
greatly improving performance on partition to partition transfers.
The patch creates directories pool1...pool4 in the device directory in
sysfs, each with files: num, size, and active (which default to the
values in the mainline version).
Comments and suggestions are welcome...
--
Santiago A. Leon
Power Linux Development
IBM Linux Technology Center
Signed-off-by: Jeff Garzik <jeff@garzik.org>
2006-04-26 00:19:59 +08:00
|
|
|
&veth_active_attr,
|
|
|
|
&veth_num_attr,
|
|
|
|
&veth_size_attr,
|
|
|
|
NULL,
|
|
|
|
};
|
|
|
|
|
2010-01-19 09:58:23 +08:00
|
|
|
static const struct sysfs_ops veth_pool_ops = {
|
[PATCH] ibmveth change buffer pools dynamically
This patch provides a sysfs interface to change some properties of the
ibmveth buffer pools (size of the buffers, number of buffers per pool,
and whether a pool is active). Ethernet drivers use ethtool to provide
this type of functionality. However, the buffers in the ibmveth driver
can have an arbitrary size (not only regular, mini, and jumbo which are
the only sizes that ethtool can change), and also ibmveth can have an
arbitrary number of buffer pools
Under heavy load we have seen dropped packets which obviously kills TCP
performance. We have created several fixes that mitigate this issue,
but we definitely need a way of changing the number of buffers for an
adapter dynamically. Also, changing the size of the buffers allows
users to change the MTU to something big (bigger than a jumbo frame)
greatly improving performance on partition to partition transfers.
The patch creates directories pool1...pool4 in the device directory in
sysfs, each with files: num, size, and active (which default to the
values in the mainline version).
Comments and suggestions are welcome...
--
Santiago A. Leon
Power Linux Development
IBM Linux Technology Center
Signed-off-by: Jeff Garzik <jeff@garzik.org>
2006-04-26 00:19:59 +08:00
|
|
|
.show = veth_pool_show,
|
|
|
|
.store = veth_pool_store,
|
|
|
|
};
|
|
|
|
|
|
|
|
static struct kobj_type ktype_veth_pool = {
|
|
|
|
.release = NULL,
|
|
|
|
.sysfs_ops = &veth_pool_ops,
|
|
|
|
.default_attrs = veth_pool_attrs,
|
|
|
|
};
|
|
|
|
|
2010-05-07 16:56:08 +08:00
|
|
|
static int ibmveth_resume(struct device *dev)
|
|
|
|
{
|
|
|
|
struct net_device *netdev = dev_get_drvdata(dev);
|
|
|
|
ibmveth_interrupt(netdev->irq, netdev);
|
|
|
|
return 0;
|
|
|
|
}
|
[PATCH] ibmveth change buffer pools dynamically
This patch provides a sysfs interface to change some properties of the
ibmveth buffer pools (size of the buffers, number of buffers per pool,
and whether a pool is active). Ethernet drivers use ethtool to provide
this type of functionality. However, the buffers in the ibmveth driver
can have an arbitrary size (not only regular, mini, and jumbo which are
the only sizes that ethtool can change), and also ibmveth can have an
arbitrary number of buffer pools
Under heavy load we have seen dropped packets which obviously kills TCP
performance. We have created several fixes that mitigate this issue,
but we definitely need a way of changing the number of buffers for an
adapter dynamically. Also, changing the size of the buffers allows
users to change the MTU to something big (bigger than a jumbo frame)
greatly improving performance on partition to partition transfers.
The patch creates directories pool1...pool4 in the device directory in
sysfs, each with files: num, size, and active (which default to the
values in the mainline version).
Comments and suggestions are welcome...
--
Santiago A. Leon
Power Linux Development
IBM Linux Technology Center
Signed-off-by: Jeff Garzik <jeff@garzik.org>
2006-04-26 00:19:59 +08:00
|
|
|
|
2010-09-04 02:29:30 +08:00
|
|
|
static struct vio_device_id ibmveth_device_table[] __devinitdata = {
|
2005-04-17 06:20:36 +08:00
|
|
|
{ "network", "IBM,l-lan"},
|
2005-08-17 14:42:59 +08:00
|
|
|
{ "", "" }
|
2005-04-17 06:20:36 +08:00
|
|
|
};
|
|
|
|
MODULE_DEVICE_TABLE(vio, ibmveth_device_table);
|
|
|
|
|
2010-05-07 16:56:08 +08:00
|
|
|
static struct dev_pm_ops ibmveth_pm_ops = {
|
|
|
|
.resume = ibmveth_resume
|
|
|
|
};
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
static struct vio_driver ibmveth_driver = {
|
2005-10-24 12:53:21 +08:00
|
|
|
.id_table = ibmveth_device_table,
|
|
|
|
.probe = ibmveth_probe,
|
|
|
|
.remove = ibmveth_remove,
|
2008-07-24 02:34:52 +08:00
|
|
|
.get_desired_dma = ibmveth_get_desired_dma,
|
2005-10-24 12:53:21 +08:00
|
|
|
.driver = {
|
|
|
|
.name = ibmveth_driver_name,
|
2005-10-24 13:12:22 +08:00
|
|
|
.owner = THIS_MODULE,
|
2010-05-07 16:56:08 +08:00
|
|
|
.pm = &ibmveth_pm_ops,
|
2005-10-24 12:53:21 +08:00
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
static int __init ibmveth_module_init(void)
|
|
|
|
{
|
2010-09-04 02:29:19 +08:00
|
|
|
printk(KERN_DEBUG "%s: %s %s\n", ibmveth_driver_name,
|
|
|
|
ibmveth_driver_string, ibmveth_driver_version);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
return vio_register_driver(&ibmveth_driver);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void __exit ibmveth_module_exit(void)
|
|
|
|
{
|
|
|
|
vio_unregister_driver(&ibmveth_driver);
|
2006-05-24 13:31:14 +08:00
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
module_init(ibmveth_module_init);
|
|
|
|
module_exit(ibmveth_module_exit);
|