Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758012AbbDVSci (ORCPT ); Wed, 22 Apr 2015 14:32:38 -0400 Received: from cantor2.suse.de ([195.135.220.15]:32909 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751909AbbDVSce (ORCPT ); Wed, 22 Apr 2015 14:32:34 -0400 Date: Wed, 22 Apr 2015 20:32:29 +0200 From: "Luis R. Rodriguez" To: Doug Ledford Cc: "Luis R. Rodriguez" , infinipath@intel.com, roland@kernel.org, sean.hefty@intel.com, hal.rosenstock@gmail.com, linux-rdma@vger.kernel.org, luto@amacapital.net, mst@redhat.com, linux-kernel@vger.kernel.org, cocci@systeme.lip6.fr, Toshi Kani , Rickard Strandqvist , Mike Marciniszyn , Roland Dreier , Dennis Dalessandro , Suresh Siddha , Ingo Molnar , Thomas Gleixner , Juergen Gross , Daniel Vetter , Dave Airlie , Bjorn Helgaas , Antonino Daplas , Jean-Christophe Plagniol-Villard , Tomi Valkeinen , Dave Hansen , Arnd Bergmann , Stefan Bader , konrad.wilk@oracle.com, ville.syrjala@linux.intel.com, david.vrabel@citrix.com, jbeulich@suse.com, Roger Pau =?iso-8859-1?Q?Monn=E9?= , linux-fbdev@vger.kernel.org, xen-devel@lists.xensource.com Subject: Re: [PATCH v4 2/2] IB/qib: use arch_phys_wc_add() Message-ID: <20150422183229.GK5622@wotan.suse.de> References: <1429653035-19424-1-git-send-email-mcgrof@do-not-panic.com> <1429653035-19424-3-git-send-email-mcgrof@do-not-panic.com> <1429710878.45956.94.camel@redhat.com> <20150422153348.GD5622@wotan.suse.de> <1429721838.45956.142.camel@redhat.com> <20150422173728.GJ5622@wotan.suse.de> <1429724907.45956.165.camel@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1429724907.45956.165.camel@redhat.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3318 Lines: 70 On Wed, Apr 22, 2015 at 01:48:27PM -0400, Doug Ledford wrote: > On Wed, 2015-04-22 at 19:37 +0200, Luis R. Rodriguez wrote: > > On Wed, Apr 22, 2015 at 12:57:18PM -0400, Doug Ledford wrote: > > > On Wed, 2015-04-22 at 17:33 +0200, Luis R. Rodriguez wrote: > > > > On Wed, Apr 22, 2015 at 09:54:38AM -0400, Doug Ledford wrote: > > > > > On Tue, 2015-04-21 at 14:50 -0700, Luis R. Rodriguez wrote: > > > > > > > > > > This: > > > > > > + /* MTRR was used if this is non-zero */ > > > > > > + if (!dd->wc_cookie) > > > > > > vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); > > > > > > > > > > And this: > > > > > > + dd->wc_cookie = arch_phys_wc_add(pioaddr, piolen); > > > > > > + if (dd->wc_cookie < 0) > > > > > > + ret = -EINVAL; > > > > > > > > > > don't agree on what wc_cookie will be on error. > > > > > > > > Can you elaborate? The one below is the one that starts things, > > > > and arch_phys_wc_add() will return 0 on PAT systems. For non-PAT > > > > systems it will return a number > 0 *iff* a valid MTRR was added. > > > > It will return negative onloy on error then. > > > > > > > > The change above is meant to replace a check put in place to see > > > > if PAT was enabled. The way we replace this is to ensure that > > > > arch_phys_wc_add() returned 0. > > > > > > > > If you disagree it'd be great if you can elaborate why. > > > > > > Maybe I'm missing something, but in qib_enable_wc() you store the return > > > from arch_phys_wc_add into wc_cookie. That return is negative, > > > > If and only if the system was non-PAT and mtrr_add() failed. > > > > > so you > > > return from qib_enable_wc() to qib_init_one(), they see the ret value, > > > they print out a warning about bad performance, then they clear the > > > return value and continue with device initialization. > > > > > > In all of this though, wc_cookie is never cleared and so it still has > > > the error condition in it. Then, much later at run time, you call > > > mmap_piobufs() and you check the contents of wc_cookie, and if it's > > > non-0 (which is still will be), you do the wrong thing, right? > > > > Originally the code had it to run pgprot_writecombine() if PAT was going to be > > used. After the code changes we check for !cookie which will be true when > > cookie is 0 only. In case the cookie was an error, that is if mtrr_add() > > failed, then this code would not run because (!negative) is false. The goal was > > to trigger a run if the cookie was 0, which can only happen if PAT was enabled. > > OK, the logic works, but as much as anything, it's the comment that's > misleading. The code would be clearer with a comment like this: > > /* We used PAT if wc_cookie == 0 */ > if (!dd->wc_cookie) { > > That would be more accurate as well since the original comment didn't > account for the possible error code in wc_cookie, so it's possible you > didn't use either PAT or wc if you have that error code. Fair enough, will send a v5 follow up with the comment enhanced, but will leave the first patch in this series as-is. Luis -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/