From owner-freebsd-arch@FreeBSD.ORG Fri Jan 28 20:53:35 2011 Return-Path: Delivered-To: freebsd-arch@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E7D611065672; Fri, 28 Jan 2011 20:53:35 +0000 (UTC) (envelope-from jroberson@jroberson.net) Received: from mail-fx0-f54.google.com (mail-fx0-f54.google.com [209.85.161.54]) by mx1.freebsd.org (Postfix) with ESMTP id 60C668FC17; Fri, 28 Jan 2011 20:53:34 +0000 (UTC) Received: by fxm16 with SMTP id 16so3916913fxm.13 for ; Fri, 28 Jan 2011 12:53:34 -0800 (PST) Received: by 10.223.93.144 with SMTP id v16mr2058788fam.35.1296248013140; Fri, 28 Jan 2011 12:53:33 -0800 (PST) Received: from [10.0.1.198] ([72.253.42.56]) by mx.google.com with ESMTPS id j12sm2523642fax.9.2011.01.28.12.53.28 (version=SSLv3 cipher=RC4-MD5); Fri, 28 Jan 2011 12:53:29 -0800 (PST) Date: Fri, 28 Jan 2011 10:56:30 -1000 (HST) From: Jeff Roberson X-X-Sender: jroberson@desktop To: John Baldwin In-Reply-To: <201101281009.32986.jhb@freebsd.org> Message-ID: References: <201101281009.32986.jhb@freebsd.org> User-Agent: Alpine 2.00 (BSF 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: freebsd-arch@freebsd.org Subject: Re: ofed merge soon X-BeenThere: freebsd-arch@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussion related to FreeBSD architecture List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jan 2011 20:53:36 -0000 On Fri, 28 Jan 2011, John Baldwin wrote: > On Thursday, January 27, 2011 9:59:01 pm Jeff Roberson wrote: >> Hi Folks, >> >> I am merging ofed very soon. Here is the diff between the ofed base and >> head branches, which includes all of the diffs to vendor files and FreeBSD >> files: >> >> http://people.freebsd.org/~jeff/ofed.diff > > Did you consider changing ndp to match the code from arp to print out the link > layer addresses? If you don't want to do that, should there be a constant > similar to ETHER_ADDR_LEN that is suitable for IB to avoid hardcoding '20' in > ndp? Here is the similar code from arp (which ndp probably should adopt in > some fashion): > You're right, I was lazy in ndp. Thanks for keeping me honest. > if (sdl->sdl_alen) { > if ((sdl->sdl_type == IFT_ETHER || > sdl->sdl_type == IFT_L2VLAN || > sdl->sdl_type == IFT_BRIDGE) && > sdl->sdl_alen == ETHER_ADDR_LEN) > printf("%s", ether_ntoa((struct ether_addr > *)LLADDR(sdl))); > else { > int n = sdl->sdl_nlen > 0 ? sdl->sdl_nlen + 1 : 0; > > printf("%s", link_ntoa(sdl) + n); > } > } else > printf("(incomplete)"); > >> The diffs are actually quite small when you eliminate ofed diffs. I don't >> know why I have so many merge properties but I'll just apply this diff to >> current, build & test before committing rather than have svn do it. >> Unless someone tells me otherwise. > > Just applying the diffs is probably fine. > > Also, at some point I would probably like to rename intr_drain() or hide it in > some way so that only ofed uses it. FreeBSD drivers should drain interrupt > handlers, not IRQs. I realize the ofed Linux compat shims are stuck with that > interface, but for FreeBSD drivers I want a proper interface. Any suggestions? Is there a proper interface available yet? The implementation I have requires internals that are not exposed outside of kern_intr.c so it has to live there. Thanks, Jeff > > -- > John Baldwin >