From owner-svn-src-all@freebsd.org Thu Oct 29 07:53:49 2015 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E8097A20BDF; Thu, 29 Oct 2015 07:53:49 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 61E7A1A49; Thu, 29 Oct 2015 07:53:49 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from tom.home (kostik@localhost [127.0.0.1]) by kib.kiev.ua (8.15.2/8.15.2) with ESMTPS id t9T7ricF076526 (version=TLSv1 cipher=DHE-RSA-CAMELLIA256-SHA bits=256 verify=NO); Thu, 29 Oct 2015 09:53:44 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua t9T7ricF076526 Received: (from kostik@localhost) by tom.home (8.15.2/8.15.2/Submit) id t9T7rhML076525; Thu, 29 Oct 2015 09:53:43 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Thu, 29 Oct 2015 09:53:43 +0200 From: Konstantin Belousov To: "Conrad E. Meyer" Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r290130 - head/sys/dev/ntb/ntb_hw Message-ID: <20151029075343.GO2257@kib.kiev.ua> References: <201510290416.t9T4GSG7044279@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201510290416.t9T4GSG7044279@repo.freebsd.org> User-Agent: Mutt/1.5.24 (2015-08-30) X-Spam-Status: No, score=-2.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on tom.home X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Oct 2015 07:53:50 -0000 On Thu, Oct 29, 2015 at 04:16:28AM +0000, Conrad E. Meyer wrote: > Author: cem > Date: Thu Oct 29 04:16:28 2015 > New Revision: 290130 > URL: https://svnweb.freebsd.org/changeset/base/290130 > > Log: > ntb: Do not attempt to set write-combining on MWs > > AMD64 pmap assumes ranges will be in the DMAP, which isn't necessarily > true for NTB memory windows (especially 64-bit BARs). I am not sure what do you mean. pmap_change_attr() handles either DMAP or kernel mapped memory. > > Suggested by: pmap_change_attr_locked -> kassert_panic > Sponsored by: EMC / Isilon Storage Division > > Modified: > head/sys/dev/ntb/ntb_hw/ntb_hw.c > > Modified: head/sys/dev/ntb/ntb_hw/ntb_hw.c > ============================================================================== > --- head/sys/dev/ntb/ntb_hw/ntb_hw.c Thu Oct 29 04:16:16 2015 (r290129) > +++ head/sys/dev/ntb/ntb_hw/ntb_hw.c Thu Oct 29 04:16:28 2015 (r290130) > @@ -755,9 +755,13 @@ map_memory_window_bar(struct ntb_softc * > save_bar_parameters(bar); > } > > +#if 0 /* XXX: amd64 pmap_change_attr() assumes region lies in DMAP. */ > /* Mark bar region as write combining to improve performance. */ > rc = pmap_change_attr((vm_offset_t)bar->vbase, bar->size, > VM_MEMATTR_WRITE_COMBINING); > +#else > + rc = EINVAL; > +#endif > print_map_success(ntb, bar, "mw"); > if (rc == 0) > device_printf(ntb->device,