* Re: [PATCH 2/2] ioat2,3: convert to producer/consumer locking
From: Dan Williams @ 2010-05-13 23:42 UTC (permalink / raw)
To: David Howells
Cc: linux-kernel, linux-raid, netdev, Paul E. McKenney,
Maciej Sosnowski
In-Reply-To: <31229.1273653365@redhat.com>
On Wed, May 12, 2010 at 1:36 AM, David Howells <dhowells@redhat.com> wrote:
>
> Out of interest, does it make the code smaller if you mark
> ioat2_get_ring_ent() and ioat2_ring_mask() with __attribute_const__?
>
> I'm not sure whether it'll affect how long gcc is willing to cache these, but
> once computed, I would guess they won't change within the calling function.
Unfortunately, it does not make a difference, but I'll keep this in
mind if ioat2_get_ring_ent() ever gets more complicated (which it
might in the future).
> Also, is the device you're driving watching the ring and its indices? If so,
> does it modify the indices? If that is the case, you might need to use
> read_barrier_depends() rather than smp_read_barrier_depends().
The device does not observe the indices directly. Instead we
increment a free running 'count' register by the distance between
ioat->pending and ioat->head.
>
>> + prefetch(ioat2_get_ring_ent(ioat, idx + i + 1));
>> + desc = ioat2_get_ring_ent(ioat, idx + i);
>> dump_desc_dbg(ioat, desc);
>> tx = &desc->txd;
>> if (tx->cookie) {
>
> Is this right, I wonder? You're prefetching [i+1] before reading [i]? Doesn't
> this mean that you might have to wait for [i+1] to be retrieved from RAM before
> [i] can be read? Should you instead read tx->cookie before issuing the
> prefetch? Admittedly, this is only likely to affect the reading of the head of
> the queue - subsequent reads in the same loop will, of course, have been
> prefetched.
Yes, it should be the other way around.
Thanks!
--
Dan
^ permalink raw reply
* RE: [PATCH 2.6.34-rc6] net: Improve ks8851 snl transmit performance
From: Arce, Abraham @ 2010-05-13 23:39 UTC (permalink / raw)
To: Ha, Tristram, Ben Dooks
Cc: David Miller, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, Jan, Sebastien
In-Reply-To: <14385191E87B904DBD836449AA30269D021A66@MORGANITE.micrel.com>
Tristram,
> The latest nuttcp default size for UDP is 1500 bytes, rather than 8192 bytes.
> In my case, the transmit performance improves from 10 Mbps to 11. Have you
> tried TCP?
>
Not yet... one point to highlight before:
- SPI controller clock rate is 24 MHz, unable to set ~40 MHz,
Now testing in 2.6.34 rc7 using now TCP, nuttcp version 6.1.2:
Before the patch
# /testsuites/ethernet/bin/nuttcp -i -Ri50m 10.87.231.229
1.1460 MB / 1.00 sec = 9.6134 Mbps
1.1858 MB / 1.00 sec = 9.9473 Mbps
1.2258 MB / 1.00 sec = 10.2828 Mbps
1.1996 MB / 1.00 sec = 10.0628 Mbps
1.2203 MB / 1.00 sec = 10.2365 Mbps
1.2258 MB / 1.00 sec = 10.2828 Mbps
1.2134 MB / 1.00 sec = 10.1786 Mbps
1.2235 MB / 1.00 sec = 10.2636 Mbps
1.2134 MB / 1.00 sec = 10.1785 Mbps
1.2120 MB / 1.00 sec = 10.1670 Mbps
12.6250 MB / 10.46 sec = 10.1240 Mbps 2 %TX 0 %RX 0 retrans 7.91 msRTT
# /testsuites/ethernet/bin/nuttcp 10.87.231.229
12.9319 MB / 10.58 sec = 10.2553 Mbps 1 %TX 0 %RX 0 retrans 7.90 msRTT
After the patch
# /testsuites/ethernet/bin/nuttcp -i -Ri50m 10.87.231.229
1.1671 MB / 1.00 sec = 9.7902 Mbps
1.2169 MB / 1.00 sec = 10.2077 Mbps
1.2175 MB / 1.00 sec = 10.2134 Mbps
1.2396 MB / 1.00 sec = 10.3986 Mbps
1.2396 MB / 1.00 sec = 10.3987 Mbps
1.2387 MB / 1.00 sec = 10.3910 Mbps
1.2410 MB / 1.00 sec = 10.4102 Mbps
1.2203 MB / 1.00 sec = 10.2365 Mbps
1.2382 MB / 1.00 sec = 10.3871 Mbps
1.2369 MB / 1.00 sec = 10.3755 Mbps
12.8125 MB / 10.45 sec = 10.2820 Mbps 2 %TX 0 %RX 0 retrans 7.90 msRTT
# /testsuites/ethernet/bin/nuttcp 10.87.231.229
13.0808 MB / 10.64 sec = 10.3123 Mbps 1 %TX 0 %RX 0 retrans 7.90 msRTT
Best Regards
Abraham
^ permalink raw reply
* [PATCH 1/6] sky2: Restore multicast after restart
From: Stephen Hemminger @ 2010-05-13 16:12 UTC (permalink / raw)
To: David Miller, Mike McCormack; +Cc: netdev
In-Reply-To: <20100513161247.833356588@vyatta.com>
[-- Attachment #1: sky2-mike2.patch --]
[-- Type: text/plain, Size: 744 bytes --]
From: Mike McCormack <mikem@ring3k.org>
Multicast settings will be lost on reset, so restore them.
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Acked-by: Stephen Hemminger <shemminger@vyatta.com>
---
This regression was introduced in 2.6.34 by
commit 8a0c9228f110218f443d9ef8f9ab629251959733
sky2: Avoid down and up during sky2_reset
So please apply to -net as well.
drivers/net/sky2.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
--- a/drivers/net/sky2.c 2010-05-13 09:02:37.756960274 -0700
+++ b/drivers/net/sky2.c 2010-05-13 09:02:53.528209351 -0700
@@ -3347,6 +3347,7 @@ static void sky2_restart(struct work_str
continue;
sky2_hw_up(sky2);
+ sky2_set_multicast(dev);
netif_wake_queue(dev);
}
^ permalink raw reply
* [PATCH 0/6] sky2: update
From: Stephen Hemminger @ 2010-05-13 16:12 UTC (permalink / raw)
To: David Miller, Mike McCormack; +Cc: netdev
Bunch of patches from Mike, with some additional comments.
^ permalink raw reply
* [PATCH 5/6] sky2: Avoid allocating memory in sky2_resume
From: Stephen Hemminger @ 2010-05-13 16:12 UTC (permalink / raw)
To: David Miller, Mike McCormack; +Cc: netdev
In-Reply-To: <20100513161247.833356588@vyatta.com>
[-- Attachment #1: sky2-mike5.patch --]
[-- Type: text/plain, Size: 1988 bytes --]
From: Mike McCormack <mikem@ring3k.org>
Allocating memory can fail, and since we have the memory we need
in sky2_resume when sky2_suspend is called, just stop the hardware
without freeing the memory it's using.
This avoids the possibility of failing because we can't allocate
memory in sky2_resume(), and allows sharing code with sky2_restart().
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Acked-by: Stephen Hemminger <shemminger@vyatta.com>
---
Not a regression
drivers/net/sky2.c | 20 +++++---------------
1 files changed, 5 insertions(+), 15 deletions(-)
--- a/drivers/net/sky2.c 2010-05-13 08:57:33.337275609 -0700
+++ b/drivers/net/sky2.c 2010-05-13 08:57:33.907302370 -0700
@@ -4926,12 +4926,12 @@ static int sky2_suspend(struct pci_dev *
cancel_work_sync(&hw->restart_work);
rtnl_lock();
+
+ sky2_all_down(hw);
for (i = 0; i < hw->ports; i++) {
struct net_device *dev = hw->dev[i];
struct sky2_port *sky2 = netdev_priv(dev);
- sky2_detach(dev);
-
if (sky2->wol)
sky2_wol_init(sky2);
@@ -4940,8 +4940,6 @@ static int sky2_suspend(struct pci_dev *
device_set_wakeup_enable(&pdev->dev, wol != 0);
- sky2_write32(hw, B0_IMSK, 0);
- napi_disable(&hw->napi);
sky2_power_aux(hw);
rtnl_unlock();
@@ -4956,12 +4954,11 @@ static int sky2_suspend(struct pci_dev *
static int sky2_resume(struct pci_dev *pdev)
{
struct sky2_hw *hw = pci_get_drvdata(pdev);
- int i, err;
+ int err;
if (!hw)
return 0;
- rtnl_lock();
err = pci_set_power_state(pdev, PCI_D0);
if (err)
goto out;
@@ -4979,20 +4976,13 @@ static int sky2_resume(struct pci_dev *p
goto out;
}
+ rtnl_lock();
sky2_reset(hw);
- sky2_write32(hw, B0_IMSK, Y2_IS_BASE);
- napi_enable(&hw->napi);
-
- for (i = 0; i < hw->ports; i++) {
- err = sky2_reattach(hw->dev[i]);
- if (err)
- goto out;
- }
+ sky2_all_up(hw);
rtnl_unlock();
return 0;
out:
- rtnl_unlock();
dev_err(&pdev->dev, "resume failed (%d)\n", err);
pci_disable_device(pdev);
^ permalink raw reply
* [PATCH 3/6] sky2: Shut off interrupts before NAPI
From: Stephen Hemminger @ 2010-05-13 16:12 UTC (permalink / raw)
To: David Miller, Mike McCormack; +Cc: netdev
In-Reply-To: <20100513161247.833356588@vyatta.com>
[-- Attachment #1: sky2-mike3.patch --]
[-- Type: text/plain, Size: 749 bytes --]
From: Mike McCormack <mikem@ring3k.org>
Interrupts should be masked, then synchronized, and
finally NAPI should be disabled.
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Acked-by: Stephen Hemminger <shemminger@vyatta.com>
---
Not a regression, only apply to -next
--- a/drivers/net/sky2.c 2010-05-13 08:57:31.127627401 -0700
+++ b/drivers/net/sky2.c 2010-05-13 08:57:32.736962641 -0700
@@ -3320,10 +3320,10 @@ static void sky2_restart(struct work_str
rtnl_lock();
- napi_disable(&hw->napi);
- synchronize_irq(hw->pdev->irq);
imask = sky2_read32(hw, B0_IMSK);
sky2_write32(hw, B0_IMSK, 0);
+ synchronize_irq(hw->pdev->irq);
+ napi_disable(&hw->napi);
for (i = 0; i < hw->ports; i++) {
struct net_device *dev = hw->dev[i];
^ permalink raw reply
* [PATCH 2/6] sky2: Avoid race in sky2_change_mtu
From: Stephen Hemminger @ 2010-05-13 16:12 UTC (permalink / raw)
To: David Miller, Mike McCormack; +Cc: netdev
In-Reply-To: <20100513161247.833356588@vyatta.com>
[-- Attachment #1: sky2-mike1.patch --]
[-- Type: text/plain, Size: 888 bytes --]
From: Mike McCormack <mikem@ring3k.org>
netif_stop_queue does not ensure all in-progress transmits are complete,
so use netif_tx_disable() instead.
Secondly, make sure NAPI polls are disabled before stopping the tx queue,
otherwise sky2_status_intr might trigger a TX queue wakeup between when
we stop the queue and NAPI is disabled.
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Acked-by: Stephen Hemminger <shemminger@vyatta.com>
---
This is not a regression, so only apply to -next
--- a/drivers/net/sky2.c 2010-05-13 08:57:20.186332415 -0700
+++ b/drivers/net/sky2.c 2010-05-13 08:57:22.526983099 -0700
@@ -2275,8 +2275,8 @@ static int sky2_change_mtu(struct net_de
sky2_write32(hw, B0_IMSK, 0);
dev->trans_start = jiffies; /* prevent tx timeout */
- netif_stop_queue(dev);
napi_disable(&hw->napi);
+ netif_tx_disable(dev);
synchronize_irq(hw->pdev->irq);
^ permalink raw reply
* [PATCH 4/6] sky2: Refactor down/up code out of sky2_restart()
From: Stephen Hemminger @ 2010-05-13 16:12 UTC (permalink / raw)
To: David Miller, Mike McCormack; +Cc: netdev
In-Reply-To: <20100513161247.833356588@vyatta.com>
[-- Attachment #1: sky2-mike4.patch --]
[-- Type: text/plain, Size: 1894 bytes --]
From: Mike McCormack <mikem@ring3k.org>
Code to bring down all sky2 interfaces and bring it up
again can be reused in sky2_suspend and sky2_resume.
Factor the code to bring the interfaces down into
sky2_all_down and the up code into sky2_all_up.
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Acked-by: Stephen Hemminger <shemminger@vyatta.com>
---
Not a regression.
drivers/net/sky2.c | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
--- a/drivers/net/sky2.c 2010-05-13 08:57:32.736962641 -0700
+++ b/drivers/net/sky2.c 2010-05-13 08:57:33.337275609 -0700
@@ -3312,15 +3312,11 @@ static int sky2_reattach(struct net_devi
return err;
}
-static void sky2_restart(struct work_struct *work)
+static void sky2_all_down(struct sky2_hw *hw)
{
- struct sky2_hw *hw = container_of(work, struct sky2_hw, restart_work);
- u32 imask;
int i;
- rtnl_lock();
-
- imask = sky2_read32(hw, B0_IMSK);
+ sky2_read32(hw, B0_IMSK);
sky2_write32(hw, B0_IMSK, 0);
synchronize_irq(hw->pdev->irq);
napi_disable(&hw->napi);
@@ -3336,8 +3332,12 @@ static void sky2_restart(struct work_str
netif_tx_disable(dev);
sky2_hw_down(sky2);
}
+}
- sky2_reset(hw);
+static void sky2_all_up(struct sky2_hw *hw)
+{
+ u32 imask = Y2_IS_BASE;
+ int i;
for (i = 0; i < hw->ports; i++) {
struct net_device *dev = hw->dev[i];
@@ -3348,6 +3348,7 @@ static void sky2_restart(struct work_str
sky2_hw_up(sky2);
sky2_set_multicast(dev);
+ imask |= portirq_msk[i];
netif_wake_queue(dev);
}
@@ -3356,6 +3357,17 @@ static void sky2_restart(struct work_str
sky2_read32(hw, B0_Y2_SP_LISR);
napi_enable(&hw->napi);
+}
+
+static void sky2_restart(struct work_struct *work)
+{
+ struct sky2_hw *hw = container_of(work, struct sky2_hw, restart_work);
+
+ rtnl_lock();
+
+ sky2_all_down(hw);
+ sky2_reset(hw);
+ sky2_all_up(hw);
rtnl_unlock();
}
^ permalink raw reply
* [PATCH 6/6] sky2: version 1.28
From: Stephen Hemminger @ 2010-05-13 16:12 UTC (permalink / raw)
To: David Miller, Mike McCormack; +Cc: netdev
In-Reply-To: <20100513161247.833356588@vyatta.com>
[-- Attachment #1: sky2-1.28.patch --]
[-- Type: text/plain, Size: 401 bytes --]
Version 1.28
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
--- a/drivers/net/sky2.c 2010-05-13 09:11:26.947584759 -0700
+++ b/drivers/net/sky2.c 2010-05-13 09:11:35.827269492 -0700
@@ -53,7 +53,7 @@
#include "sky2.h"
#define DRV_NAME "sky2"
-#define DRV_VERSION "1.27"
+#define DRV_VERSION "1.28"
/*
* The Yukon II chipset takes 64 bit command blocks (called list elements)
^ permalink raw reply
* Re: mmotm 2010-05-11 - dies in pm_qos_update_request()
From: Rafael J. Wysocki @ 2010-05-13 22:32 UTC (permalink / raw)
To: Valdis.Kletnieks
Cc: Mark Gross, e1000-devel, netdev, linux-kernel, Andrew Morton,
David S. Miller
In-Reply-To: <4793.1273761278@localhost>
On Thursday 13 May 2010, Valdis.Kletnieks@vt.edu wrote:
> On Wed, 12 May 2010 23:07:20 +0200, "Rafael J. Wysocki" said:
> > On Wednesday 12 May 2010, Valdis.Kletnieks@vt.edu wrote:
> > > On Tue, 11 May 2010 18:21:22 PDT, akpm@linux-foundation.org said:
> > > > The mm-of-the-moment snapshot 2010-05-11-18-20 has been uploaded to
> > > >
> > > > http://userweb.kernel.org/~akpm/mmotm/
> > >
> > > Dell Latitude E6500, x86_64 kernel.
> > >
> > > Died a horrid death at boot in the e1000e driver. Seems to be
> > > something in linux-next.patch. Didn't get a netconsole trace for obvious
> > > reasons...
> > >
> > > Copied-by-hand traceback:
> > > pm_qos_update_request()+0x22
> > > e1000_configure+0x478
> > > e1000_open_device+0xee
> > > ? _raw_notifier_call_chain+0xf
> > > __dev_open+0xec
> > > dev_open+0x1b
> > > netpoll_setup+0x28b
> > > init_netconsole+0xbc
> > >
> > > I suspect this commit:
> > >
> > > commit 23606cf5d1192c2b17912cb2ef6e62f9b11de133
> > > Author: Rafael J. Wysocki <rjw@sisk.pl>
> > > Date: Sun Mar 14 14:35:17 2010 +0000
> > >
> > > e1000e / PCI / PM: Add basic runtime PM support (rev. 4)
> >
> > No, I don't think so. I'm running -rc6 with this patch applied on a box with
> > e1000e and it works just fine.
> >
> > Please try to revert this one instead:
> >
> > http://git.kernel.org/?p=linux/kernel/git/rafael/suspend-2.6.git;a=patch;h=ed77134bfccf5e75b6cbadab268e559dbe6a4ebb
>
> Confirming - reverting that patch and doing the build fixup results in a
> kernel that doesn't blow up in the e1000e driver...
Can you try the tree at:
git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6.git linux-next
without the other linux-next changes, please?
I'm not seeing the problem you're reporting on my test box with e1000e.
Rafael
------------------------------------------------------------------------------
_______________________________________________
E1000-devel mailing list
E1000-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/e1000-devel
To learn more about Intel® Ethernet, visit http://communities.intel.com/community/wired
^ permalink raw reply
* Re: mmotm 2010-05-11 - dies in pm_qos_update_request()
From: Rafael J. Wysocki @ 2010-05-13 22:24 UTC (permalink / raw)
To: Valdis.Kletnieks, Mark Gross
Cc: e1000-devel, netdev, Andrew Morton, David S. Miller, linux-kernel
In-Reply-To: <4793.1273761278@localhost>
On Thursday 13 May 2010, Valdis.Kletnieks@vt.edu wrote:
> On Wed, 12 May 2010 23:07:20 +0200, "Rafael J. Wysocki" said:
> > On Wednesday 12 May 2010, Valdis.Kletnieks@vt.edu wrote:
> > > On Tue, 11 May 2010 18:21:22 PDT, akpm@linux-foundation.org said:
> > > > The mm-of-the-moment snapshot 2010-05-11-18-20 has been uploaded to
> > > >
> > > > http://userweb.kernel.org/~akpm/mmotm/
> > >
> > > Dell Latitude E6500, x86_64 kernel.
> > >
> > > Died a horrid death at boot in the e1000e driver. Seems to be
> > > something in linux-next.patch. Didn't get a netconsole trace for obvious
> > > reasons...
> > >
> > > Copied-by-hand traceback:
> > > pm_qos_update_request()+0x22
> > > e1000_configure+0x478
> > > e1000_open_device+0xee
> > > ? _raw_notifier_call_chain+0xf
> > > __dev_open+0xec
> > > dev_open+0x1b
> > > netpoll_setup+0x28b
> > > init_netconsole+0xbc
> > >
> > > I suspect this commit:
> > >
> > > commit 23606cf5d1192c2b17912cb2ef6e62f9b11de133
> > > Author: Rafael J. Wysocki <rjw@sisk.pl>
> > > Date: Sun Mar 14 14:35:17 2010 +0000
> > >
> > > e1000e / PCI / PM: Add basic runtime PM support (rev. 4)
> >
> > No, I don't think so. I'm running -rc6 with this patch applied on a box with
> > e1000e and it works just fine.
> >
> > Please try to revert this one instead:
> >
> > http://git.kernel.org/?p=linux/kernel/git/rafael/suspend-2.6.git;a=patch;h=ed77134bfccf5e75b6cbadab268e559dbe6a4ebb
>
> Confirming - reverting that patch and doing the build fixup results in a
> kernel that doesn't blow up in the e1000e driver...
Then I guess there's an initializations problem somewhere.
Mark, any chance to look into that any time soon? If we don't resolve this
before the merge window opens, I'm afraid I'll have to revert that commit
from my tree.
Rafael
------------------------------------------------------------------------------
_______________________________________________
E1000-devel mailing list
E1000-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/e1000-devel
To learn more about Intel® Ethernet, visit http://communities.intel.com/community/wired
^ permalink raw reply
* Re: [PATCH net-next] ixgbevf: Enable GRO by default
From: Jeff Kirsher @ 2010-05-13 22:16 UTC (permalink / raw)
To: Shirley Ma; +Cc: e1000-devel, netdev, davem, kvm
In-Reply-To: <1273780274.30943.6.camel@localhost.localdomain>
On Thu, May 13, 2010 at 12:51, Shirley Ma <mashirle@us.ibm.com> wrote:
> Enable GRO by default for performance.
>
> Signed-off-by: Shirley Ma <xma@us.ibm.com>
> ---
>
> drivers/net/ixgbevf/ixgbevf_main.c | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/net/ixgbevf/ixgbevf_main.c b/drivers/net/ixgbevf/ixgbevf_main.c
> index 40f47b8..1bbb05e 100644
> --- a/drivers/net/ixgbevf/ixgbevf_main.c
> +++ b/drivers/net/ixgbevf/ixgbevf_main.c
> @@ -3415,6 +3415,7 @@ static int __devinit ixgbevf_probe(struct pci_dev *pdev,
> netdev->features |= NETIF_F_IPV6_CSUM;
> netdev->features |= NETIF_F_TSO;
> netdev->features |= NETIF_F_TSO6;
> + netdev->features |= NETIF_F_GRO;
> netdev->vlan_features |= NETIF_F_TSO;
> netdev->vlan_features |= NETIF_F_TSO6;
> netdev->vlan_features |= NETIF_F_IP_CSUM;
>
>
Thanks, I have added the patch to my queue.
--
Cheers,
Jeff
------------------------------------------------------------------------------
_______________________________________________
E1000-devel mailing list
E1000-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/e1000-devel
To learn more about Intel® Ethernet, visit http://communities.intel.com/community/wired
^ permalink raw reply
* Re: [PATCH 0/9] mm: generic adaptive large memory allocation APIs
From: Andreas Dilger @ 2010-05-13 21:56 UTC (permalink / raw)
To: James Bottomley
Cc: Changli Gao, Andrew Morton, Hoang-Nam Nguyen, Christoph Raisch,
Roland Dreier, Sean Hefty, Hal Rosenstock, Divy Le Ray,
Theodore Ts'o, Alexander Viro, Paul Menage, Li Zefan,
linux-rdma, linux-kernel@vger.kernel.org Mailinglist, netdev,
linux-scsi, linux-ext4@vger.kernel.org development, linux-fsdevel,
linux-mm, containers
In-Reply-To: <1273763055.4353.136.camel@mulgrave.site>
On 2010-05-13, at 09:04, James Bottomley wrote:
> This isn't necessarily true ... most drivers and filesystems have to
> know what type they're getting. Often they have to do extra tricks to
> process vmalloc areas. Conversely, large kmalloc areas are a very
> precious commodity: if a driver or filesystem can handle vmalloc for
> large allocations, it should: it's easier for us to expand the vmalloc
> area than to try to make page reclaim keep large contiguous areas ... I
> notice your proposed API does the exact opposite of this ... tries
> kmalloc first and then does vmalloc.
>
> Given this policy problem, isn't it easier simply to hand craft the
> vmalloc fall back to kmalloc (or vice versa) in the driver than add this
> whole massive raft of APIs for it?
I know we wouldn't mind using large vmalloc allocations for e.g. per-group arrays in ext4 (allocated once per mount), but I'd always understood that using vmalloc for general purpose uses can have a significant impact because the vmalloc() engine has (had?) serious performance problems. That means it is better performance-wise to have a wrapper function like this to switch between kmalloc() and vmalloc() based on the allocation size, but it makes the code ugly. Having the wrapper in the kernel would at least identify the different places that are using this kind of workaround.
If the performance of vmalloc() has been improved in the last few years, then I'd be happy to just use vmalloc() all the time. That said, vmalloc still isn't suitable for sub-page allocations, so if you have a variable-sized allocation that may be very small or very large the small allocations will waste a whole page and a wrapper is still needed, or vmalloc should be changed to call kmalloc/kfree for the sub-page allocations.
Cheers, Andreas
--
Andreas Dilger
Lustre Technical Lead
Oracle Corporation Canada Inc.
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply
* Re: [net-next-2.6 V6 PATCH 1/2] Add netlink support for virtual port management (was iovnl)
From: Scott Feldman @ 2010-05-13 21:30 UTC (permalink / raw)
To: Patrick McHardy; +Cc: davem, netdev, chrisw, arnd
In-Reply-To: <4BEC63DB.2090306@trash.net>
On 5/13/10 1:40 PM, "Patrick McHardy" <kaber@trash.net> wrote:
> Scott Feldman wrote:
>> +struct ifla_vf_port_vsi {
>> + __u8 vsi_mgr_id;
>> + __u8 vsi_type_id[3];
>> + __u8 vsi_type_version;
>> + __u8 pad[3];
>> +};
>
> Where is this actually used? The only use I could find is in the
> size calculation.
This is provisioned for VDP use. The enic implementation (patch 2/2)
doesn't use these members.
> Please keep the style used in that file consistent and align arguments
> to the beginning of the opening '('.
I'll fix.
>> +{
>> + struct nlattr *data;
>> + int err;
>> +
>> + data = nla_nest_start(skb, IFLA_VF_PORT);
>> + if (!data)
>> + return -EMSGSIZE;
>> +
>> + if (vf >= 0)
>> + nla_put_u32(skb, IFLA_VF_PORT_VF, vf);
>> +
>> + err = dev->netdev_ops->ndo_get_vf_port(dev, vf, skb);
>> + if (err == -EMSGSIZE) {
>> + nla_nest_cancel(skb, data);
>> + return -EMSGSIZE;
>> + } else if (err) {
>> + nla_nest_cancel(skb, data);
>> + return 0;
>
> Why is the error not returned in this case?
I was think the netdev could fail the call if the operation wasn't
supported. I better choice would be to not set the netdev->op in the first
place. Let me fix this.
>> + if (err)
>> + goto nla_put_failure;
>> + }
>> +
>> + return 0;
>> +
>> +nla_put_failure:
>> + return -EMSGSIZE;
>> +}
>> +
>> static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
>> int type, u32 pid, u32 seq, u32 change,
>> unsigned int flags)
>> @@ -747,17 +825,23 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct
>> net_device *dev,
>> goto nla_put_failure;
>> copy_rtnl_link_stats64(nla_data(attr), stats);
>>
>> + if (dev->dev.parent)
>> + NLA_PUT_U32(skb, IFLA_NUM_VF, dev_num_vf(dev->dev.parent));
>
> Should this attribute really be included even if the number is zero?
The previous code would write zero also. I moved it out of the
get_vf_config check so it could be used for get_vf_port as well.
> This is oddly indented, please align .len to .type as in the
> existing attributes.
I'll fix, but bumping into 80 char issues...
>> + [IFLA_VF_PORT_VSI_TYPE] = { .type = NLA_BINARY,
>> + .len = sizeof(struct ifla_vf_port_vsi)},
>> + [IFLA_VF_PORT_INSTANCE_UUID] = { .type = NLA_BINARY,
>> + .len = VF_PORT_UUID_MAX },
>> + [IFLA_VF_PORT_HOST_UUID] = { .type = NLA_STRING,
>> + .len = VF_PORT_UUID_MAX },
>> + [IFLA_VF_PORT_REQUEST] = { .type = NLA_U8, },
>> + [IFLA_VF_PORT_RESPONSE] = { .type = NLA_U16, },
>> +};
>> +
>> struct net *rtnl_link_get_net(struct net *src_net, struct nlattr *tb[])
>> {
>> struct net *net;
>> @@ -1028,6 +1127,27 @@ static int do_setlink(struct net_device *dev, struct
>> ifinfomsg *ifm,
>> }
>> err = 0;
>>
>> + if (tb[IFLA_VF_PORT]) {
>> + struct nlattr *vf_port[IFLA_VF_PORT_MAX+1];
>> + int vf = -1;
>> +
>> + err = nla_parse_nested(vf_port, IFLA_VF_PORT_MAX,
>> + tb[IFLA_VF_PORT], ifla_vf_port_policy);
>> + if (err < 0)
>> + goto errout;
>> +
>> + if (vf_port[IFLA_VF_PORT_VF])
>> + vf = nla_get_u32(vf_port[IFLA_VF_PORT_VF]);
>> + err = -EOPNOTSUPP;
>> + if (ops->ndo_set_vf_port)
>> + err = ops->ndo_set_vf_port(dev, vf, vf_port);
>
> This appears to be addressing a single VF to issue commands.
> I already explained this during the last set of VF patches,
> messages are supposed to by symetrical, since you're dumping
> state for all existing VFs, you also need to accept configuration
> for multiple VFs. Basically, the kernel must be able to receive
> a message it created during a dump and fully recreate the state.
This was modeled same as existing IFLA_VF_ cmd where single VF is addressed
on set, but all VFs for PF are dumped on get.
^ permalink raw reply
* Re: [net-next-2.6 V6 PATCH 1/2] Add netlink support for virtual port management (was iovnl)
From: Patrick McHardy @ 2010-05-13 21:23 UTC (permalink / raw)
To: Chris Wright; +Cc: Scott Feldman, davem, netdev, arnd
In-Reply-To: <20100513211847.GE30483@x200.localdomain>
Chris Wright wrote:
> * Patrick McHardy (kaber@trash.net) wrote:
>> Chris Wright wrote:
>>> * Patrick McHardy (kaber@trash.net) wrote:
>>>> Chris Wright wrote:
>>>>> * Patrick McHardy (kaber@trash.net) wrote:
>>>>>>> + } else {
>>>>>>> + err = rtnl_vf_port_fill_nest(skb, dev, -1);
>>>>>> What does -1 mean?
>>>>> It means no VFs. Could be made a macro/enum constant
>>>> Why call rtnl_vg_port_fill_nest at all in that case? It even
>>>> calls the ndo_get_vf_port() callback.
>>> For the case where port profile is set on net dev that does not
>>> have VFs (e.g. the enic case in 2/2).
>> Thanks for the explanation. I guess a enum constant would be nice
>> to have. But the bigger problem is the asymetrical message
>> parsing/construction.
>
> Yeah, what would you like to do there? I think we have to keep the
> existing, just break out symmtetic set/get?
Sure, that would be fine. I'll have a closer look at the exact
message layout tommorrow, its getting late here.
>> BTW:
>>
>>> +enum {
>>> + VF_PORT_REQUEST_PREASSOCIATE = 0,
>>> + VF_PORT_REQUEST_PREASSOCIATE_RR,
>>> + VF_PORT_REQUEST_ASSOCIATE,
>>> + VF_PORT_REQUEST_DISASSOCIATE,
>>> +};
>> Do multiple of these commands have to be issued in order to
>> reach "associated" state? That also wouldn't fit into the
>> rtnetlink design, which contains state, not commands.
>
> It's optional. At the very least, you need 1 associate/disassociate for
> each logical link up/down.
>
> For VM migration or (perhaps failover modes) you can optionally issue a
> preassociate. Preassociate has 2 flavors. One which is purely advisory,
> another which will reserve resources on the switch. These all reprsent
> state transitions in the switch, but only associate should allow final
> logical link up and traffic to flow.
I see, thanks. That seems fine.
^ permalink raw reply
* RE: [Pv-drivers] [PATCH 14/20] drivers/net/vmxnet3: Use kzalloc
From: Bhavesh Davda @ 2010-05-13 21:20 UTC (permalink / raw)
To: Julia Lawall, Shreyas Bhatewara, VMware, Inc.,
netdev@vger.kernel.org, "linux-kernel@vger
In-Reply-To: <Pine.LNX.4.64.1005132204040.6282@ask.diku.dk>
Looks good. Thanks for doing this!
Signed-off-by: Bhavesh Davda <bhavesh@vmware.com>
- Bhavesh
Bhavesh P. Davda
> -----Original Message-----
> From: pv-drivers-bounces@vmware.com [mailto:pv-drivers-
> bounces@vmware.com] On Behalf Of Julia Lawall
> Sent: Thursday, May 13, 2010 1:06 PM
> To: Shreyas Bhatewara; VMware, Inc.; netdev@vger.kernel.org; linux-
> kernel@vger.kernel.org; kernel-janitors@vger.kernel.org
> Subject: [Pv-drivers] [PATCH 14/20] drivers/net/vmxnet3: Use kzalloc
>
> From: Julia Lawall <julia@diku.dk>
>
> Use 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,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>
>
> ---
> drivers/net/vmxnet3/vmxnet3_drv.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff -u -p a/drivers/net/vmxnet3/vmxnet3_drv.c
> b/drivers/net/vmxnet3/vmxnet3_drv.c
> --- a/drivers/net/vmxnet3/vmxnet3_drv.c
> +++ b/drivers/net/vmxnet3/vmxnet3_drv.c
> @@ -1369,13 +1369,12 @@ vmxnet3_rq_create(struct vmxnet3_rx_queu
>
> sz = sizeof(struct vmxnet3_rx_buf_info) * (rq->rx_ring[0].size +
> rq->rx_ring[1].size);
> - bi = kmalloc(sz, GFP_KERNEL);
> + bi = kzalloc(sz, GFP_KERNEL);
> if (!bi) {
> printk(KERN_ERR "%s: failed to allocate rx bufinfo\n",
> adapter->netdev->name);
> goto err;
> }
> - memset(bi, 0, sz);
> rq->buf_info[0] = bi;
> rq->buf_info[1] = bi + rq->rx_ring[0].size;
>
> _______________________________________________
> Pv-drivers mailing list
> Pv-drivers@vmware.com
> http://mailman2.vmware.com/mailman/listinfo/pv-drivers
^ permalink raw reply
* Re: [net-next-2.6 V6 PATCH 1/2] Add netlink support for virtual port management (was iovnl)
From: Chris Wright @ 2010-05-13 21:18 UTC (permalink / raw)
To: Patrick McHardy; +Cc: Chris Wright, Scott Feldman, davem, netdev, arnd
In-Reply-To: <4BEC6B19.1040808@trash.net>
* Patrick McHardy (kaber@trash.net) wrote:
> Chris Wright wrote:
> > * Patrick McHardy (kaber@trash.net) wrote:
> >> Chris Wright wrote:
> >>> * Patrick McHardy (kaber@trash.net) wrote:
> >>>>> + } else {
> >>>>> + err = rtnl_vf_port_fill_nest(skb, dev, -1);
> >>>> What does -1 mean?
> >>> It means no VFs. Could be made a macro/enum constant
> >> Why call rtnl_vg_port_fill_nest at all in that case? It even
> >> calls the ndo_get_vf_port() callback.
> >
> > For the case where port profile is set on net dev that does not
> > have VFs (e.g. the enic case in 2/2).
>
> Thanks for the explanation. I guess a enum constant would be nice
> to have. But the bigger problem is the asymetrical message
> parsing/construction.
Yeah, what would you like to do there? I think we have to keep the
existing, just break out symmtetic set/get?
> BTW:
>
> > +enum {
> > + VF_PORT_REQUEST_PREASSOCIATE = 0,
> > + VF_PORT_REQUEST_PREASSOCIATE_RR,
> > + VF_PORT_REQUEST_ASSOCIATE,
> > + VF_PORT_REQUEST_DISASSOCIATE,
> > +};
>
> Do multiple of these commands have to be issued in order to
> reach "associated" state? That also wouldn't fit into the
> rtnetlink design, which contains state, not commands.
It's optional. At the very least, you need 1 associate/disassociate for
each logical link up/down.
For VM migration or (perhaps failover modes) you can optionally issue a
preassociate. Preassociate has 2 flavors. One which is purely advisory,
another which will reserve resources on the switch. These all reprsent
state transitions in the switch, but only associate should allow final
logical link up and traffic to flow.
thanks,
-chris
^ permalink raw reply
* Re: [net-next-2.6 V6 PATCH 1/2] Add netlink support for virtual port management (was iovnl)
From: Patrick McHardy @ 2010-05-13 21:11 UTC (permalink / raw)
To: Chris Wright; +Cc: Scott Feldman, davem, netdev, arnd
In-Reply-To: <20100513210828.GD30483@x200.localdomain>
Chris Wright wrote:
> * Patrick McHardy (kaber@trash.net) wrote:
>> Chris Wright wrote:
>>> * Patrick McHardy (kaber@trash.net) wrote:
>>>>> + } else {
>>>>> + err = rtnl_vf_port_fill_nest(skb, dev, -1);
>>>> What does -1 mean?
>>> It means no VFs. Could be made a macro/enum constant
>> Why call rtnl_vg_port_fill_nest at all in that case? It even
>> calls the ndo_get_vf_port() callback.
>
> For the case where port profile is set on net dev that does not
> have VFs (e.g. the enic case in 2/2).
Thanks for the explanation. I guess a enum constant would be nice
to have. But the bigger problem is the asymetrical message
parsing/construction.
BTW:
> +enum {
> + VF_PORT_REQUEST_PREASSOCIATE = 0,
> + VF_PORT_REQUEST_PREASSOCIATE_RR,
> + VF_PORT_REQUEST_ASSOCIATE,
> + VF_PORT_REQUEST_DISASSOCIATE,
> +};
Do multiple of these commands have to be issued in order to
reach "associated" state? That also wouldn't fit into the
rtnetlink design, which contains state, not commands.
^ permalink raw reply
* Re: [net-next-2.6 V6 PATCH 1/2] Add netlink support for virtual port management (was iovnl)
From: Chris Wright @ 2010-05-13 21:08 UTC (permalink / raw)
To: Patrick McHardy; +Cc: Chris Wright, Scott Feldman, davem, netdev, arnd
In-Reply-To: <4BEC65BC.5040208@trash.net>
* Patrick McHardy (kaber@trash.net) wrote:
> Chris Wright wrote:
> > * Patrick McHardy (kaber@trash.net) wrote:
> >>> + } else {
> >>> + err = rtnl_vf_port_fill_nest(skb, dev, -1);
> >> What does -1 mean?
> >
> > It means no VFs. Could be made a macro/enum constant
>
> Why call rtnl_vg_port_fill_nest at all in that case? It even
> calls the ndo_get_vf_port() callback.
For the case where port profile is set on net dev that does not
have VFs (e.g. the enic case in 2/2).
thanks,
-chris
^ permalink raw reply
* Re: [net-next-2.6 V6 PATCH 1/2] Add netlink support for virtual port management (was iovnl)
From: Patrick McHardy @ 2010-05-13 20:49 UTC (permalink / raw)
To: Chris Wright; +Cc: Scott Feldman, davem, netdev, arnd
In-Reply-To: <20100513204614.GB30483@x200.localdomain>
Chris Wright wrote:
> * Patrick McHardy (kaber@trash.net) wrote:
>>> + } else {
>>> + err = rtnl_vf_port_fill_nest(skb, dev, -1);
>> What does -1 mean?
>
> It means no VFs. Could be made a macro/enum constant
Why call rtnl_vg_port_fill_nest at all in that case? It even
calls the ndo_get_vf_port() callback.
^ permalink raw reply
* Re: [net-next-2.6 V6 PATCH 1/2] Add netlink support for virtual port management (was iovnl)
From: Chris Wright @ 2010-05-13 20:46 UTC (permalink / raw)
To: Patrick McHardy; +Cc: Scott Feldman, davem, netdev, chrisw, arnd
In-Reply-To: <4BEC63DB.2090306@trash.net>
* Patrick McHardy (kaber@trash.net) wrote:
> > + } else {
> > + err = rtnl_vf_port_fill_nest(skb, dev, -1);
>
> What does -1 mean?
It means no VFs. Could be made a macro/enum constant
thanks,
-chris
^ permalink raw reply
* Re: [net-next-2.6 V6 PATCH 1/2] Add netlink support for virtual port management (was iovnl)
From: Patrick McHardy @ 2010-05-13 20:40 UTC (permalink / raw)
To: Scott Feldman; +Cc: davem, netdev, chrisw, arnd
In-Reply-To: <20100513201720.25579.51230.stgit@savbu-pc100.cisco.com>
Scott Feldman wrote:
> +struct ifla_vf_port_vsi {
> + __u8 vsi_mgr_id;
> + __u8 vsi_type_id[3];
> + __u8 vsi_type_version;
> + __u8 pad[3];
> +};
Where is this actually used? The only use I could find is in the
size calculation.
> diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
> index 23a71cb..de14d36 100644
> --- a/net/core/rtnetlink.c
> +++ b/net/core/rtnetlink.c
> +static int rtnl_vf_port_fill_nest(struct sk_buff *skb, struct net_device *dev,
> + int vf)
Please keep the style used in that file consistent and align arguments
to the beginning of the opening '('.
> +{
> + struct nlattr *data;
> + int err;
> +
> + data = nla_nest_start(skb, IFLA_VF_PORT);
> + if (!data)
> + return -EMSGSIZE;
> +
> + if (vf >= 0)
> + nla_put_u32(skb, IFLA_VF_PORT_VF, vf);
> +
> + err = dev->netdev_ops->ndo_get_vf_port(dev, vf, skb);
> + if (err == -EMSGSIZE) {
> + nla_nest_cancel(skb, data);
> + return -EMSGSIZE;
> + } else if (err) {
> + nla_nest_cancel(skb, data);
> + return 0;
Why is the error not returned in this case?
> + }
> +
> + nla_nest_end(skb, data);
> +
> + return 0;
> +}
> +
> +static int rtnl_vf_port_fill(struct sk_buff *skb, struct net_device *dev)
> +{
> + int num_vf;
> + int err;
> +
> + if (!dev->netdev_ops->ndo_get_vf_port || !dev->dev.parent)
> + return 0;
> +
> + num_vf = dev_num_vf(dev->dev.parent);
> +
> + if (num_vf) {
> + int i;
> +
> + for (i = 0; i < num_vf; i++) {
> + err = rtnl_vf_port_fill_nest(skb, dev, i);
> + if (err)
> + goto nla_put_failure;
> + }
> + } else {
> + err = rtnl_vf_port_fill_nest(skb, dev, -1);
What does -1 mean?
> + if (err)
> + goto nla_put_failure;
> + }
> +
> + return 0;
> +
> +nla_put_failure:
> + return -EMSGSIZE;
> +}
> +
> static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
> int type, u32 pid, u32 seq, u32 change,
> unsigned int flags)
> @@ -747,17 +825,23 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
> goto nla_put_failure;
> copy_rtnl_link_stats64(nla_data(attr), stats);
>
> + if (dev->dev.parent)
> + NLA_PUT_U32(skb, IFLA_NUM_VF, dev_num_vf(dev->dev.parent));
Should this attribute really be included even if the number is zero?
> +
> if (dev->netdev_ops->ndo_get_vf_config && dev->dev.parent) {
> int i;
> struct ifla_vf_info ivi;
>
> - NLA_PUT_U32(skb, IFLA_NUM_VF, dev_num_vf(dev->dev.parent));
> for (i = 0; i < dev_num_vf(dev->dev.parent); i++) {
> if (dev->netdev_ops->ndo_get_vf_config(dev, i, &ivi))
> break;
> NLA_PUT(skb, IFLA_VFINFO, sizeof(ivi), &ivi);
> }
> }
> +
> + if (rtnl_vf_port_fill(skb, dev))
> + goto nla_put_failure;
> +
> if (dev->rtnl_link_ops) {
> if (rtnl_link_fill(skb, dev) < 0)
> goto nla_put_failure;
> @@ -824,6 +908,7 @@ const struct nla_policy ifla_policy[IFLA_MAX+1] = {
> .len = sizeof(struct ifla_vf_vlan) },
> [IFLA_VF_TX_RATE] = { .type = NLA_BINARY,
> .len = sizeof(struct ifla_vf_tx_rate) },
> + [IFLA_VF_PORT] = { .type = NLA_NESTED },
> };
> EXPORT_SYMBOL(ifla_policy);
>
> @@ -832,6 +917,20 @@ static const struct nla_policy ifla_info_policy[IFLA_INFO_MAX+1] = {
> [IFLA_INFO_DATA] = { .type = NLA_NESTED },
> };
>
> +static const struct nla_policy ifla_vf_port_policy[IFLA_VF_PORT_MAX+1] = {
> + [IFLA_VF_PORT_VF] = { .type = NLA_U32 },
> + [IFLA_VF_PORT_PROFILE] = { .type = NLA_STRING,
> + .len = VF_PORT_PROFILE_MAX },
This is oddly indented, please align .len to .type as in the
existing attributes.
> + [IFLA_VF_PORT_VSI_TYPE] = { .type = NLA_BINARY,
> + .len = sizeof(struct ifla_vf_port_vsi)},
> + [IFLA_VF_PORT_INSTANCE_UUID] = { .type = NLA_BINARY,
> + .len = VF_PORT_UUID_MAX },
> + [IFLA_VF_PORT_HOST_UUID] = { .type = NLA_STRING,
> + .len = VF_PORT_UUID_MAX },
> + [IFLA_VF_PORT_REQUEST] = { .type = NLA_U8, },
> + [IFLA_VF_PORT_RESPONSE] = { .type = NLA_U16, },
> +};
> +
> struct net *rtnl_link_get_net(struct net *src_net, struct nlattr *tb[])
> {
> struct net *net;
> @@ -1028,6 +1127,27 @@ static int do_setlink(struct net_device *dev, struct ifinfomsg *ifm,
> }
> err = 0;
>
> + if (tb[IFLA_VF_PORT]) {
> + struct nlattr *vf_port[IFLA_VF_PORT_MAX+1];
> + int vf = -1;
> +
> + err = nla_parse_nested(vf_port, IFLA_VF_PORT_MAX,
> + tb[IFLA_VF_PORT], ifla_vf_port_policy);
> + if (err < 0)
> + goto errout;
> +
> + if (vf_port[IFLA_VF_PORT_VF])
> + vf = nla_get_u32(vf_port[IFLA_VF_PORT_VF]);
> + err = -EOPNOTSUPP;
> + if (ops->ndo_set_vf_port)
> + err = ops->ndo_set_vf_port(dev, vf, vf_port);
This appears to be addressing a single VF to issue commands.
I already explained this during the last set of VF patches,
messages are supposed to by symetrical, since you're dumping
state for all existing VFs, you also need to accept configuration
for multiple VFs. Basically, the kernel must be able to receive
a message it created during a dump and fully recreate the state.
^ permalink raw reply
* Re: [PATCH 6/20] drivers/net: Use kzalloc
From: Lennert Buytenhek @ 2010-05-13 20:29 UTC (permalink / raw)
To: Julia Lawall; +Cc: netdev, linux-kernel, kernel-janitors
In-Reply-To: <Pine.LNX.4.64.1005132200050.6282@ask.diku.dk>
On Thu, May 13, 2010 at 10:00:22PM +0200, Julia Lawall wrote:
> From: Julia Lawall <julia@diku.dk>
>
> Use 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,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>
Acked-by: Lennert Buytenhek <buytenh@wantstofly.org>
^ permalink raw reply
* Re: [net-next-2.6 V6 PATCH 1/2] Add netlink support for virtual port management (was iovnl)
From: Chris Wright @ 2010-05-13 20:28 UTC (permalink / raw)
To: Scott Feldman; +Cc: davem, netdev, chrisw, arnd
In-Reply-To: <20100513201720.25579.51230.stgit@savbu-pc100.cisco.com>
* Scott Feldman (scofeldm@cisco.com) wrote:
> From: Scott Feldman <scofeldm@cisco.com>
>
> Add new netdev ops ndo_{set|get}_vf_port to allow setting of
> port-profile on a netdev interface. Extends netlink socket RTM_SETLINK/
> RTM_GETLINK with new sub cmd called IFLA_VF_PORT (added to end of
> IFLA_cmd list).
>
> A port-profile is used to configure/enable the external switch virtual port
> backing the netdev interface, not to configure the host-facing side of the
> netdev. A port-profile is an identifier known to the switch. How port-
> profiles are installed on the switch or how available port-profiles are
> made know to the host is outside the scope of this patch.
>
> There are two types of port-profiles specs in the netlink msg. The first spec
> is for 802.1Qbg (pre-)standard, VDP protocol. The second spec is for devices
> that run a similar protocol as VDP but in firmware, thus hiding the protocol
> details. In either case, the specs have much in common and makes sense to
> define the netlink msg as the union of the two specs. For example, both specs
> have a notition of associating/deassociating a port-profile. And both specs
> require some information from the hypervisor manager, such as client port
> instance ID.
>
> The general flow is the port-profile is applied to a host netdev interface
> using RTM_SETLINK, the receiver of the RTM_SETLINK msg communicates with the
> switch, and the switch virtual port backing the host netdev interface is
> configured/enabled based on the settings defined by the port-profile. What
> those settings comprise, and how those settings are managed is again
> outside the scope of this patch, since this patch only deals with the
> first step in the flow.
>
> There is a RTM_GETLINK cmd to to return port-profile setting of an
> interface and to also return the status of the last port-profile
> association.
>
> IFLA_VF_PORT is modeled after the existing IFLA_VF_* cmd where a
> VF number is passed in to identify the virtual function (VF) of an SR-IOV-
> capable device. In this case, the target of IFLA_VF_PORT msg is the
> netdev physical function (PF) device. The PF will apply the port-profile
> to the VF. IFLA_VF_PORT can also be used for devices that don't
> adhere to SR-IOV and can apply the port-profile directly to the netdev
> target. In this case, the VF number is ignored.
>
> Passing in a NULL port-profile is used to delete the port-profile association.
>
> Acked-by: Arnd Bergmann <arnd@arndb.de>
> Signed-off-by: Scott Feldman <scofeldm@cisco.com>
> Signed-off-by: Roopa Prabhu<roprabhu@cisco.com>
Nice, this looks good to me.
Acked-by: Chris Wright <chrisw@redhat.com>
^ permalink raw reply
* [net-next-2.6 V6 PATCH 2/2] Add ndo_{set|get}_vf_port support for enic dynamic vnics
From: Scott Feldman @ 2010-05-13 20:17 UTC (permalink / raw)
To: davem; +Cc: netdev, chrisw, arnd
In-Reply-To: <20100513201714.25579.53530.stgit@savbu-pc100.cisco.com>
From: Scott Feldman <scofeldm@cisco.com>
Add enic ndo_{set|get}_vf_port ops to support setting/getting
port-profile for enic dynamic devices. Enic dynamic devices are just like
normal enic eth devices except dynamic enics require an extra configuration
step to assign a port-profile identifier to the interface before the
interface is useable. Once a port-profile is assigned, link comes up on the
interface and is ready for I/O. The port-profile is used to configure the
network port assigned to the interface. The network port configuration
includes VLAN membership, QoS policies, and port security settings typical
of a data center network.
A dynamic enic initially has a zero-mac address. Before a port-profile is
assigned, a valid non-zero unicast mac address should be assign to the
dynamic enic interface.
Signed-off-by: Scott Feldman <scofeldm@cisco.com>
Signed-off-by: Roopa Prabhu<roprabhu@cisco.com>
---
drivers/net/enic/Makefile | 2
drivers/net/enic/enic.h | 9 +
drivers/net/enic/enic_main.c | 321 +++++++++++++++++++++++++++++++++++++++---
drivers/net/enic/enic_res.c | 5 -
drivers/net/enic/enic_res.h | 1
drivers/net/enic/vnic_dev.c | 58 +++++++-
drivers/net/enic/vnic_dev.h | 7 +
drivers/net/enic/vnic_vic.c | 73 ++++++++++
drivers/net/enic/vnic_vic.h | 59 ++++++++
9 files changed, 500 insertions(+), 35 deletions(-)
diff --git a/drivers/net/enic/Makefile b/drivers/net/enic/Makefile
index 391c3bc..e7b6c31 100644
--- a/drivers/net/enic/Makefile
+++ b/drivers/net/enic/Makefile
@@ -1,5 +1,5 @@
obj-$(CONFIG_ENIC) := enic.o
enic-y := enic_main.o vnic_cq.o vnic_intr.o vnic_wq.o \
- enic_res.o vnic_dev.o vnic_rq.o
+ enic_res.o vnic_dev.o vnic_rq.o vnic_vic.o
diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h
index 5fa56f1..91088be 100644
--- a/drivers/net/enic/enic.h
+++ b/drivers/net/enic/enic.h
@@ -34,7 +34,7 @@
#define DRV_NAME "enic"
#define DRV_DESCRIPTION "Cisco VIC Ethernet NIC Driver"
-#define DRV_VERSION "1.3.1.1"
+#define DRV_VERSION "1.3.1.1-pp"
#define DRV_COPYRIGHT "Copyright 2008-2009 Cisco Systems, Inc"
#define PFX DRV_NAME ": "
@@ -74,6 +74,12 @@ struct enic_msix_entry {
void *devid;
};
+struct enic_port_profile {
+ char name[VF_PORT_PROFILE_MAX];
+ u8 instance_uuid[VF_PORT_UUID_MAX];
+ u8 host_uuid[VF_PORT_UUID_MAX];
+};
+
/* Per-instance private data structure */
struct enic {
struct net_device *netdev;
@@ -95,6 +101,7 @@ struct enic {
u32 port_mtu;
u32 rx_coalesce_usecs;
u32 tx_coalesce_usecs;
+ struct enic_port_profile pp;
/* work queue cache line section */
____cacheline_aligned struct vnic_wq wq[ENIC_WQ_MAX];
diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c
index 1232887..fb8bf4a 100644
--- a/drivers/net/enic/enic_main.c
+++ b/drivers/net/enic/enic_main.c
@@ -29,6 +29,7 @@
#include <linux/etherdevice.h>
#include <linux/if_ether.h>
#include <linux/if_vlan.h>
+#include <linux/if_link.h>
#include <linux/ethtool.h>
#include <linux/in.h>
#include <linux/ip.h>
@@ -40,6 +41,7 @@
#include "vnic_dev.h"
#include "vnic_intr.h"
#include "vnic_stats.h"
+#include "vnic_vic.h"
#include "enic_res.h"
#include "enic.h"
@@ -49,10 +51,12 @@
#define ENIC_DESC_MAX_SPLITS (MAX_TSO / WQ_ENET_MAX_DESC_LEN + 1)
#define PCI_DEVICE_ID_CISCO_VIC_ENET 0x0043 /* ethernet vnic */
+#define PCI_DEVICE_ID_CISCO_VIC_ENET_DYN 0x0044 /* enet dynamic vnic */
/* Supported devices */
static DEFINE_PCI_DEVICE_TABLE(enic_id_table) = {
{ PCI_VDEVICE(CISCO, PCI_DEVICE_ID_CISCO_VIC_ENET) },
+ { PCI_VDEVICE(CISCO, PCI_DEVICE_ID_CISCO_VIC_ENET_DYN) },
{ 0, } /* end of table */
};
@@ -113,6 +117,11 @@ static const struct enic_stat enic_rx_stats[] = {
static const unsigned int enic_n_tx_stats = ARRAY_SIZE(enic_tx_stats);
static const unsigned int enic_n_rx_stats = ARRAY_SIZE(enic_rx_stats);
+static int enic_is_dynamic(struct enic *enic)
+{
+ return enic->pdev->device == PCI_DEVICE_ID_CISCO_VIC_ENET_DYN;
+}
+
static int enic_get_settings(struct net_device *netdev,
struct ethtool_cmd *ecmd)
{
@@ -810,14 +819,73 @@ static void enic_reset_mcaddrs(struct enic *enic)
static int enic_set_mac_addr(struct net_device *netdev, char *addr)
{
- if (!is_valid_ether_addr(addr))
- return -EADDRNOTAVAIL;
+ struct enic *enic = netdev_priv(netdev);
+
+ if (enic_is_dynamic(enic)) {
+ if (!is_valid_ether_addr(addr) && !is_zero_ether_addr(addr))
+ return -EADDRNOTAVAIL;
+ } else {
+ if (!is_valid_ether_addr(addr))
+ return -EADDRNOTAVAIL;
+ }
memcpy(netdev->dev_addr, addr, netdev->addr_len);
return 0;
}
+static int enic_dev_add_station_addr(struct enic *enic)
+{
+ int err = 0;
+
+ if (is_valid_ether_addr(enic->netdev->dev_addr)) {
+ spin_lock(&enic->devcmd_lock);
+ err = vnic_dev_add_addr(enic->vdev, enic->netdev->dev_addr);
+ spin_unlock(&enic->devcmd_lock);
+ }
+
+ return err;
+}
+
+static int enic_dev_del_station_addr(struct enic *enic)
+{
+ int err = 0;
+
+ if (is_valid_ether_addr(enic->netdev->dev_addr)) {
+ spin_lock(&enic->devcmd_lock);
+ err = vnic_dev_del_addr(enic->vdev, enic->netdev->dev_addr);
+ spin_unlock(&enic->devcmd_lock);
+ }
+
+ return err;
+}
+
+static int enic_set_mac_address(struct net_device *netdev, void *p)
+{
+ struct enic *enic = netdev_priv(netdev);
+ struct sockaddr *saddr = p;
+ char *addr = saddr->sa_data;
+ int err = -EOPNOTSUPP;
+
+ if (enic_is_dynamic(enic)) {
+ if (netif_running(enic->netdev)) {
+ err = enic_dev_del_station_addr(enic);
+ if (err)
+ return err;
+ }
+ err = enic_set_mac_addr(netdev, addr);
+ if (err)
+ return err;
+ if (netif_running(enic->netdev)) {
+ err = enic_dev_add_station_addr(enic);
+ if (err)
+ return err;
+ }
+ }
+
+ return err;
+}
+
/* netif_tx_lock held, BHs disabled */
static void enic_set_multicast_list(struct net_device *netdev)
{
@@ -922,6 +990,209 @@ static void enic_tx_timeout(struct net_device *netdev)
schedule_work(&enic->reset);
}
+static int enic_vnic_dev_deinit(struct enic *enic)
+{
+ int err;
+
+ spin_lock(&enic->devcmd_lock);
+ err = vnic_dev_deinit(enic->vdev);
+ spin_unlock(&enic->devcmd_lock);
+
+ return err;
+}
+
+static int enic_dev_init_prov(struct enic *enic, struct vic_provinfo *vp)
+{
+ int err;
+
+ spin_lock(&enic->devcmd_lock);
+ err = vnic_dev_init_prov(enic->vdev,
+ (u8 *)vp, vic_provinfo_size(vp));
+ spin_unlock(&enic->devcmd_lock);
+
+ return err;
+}
+
+static int enic_dev_init_done(struct enic *enic, int *done, int *error)
+{
+ int err;
+
+ spin_lock(&enic->devcmd_lock);
+ err = vnic_dev_init_done(enic->vdev, done, error);
+ spin_unlock(&enic->devcmd_lock);
+
+ return err;
+}
+
+static int enic_set_port_profile(struct enic *enic, int vf, u8 *mac,
+ char *name, u8 *instance_uuid, u8 *host_uuid)
+{
+ struct vic_provinfo *vp;
+ u8 oui[3] = VIC_PROVINFO_CISCO_OUI;
+ unsigned short *uuid;
+ char uuid_str[38];
+ static char *uuid_fmt = "%04X%04X-%04X-%04X-%04X-%04X%04X%04X";
+ int err;
+
+ if (!name)
+ return -EINVAL;
+
+ if (!is_valid_ether_addr(mac))
+ return -EADDRNOTAVAIL;
+
+ vp = vic_provinfo_alloc(GFP_KERNEL, oui, VIC_PROVINFO_LINUX_TYPE);
+ if (!vp)
+ return -ENOMEM;
+
+ vic_provinfo_add_tlv(vp,
+ VIC_LINUX_PROV_TLV_PORT_PROFILE_NAME_STR,
+ strlen(name) + 1, name);
+
+ vic_provinfo_add_tlv(vp,
+ VIC_LINUX_PROV_TLV_CLIENT_MAC_ADDR,
+ ETH_ALEN, mac);
+
+ if (instance_uuid) {
+ uuid = (unsigned short *)instance_uuid;
+ sprintf(uuid_str, uuid_fmt,
+ uuid[0], uuid[1], uuid[2], uuid[3],
+ uuid[4], uuid[5], uuid[6], uuid[7]);
+ vic_provinfo_add_tlv(vp,
+ VIC_LINUX_PROV_TLV_CLIENT_UUID_STR,
+ sizeof(uuid_str), uuid_str);
+ }
+
+ if (host_uuid) {
+ uuid = (unsigned short *)host_uuid;
+ sprintf(uuid_str, uuid_fmt,
+ uuid[0], uuid[1], uuid[2], uuid[3],
+ uuid[4], uuid[5], uuid[6], uuid[7]);
+ vic_provinfo_add_tlv(vp,
+ VIC_LINUX_PROV_TLV_HOST_UUID_STR,
+ sizeof(uuid_str), uuid_str);
+ }
+
+ err = enic_vnic_dev_deinit(enic);
+ if (err)
+ goto err_out;
+
+ memset(&enic->pp, 0, sizeof(enic->pp));
+
+ err = enic_dev_init_prov(enic, vp);
+ if (err)
+ goto err_out;
+
+ memcpy(enic->pp.name, name, VF_PORT_PROFILE_MAX);
+ if (instance_uuid)
+ memcpy(enic->pp.instance_uuid,
+ instance_uuid, VF_PORT_UUID_MAX);
+ if (host_uuid)
+ memcpy(enic->pp.host_uuid,
+ host_uuid, VF_PORT_UUID_MAX);
+
+err_out:
+ vic_provinfo_free(vp);
+
+ return err;
+}
+
+static int enic_unset_port_profile(struct enic *enic, int vf)
+{
+ memset(&enic->pp, 0, sizeof(enic->pp));
+ return enic_vnic_dev_deinit(enic);
+}
+
+static int enic_set_vf_port(struct net_device *netdev, int vf,
+ struct nlattr *vf_port[])
+{
+ struct enic *enic = netdev_priv(netdev);
+ char *name = NULL;
+ u8 *instance_uuid = NULL;
+ u8 *host_uuid = NULL;
+ u8 request = VF_PORT_REQUEST_DISASSOCIATE;
+
+ if (!enic_is_dynamic(enic))
+ return -EOPNOTSUPP;
+
+ if (vf_port[IFLA_VF_PORT_REQUEST])
+ request = nla_get_u8(vf_port[IFLA_VF_PORT_REQUEST]);
+
+ switch (request) {
+ case VF_PORT_REQUEST_ASSOCIATE:
+
+ if (vf_port[IFLA_VF_PORT_PROFILE])
+ name = nla_data(vf_port[IFLA_VF_PORT_PROFILE]);
+
+ if (vf_port[IFLA_VF_PORT_INSTANCE_UUID])
+ instance_uuid =
+ nla_data(vf_port[IFLA_VF_PORT_INSTANCE_UUID]);
+
+ if (vf_port[IFLA_VF_PORT_HOST_UUID])
+ host_uuid = nla_data(vf_port[IFLA_VF_PORT_HOST_UUID]);
+
+ return enic_set_port_profile(enic, vf,
+ netdev->dev_addr, name,
+ instance_uuid, host_uuid);
+
+ case VF_PORT_REQUEST_DISASSOCIATE:
+
+ return enic_unset_port_profile(enic, vf);
+
+ default:
+ break;
+ }
+
+ return -EOPNOTSUPP;
+}
+
+static int enic_get_vf_port(struct net_device *netdev, int vf,
+ struct sk_buff *skb)
+{
+ struct enic *enic = netdev_priv(netdev);
+ int err, error, done;
+ u16 response = VF_PORT_PROFILE_RESPONSE_SUCCESS;
+
+ if (!enic_is_dynamic(enic))
+ return -EOPNOTSUPP;
+
+ err = enic_dev_init_done(enic, &done, &error);
+
+ if (err)
+ return err;
+
+ switch (error) {
+ case ERR_SUCCESS:
+ if (!done)
+ response = VF_PORT_PROFILE_RESPONSE_INPROGRESS;
+ break;
+ case ERR_EINVAL:
+ response = VF_PORT_PROFILE_RESPONSE_INVALID;
+ break;
+ case ERR_EBADSTATE:
+ response = VF_PORT_PROFILE_RESPONSE_BADSTATE;
+ break;
+ case ERR_ENOMEM:
+ response = VF_PORT_PROFILE_RESPONSE_INSUFFICIENT_RESOURCES;
+ break;
+ default:
+ response = VF_PORT_PROFILE_RESPONSE_ERROR;
+ break;
+ }
+
+ NLA_PUT_U16(skb, IFLA_VF_PORT_RESPONSE, response);
+ NLA_PUT(skb, IFLA_VF_PORT_PROFILE, VF_PORT_PROFILE_MAX,
+ enic->pp.name);
+ NLA_PUT(skb, IFLA_VF_PORT_INSTANCE_UUID, VF_PORT_UUID_MAX,
+ enic->pp.instance_uuid);
+ NLA_PUT(skb, IFLA_VF_PORT_HOST_UUID, VF_PORT_UUID_MAX,
+ enic->pp.host_uuid);
+
+ return 0;
+
+nla_put_failure:
+ return -EMSGSIZE;
+}
+
static void enic_free_rq_buf(struct vnic_rq *rq, struct vnic_rq_buf *buf)
{
struct enic *enic = vnic_dev_priv(rq->vdev);
@@ -1440,9 +1711,7 @@ static int enic_open(struct net_device *netdev)
for (i = 0; i < enic->rq_count; i++)
vnic_rq_enable(&enic->rq[i]);
- spin_lock(&enic->devcmd_lock);
- enic_add_station_addr(enic);
- spin_unlock(&enic->devcmd_lock);
+ enic_dev_add_station_addr(enic);
enic_set_multicast_list(netdev);
netif_wake_queue(netdev);
@@ -1489,6 +1758,8 @@ static int enic_stop(struct net_device *netdev)
netif_carrier_off(netdev);
netif_tx_disable(netdev);
+ enic_dev_del_station_addr(enic);
+
for (i = 0; i < enic->wq_count; i++) {
err = vnic_wq_disable(&enic->wq[i]);
if (err)
@@ -1775,20 +2046,22 @@ static void enic_clear_intr_mode(struct enic *enic)
}
static const struct net_device_ops enic_netdev_ops = {
- .ndo_open = enic_open,
- .ndo_stop = enic_stop,
- .ndo_start_xmit = enic_hard_start_xmit,
- .ndo_get_stats = enic_get_stats,
- .ndo_validate_addr = eth_validate_addr,
- .ndo_set_mac_address = eth_mac_addr,
- .ndo_set_multicast_list = enic_set_multicast_list,
- .ndo_change_mtu = enic_change_mtu,
- .ndo_vlan_rx_register = enic_vlan_rx_register,
- .ndo_vlan_rx_add_vid = enic_vlan_rx_add_vid,
- .ndo_vlan_rx_kill_vid = enic_vlan_rx_kill_vid,
- .ndo_tx_timeout = enic_tx_timeout,
+ .ndo_open = enic_open,
+ .ndo_stop = enic_stop,
+ .ndo_start_xmit = enic_hard_start_xmit,
+ .ndo_get_stats = enic_get_stats,
+ .ndo_validate_addr = eth_validate_addr,
+ .ndo_set_multicast_list = enic_set_multicast_list,
+ .ndo_set_mac_address = enic_set_mac_address,
+ .ndo_change_mtu = enic_change_mtu,
+ .ndo_vlan_rx_register = enic_vlan_rx_register,
+ .ndo_vlan_rx_add_vid = enic_vlan_rx_add_vid,
+ .ndo_vlan_rx_kill_vid = enic_vlan_rx_kill_vid,
+ .ndo_tx_timeout = enic_tx_timeout,
+ .ndo_set_vf_port = enic_set_vf_port,
+ .ndo_get_vf_port = enic_get_vf_port,
#ifdef CONFIG_NET_POLL_CONTROLLER
- .ndo_poll_controller = enic_poll_controller,
+ .ndo_poll_controller = enic_poll_controller,
#endif
};
@@ -2010,11 +2283,13 @@ static int __devinit enic_probe(struct pci_dev *pdev,
netif_carrier_off(netdev);
- err = vnic_dev_init(enic->vdev, 0);
- if (err) {
- printk(KERN_ERR PFX
- "vNIC dev init failed, aborting.\n");
- goto err_out_dev_close;
+ if (!enic_is_dynamic(enic)) {
+ err = vnic_dev_init(enic->vdev, 0);
+ if (err) {
+ printk(KERN_ERR PFX
+ "vNIC dev init failed, aborting.\n");
+ goto err_out_dev_close;
+ }
}
err = enic_dev_init(enic);
diff --git a/drivers/net/enic/enic_res.c b/drivers/net/enic/enic_res.c
index 02839bf..9b18840 100644
--- a/drivers/net/enic/enic_res.c
+++ b/drivers/net/enic/enic_res.c
@@ -103,11 +103,6 @@ int enic_get_vnic_config(struct enic *enic)
return 0;
}
-void enic_add_station_addr(struct enic *enic)
-{
- vnic_dev_add_addr(enic->vdev, enic->mac_addr);
-}
-
void enic_add_multicast_addr(struct enic *enic, u8 *addr)
{
vnic_dev_add_addr(enic->vdev, addr);
diff --git a/drivers/net/enic/enic_res.h b/drivers/net/enic/enic_res.h
index abc1974..494664f 100644
--- a/drivers/net/enic/enic_res.h
+++ b/drivers/net/enic/enic_res.h
@@ -131,7 +131,6 @@ static inline void enic_queue_rq_desc(struct vnic_rq *rq,
struct enic;
int enic_get_vnic_config(struct enic *);
-void enic_add_station_addr(struct enic *enic);
void enic_add_multicast_addr(struct enic *enic, u8 *addr);
void enic_del_multicast_addr(struct enic *enic, u8 *addr);
void enic_add_vlan(struct enic *enic, u16 vlanid);
diff --git a/drivers/net/enic/vnic_dev.c b/drivers/net/enic/vnic_dev.c
index d43a9d4..2b3e16d 100644
--- a/drivers/net/enic/vnic_dev.c
+++ b/drivers/net/enic/vnic_dev.c
@@ -530,7 +530,7 @@ void vnic_dev_packet_filter(struct vnic_dev *vdev, int directed, int multicast,
printk(KERN_ERR "Can't set packet filter\n");
}
-void vnic_dev_add_addr(struct vnic_dev *vdev, u8 *addr)
+int vnic_dev_add_addr(struct vnic_dev *vdev, u8 *addr)
{
u64 a0 = 0, a1 = 0;
int wait = 1000;
@@ -543,9 +543,11 @@ void vnic_dev_add_addr(struct vnic_dev *vdev, u8 *addr)
err = vnic_dev_cmd(vdev, CMD_ADDR_ADD, &a0, &a1, wait);
if (err)
printk(KERN_ERR "Can't add addr [%pM], %d\n", addr, err);
+
+ return err;
}
-void vnic_dev_del_addr(struct vnic_dev *vdev, u8 *addr)
+int vnic_dev_del_addr(struct vnic_dev *vdev, u8 *addr)
{
u64 a0 = 0, a1 = 0;
int wait = 1000;
@@ -558,6 +560,8 @@ void vnic_dev_del_addr(struct vnic_dev *vdev, u8 *addr)
err = vnic_dev_cmd(vdev, CMD_ADDR_DEL, &a0, &a1, wait);
if (err)
printk(KERN_ERR "Can't del addr [%pM], %d\n", addr, err);
+
+ return err;
}
int vnic_dev_raise_intr(struct vnic_dev *vdev, u16 intr)
@@ -682,6 +686,56 @@ int vnic_dev_init(struct vnic_dev *vdev, int arg)
return r;
}
+int vnic_dev_init_done(struct vnic_dev *vdev, int *done, int *err)
+{
+ u64 a0 = 0, a1 = 0;
+ int wait = 1000;
+ int ret;
+
+ *done = 0;
+
+ ret = vnic_dev_cmd(vdev, CMD_INIT_STATUS, &a0, &a1, wait);
+ if (ret)
+ return ret;
+
+ *done = (a0 == 0);
+
+ *err = (a0 == 0) ? a1 : 0;
+
+ return 0;
+}
+
+int vnic_dev_init_prov(struct vnic_dev *vdev, u8 *buf, u32 len)
+{
+ u64 a0, a1 = len;
+ int wait = 1000;
+ u64 prov_pa;
+ void *prov_buf;
+ int ret;
+
+ prov_buf = pci_alloc_consistent(vdev->pdev, len, &prov_pa);
+ if (!prov_buf)
+ return -ENOMEM;
+
+ memcpy(prov_buf, buf, len);
+
+ a0 = prov_pa;
+
+ ret = vnic_dev_cmd(vdev, CMD_INIT_PROV_INFO, &a0, &a1, wait);
+
+ pci_free_consistent(vdev->pdev, len, prov_buf, prov_pa);
+
+ return ret;
+}
+
+int vnic_dev_deinit(struct vnic_dev *vdev)
+{
+ u64 a0 = 0, a1 = 0;
+ int wait = 1000;
+
+ return vnic_dev_cmd(vdev, CMD_DEINIT, &a0, &a1, wait);
+}
+
int vnic_dev_link_status(struct vnic_dev *vdev)
{
if (vdev->linkstatus)
diff --git a/drivers/net/enic/vnic_dev.h b/drivers/net/enic/vnic_dev.h
index f5be640..caccce3 100644
--- a/drivers/net/enic/vnic_dev.h
+++ b/drivers/net/enic/vnic_dev.h
@@ -103,8 +103,8 @@ int vnic_dev_stats_dump(struct vnic_dev *vdev, struct vnic_stats **stats);
int vnic_dev_hang_notify(struct vnic_dev *vdev);
void vnic_dev_packet_filter(struct vnic_dev *vdev, int directed, int multicast,
int broadcast, int promisc, int allmulti);
-void vnic_dev_add_addr(struct vnic_dev *vdev, u8 *addr);
-void vnic_dev_del_addr(struct vnic_dev *vdev, u8 *addr);
+int vnic_dev_add_addr(struct vnic_dev *vdev, u8 *addr);
+int vnic_dev_del_addr(struct vnic_dev *vdev, u8 *addr);
int vnic_dev_mac_addr(struct vnic_dev *vdev, u8 *mac_addr);
int vnic_dev_raise_intr(struct vnic_dev *vdev, u16 intr);
int vnic_dev_notify_setcmd(struct vnic_dev *vdev,
@@ -124,6 +124,9 @@ int vnic_dev_disable(struct vnic_dev *vdev);
int vnic_dev_open(struct vnic_dev *vdev, int arg);
int vnic_dev_open_done(struct vnic_dev *vdev, int *done);
int vnic_dev_init(struct vnic_dev *vdev, int arg);
+int vnic_dev_init_done(struct vnic_dev *vdev, int *done, int *err);
+int vnic_dev_init_prov(struct vnic_dev *vdev, u8 *buf, u32 len);
+int vnic_dev_deinit(struct vnic_dev *vdev);
int vnic_dev_soft_reset(struct vnic_dev *vdev, int arg);
int vnic_dev_soft_reset_done(struct vnic_dev *vdev, int *done);
void vnic_dev_set_intr_mode(struct vnic_dev *vdev,
diff --git a/drivers/net/enic/vnic_vic.c b/drivers/net/enic/vnic_vic.c
new file mode 100644
index 0000000..d769772
--- /dev/null
+++ b/drivers/net/enic/vnic_vic.c
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2010 Cisco Systems, Inc. All rights reserved.
+ *
+ * This program is free software; you may redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/types.h>
+#include <linux/slab.h>
+
+#include "vnic_vic.h"
+
+struct vic_provinfo *vic_provinfo_alloc(gfp_t flags, u8 *oui, u8 type)
+{
+ struct vic_provinfo *vp = kzalloc(VIC_PROVINFO_MAX_DATA, flags);
+
+ if (!vp || !oui)
+ return NULL;
+
+ memcpy(vp->oui, oui, sizeof(vp->oui));
+ vp->type = type;
+ vp->length = htonl(sizeof(vp->num_tlvs));
+
+ return vp;
+}
+
+void vic_provinfo_free(struct vic_provinfo *vp)
+{
+ kfree(vp);
+}
+
+int vic_provinfo_add_tlv(struct vic_provinfo *vp, u16 type, u16 length,
+ void *value)
+{
+ struct vic_provinfo_tlv *tlv;
+
+ if (!vp || !value)
+ return -EINVAL;
+
+ if (ntohl(vp->length) + sizeof(*tlv) + length >
+ VIC_PROVINFO_MAX_TLV_DATA)
+ return -ENOMEM;
+
+ tlv = (struct vic_provinfo_tlv *)((u8 *)vp->tlv +
+ ntohl(vp->length) - sizeof(vp->num_tlvs));
+
+ tlv->type = htons(type);
+ tlv->length = htons(length);
+ memcpy(tlv->value, value, length);
+
+ vp->num_tlvs = htonl(ntohl(vp->num_tlvs) + 1);
+ vp->length = htonl(ntohl(vp->length) + sizeof(*tlv) + length);
+
+ return 0;
+}
+
+size_t vic_provinfo_size(struct vic_provinfo *vp)
+{
+ return vp ? ntohl(vp->length) + sizeof(*vp) - sizeof(vp->num_tlvs) : 0;
+}
diff --git a/drivers/net/enic/vnic_vic.h b/drivers/net/enic/vnic_vic.h
new file mode 100644
index 0000000..085c2a2
--- /dev/null
+++ b/drivers/net/enic/vnic_vic.h
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2010 Cisco Systems, Inc. All rights reserved.
+ *
+ * This program is free software; you may redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+#ifndef _VNIC_VIC_H_
+#define _VNIC_VIC_H_
+
+/* Note: All integer fields in NETWORK byte order */
+
+/* Note: String field lengths include null char */
+
+#define VIC_PROVINFO_CISCO_OUI { 0x00, 0x00, 0x0c }
+#define VIC_PROVINFO_LINUX_TYPE 0x2
+
+enum vic_linux_prov_tlv_type {
+ VIC_LINUX_PROV_TLV_PORT_PROFILE_NAME_STR = 0,
+ VIC_LINUX_PROV_TLV_CLIENT_MAC_ADDR = 1, /* u8[6] */
+ VIC_LINUX_PROV_TLV_CLIENT_NAME_STR = 2,
+ VIC_LINUX_PROV_TLV_HOST_UUID_STR = 8,
+ VIC_LINUX_PROV_TLV_CLIENT_UUID_STR = 9,
+};
+
+struct vic_provinfo {
+ u8 oui[3]; /* OUI of data provider */
+ u8 type; /* provider-specific type */
+ u32 length; /* length of data below */
+ u32 num_tlvs; /* number of tlvs */
+ struct vic_provinfo_tlv {
+ u16 type;
+ u16 length;
+ u8 value[0];
+ } tlv[0];
+} __attribute__ ((packed));
+
+#define VIC_PROVINFO_MAX_DATA 1385
+#define VIC_PROVINFO_MAX_TLV_DATA (VIC_PROVINFO_MAX_DATA - \
+ sizeof(struct vic_provinfo))
+
+struct vic_provinfo *vic_provinfo_alloc(gfp_t flags, u8 *oui, u8 type);
+void vic_provinfo_free(struct vic_provinfo *vp);
+int vic_provinfo_add_tlv(struct vic_provinfo *vp, u16 type, u16 length,
+ void *value);
+size_t vic_provinfo_size(struct vic_provinfo *vp);
+
+#endif /* _VNIC_VIC_H_ */
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox