* Re: [V2 PATCH 1/9] csiostor: Chelsio FCoE offload driver submission (sources part 1).
From: Naresh Kumar Inna @ 2012-09-05 17:18 UTC (permalink / raw)
To: Stephen Hemminger
Cc: JBottomley@parallels.com, linux-scsi@vger.kernel.org,
Dimitrios Michailidis, Casey Leedom, netdev@vger.kernel.org,
Chethan Seshadri
In-Reply-To: <20120905092326.0a54226f@nehalam.linuxnetplumber.net>
On 9/5/2012 9:53 PM, Stephen Hemminger wrote:
> On Wed, 5 Sep 2012 18:03:54 +0530
> Naresh Kumar Inna <naresh@chelsio.com> wrote:
>
>> +
>> +/* FCoE Adapter types & its description */
>> +static struct csio_adap_desc csio_fcoe_adapters[] = {
>
> Tables like this should be const.
>
Thanks for reviewing. I will change it to const.
^ permalink raw reply
* Re: [V2 PATCH 6/9] csiostor: Chelsio FCoE offload driver submission (headers part 1).
From: Naresh Kumar Inna @ 2012-09-05 17:26 UTC (permalink / raw)
To: Stephen Hemminger
Cc: JBottomley@parallels.com, linux-scsi@vger.kernel.org,
Dimitrios Michailidis, Casey Leedom, netdev@vger.kernel.org,
Chethan Seshadri
In-Reply-To: <20120905093133.5f97fcbb@nehalam.linuxnetplumber.net>
On 9/5/2012 10:01 PM, Stephen Hemminger wrote:
> On Wed, 5 Sep 2012 18:03:59 +0530
> Naresh Kumar Inna <naresh@chelsio.com> wrote:
>
>> +#define CSIO_ROUNDUP(__v, __r) (((__v) + (__r) - 1) / (__r))
>
> This is similar to existing round_up() in kernel.h could you use that?
>
I will replace it with round_up() if it serves the same purpose. Thanks.
^ permalink raw reply
* Re: [V2 PATCH 2/9] csiostor: Chelsio FCoE offload driver submission (sources part 2).
From: Naresh Kumar Inna @ 2012-09-05 17:43 UTC (permalink / raw)
To: Stephen Hemminger
Cc: JBottomley@parallels.com, linux-scsi@vger.kernel.org,
Dimitrios Michailidis, Casey Leedom, netdev@vger.kernel.org,
Chethan Seshadri
In-Reply-To: <20120905092957.7d24187e@nehalam.linuxnetplumber.net>
On 9/5/2012 9:59 PM, Stephen Hemminger wrote:
> On Wed, 5 Sep 2012 18:03:55 +0530
> Naresh Kumar Inna <naresh@chelsio.com> wrote:
>
>> This patch contains code for driver initialization, driver resource
>> allocation and the Work Request module functionality. Driver initialization
>> includes module entry/exit points, registration with PCI, FC transport and
>> SCSI mid layer subsystems. The Work Request module provides services for
>> allocation of DMA queues, posting Work Requests on them and processing
>> completions.
>>
>> Signed-off-by: Naresh Kumar Inna <naresh@chelsio.com>
>
> Although the comments say you are using proc fs, there is no
> code here related to that.
I will remove that comment.
>
> Any use of debugfs must be conditional the DEBUG_FS kernel configuration
> parameter. Your code probably will break if DEBUG_FS is not
> enabled. For a possible alternative see how a sub-config parameter
> was added in sky2 driver.
>
It appears that debugfs_create_dir() returns an error if DEBUG_FS is not
enabled. Considering the driver handles this error and continues
initialization, do you still think I should guard this code within DEBUG_FS?
Thanks.
^ permalink raw reply
* Re: [V2 PATCH 6/9] csiostor: Chelsio FCoE offload driver submission (headers part 1).
From: Naresh Kumar Inna @ 2012-09-05 17:44 UTC (permalink / raw)
To: Stephen Hemminger
Cc: JBottomley@parallels.com, linux-scsi@vger.kernel.org,
Dimitrios Michailidis, Casey Leedom, netdev@vger.kernel.org,
Chethan Seshadri
In-Reply-To: <20120905093305.2418eac8@nehalam.linuxnetplumber.net>
On 9/5/2012 10:03 PM, Stephen Hemminger wrote:
> On Wed, 5 Sep 2012 18:03:59 +0530
> Naresh Kumar Inna <naresh@chelsio.com> wrote:
>
>> +
>> +#define CSIO_ASSERT(cond) \
>> +do { \
>> + if (unlikely(!((cond)))) \
>> + BUG(); \
>> +} while (0)
>> +
>
> Why is this not just BUG_ON(!(cond)) ?
>
I will replace the 2 lines in the macro with BUG_ON() as you have
suggested. Thanks.
^ permalink raw reply
* Re: [PATCH] netfilter: take care of timewait sockets
From: Eric Dumazet @ 2012-09-05 17:52 UTC (permalink / raw)
To: Pablo Neira Ayuso; +Cc: Patrick McHardy, netfilter-devel, netdev
In-Reply-To: <20120905171016.GA23211@1984>
On Wed, 2012-09-05 at 19:10 +0200, Pablo Neira Ayuso wrote:
> On Tue, Sep 04, 2012 at 07:49:03PM +0200, Eric Dumazet wrote:
> > From: Eric Dumazet <edumazet@google.com>
> >
> > Sami Farin reported crashes in xt_LOG because it assumes skb->sk is a
> > full blown socket.
> >
> > But with TCP early demux, we can have skb->sk pointing to a timewait
> > socket.
>
> TCP early demux is there since 3.6-rc.
>
> I'll add that to the changelog if you don't mind, to help tracking
> things for -stable.
Sure, its not a stable candidate.
^ permalink raw reply
* Re: [net-next 0/4][pull request] Intel Wired LAN Driver Updates
From: David Miller @ 2012-09-05 19:10 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, gospo, sassmann
In-Reply-To: <1346826350-27733-1-git-send-email-jeffrey.t.kirsher@intel.com>
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Tue, 4 Sep 2012 23:25:46 -0700
> This series contains updates to igb and ixgbe.
>
> The following are changes since commit 600e177920df936d03b807780ca92c662af98990:
> net: Providing protocol type via system.sockprotoname xattr of /proc/PID/fd entries
> and are available in the git repository at:
> git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
Pulled, thanks Jeff.
^ permalink raw reply
* Re: pull-request: can 2012-09-04
From: David Miller @ 2012-09-05 19:12 UTC (permalink / raw)
To: mkl; +Cc: netdev, linux-can
In-Reply-To: <1346792142-17609-1-git-send-email-mkl@pengutronix.de>
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Tue, 4 Sep 2012 22:55:41 +0200
> this patch is for the v3.6 release cycle. Benoît Locher fixed a repeated frame
> bug in the mcp251x driver. He implemented the workaround suggested by the
> errata sheet.
...
> git://gitorious.org/linux-can/linux-can.git fixes-for-3.6
Pulled, thanks Marc.
^ permalink raw reply
* Re: [PATCH v3 1/3] tcp: add generic netlink support for tcp_metrics
From: David Miller @ 2012-09-05 19:17 UTC (permalink / raw)
To: ja; +Cc: netdev, shemminger
In-Reply-To: <1346792597-2427-2-git-send-email-ja@ssi.bg>
From: Julian Anastasov <ja@ssi.bg>
Date: Wed, 5 Sep 2012 00:03:15 +0300
> Add support for genl "tcp_metrics". No locking
> is changed, only that now we can unlink and delete
> entries after grace period. We implement get/del for
> single entry and dump to support show/flush filtering
> in user space. Del without address attribute causes
> flush for all addresses, sadly under genl_mutex.
>
> v2:
> - remove rcu_assign_pointer as suggested by Eric Dumazet,
> it is not needed because there are no other writes under lock
> - move the flushing code in tcp_metrics_flush_all
>
> v3:
> - remove synchronize_rcu on flush as suggested by Eric Dumazet
>
> Signed-off-by: Julian Anastasov <ja@ssi.bg>
Looks great, applied to net-next, thanks Julian.
^ permalink raw reply
* [PATCH] Revert "usbnet: drop unneeded check for NULL"
From: Oliver Neukum @ 2012-09-05 19:22 UTC (permalink / raw)
To: davem, netdev; +Cc: Oliver Neukum, Oliver Neukum
This reverts commit 5d65878d7031b6c39054b282faceff406bb2fda9.
The upper layers call usbnet_start_xmit() with a valid skb.
However cdc_ncm abuses this method by calling it with NULL
to trigger IO for the aggregated private skb holding erlier
packets. Until cdc_ncm is fixed, the check for NULL must
be reintroduced.
Signed-off-by: Oliver Neukum <oneukum@suse.de>
---
drivers/net/usb/usbnet.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index 5234d20..8531c1c 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -1092,7 +1092,8 @@ netdev_tx_t usbnet_start_xmit (struct sk_buff *skb,
unsigned long flags;
int retval;
- skb_tx_timestamp(skb);
+ if (skb)
+ skb_tx_timestamp(skb);
// some devices want funky USB-level framing, for
// win32 driver (usually) and/or hardware quirks
--
1.7.7
^ permalink raw reply related
* changing usbnet's API to better deal with cdc-ncm
From: Oliver Neukum @ 2012-09-05 20:12 UTC (permalink / raw)
To: alexey.orishko, bjorn, netdev, linux-usb
Hi,
looking at cdc-ncm it seeems to me that cdc-ncm is forced to play
very dirty games because usbnet doesn't have a notion about aggregating
packets for a single transfer.
It seems to me that this can be fixed introducing a method for bundling,
which tells usbnet how packets have been aggregated. To have performance
usbnet strives to always keep at least two transfers in flight.
The code isn't complete and I need to get a device for testing, but to get
your opinion, I ask you to comment on what I have now.
Regards
Oliver
diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c
index 4cd582a..56ef743 100644
--- a/drivers/net/usb/cdc_ncm.c
+++ b/drivers/net/usb/cdc_ncm.c
@@ -135,9 +135,6 @@ struct cdc_ncm_ctx {
u16 connected;
};
-static void cdc_ncm_txpath_bh(unsigned long param);
-static void cdc_ncm_tx_timeout_start(struct cdc_ncm_ctx *ctx);
-static enum hrtimer_restart cdc_ncm_tx_timer_cb(struct hrtimer *hr_timer);
static struct usb_driver cdc_ncm_driver;
static void
@@ -464,10 +461,6 @@ static int cdc_ncm_bind(struct usbnet *dev, struct usb_interface *intf)
if (ctx == NULL)
return -ENODEV;
- hrtimer_init(&ctx->tx_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
- ctx->tx_timer.function = &cdc_ncm_tx_timer_cb;
- ctx->bh.data = (unsigned long)ctx;
- ctx->bh.func = cdc_ncm_txpath_bh;
atomic_set(&ctx->stop, 0);
spin_lock_init(&ctx->mtx);
ctx->netdev = dev->net;
@@ -650,7 +643,7 @@ static void cdc_ncm_zero_fill(u8 *ptr, u32 first, u32 end, u32 max)
memset(ptr + first, 0, end - first);
}
-static struct sk_buff *
+static int
cdc_ncm_fill_tx_frame(struct cdc_ncm_ctx *ctx, struct sk_buff *skb)
{
struct sk_buff *skb_out;
@@ -659,12 +652,7 @@ cdc_ncm_fill_tx_frame(struct cdc_ncm_ctx *ctx, struct sk_buff *skb)
u32 last_offset;
u16 n = 0, index;
u8 ready2send = 0;
-
- /* if there is a remaining skb, it gets priority */
- if (skb != NULL)
- swap(skb, ctx->tx_rem_skb);
- else
- ready2send = 1;
+ u8 error = 0;
/*
* +----------------+
@@ -690,7 +678,7 @@ cdc_ncm_fill_tx_frame(struct cdc_ncm_ctx *ctx, struct sk_buff *skb)
dev_kfree_skb_any(skb);
ctx->netdev->stats.tx_dropped++;
}
- goto exit_no_skb;
+ return -EBUSY;
}
/* make room for NTH and NDP */
@@ -719,28 +707,15 @@ cdc_ncm_fill_tx_frame(struct cdc_ncm_ctx *ctx, struct sk_buff *skb)
/* compute maximum buffer size */
rem = ctx->tx_max - offset;
- if (skb == NULL) {
- skb = ctx->tx_rem_skb;
- ctx->tx_rem_skb = NULL;
-
- /* check for end of skb */
- if (skb == NULL)
- break;
- }
-
if (skb->len > rem) {
if (n == 0) {
/* won't fit, MTU problem? */
dev_kfree_skb_any(skb);
skb = NULL;
ctx->netdev->stats.tx_dropped++;
+ error = 1;
} else {
- /* no room for skb - store for later */
- if (ctx->tx_rem_skb != NULL) {
- dev_kfree_skb_any(ctx->tx_rem_skb);
- ctx->netdev->stats.tx_dropped++;
- }
- ctx->tx_rem_skb = skb;
+
skb = NULL;
ready2send = 1;
}
@@ -768,13 +743,6 @@ cdc_ncm_fill_tx_frame(struct cdc_ncm_ctx *ctx, struct sk_buff *skb)
skb = NULL;
}
- /* free up any dangling skb */
- if (skb != NULL) {
- dev_kfree_skb_any(skb);
- skb = NULL;
- ctx->netdev->stats.tx_dropped++;
- }
-
ctx->tx_curr_frame_num = n;
if (n == 0) {
@@ -791,9 +759,7 @@ cdc_ncm_fill_tx_frame(struct cdc_ncm_ctx *ctx, struct sk_buff *skb)
ctx->tx_curr_skb = skb_out;
ctx->tx_curr_offset = offset;
ctx->tx_curr_last_offset = last_offset;
- /* set the pending count */
- if (n < CDC_NCM_RESTART_TIMER_DATAGRAM_CNT)
- ctx->tx_timer_pending = CDC_NCM_TIMER_PENDING_CNT;
+
goto exit_no_skb;
} else {
@@ -874,71 +840,37 @@ cdc_ncm_fill_tx_frame(struct cdc_ncm_ctx *ctx, struct sk_buff *skb)
/* return skb */
ctx->tx_curr_skb = NULL;
ctx->netdev->stats.tx_packets += ctx->tx_curr_frame_num;
- return skb_out;
-exit_no_skb:
- /* Start timer, if there is a remaining skb */
- if (ctx->tx_curr_skb != NULL)
- cdc_ncm_tx_timeout_start(ctx);
- return NULL;
-}
-
-static void cdc_ncm_tx_timeout_start(struct cdc_ncm_ctx *ctx)
-{
- /* start timer, if not already started */
- if (!(hrtimer_active(&ctx->tx_timer) || atomic_read(&ctx->stop)))
- hrtimer_start(&ctx->tx_timer,
- ktime_set(0, CDC_NCM_TIMER_INTERVAL),
- HRTIMER_MODE_REL);
-}
+ if (error)
+ return -EBUSY;
+ if (ready2send)
+ return -EBUSY;
+ else
+ return 0;
-static enum hrtimer_restart cdc_ncm_tx_timer_cb(struct hrtimer *timer)
-{
- struct cdc_ncm_ctx *ctx =
- container_of(timer, struct cdc_ncm_ctx, tx_timer);
+exit_no_skb:
- if (!atomic_read(&ctx->stop))
- tasklet_schedule(&ctx->bh);
- return HRTIMER_NORESTART;
+ return -EAGAIN;
}
-static void cdc_ncm_txpath_bh(unsigned long param)
+static int cdc_ncm_tx_bundle(struct usbnet *dev, struct sk_buff *skb, gfp_t flags)
{
- struct cdc_ncm_ctx *ctx = (struct cdc_ncm_ctx *)param;
-
- spin_lock_bh(&ctx->mtx);
- if (ctx->tx_timer_pending != 0) {
- ctx->tx_timer_pending--;
- cdc_ncm_tx_timeout_start(ctx);
- spin_unlock_bh(&ctx->mtx);
- } else if (ctx->netdev != NULL) {
- spin_unlock_bh(&ctx->mtx);
- netif_tx_lock_bh(ctx->netdev);
- usbnet_start_xmit(NULL, ctx->netdev);
- netif_tx_unlock_bh(ctx->netdev);
- }
+ int err;
+ struct cdc_ncm_ctx *ctx = (struct cdc_ncm_ctx *)dev->data[0];
+
+ err = cdc_ncm_fill_tx_frame(ctx, skb);
+ return err;
}
static struct sk_buff *
cdc_ncm_tx_fixup(struct usbnet *dev, struct sk_buff *skb, gfp_t flags)
{
- struct sk_buff *skb_out;
struct cdc_ncm_ctx *ctx = (struct cdc_ncm_ctx *)dev->data[0];
- /*
- * The Ethernet API we are using does not support transmitting
- * multiple Ethernet frames in a single call. This driver will
- * accumulate multiple Ethernet frames and send out a larger
- * USB frame when the USB buffer is full or when a single jiffies
- * timeout happens.
- */
if (ctx == NULL)
goto error;
- spin_lock_bh(&ctx->mtx);
- skb_out = cdc_ncm_fill_tx_frame(ctx, skb);
- spin_unlock_bh(&ctx->mtx);
- return skb_out;
+ return ctx->tx_curr_skb;
error:
if (skb != NULL)
@@ -1197,6 +1129,7 @@ static const struct driver_info cdc_ncm_info = {
.manage_power = cdc_ncm_manage_power,
.status = cdc_ncm_status,
.rx_fixup = cdc_ncm_rx_fixup,
+ .tx_bundle = cdc_ncm_tx_bundle,
.tx_fixup = cdc_ncm_tx_fixup,
};
@@ -1211,6 +1144,7 @@ static const struct driver_info wwan_info = {
.manage_power = cdc_ncm_manage_power,
.status = cdc_ncm_status,
.rx_fixup = cdc_ncm_rx_fixup,
+ .tx_bundle = cdc_ncm_tx_bundle,
.tx_fixup = cdc_ncm_tx_fixup,
};
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index 8531c1c..d9a595e 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -1024,6 +1024,7 @@ static void tx_complete (struct urb *urb)
struct skb_data *entry = (struct skb_data *) skb->cb;
struct usbnet *dev = entry->dev;
+ atomic_dec(&dev->tx_in_flight);
if (urb->status == 0) {
if (!(dev->driver_info->flags & FLAG_MULTI_PACKET))
dev->net->stats.tx_packets++;
@@ -1089,23 +1090,50 @@ netdev_tx_t usbnet_start_xmit (struct sk_buff *skb,
struct urb *urb = NULL;
struct skb_data *entry;
struct driver_info *info = dev->driver_info;
+ struct sk_buff *skb_old = NULL;
unsigned long flags;
int retval;
+ int transmit_now = 1;
+ int bundle_again = 0;
if (skb)
skb_tx_timestamp(skb);
+ /*
+ * first we allow drivers to bundle packets together
+ * maintainance of the buffer is the responsibility
+ * of the lower layer
+ */
+rebundle:
+ if (info->tx_bundle) {
+ bundle_again = 0;
+ retval = info->tx_bundle(dev, skb, GFP_ATOMIC);
+
+ switch (retval) {
+ case 0: /* the package has been bundled */
+ if (atomic_read(&dev->tx_in_flight) < 2)
+ transmit_now = 1;
+ else
+ transmit_now = 0;
+ break;
+ case -EAGAIN:
+ transmit_now = 1;
+ bundle_again = 1;
+ skb_old = skb;
+ break;
+ case -EBUSY:
+ transmit_now = 1;
+ break;
+ }
+ }
// some devices want funky USB-level framing, for
// win32 driver (usually) and/or hardware quirks
- if (info->tx_fixup) {
+ if (transmit_now && info->tx_fixup) {
skb = info->tx_fixup (dev, skb, GFP_ATOMIC);
if (!skb) {
if (netif_msg_tx_err(dev)) {
netif_dbg(dev, tx_err, dev->net, "can't tx_fixup skb\n");
goto drop;
- } else {
- /* cdc_ncm collected packet; waits for more */
- goto not_drop;
}
}
}
@@ -1164,14 +1192,17 @@ netdev_tx_t usbnet_start_xmit (struct sk_buff *skb,
}
#endif
+ atomic_inc(&dev->tx_in_flight);
switch ((retval = usb_submit_urb (urb, GFP_ATOMIC))) {
case -EPIPE:
netif_stop_queue (net);
usbnet_defer_kevent (dev, EVENT_TX_HALT);
+ atomic_dec(&dev->tx_in_flight);
usb_autopm_put_interface_async(dev->intf);
break;
default:
usb_autopm_put_interface_async(dev->intf);
+ atomic_dec(&dev->tx_in_flight);
netif_dbg(dev, tx_err, dev->net,
"tx: submit urb err %d\n", retval);
break;
@@ -1187,7 +1218,6 @@ netdev_tx_t usbnet_start_xmit (struct sk_buff *skb,
netif_dbg(dev, tx_err, dev->net, "drop, code %d\n", retval);
drop:
dev->net->stats.tx_dropped++;
-not_drop:
if (skb)
dev_kfree_skb_any (skb);
usb_free_urb (urb);
@@ -1197,6 +1227,10 @@ not_drop:
#ifdef CONFIG_PM
deferred:
#endif
+ if (bundle_again) {
+ skb = skb_old;
+ goto rebundle;
+ }
return NETDEV_TX_OK;
}
EXPORT_SYMBOL_GPL(usbnet_start_xmit);
@@ -1393,6 +1427,7 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
dev->delay.data = (unsigned long) dev;
init_timer (&dev->delay);
mutex_init (&dev->phy_mutex);
+ atomic_set(&dev->tx_in_flight, 0);
dev->net = net;
strcpy (net->name, "usb%d");
diff --git a/include/linux/usb/usbnet.h b/include/linux/usb/usbnet.h
index f87cf62..bb2f622 100644
--- a/include/linux/usb/usbnet.h
+++ b/include/linux/usb/usbnet.h
@@ -33,6 +33,7 @@ struct usbnet {
wait_queue_head_t *wait;
struct mutex phy_mutex;
unsigned char suspend_count;
+ atomic_t tx_in_flight;
/* i/o info: pipes etc */
unsigned in, out;
@@ -133,6 +134,12 @@ struct driver_info {
/* fixup rx packet (strip framing) */
int (*rx_fixup)(struct usbnet *dev, struct sk_buff *skb);
+ /* bundle individual package for transmission as
+ * larger package. This cannot sleep
+ */
+ int (*tx_bundle)(struct usbnet *dev,
+ struct sk_buff *skb, gfp_t flags);
+
/* fixup tx packet (add framing) */
struct sk_buff *(*tx_fixup)(struct usbnet *dev,
struct sk_buff *skb, gfp_t flags);
^ permalink raw reply related
* Re: [PATCH] Revert "usbnet: drop unneeded check for NULL"
From: David Miller @ 2012-09-05 20:20 UTC (permalink / raw)
To: oliver; +Cc: netdev, oneukum
In-Reply-To: <1346872952-21192-1-git-send-email-oliver@neukum.org>
From: Oliver Neukum <oliver@neukum.org>
Date: Wed, 5 Sep 2012 21:22:32 +0200
> This reverts commit 5d65878d7031b6c39054b282faceff406bb2fda9.
> The upper layers call usbnet_start_xmit() with a valid skb.
> However cdc_ncm abuses this method by calling it with NULL
> to trigger IO for the aggregated private skb holding erlier
> packets. Until cdc_ncm is fixed, the check for NULL must
> be reintroduced.
>
> Signed-off-by: Oliver Neukum <oneukum@suse.de>
Applied, thanks Oliver.
^ permalink raw reply
* Re: kernel BUG at kernel/timer.c:748!
From: Julian Anastasov @ 2012-09-05 20:48 UTC (permalink / raw)
To: Dave Jones; +Cc: netdev
In-Reply-To: <20120905043523.GA12988@redhat.com>
Hello,
On Wed, 5 Sep 2012, Dave Jones wrote:
> Just hit this bug on 3.6-rc4.
>
> The BUG is..
>
> BUG_ON(!timer->function);
>
>
> Not much to go on... Any thoughts on what I could add to get
> more debug info on which protocol etc this was ?
>
> Dave
>
>
> kernel BUG at kernel/timer.c:748!
> invalid opcode: 0000 [#1] SMP
> Modules linked in: tun fuse ipt_ULOG binfmt_misc nfnetlink nfc caif_socket caif phonet can llc2 pppoe pppox ppp_generic slhc irda crc_ccitt rds af_key decnet rose x25 atm netrom appletalk ipx p8023 psnap p8022 llc ax25 nfsv3 nfs_acl nfs fscache lockd sunrpc bluetooth rfkill ip6t_REJECT nf_conntrack_ipv6 nf_defrag_ipv6 ip6table_filter ip6_tables nf_conntrack_ipv4 nf_defrag_ipv4 xt_state nf_conntrack kvm_intel kvm crc32c_intel ghash_clmulni_intel microcode pcspkr i2c_i801 e1000e uinput i915 video i2c_algo_bit drm_kms_helper drm i2c_core
> CPU 3
> Pid: 12330, comm: trinity-child3 Not tainted 3.6.0-rc4+ #36
> RIP: 0010:[<ffffffff810813f5>] [<ffffffff810813f5>] mod_timer+0x2c5/0x2f0
> RSP: 0018:ffff88000dfd7e08 EFLAGS: 00010246
> RAX: 000000000000001a RBX: ffff880122d62948 RCX: 000000000000001a
> RDX: 0000000000000000 RSI: 0000000000000000 RDI: ffff88000dfd7e10
> RBP: ffff88000dfd7e48 R08: 0000000000000000 R09: 0000000000000000
> R10: 0000000001517000 R11: 0000000000000246 R12: 000000016c000000
> R13: 000000016c12bcb1 R14: ffff8801236cee00 R15: 00000000ffffff01
> FS: 00007fa96745f740(0000) GS:ffff880148200000(0000) knlGS:0000000000000000
> CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
> CR2: 00000000100ff000 CR3: 0000000099344000 CR4: 00000000001407e0
> DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
> DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
> Process trinity-child3 (pid: 12330, threadinfo ffff88000dfd6000, task ffff880090890000)
> Stack:
> ffffffff8154cb6d 0000000007b5edf7 ffff88000dfd7e28 ffff880122d62520
> 0000000000000009 0000000000000004 ffff8801236cee00 00000000ffffff01
> ffff88000dfd7e68 ffffffff8154c79c ffffffff81550e6c ffff880122d62520
> Call Trace:
> [<ffffffff8154cb6d>] ? lock_sock_nested+0x8d/0xa0
> [<ffffffff8154c79c>] sk_reset_timer+0x1c/0x30
> [<ffffffff81550e6c>] ? sock_setsockopt+0x8c/0x960
> [<ffffffff815a84a0>] inet_csk_reset_keepalive_timer+0x20/0x30
> [<ffffffff815c018d>] tcp_set_keepalive+0x3d/0x50
> [<ffffffff81551703>] sock_setsockopt+0x923/0x960
> [<ffffffff810ddf76>] ? trace_hardirqs_on_caller+0x16/0x1e0
> [<ffffffff811db0ac>] ? fget_light+0x24c/0x520
> [<ffffffff8154af86>] sys_setsockopt+0xc6/0xe0
> [<ffffffff816a50ed>] system_call_fastpath+0x1a/0x1f
> Code: 00 74 43 9c 58 0f 1f 44 00 00 f6 c4 02 0f 84 14 ff ff ff eb 93 48 c7 c7 20 48 c3 81 e8 f5 70 05 00 85 c0 0f 85 fe fe ff ff eb b7 <0f> 0b 48 8b 75 08 48 89 df e8 3d f6 ff ff e9 b2 fd ff ff 4d 89
> RIP [<ffffffff810813f5>] mod_timer+0x2c5/0x2f0
> RSP <ffff88000dfd7e08>
> ---[ end trace 7e7b5910138e49a3 ]---
Can this help? In case you see ICMPV6_PKT_TOOBIG...
[PATCH] tcp: fix possible socket refcount problem for ipv6
commit 144d56e91044181ec0ef67aeca91e9a8b5718348
("tcp: fix possible socket refcount problem") is missing
the IPv6 part. As tcp_release_cb is shared by both protocols
we should hold sock reference for the TCP_MTU_REDUCED_DEFERRED
bit.
Signed-off-by: Julian Anastasov <ja@ssi.bg>
---
net/ipv6/tcp_ipv6.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 09078b9..f3bfb8b 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -403,8 +403,9 @@ static void tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
tp->mtu_info = ntohl(info);
if (!sock_owned_by_user(sk))
tcp_v6_mtu_reduced(sk);
- else
- set_bit(TCP_MTU_REDUCED_DEFERRED, &tp->tsq_flags);
+ else if (!test_and_set_bit(TCP_MTU_REDUCED_DEFERRED,
+ &tp->tsq_flags))
+ sock_hold(sk);
goto out;
}
--
1.7.3.4
^ permalink raw reply related
* [PATCH] tcp: fix possible socket refcount problem for ipv6
From: Julian Anastasov @ 2012-09-05 20:53 UTC (permalink / raw)
To: David Miller; +Cc: netdev
commit 144d56e91044181ec0ef67aeca91e9a8b5718348
("tcp: fix possible socket refcount problem") is missing
the IPv6 part. As tcp_release_cb is shared by both protocols
we should hold sock reference for the TCP_MTU_REDUCED_DEFERRED
bit.
Signed-off-by: Julian Anastasov <ja@ssi.bg>
---
net/ipv6/tcp_ipv6.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 09078b9..f3bfb8b 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -403,8 +403,9 @@ static void tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
tp->mtu_info = ntohl(info);
if (!sock_owned_by_user(sk))
tcp_v6_mtu_reduced(sk);
- else
- set_bit(TCP_MTU_REDUCED_DEFERRED, &tp->tsq_flags);
+ else if (!test_and_set_bit(TCP_MTU_REDUCED_DEFERRED,
+ &tp->tsq_flags))
+ sock_hold(sk);
goto out;
}
--
1.7.3.4
^ permalink raw reply related
* Re: [PATCH] tcp: fix possible socket refcount problem for ipv6
From: Eric Dumazet @ 2012-09-05 20:57 UTC (permalink / raw)
To: Julian Anastasov; +Cc: David Miller, netdev
In-Reply-To: <1346878398-4782-1-git-send-email-ja@ssi.bg>
On Wed, 2012-09-05 at 23:53 +0300, Julian Anastasov wrote:
> commit 144d56e91044181ec0ef67aeca91e9a8b5718348
> ("tcp: fix possible socket refcount problem") is missing
> the IPv6 part. As tcp_release_cb is shared by both protocols
> we should hold sock reference for the TCP_MTU_REDUCED_DEFERRED
> bit.
>
> Signed-off-by: Julian Anastasov <ja@ssi.bg>
> ---
> net/ipv6/tcp_ipv6.c | 5 +++--
> 1 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
> index 09078b9..f3bfb8b 100644
> --- a/net/ipv6/tcp_ipv6.c
> +++ b/net/ipv6/tcp_ipv6.c
> @@ -403,8 +403,9 @@ static void tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
> tp->mtu_info = ntohl(info);
> if (!sock_owned_by_user(sk))
> tcp_v6_mtu_reduced(sk);
> - else
> - set_bit(TCP_MTU_REDUCED_DEFERRED, &tp->tsq_flags);
> + else if (!test_and_set_bit(TCP_MTU_REDUCED_DEFERRED,
> + &tp->tsq_flags))
> + sock_hold(sk);
> goto out;
> }
>
Thanks !
Acked-by: Eric Dumazet <edumazet@google.com>
^ permalink raw reply
* Re: [REVIEW][PATCH 10/15] userns: Convert debugfs to use kuid/kgid where appropriate.
From: Greg Kroah-Hartman @ 2012-09-05 21:09 UTC (permalink / raw)
To: Eric W. Biederman
Cc: linux-kernel, netdev, linux-fsdevel, Serge E. Hallyn,
David Miller
In-Reply-To: <871uiufrj6.fsf@xmission.com>
On Sat, Aug 25, 2012 at 05:03:41PM -0700, Eric W. Biederman wrote:
>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
> Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
^ permalink raw reply
* RE: Intel 82574L hang when sending short ethernet packets at 100BaseT
From: Dave, Tushar N @ 2012-09-05 21:12 UTC (permalink / raw)
To: Kelvie Wong
Cc: netdev@vger.kernel.org, e1000-devel@lists.sourceforge.net,
Kelvie Wong
In-Reply-To: <CAK2bC5oMnxerNYsgoD7WFJ6p84=BqaZLFdt+GdO91tF0gmyg2w@mail.gmail.com>
>-----Original Message-----
>From: kelvie@gmail.com [mailto:kelvie@gmail.com] On Behalf Of Kelvie Wong
>Sent: Wednesday, August 29, 2012 1:46 PM
>To: Dave, Tushar N
>Cc: netdev@vger.kernel.org; e1000-devel@lists.sourceforge.net; Kelvie Wong
>Subject: Re: Intel 82574L hang when sending short ethernet packets at
>100BaseT
>
>On Wed, Aug 29, 2012 at 1:29 PM, Dave, Tushar N <tushar.n.dave@intel.com>
>wrote:
>> I'm already aware of this issue on PCI/PCI-X parts and e1000 SF driver
>does have this WA implemented. The patch for upstream e1000 driver is
>submitted too which will be accepted soon.
>> I will check with team and see if we need similar WA for PCIe part(s)!
>
>Ah, I see. Thanks for the clarification.
Thanks for your patience.
It is confirmed that minimum 17 bytes of packet size is a HW requirement for all of our PCI/PCI-X/PCIe parts.
Next release of all our drivers (e1000, e1000e , igb and ixgbe) will have this fixed.
-Tushar
^ permalink raw reply
* Re: [PATCH] tcp: fix possible socket refcount problem for ipv6
From: David Miller @ 2012-09-05 21:16 UTC (permalink / raw)
To: eric.dumazet; +Cc: ja, netdev
In-Reply-To: <1346878620.13121.161.camel@edumazet-glaptop>
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Wed, 05 Sep 2012 22:57:00 +0200
> On Wed, 2012-09-05 at 23:53 +0300, Julian Anastasov wrote:
>> commit 144d56e91044181ec0ef67aeca91e9a8b5718348
>> ("tcp: fix possible socket refcount problem") is missing
>> the IPv6 part. As tcp_release_cb is shared by both protocols
>> we should hold sock reference for the TCP_MTU_REDUCED_DEFERRED
>> bit.
>>
>> Signed-off-by: Julian Anastasov <ja@ssi.bg>
...
> Acked-by: Eric Dumazet <edumazet@google.com>
Applied, thanks everyone.
^ permalink raw reply
* Re: kernel BUG at kernel/timer.c:748!
From: Jerry Chu @ 2012-09-05 21:18 UTC (permalink / raw)
To: Lin Ming; +Cc: Dave Jones, netdev
In-Reply-To: <CAF1ivSauxzNhrm9c==_xFpuh9Lo3KrUNLNRb_62fLZxMfTuU1w@mail.gmail.com>
On Wed, Sep 5, 2012 at 9:04 AM, Lin Ming <mlin@ss.pku.edu.cn> wrote:
> On Wed, Sep 5, 2012 at 12:35 PM, Dave Jones <davej@redhat.com> wrote:
>> Just hit this bug on 3.6-rc4.
>>
>> The BUG is..
>>
>> BUG_ON(!timer->function);
>
> TCP keepalive timer is setup when the socket is created.
>
> __sock_create
> inet_create
> tcp_v4_init_sock
> tcp_init_sock
> tcp_init_xmit_timers
> inet_csk_init_xmit_timers
>
> timer->function should not be NULL when set keepalive option.
And tcp_init_xmit_timers() is called on the passive open side as well, v4
as well as v6. I don't see any code explicitly set timer->function back to NULL
(unless through set_timer(..., NULL,...). This may be a corrupted sock (already
released?)
Jerry
>
> Strange...have bug somewhere.
>
> Lin Ming
>
>>
>>
>> Not much to go on... Any thoughts on what I could add to get
>> more debug info on which protocol etc this was ?
>>
>> Dave
>>
>>
>> kernel BUG at kernel/timer.c:748!
>> invalid opcode: 0000 [#1] SMP
>> Modules linked in: tun fuse ipt_ULOG binfmt_misc nfnetlink nfc caif_socket caif phonet can llc2 pppoe pppox ppp_generic slhc irda crc_ccitt rds af_key decnet rose x25 atm netrom appletalk ipx p8023 psnap p8022 llc ax25 nfsv3 nfs_acl nfs fscache lockd sunrpc bluetooth rfkill ip6t_REJECT nf_conntrack_ipv6 nf_defrag_ipv6 ip6table_filter ip6_tables nf_conntrack_ipv4 nf_defrag_ipv4 xt_state nf_conntrack kvm_intel kvm crc32c_intel ghash_clmulni_intel microcode pcspkr i2c_i801 e1000e uinput i915 video i2c_algo_bit drm_kms_helper drm i2c_core
>> CPU 3
>> Pid: 12330, comm: trinity-child3 Not tainted 3.6.0-rc4+ #36
>> RIP: 0010:[<ffffffff810813f5>] [<ffffffff810813f5>] mod_timer+0x2c5/0x2f0
>> RSP: 0018:ffff88000dfd7e08 EFLAGS: 00010246
>> RAX: 000000000000001a RBX: ffff880122d62948 RCX: 000000000000001a
>> RDX: 0000000000000000 RSI: 0000000000000000 RDI: ffff88000dfd7e10
>> RBP: ffff88000dfd7e48 R08: 0000000000000000 R09: 0000000000000000
>> R10: 0000000001517000 R11: 0000000000000246 R12: 000000016c000000
>> R13: 000000016c12bcb1 R14: ffff8801236cee00 R15: 00000000ffffff01
>> FS: 00007fa96745f740(0000) GS:ffff880148200000(0000) knlGS:0000000000000000
>> CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
>> CR2: 00000000100ff000 CR3: 0000000099344000 CR4: 00000000001407e0
>> DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
>> DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
>> Process trinity-child3 (pid: 12330, threadinfo ffff88000dfd6000, task ffff880090890000)
>> Stack:
>> ffffffff8154cb6d 0000000007b5edf7 ffff88000dfd7e28 ffff880122d62520
>> 0000000000000009 0000000000000004 ffff8801236cee00 00000000ffffff01
>> ffff88000dfd7e68 ffffffff8154c79c ffffffff81550e6c ffff880122d62520
>> Call Trace:
>> [<ffffffff8154cb6d>] ? lock_sock_nested+0x8d/0xa0
>> [<ffffffff8154c79c>] sk_reset_timer+0x1c/0x30
>> [<ffffffff81550e6c>] ? sock_setsockopt+0x8c/0x960
>> [<ffffffff815a84a0>] inet_csk_reset_keepalive_timer+0x20/0x30
>> [<ffffffff815c018d>] tcp_set_keepalive+0x3d/0x50
>> [<ffffffff81551703>] sock_setsockopt+0x923/0x960
>> [<ffffffff810ddf76>] ? trace_hardirqs_on_caller+0x16/0x1e0
>> [<ffffffff811db0ac>] ? fget_light+0x24c/0x520
>> [<ffffffff8154af86>] sys_setsockopt+0xc6/0xe0
>> [<ffffffff816a50ed>] system_call_fastpath+0x1a/0x1f
>> Code: 00 74 43 9c 58 0f 1f 44 00 00 f6 c4 02 0f 84 14 ff ff ff eb 93 48 c7 c7 20 48 c3 81 e8 f5 70 05 00 85 c0 0f 85 fe fe ff ff eb b7 <0f> 0b 48 8b 75 08 48 89 df e8 3d f6 ff ff e9 b2 fd ff ff 4d 89
>> RIP [<ffffffff810813f5>] mod_timer+0x2c5/0x2f0
>> RSP <ffff88000dfd7e08>
>> ---[ end trace 7e7b5910138e49a3 ]---
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe netdev" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* Re: [PATCH 04/10] net/macb: Fix a race in macb_start_xmit()
From: David Miller @ 2012-09-05 21:30 UTC (permalink / raw)
To: nicolas.ferre
Cc: netdev, patrice.vilchez, linux-kernel, havard, jamie, plagnioj,
linux-arm-kernel
In-Reply-To: <40f02ee50a29aaec6c949432a1bcf09f4b027181.1346775479.git.nicolas.ferre@atmel.com>
From: Nicolas Ferre <nicolas.ferre@atmel.com>
Date: Wed, 5 Sep 2012 10:19:11 +0200
> From: Havard Skinnemoen <havard@skinnemoen.net>
>
> Fix a race in macb_start_xmit() where we unconditionally set the TSTART bit.
> If an underrun just happened (we do this with interrupts disabled, so it might
> not have been handled yet), the controller starts transmitting from the first
> entry in the ring, which is usually wrong.
> Restart the controller after error handling.
>
> Signed-off-by: Havard Skinnemoen <havard@skinnemoen.net>
> [nicolas.ferre@atmel.com: split patch in topics]
> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Accumulating special case code and checks into the hot path of TX packet
processing is extremely unwise.
Instead, when you handle the TX error conditions and reset the chip you
should first ensure that there are no flows of control in the transmit
function of your driver by using the appropriate locking et al. facilities.
For example, you can quiesce the transmit path by handling the chip error
interrupt as follows:
1) Disable chip interrupt generation.
2) Schedule a workqueue so you can process the reset outside of hard
interrupt context.
3) In the workqueue function, disable NAPI and perform a
netif_tx_disable() to guarentee there are no threads of
execution trying to queue up packets for TX into the driver.
4) Perform your chip reset and whatever else is necessary.
5) Re-enable NAPI and TX.
Then you don't need any special checks in your xmit method at all.
^ permalink raw reply
* Re: [PATCH 08/10] net/macb: macb_get_drvinfo: add GEM/MACB suffix to differentiate revision
From: David Miller @ 2012-09-05 21:31 UTC (permalink / raw)
To: nicolas.ferre
Cc: netdev, linux-arm-kernel, havard, plagnioj, jamie, linux-kernel,
patrice.vilchez
In-Reply-To: <fc701a2ed18198b7a671c55f1e65725f1709509c.1346775479.git.nicolas.ferre@atmel.com>
From: Nicolas Ferre <nicolas.ferre@atmel.com>
Date: Wed, 5 Sep 2012 11:00:53 +0200
> strcpy(info->driver, bp->pdev->dev.driver->name);
> + if (macb_is_gem(bp))
> + strcat(info->driver, " GEM");
> + else
> + strcat(info->driver, " MACB");
This is a driver string, which means the software driver, and has
absolutely nothing to do with the exact type of the underlying
physical hardware.
Therefore the these suffixes should be left out of the driver string.
^ permalink raw reply
* Re: [PATCH 09/10] net/macb: ethtool interface: add register dump feature
From: David Miller @ 2012-09-05 21:32 UTC (permalink / raw)
To: nicolas.ferre
Cc: netdev, linux-arm-kernel, havard, plagnioj, jamie, linux-kernel,
patrice.vilchez
In-Reply-To: <fcd1c2443a30f23ffcd8de28328c5a382e2a2459.1346775479.git.nicolas.ferre@atmel.com>
From: Nicolas Ferre <nicolas.ferre@atmel.com>
Date: Wed, 5 Sep 2012 11:00:54 +0200
> @@ -10,6 +10,9 @@
> #ifndef _MACB_H
> #define _MACB_H
>
> +
> +#define MACB_GREGS_LEN 32
Please don't add such extraneous empty lines. One empty line between
constructs is more than enough, and anything more is visually awkward.
Thanks.
^ permalink raw reply
* Re: [PATCH] net: add unknown state to sysfs NIC duplex export
From: David Miller @ 2012-09-05 21:40 UTC (permalink / raw)
To: naleksan; +Cc: netdev
In-Reply-To: <1346854288-6380-1-git-send-email-naleksan@redhat.com>
From: Nikolay Aleksandrov <naleksan@redhat.com>
Date: Wed, 5 Sep 2012 16:11:28 +0200
> Currently when the NIC duplex state is DUPLEX_UNKNOWN it is exported as
> full through sysfs, this patch adds support for DUPLEX_UNKNOWN. It is
> handled the same way as in ethtool.
>
> Signed-off-by: Nikolay Aleksandrov <naleksan@redhat.com>
Applied with two minor corrections:
> + char *duplex;
I made this "const char *"
> + switch(cmd.duplex) {
I added the missing space between 'switch' and '(cmd.duplex)'.
Thanks.
^ permalink raw reply
* Re: Commit "ipconfig wait for carrier" makes boot hang for 2 mins if no carrier
From: Joakim Tjernlund @ 2012-09-05 21:41 UTC (permalink / raw)
To: David Miller; +Cc: micha, netdev
In-Reply-To: <20120905.130158.897788930198410991.davem@davemloft.net>
David Miller <davem@davemloft.net> wrote on 2012/09/05 19:01:58:
>
> From: Joakim Tjernlund <joakim.tjernlund@transmode.se>
> Date: Wed, 5 Sep 2012 10:47:56 +0200
>
> > Please adjust the 2 min wait to nfsroot= only and keep the old way for ip=
>
> Sorry, this is not happening, I fully support the change in the tree
> as-is and will not modify it in the way you request.
>
> You'll have to accomodate this situation in some other local way.
I have fixed it locally, but I would like to know why you support the current way.
It adds a incredibly long delay for systems that doesn't need a carrier, they
just want an IP address defined for a particular I/F. I cannot see why
this change would be beneficial for all.
Jocke
^ permalink raw reply
* Re: [PATCH V2 0/2] Remove duplicate register definitions in Chelsio cxgb4
From: David Miller @ 2012-09-05 21:43 UTC (permalink / raw)
To: vipul-ut6Up61K2wZBDgjK7y7TUQ
Cc: linux-rdma-u79uwXL29TY76Z2rM5mHXA, netdev-u79uwXL29TY76Z2rM5mHXA,
roland-BHEL68pLQRGGvPXPguhicg, divy-ut6Up61K2wZBDgjK7y7TUQ,
dm-ut6Up61K2wZBDgjK7y7TUQ, swise-7bPotxP6k4+P2YhJcF5u+vpXobYPEAuW,
kumaras-ut6Up61K2wZBDgjK7y7TUQ, santosh-ut6Up61K2wZBDgjK7y7TUQ,
sivasu-ut6Up61K2wZBDgjK7y7TUQ
In-Reply-To: <1346846515-25997-1-git-send-email-vipul-ut6Up61K2wZBDgjK7y7TUQ@public.gmane.org>
From: Vipul Pandya <vipul-ut6Up61K2wZBDgjK7y7TUQ@public.gmane.org>
Date: Wed, 5 Sep 2012 17:31:53 +0530
> This patch series has minor changes in cxgb4 driver. It removes the duplicate
> definitions of the registers in cxgb4 driver. It also has a minor update in
> RDMA/cxgb4 driver due to change in cxgb4 driver.
>
> This patch series is built against Stephen Rothwell's linux-next tree. We
> request to merge patch series thorough single tree to avoid build failures.
Applied to net-next, thanks.
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* Re: [PATCH] ibmveth: Fix alignment of rx queue bug
From: David Miller @ 2012-09-05 21:45 UTC (permalink / raw)
To: santil; +Cc: netdev
In-Reply-To: <50469FC1.2000202@linux.vnet.ibm.com>
From: Santiago Leon <santil@linux.vnet.ibm.com>
Date: Tue, 04 Sep 2012 19:41:37 -0500
> This patch fixes a bug found by Nish Aravamudan
> (https://lkml.org/lkml/2012/5/15/220) where the driver is not following
> the spec (it is not aligning the rx buffer on a 16-byte boundary) and the
> hypervisor aborts the registration, making the device unusable.
>
> The fix follows BenH's recommendation (https://lkml.org/lkml/2012/7/20/461)
> to replace the kmalloc+map for a single call to dma_alloc_coherent()
> because that function always aligns to a 16-byte boundary.
>
> The stable trees will run into this bug whenever the rx buffer kmalloc call
> returns something not aligned on a 16-byte boundary.
>
> Cc: <stable@vger.kernel.org>
> Signed-off-by: Santiago Leon <santil@linux.vnet.ibm.com>
Applied, thanks.
^ permalink raw reply
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