From owner-freebsd-arch@FreeBSD.ORG Fri Jan 28 22:06:32 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 831861065695 for ; Fri, 28 Jan 2011 22:06:32 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id 532FB8FC12 for ; Fri, 28 Jan 2011 22:06:32 +0000 (UTC) Received: from bigwig.baldwin.cx (66.111.2.69.static.nyinternet.net [66.111.2.69]) by cyrus.watson.org (Postfix) with ESMTPSA id DD9C746B39; Fri, 28 Jan 2011 17:06:31 -0500 (EST) Received: from jhbbsd.localnet (smtp.hudson-trading.com [209.249.190.9]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id BD44D8A009; Fri, 28 Jan 2011 17:06:30 -0500 (EST) From: John Baldwin To: Jeff Roberson Date: Fri, 28 Jan 2011 17:06:27 -0500 User-Agent: KMail/1.13.5 (FreeBSD/7.4-CBSD-20110107; KDE/4.4.5; amd64; ; ) References: <201101281009.32986.jhb@freebsd.org> In-Reply-To: MIME-Version: 1.0 Message-Id: <201101281706.27514.jhb@freebsd.org> Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.6 (bigwig.baldwin.cx); Fri, 28 Jan 2011 17:06:30 -0500 (EST) X-Virus-Scanned: clamav-milter 0.96.3 at bigwig.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-1.9 required=4.2 tests=BAYES_00 autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on bigwig.baldwin.cx 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 22:06:32 -0000 On Friday, January 28, 2011 3:56:30 pm Jeff Roberson wrote: > 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. I think it will have to live there always, yes. Hmm, for now maybe just add a comment to say that it is only for Linux compat currently and not a supported interface. When I add a different drain interface I will make sure this function has the same semantics. -- John Baldwin