From patchwork Fri Jun 24 09:13:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 9197075 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3DD9660754 for ; Fri, 24 Jun 2016 09:15:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 286FB2847B for ; Fri, 24 Jun 2016 09:15:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 148EB2849B; Fri, 24 Jun 2016 09:15:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C0D462847B for ; Fri, 24 Jun 2016 09:15:35 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bGNBE-00063W-FC; Fri, 24 Jun 2016 09:13:40 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bGNBC-00063P-UJ for xen-devel@lists.xenproject.org; Fri, 24 Jun 2016 09:13:39 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id DB/37-28354-1C9FC675; Fri, 24 Jun 2016 09:13:37 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrKIsWRWlGSWpSXmKPExsXS6fjDS/fgz5x wg3PvxC2+b5nM5MDocfjDFZYAxijWzLyk/IoE1oyne6ewF8wRrzg5Yz1rA+M84S5GTg4hgTyJ xZ27WEFsXgE7icU3X4PZEgKGEvvmr2IDsVkEVCVu97SwgNhsAuoSbc+2A9VwcYgIbGGU6FjZD 1bELBAoMXf2TrAiYQEfiR37J7BCLCiSeNjcwNzFyMHBKWAvsWhROIjJKyAo8XeHMESnlsTDX7 dYIGxtiWULX4NVMwtISyz/xzGBkW8WQsMsJA2zkDTMQmhYwMiyilGjOLWoLLVI19BML6koMz2 jJDcxM0fX0MBYLze1uDgxPTUnMalYLzk/dxMjMPgYgGAH46rtnocYJTmYlER5py3KCRfiS8pP qcxILM6ILyrNSS0+xCjDwaEkwfv8B1BOsCg1PbUiLTMHGAcwaQkOHiURXjlgLAjxFhck5hZnp kOkTjEqSonzbgbpEwBJZJTmwbXBYu8So6yUMC8j0CFCPAWpRbmZJajyrxjFORiVhHk3gEzhyc wrgZv+CmgxE9Diu/3ZIItLEhFSUg2MXP1s3Pn7GCfGS+svyfjuoXZL7rLK4UoNhZ9xHsHM+e2 7Q7qtlprdrd9tHJf5KlnD6u/Gsier/7S19hn63H935lTfbXX+B9/bHGe+vp94sk7e8HHUjpgJ WhfjQnZtb7B/KL1o0xf7Pcsitgse+HYkRGR/SXSW3pvKFx+KM03zTl6xuV7cd59JiaU4I9FQi 7moOBEAh8Tr6LgCAAA= X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1466759615!43029417!1 X-Originating-IP: [137.65.248.74] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.46; banners=-,-,- X-VirusChecked: Checked Received: (qmail 51900 invoked from network); 24 Jun 2016 09:13:37 -0000 Received: from prv-mh.provo.novell.com (HELO prv-mh.provo.novell.com) (137.65.248.74) by server-15.tower-31.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 24 Jun 2016 09:13:37 -0000 Received: from INET-PRV-MTA by prv-mh.provo.novell.com with Novell_GroupWise; Fri, 24 Jun 2016 03:13:34 -0600 Message-Id: <576D15DE02000078000F8678@prv-mh.provo.novell.com> X-Mailer: Novell GroupWise Internet Agent 14.2.0 Date: Fri, 24 Jun 2016 03:13:34 -0600 From: "Jan Beulich" To: "David Vrabel" , "Boris Ostrovsky" , "Konrad Rzeszutek Wilk" , "Juergen Gross" References: <5756857802000078000F268D@prv-mh.provo.novell.com> <5756864102000078000F269A@prv-mh.provo.novell.com> In-Reply-To: <5756864102000078000F269A@prv-mh.provo.novell.com> Mime-Version: 1.0 Content-Disposition: inline Cc: xen-devel , linux-kernel@vger.kernel.org Subject: [Xen-devel] [PATCH v3 1/2] xen-pciback: return proper values during BAR sizing X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Reads following writes with all address bits set to 1 should return all changeable address bits as one, not the BAR size (nor, as was the case for the upper half of 64-bit BARs, the high half of the region's end address). Presumably this didn't cause any problems so far because consumers use the value to calculate the size (usually via val & -val), and do nothing else with it. But also consider the exception here: Unimplemented BARs should always return all zeroes. And finally, the check for whether to return the sizing address on read for the ROM BAR should ignore all non-address bits, not just the ROM Enable one. Signed-off-by: Jan Beulich Reviewed-by: Boris Ostrovsky --- v3: Use ~0U in rom_write(), to account for PCI_ROM_ADDRESS_MASK being of unsigned long type (relevant on 64-bit). (Note: Patch 2 is unchanged, and hence not being re-sent. I hope that, despite this being a bug fix from v2, retaining the R-b is okay.) --- drivers/xen/xen-pciback/conf_space_header.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) --- 4.7-rc4-xen-pciback-BAR.orig/drivers/xen/xen-pciback/conf_space_header.c +++ 4.7-rc4-xen-pciback-BAR/drivers/xen/xen-pciback/conf_space_header.c @@ -145,7 +145,7 @@ static int rom_write(struct pci_dev *dev /* A write to obtain the length must happen as a 32-bit write. * This does not (yet) support writing individual bytes */ - if (value == ~PCI_ROM_ADDRESS_ENABLE) + if ((value | ~PCI_ROM_ADDRESS_MASK) == ~0U) bar->which = 1; else { u32 tmpval; @@ -225,38 +225,42 @@ static inline void read_dev_bar(struct p (PCI_BASE_ADDRESS_SPACE_MEMORY | PCI_BASE_ADDRESS_MEM_TYPE_64))) { bar_info->val = res[pos - 1].start >> 32; - bar_info->len_val = res[pos - 1].end >> 32; + bar_info->len_val = -resource_size(&res[pos - 1]) >> 32; return; } } + if (!res[pos].flags || + (res[pos].flags & (IORESOURCE_DISABLED | IORESOURCE_UNSET | + IORESOURCE_BUSY))) + return; + bar_info->val = res[pos].start | (res[pos].flags & PCI_REGION_FLAG_MASK); - bar_info->len_val = resource_size(&res[pos]); + bar_info->len_val = -resource_size(&res[pos]) | + (res[pos].flags & PCI_REGION_FLAG_MASK); } static void *bar_init(struct pci_dev *dev, int offset) { - struct pci_bar_info *bar = kmalloc(sizeof(*bar), GFP_KERNEL); + struct pci_bar_info *bar = kzalloc(sizeof(*bar), GFP_KERNEL); if (!bar) return ERR_PTR(-ENOMEM); read_dev_bar(dev, bar, offset, ~0); - bar->which = 0; return bar; } static void *rom_init(struct pci_dev *dev, int offset) { - struct pci_bar_info *bar = kmalloc(sizeof(*bar), GFP_KERNEL); + struct pci_bar_info *bar = kzalloc(sizeof(*bar), GFP_KERNEL); if (!bar) return ERR_PTR(-ENOMEM); read_dev_bar(dev, bar, offset, ~PCI_ROM_ADDRESS_ENABLE); - bar->which = 0; return bar; }