[PATCH NET-2.6 0/1]qlcnic: bug fix

[PATCH NET-2.6 0/1]qlcnic: bug fix

[Amit Kumar Salecha]

David,
	Apply this fix to net-2.6 tree.
	This patch will give hunk failure while merging to net-next tree.
	Somehow I can't avoid it. Two lines below diff has changed in qlcnic_xmit_frame().

-Amit

[PATCH NET-2.6 1/1] qlcnic: limit skb frags for non tso packet

[Amit Kumar Salecha]

Machines are getting deadlock in four node cluster environment.
All nodes are accessing (find /gfs2 -depth -print|cpio -ocv > /dev/null)
200 GB storage on a GFS2 filesystem.
This result in memory fragmentation and driver receives 18 frags for
1448 byte packets.
For non tso packet, fw drops the tx request, if it has >14 frags.

Fixing it by pulling extra frags.

Cc: stable@kernel.org
Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com>
---
 drivers/net/qlcnic/qlcnic.h      |    1 +
 drivers/net/qlcnic/qlcnic_main.c |   14 ++++++++++++++
 2 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/drivers/net/qlcnic/qlcnic.h b/drivers/net/qlcnic/qlcnic.h
index dc44564..b0dead0 100644
--- a/drivers/net/qlcnic/qlcnic.h
+++ b/drivers/net/qlcnic/qlcnic.h
@@ -99,6 +99,7 @@
 #define TX_UDPV6_PKT	0x0c
 
 /* Tx defines */
+#define QLCNIC_MAX_FRAGS_PER_TX	14
 #define MAX_TSO_HEADER_DESC	2
 #define MGMT_CMD_DESC_RESV	4
 #define TX_STOP_THRESH		((MAX_SKB_FRAGS >> 2) + MAX_TSO_HEADER_DESC \
diff --git a/drivers/net/qlcnic/qlcnic_main.c b/drivers/net/qlcnic/qlcnic_main.c
index cd88c7e..cb1a1ef 100644
--- a/drivers/net/qlcnic/qlcnic_main.c
+++ b/drivers/net/qlcnic/qlcnic_main.c
@@ -2099,6 +2099,7 @@ qlcnic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
 	struct cmd_desc_type0 *hwdesc, *first_desc;
 	struct pci_dev *pdev;
 	struct ethhdr *phdr;
+	int delta = 0;
 	int i, k;
 
 	u32 producer;
@@ -2118,6 +2119,19 @@ qlcnic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
 	}
 
 	frag_count = skb_shinfo(skb)->nr_frags + 1;
+	/* 14 frags supported for normal packet and
+	 * 32 frags supported for TSO packet
+	 */
+	if (!skb_is_gso(skb) && frag_count > QLCNIC_MAX_FRAGS_PER_TX) {
+
+		for (i = 0; i < (frag_count - QLCNIC_MAX_FRAGS_PER_TX); i++)
+			delta += skb_shinfo(skb)->frags[i].size;
+
+		if (!__pskb_pull_tail(skb, delta))
+			goto drop_packet;
+
+		frag_count = 1 + skb_shinfo(skb)->nr_frags;
+	}
 
 	/* 4 fragments per cmd des */
 	no_of_desc = (frag_count + 3) >> 2;
-- 
1.7.3.2

_______________________________________________
stable mailing list
stable@linux.kernel.org
http://linux.kernel.org/mailman/listinfo/stable

Re: [PATCH NET-2.6 1/1] qlcnic: limit skb frags for non tso packet

[David Miller]

From: Amit Kumar Salecha <amit.salecha@qlogic.com>
Date: Tue, 12 Apr 2011 00:19:41 -0700

> <<< No Message Collected >>>

Can you PLEASE fix your email.

PLEASE?

Yesterday you spammed us all, and today you've sent three postings
with this subject line.

1) One with the patch, and the proper set of CC:'s (myself, other
   qlogic engineers, netdev, and stable)

2) One with the patch, and a too short CC: list (only netdev and
   stable)

3) And now this email with no actual content and a weird message.

I really can't spend my afternoons sifting through the emails that
spam from qlogic, trying to figure out which ones I should pay
attention to for review, and which ones are spam.

Please resend properly any patches you actually want me to pay
attention to.

If you cannot make sure at this time that the patches will be sent
without incident, sit on them until you can.

Thank you.

RE: [PATCH NET-2.6 1/1] qlcnic: limit skb frags for non tso packet

[Amit Salecha]

> From: Amit Kumar Salecha <amit.salecha@qlogic.com>
> Date: Tue, 12 Apr 2011 00:19:41 -0700
>
> > <<< No Message Collected >>>
>
> Can you PLEASE fix your email.
>
> PLEASE?
>
> Yesterday you spammed us all, and today you've sent three postings
> with this subject line.
>
> 1) One with the patch, and the proper set of CC:'s (myself, other
>    qlogic engineers, netdev, and stable)
>
> 2) One with the patch, and a too short CC: list (only netdev and
>    stable)
>
> 3) And now this email with no actual content and a weird message.
>
> I really can't spend my afternoons sifting through the emails that
> spam from qlogic, trying to figure out which ones I should pay
> attention to for review, and which ones are spam.
>
> Please resend properly any patches you actually want me to pay
> attention to.
>
> If you cannot make sure at this time that the patches will be sent
> without incident, sit on them until you can.
>
> Thank you.

Sorry for all this. Yesterday, 1st patch got send to all other than netdev mailing list.
So I resend that to netdev mailing list. I didn't cc all other, as they will receive duplicate email.
In all these header patch got corrupted. Our IT is working on it and soon will resolve all these problem.
I will resend patch with version 2.

-Amit


This message and any attached documents contain information from QLogic Corporation or its wholly-owned subsidiaries that may be confidential. If you are not the intended recipient, you may not read, copy, distribute, or use this information. If you have received this transmission in error, please notify the sender immediately by reply e-mail and then delete this message.

Re: [stable] [PATCH NET-2.6 1/1] qlcnic: limit skb frags for non tso packet

[Greg KH]

On Tue, Apr 12, 2011 at 09:01:13PM -0500, Amit Salecha wrote:
> 
> This message and any attached documents contain information from QLogic Corporation or its wholly-owned subsidiaries that may be confidential. If you are not the intended recipient, you may not read, copy, distribute, or use this information. If you have received this transmission in error, please notify the sender immediately by reply e-mail and then delete this message.

I have received this transmission in error.

Please remove this from your footer, otherwise we can not accept any
emails sent from you as actually being allowed to contribute to the
kernel properly :(

thanks,

greg k-h

RE: [stable] [PATCH NET-2.6 1/1] qlcnic: limit skb frags for non tso packet

[Amit Salecha]

> On Tue, Apr 12, 2011 at 09:01:13PM -0500, Amit Salecha wrote:
> >
> > This message and any attached documents contain information from
> QLogic Corporation or its wholly-owned subsidiaries that may be
> confidential. If you are not the intended recipient, you may not read,
> copy, distribute, or use this information. If you have received this
> transmission in error, please notify the sender immediately by reply e-
> mail and then delete this message.
>
> I have received this transmission in error.
>
> Please remove this from your footer, otherwise we can not accept any
> emails sent from you as actually being allowed to contribute to the
> kernel properly :(
>
I have send version two of this patch, that doesn't have this footer.
Please discard this one.

This message and any attached documents contain information from QLogic Corporation or its wholly-owned subsidiaries that may be confidential. If you are not the intended recipient, you may not read, copy, distribute, or use this information. If you have received this transmission in error, please notify the sender immediately by reply e-mail and then delete this message.

Re: [stable] [PATCH NET-2.6 1/1] qlcnic: limit skb frags for non tso packet

[Greg KH]

On Wed, Apr 13, 2011 at 12:56:56AM -0500, Amit Salecha wrote:
> > On Tue, Apr 12, 2011 at 09:01:13PM -0500, Amit Salecha wrote:
> > >
> > > This message and any attached documents contain information from
> > QLogic Corporation or its wholly-owned subsidiaries that may be
> > confidential. If you are not the intended recipient, you may not read,
> > copy, distribute, or use this information. If you have received this
> > transmission in error, please notify the sender immediately by reply e-
> > mail and then delete this message.
> >
> > I have received this transmission in error.
> >
> > Please remove this from your footer, otherwise we can not accept any
> > emails sent from you as actually being allowed to contribute to the
> > kernel properly :(
> >
> I have send version two of this patch, that doesn't have this footer.
> Please discard this one.
> 
> This message and any attached documents contain information from QLogic Corporation or its wholly-owned subsidiaries that may be confidential. If you are not the intended recipient, you may not read, copy, distribute, or use this information. If you have received this transmission in error, please notify the sender immediately by reply e-mail and then delete this message.

Your footer is still present, please fix this.

Re: [PATCH NET-2.6 1/1] qlcnic: limit skb frags for non tso packet

[Amit Salecha]

> On Wed, Apr 13, 2011 at 12:56:56AM -0500, Amit Salecha wrote:
> > > On Tue, Apr 12, 2011 at 09:01:13PM -0500, Amit Salecha wrote:
> > > >
> > > > This message and any attached documents contain information from
> > > QLogic Corporation or its wholly-owned subsidiaries that may be
> > > confidential. If you are not the intended recipient, you may not
> read,
> > > copy, distribute, or use this information. If you have received
> this
> > > transmission in error, please notify the sender immediately by
> reply e-
> > > mail and then delete this message.
> > >
> > > I have received this transmission in error.
> > >
> > > Please remove this from your footer, otherwise we can not accept
> any
> > > emails sent from you as actually being allowed to contribute to the
> > > kernel properly :(
> > >
> > I have send version two of this patch, that doesn't have this footer.
> > Please discard this one.
> >
> > This message and any attached documents contain information from
> QLogic Corporation or its wholly-owned subsidiaries that may be
> confidential. If you are not the intended recipient, you may not read,
> copy, distribute, or use this information. If you have received this
> transmission in error, please notify the sender immediately by reply e-
> mail and then delete this message.
>
> Your footer is still present, please fix this.


Footer will present in my reply to this email. But footer should not be there in patches sent by me.
Can you verify patch version 2 again ? Here http://patchwork.ozlabs.org/patch/90938/ I don't see any footer.
If you see footer with patch version 2, please send me that.


-Amit



This message and any attached documents contain information from QLogic Corporation or its wholly-owned subsidiaries that may be confidential. If you are not the intended recipient, you may not read, copy, distribute, or use this information. If you have received this transmission in error, please notify the sender immediately by reply e-mail and then delete this message.


_______________________________________________
stable mailing list
stable@linux.kernel.org
http://linux.kernel.org/mailman/listinfo/stable

Re: [PATCH NET-2.6 1/1] qlcnic: limit skb frags for non tso packet

[Greg KH]

On Wed, Apr 13, 2011 at 10:59:56AM -0500, Amit Salecha wrote:
> > On Wed, Apr 13, 2011 at 12:56:56AM -0500, Amit Salecha wrote:
> > > > On Tue, Apr 12, 2011 at 09:01:13PM -0500, Amit Salecha wrote:
> > > > >
> > > > > This message and any attached documents contain information from
> > > > QLogic Corporation or its wholly-owned subsidiaries that may be
> > > > confidential. If you are not the intended recipient, you may not
> > read,
> > > > copy, distribute, or use this information. If you have received
> > this
> > > > transmission in error, please notify the sender immediately by
> > reply e-
> > > > mail and then delete this message.
> > > >
> > > > I have received this transmission in error.
> > > >
> > > > Please remove this from your footer, otherwise we can not accept
> > any
> > > > emails sent from you as actually being allowed to contribute to the
> > > > kernel properly :(
> > > >
> > > I have send version two of this patch, that doesn't have this footer.
> > > Please discard this one.
> > >
> > > This message and any attached documents contain information from
> > QLogic Corporation or its wholly-owned subsidiaries that may be
> > confidential. If you are not the intended recipient, you may not read,
> > copy, distribute, or use this information. If you have received this
> > transmission in error, please notify the sender immediately by reply e-
> > mail and then delete this message.
> >
> > Your footer is still present, please fix this.
> 
> 
> Footer will present in my reply to this email. But footer should not be there in patches sent by me.
> Can you verify patch version 2 again ? Here http://patchwork.ozlabs.org/patch/90938/ I don't see any footer.
> If you see footer with patch version 2, please send me that.

Your footer was not in your patch, correct.  But it was in this email.

And that's the issue, you can't have that footer on emails you send to a
public list where you are going to be collaborating on a public project,
otherwise no one can use anything you say.

Now if you only think that people will just accept your patches, without
being able to have you participate in development and maintance of those
patches (which is required to be done through email), you are mistaken.

So please fix your email issue, otherwise it is not going to work.

Note, other people at qualcomm have fixed this, so you are not alone.

thanks,

greg k-h

_______________________________________________
stable mailing list
stable@linux.kernel.org
http://linux.kernel.org/mailman/listinfo/stable

RE: [stable] [PATCH NET-2.6 1/1] qlcnic: limit skb frags for non tso packet

[Amit Salecha]

> > Footer will present in my reply to this email. But footer should not
> be there in patches sent by me.
> > Can you verify patch version 2 again ? Here
> http://patchwork.ozlabs.org/patch/90938/ I don't see any footer.
> > If you see footer with patch version 2, please send me that.
>
> Your footer was not in your patch, correct.  But it was in this email.
>
> And that's the issue, you can't have that footer on emails you send to
> a
> public list where you are going to be collaborating on a public
> project,
> otherwise no one can use anything you say.
>
> Now if you only think that people will just accept your patches,
> without
> being able to have you participate in development and maintance of
> those
> patches (which is required to be done through email), you are mistaken.
>
> So please fix your email issue, otherwise it is not going to work.
>
> Note, other people at qualcomm have fixed this, so you are not alone.
>
Ok.

Our IT has fixed the footer issue. Sending this email to verify.

-Amit

This message and any attached documents contain information from QLogic Corporation or its wholly-owned subsidiaries that may be confidential. If you are not the intended recipient, you may not read, copy, distribute, or use this information. If you have received this transmission in error, please notify the sender immediately by reply e-mail and then delete this message.

Re: [PATCH NET-2.6 1/1] qlcnic: limit skb frags for non tso packet

[Greg KH]

On Thu, Apr 14, 2011 at 12:22:35AM -0500, Amit Salecha wrote:
> > > Footer will present in my reply to this email. But footer should not
> > be there in patches sent by me.
> > > Can you verify patch version 2 again ? Here
> > http://patchwork.ozlabs.org/patch/90938/ I don't see any footer.
> > > If you see footer with patch version 2, please send me that.
> >
> > Your footer was not in your patch, correct.  But it was in this email.
> >
> > And that's the issue, you can't have that footer on emails you send to
> > a
> > public list where you are going to be collaborating on a public
> > project,
> > otherwise no one can use anything you say.
> >
> > Now if you only think that people will just accept your patches,
> > without
> > being able to have you participate in development and maintance of
> > those
> > patches (which is required to be done through email), you are mistaken.
> >
> > So please fix your email issue, otherwise it is not going to work.
> >
> > Note, other people at qualcomm have fixed this, so you are not alone.
> >
> Ok.
> 
> Our IT has fixed the footer issue. Sending this email to verify.
> 
> -Amit
> 
> This message and any attached documents contain information from QLogic Corporation or its wholly-owned subsidiaries that may be confidential. If you are not the intended recipient, you may not read, copy, distribute, or use this information. If you have received this transmission in error, please notify the sender immediately by reply e-mail and then delete this message.

Nope, still shows up :(


_______________________________________________
stable mailing list
stable@linux.kernel.org
http://linux.kernel.org/mailman/listinfo/stable

[PATCH NET-2.6 1/1] qlcnic: limit skb frags for non tso packet

[Amit Kumar Salecha]

Machines are getting deadlock in four node cluster environment.
All nodes are accessing (find /gfs2 -depth -print|cpio -ocv > /dev/null)
200 GB storage on a GFS2 filesystem.
This result in memory fragmentation and driver receives 18 frags for
1448 byte packets.
For non tso packet, fw drops the tx request, if it has >14 frags.

Fixing it by pulling extra frags.

Cc: stable@kernel.org
Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com>
---
 drivers/net/qlcnic/qlcnic.h      |    1 +
 drivers/net/qlcnic/qlcnic_main.c |   14 ++++++++++++++
 2 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/drivers/net/qlcnic/qlcnic.h b/drivers/net/qlcnic/qlcnic.h
index dc44564..b0dead0 100644
--- a/drivers/net/qlcnic/qlcnic.h
+++ b/drivers/net/qlcnic/qlcnic.h
@@ -99,6 +99,7 @@
 #define TX_UDPV6_PKT	0x0c
 
 /* Tx defines */
+#define QLCNIC_MAX_FRAGS_PER_TX	14
 #define MAX_TSO_HEADER_DESC	2
 #define MGMT_CMD_DESC_RESV	4
 #define TX_STOP_THRESH		((MAX_SKB_FRAGS >> 2) + MAX_TSO_HEADER_DESC \
diff --git a/drivers/net/qlcnic/qlcnic_main.c b/drivers/net/qlcnic/qlcnic_main.c
index cd88c7e..cb1a1ef 100644
--- a/drivers/net/qlcnic/qlcnic_main.c
+++ b/drivers/net/qlcnic/qlcnic_main.c
@@ -2099,6 +2099,7 @@ qlcnic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
 	struct cmd_desc_type0 *hwdesc, *first_desc;
 	struct pci_dev *pdev;
 	struct ethhdr *phdr;
+	int delta = 0;
 	int i, k;
 
 	u32 producer;
@@ -2118,6 +2119,19 @@ qlcnic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
 	}
 
 	frag_count = skb_shinfo(skb)->nr_frags + 1;
+	/* 14 frags supported for normal packet and
+	 * 32 frags supported for TSO packet
+	 */
+	if (!skb_is_gso(skb) && frag_count > QLCNIC_MAX_FRAGS_PER_TX) {
+
+		for (i = 0; i < (frag_count - QLCNIC_MAX_FRAGS_PER_TX); i++)
+			delta += skb_shinfo(skb)->frags[i].size;
+
+		if (!__pskb_pull_tail(skb, delta))
+			goto drop_packet;
+
+		frag_count = 1 + skb_shinfo(skb)->nr_frags;
+	}
 
 	/* 4 fragments per cmd des */
 	no_of_desc = (frag_count + 3) >> 2;
-- 
1.7.3.2