From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932317AbWHGTHJ (ORCPT ); Mon, 7 Aug 2006 15:07:09 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932318AbWHGTHJ (ORCPT ); Mon, 7 Aug 2006 15:07:09 -0400 Received: from nz-out-0102.google.com ([64.233.162.194]:27737 "EHLO nz-out-0102.google.com") by vger.kernel.org with ESMTP id S932317AbWHGTHH (ORCPT ); Mon, 7 Aug 2006 15:07:07 -0400 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=DMNWWrNnmGdEhQxH4O9GfmwUFGIpkmocJwd5Cg0Ykg/cn7hTVrQ5ULmZqlROHcn1kJgqNOyOuikKMuOWoLF8PjUdyu+uBxwtoI1nXyJczdv8Uv9omqTvV25LWAaGxClwKqwqXiDroEfeT0GGOIcbt18Kx4Zu+jsGPzLbK7nJyHU= Message-ID: Date: Mon, 7 Aug 2006 15:07:06 -0400 From: "Tien ChenLi" To: "Willy Tarreau" Subject: Re: [PATCH]pktgen oops when used with balance-tlb bonding Cc: linux-kernel@vger.kernel.org, "David Miller" In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <20060802203854.GA462@1wt.eu> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Hi, I forgot that if I also need to patch the fill_packet_ipv6 since I don't have experience with it. I guess we should patch that one too. Chen-Li Tien On 07/08/06, Tien ChenLi wrote: > Indeed the skb->mac.raw is already set just several lines up. Now only > two lines are needed: > > Signed-off-by: Chen-Li Tien > > --- linux-2.6.17.6/net/core/pktgen.c.orig 2006-07-15 > 15:00:43.000000000 -0400 > +++ linux-2.6.17.6/net/core/pktgen.c 2006-08-07 14:50:09.000000000 -0400 > @@ -2149,6 +2149,8 @@ static struct sk_buff *fill_packet_ipv4( > skb->mac.raw = ((u8 *) iph) - 14 - pkt_dev->nr_labels*sizeof(u32); > skb->dev = odev; > skb->pkt_type = PACKET_HOST; > + skb->nh.iph = iph; > + skb->h.uh = udph; > > if (pkt_dev->nfrags <= 0) > pgh = (struct pktgen_hdr *)skb_put(skb, datalen); > > Since google mail extand tab into spaces and I cannot change them back > to tab, I attached the patch file itself so please use it instead. > > Sincerely, > Chen-Li Tien > > On 02/08/06, Willy Tarreau wrote: > > On Sat, Jul 22, 2006 at 07:11:21PM -0400, Tien ChenLi wrote: > > > I fixed a bug in pktgen so it won't cause oops when used with > > > balance-tlb or balance-alb bonding driver: > > > > > > --- linux-2.6.17.4/net/core/pktgen.c.orig 2006-07-06 > > > 16:02:28.000000000 -0 > > > 400 > > > +++ linux-2.6.17.4/net/core/pktgen.c 2006-07-10 16:40:47.000000000 -0400 > > > @@ -2149,6 +2149,9 @@ > > > skb->mac.raw = ((u8 *) iph) - 14 - pkt_dev->nr_labels*sizeof(u32); > > > skb->dev = odev; > > > skb->pkt_type = PACKET_HOST; > > > + skb->mac.raw = eth; > > ^^^^^^^^^^^^ > > Are you sure about this ? I don't understand why you change skb->mac.raw > > here while it's still assigned 3 lines above. Either of those is unneeded > > and/or erroneous. > > > > > + skb->nh.iph = iph; > > > + skb->h.uh = udph; > > > > > > if (pkt_dev->nfrags <= 0) > > > pgh = (struct pktgen_hdr *)skb_put(skb, datalen); > > > > > > The root cause is that the bond_alb_xmit in bonding will peek the > > > destination address in packet via the skb->nh.iph pointer, generally > > > this will be filled by upper layer network driver, but the packet > > > generated by pktgen will be sent to device driver so it will need to > > > set this pointer correctly. The other two pointers are not necessary > > > for now, they are set to avoid similar problem. > > > > Fine. Please confirm your intention about mac.raw above, and as David > > said, please sign-off the patch and check your mailer for unexpected > > tabs/spaces conversions. > > > > > Chen-Li Tien > > > > Thanks in advance, > > Willy > > > > > > >