* [PATCH] x86/PCI: MMCONFIG: cleanup and add address warning to pci_mmconfig_insert @ 2013-07-26 9:10 ethan zhao 2013-07-26 12:36 ` Yinghai Lu 2013-07-26 17:39 ` Bjorn Helgaas 0 siblings, 2 replies; 7+ messages in thread From: ethan zhao @ 2013-07-26 9:10 UTC (permalink / raw) To: jbarnes, bjorn.helgaas; +Cc: yinghai, linux-kernel, ethan.kernel [-- Attachment #1: Type: text/plain, Size: 1361 bytes --] Cleanup the -EINVAL return value handling and add warning message for invalid start,end,addr parameters. Signed-off-by: ethan.zhao <ethan.zhao@oracle.com> --- arch/x86/pci/mmconfig-shared.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c index 082e881..37f6c7f 100644 --- a/arch/x86/pci/mmconfig-shared.c +++ b/arch/x86/pci/mmconfig-shared.c @@ -700,8 +700,13 @@ int pci_mmconfig_insert(struct device *dev, u16 seg, u8 start, u8 end, if (!(pci_probe & PCI_PROBE_MMCONF) || pci_mmcfg_arch_init_failed) return -ENODEV; - if (start > end) + if (start > end || !addr) { + dev_warn(dev, FW_WARN + "Invalid address to add MMCONFIG" + "start %02x end %02x addr %pR\n", + start, end, addr); return -EINVAL; + } mutex_lock(&pci_mmcfg_lock); cfg = pci_mmconfig_lookup(seg, start); @@ -716,11 +721,6 @@ int pci_mmconfig_insert(struct device *dev, u16 seg, u8 start, u8 end, return -EEXIST; } - if (!addr) { - mutex_unlock(&pci_mmcfg_lock); - return -EINVAL; - } - rc = -EBUSY; cfg = pci_mmconfig_alloc(seg, start, end, addr); if (cfg == NULL) { -- 1.7.1 [-- Attachment #2: 0001-x86-PCI-MMCONFIG-cleanup-and-add-address-warning-to-.patch --] [-- Type: text/x-patch, Size: 1519 bytes --] >From 4f7337340c8b3b03fcedfa02ca7b0c3ba4379711 Mon Sep 17 00:00:00 2001 From: ethan.zhao <ethan.zhao@oracle.com> Date: Fri, 26 Jul 2013 16:25:07 -0400 Subject: [PATCH] x86/PCI: MMCONFIG: cleanup and add address warning to pci_mmconfig_insert Cleanup the -EINVAL return value handling and add warning message for invalid start,end,addr parameters. Signed-off-by: ethan.zhao <ethan.zhao@oracle.com> --- arch/x86/pci/mmconfig-shared.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c index 082e881..37f6c7f 100644 --- a/arch/x86/pci/mmconfig-shared.c +++ b/arch/x86/pci/mmconfig-shared.c @@ -700,8 +700,13 @@ int pci_mmconfig_insert(struct device *dev, u16 seg, u8 start, u8 end, if (!(pci_probe & PCI_PROBE_MMCONF) || pci_mmcfg_arch_init_failed) return -ENODEV; - if (start > end) + if (start > end || !addr) { + dev_warn(dev, FW_WARN + "Invalid address to add MMCONFIG" + "start %02x end %02x addr %pR\n", + start, end, addr); return -EINVAL; + } mutex_lock(&pci_mmcfg_lock); cfg = pci_mmconfig_lookup(seg, start); @@ -716,11 +721,6 @@ int pci_mmconfig_insert(struct device *dev, u16 seg, u8 start, u8 end, return -EEXIST; } - if (!addr) { - mutex_unlock(&pci_mmcfg_lock); - return -EINVAL; - } - rc = -EBUSY; cfg = pci_mmconfig_alloc(seg, start, end, addr); if (cfg == NULL) { -- 1.7.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] x86/PCI: MMCONFIG: cleanup and add address warning to pci_mmconfig_insert 2013-07-26 9:10 [PATCH] x86/PCI: MMCONFIG: cleanup and add address warning to pci_mmconfig_insert ethan zhao @ 2013-07-26 12:36 ` Yinghai Lu 2013-07-26 17:39 ` Bjorn Helgaas 1 sibling, 0 replies; 7+ messages in thread From: Yinghai Lu @ 2013-07-26 12:36 UTC (permalink / raw) To: ethan zhao, Bjorn Helgaas Cc: Linux Kernel Mailing List, ethan.kernel, linux-pci@vger.kernel.org On Fri, Jul 26, 2013 at 2:10 AM, ethan zhao <ethan.zhao@oracle.com> wrote: > Cleanup the -EINVAL return value handling and add warning message for > invalid > start,end,addr parameters. > > Signed-off-by: ethan.zhao <ethan.zhao@oracle.com> > --- > arch/x86/pci/mmconfig-shared.c | 12 ++++++------ > 1 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c > index 082e881..37f6c7f 100644 > --- a/arch/x86/pci/mmconfig-shared.c > +++ b/arch/x86/pci/mmconfig-shared.c > @@ -700,8 +700,13 @@ int pci_mmconfig_insert(struct device *dev, u16 seg, u8 > start, u8 end, > if (!(pci_probe & PCI_PROBE_MMCONF) || pci_mmcfg_arch_init_failed) > return -ENODEV; > > - if (start > end) > + if (start > end || !addr) { > + dev_warn(dev, FW_WARN > + "Invalid address to add MMCONFIG" > + "start %02x end %02x addr %pR\n", > + start, end, addr); > return -EINVAL; > + } > > mutex_lock(&pci_mmcfg_lock); > cfg = pci_mmconfig_lookup(seg, start); > @@ -716,11 +721,6 @@ int pci_mmconfig_insert(struct device *dev, u16 seg, u8 > start, u8 end, > return -EEXIST; > } > > - if (!addr) { > - mutex_unlock(&pci_mmcfg_lock); > - return -EINVAL; > - } > - > rc = -EBUSY; > cfg = pci_mmconfig_alloc(seg, start, end, addr); > if (cfg == NULL) { Acked-by: Yinghai Lu <yinghai@kerne.org> ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] x86/PCI: MMCONFIG: cleanup and add address warning to pci_mmconfig_insert 2013-07-26 9:10 [PATCH] x86/PCI: MMCONFIG: cleanup and add address warning to pci_mmconfig_insert ethan zhao 2013-07-26 12:36 ` Yinghai Lu @ 2013-07-26 17:39 ` Bjorn Helgaas 2013-07-27 14:27 ` Yinghai Lu 2013-07-27 23:47 ` Ethan Zhao 1 sibling, 2 replies; 7+ messages in thread From: Bjorn Helgaas @ 2013-07-26 17:39 UTC (permalink / raw) To: ethan zhao Cc: jbarnes, yinghai, linux-kernel, ethan.kernel, Jiang Liu, linux-pci [+cc Jiang, linux-pci, -cc bjorn.helgaas@hp.com (dead address)] On Fri, Jul 26, 2013 at 05:10:39PM +0800, ethan zhao wrote: > Cleanup the -EINVAL return value handling and add warning message > for invalid > start,end,addr parameters. > > Signed-off-by: ethan.zhao <ethan.zhao@oracle.com> This patch was corrupted, so I couldn't apply it directly. See Documentation/SubmittingPatches, sections 5-7. > --- > arch/x86/pci/mmconfig-shared.c | 12 ++++++------ > 1 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c > index 082e881..37f6c7f 100644 > --- a/arch/x86/pci/mmconfig-shared.c > +++ b/arch/x86/pci/mmconfig-shared.c > @@ -700,8 +700,13 @@ int pci_mmconfig_insert(struct device *dev, u16 > seg, u8 start, u8 end, > if (!(pci_probe & PCI_PROBE_MMCONF) || pci_mmcfg_arch_init_failed) > return -ENODEV; > > - if (start > end) > + if (start > end || !addr) { > + dev_warn(dev, FW_WARN > + "Invalid address to add MMCONFIG" > + "start %02x end %02x addr %pR\n", > + start, end, addr); > return -EINVAL; > + } I like the "!addr" cleanup. Did you actually see this problem on a machine? I expect this would be a BIOS bug, and one that should be found early in development, long before a machine is released. Therefore, I doubt that it's worth adding another printk for it. If an end-user sees this problem, I think we'll already get a generic message from check_segment(). I propose the patch below; what do you think? > > mutex_lock(&pci_mmcfg_lock); > cfg = pci_mmconfig_lookup(seg, start); > @@ -716,11 +721,6 @@ int pci_mmconfig_insert(struct device *dev, u16 > seg, u8 start, u8 end, > return -EEXIST; > } > > - if (!addr) { > - mutex_unlock(&pci_mmcfg_lock); > - return -EINVAL; > - } > - > rc = -EBUSY; > cfg = pci_mmconfig_alloc(seg, start, end, addr); > if (cfg == NULL) { Author: ethan.zhao <ethan.zhao@oracle.com> Date: Fri Jul 26 11:21:24 2013 -0600 x86/PCI: MMCONFIG: Check earlier for MMCONFIG region at address zero We can check for addr being zero earlier and thus avoid the mutex_unlock() cleanup path. [bhelgaas: changelog, drop printk] Signed-off-by: ethan.zhao <ethan.zhao@oracle.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Acked-by: Yinghai Lu <yinghai@kerne.org> diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c index 082e881..5596c7b 100644 --- a/arch/x86/pci/mmconfig-shared.c +++ b/arch/x86/pci/mmconfig-shared.c @@ -700,7 +700,7 @@ int pci_mmconfig_insert(struct device *dev, u16 seg, u8 start, u8 end, if (!(pci_probe & PCI_PROBE_MMCONF) || pci_mmcfg_arch_init_failed) return -ENODEV; - if (start > end) + if (start > end || !addr) return -EINVAL; mutex_lock(&pci_mmcfg_lock); @@ -716,11 +716,6 @@ int pci_mmconfig_insert(struct device *dev, u16 seg, u8 start, u8 end, return -EEXIST; } - if (!addr) { - mutex_unlock(&pci_mmcfg_lock); - return -EINVAL; - } - rc = -EBUSY; cfg = pci_mmconfig_alloc(seg, start, end, addr); if (cfg == NULL) { ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] x86/PCI: MMCONFIG: cleanup and add address warning to pci_mmconfig_insert 2013-07-26 17:39 ` Bjorn Helgaas @ 2013-07-27 14:27 ` Yinghai Lu 2013-07-27 16:09 ` Bjorn Helgaas 2013-07-27 23:47 ` Ethan Zhao 1 sibling, 1 reply; 7+ messages in thread From: Yinghai Lu @ 2013-07-27 14:27 UTC (permalink / raw) To: Bjorn Helgaas Cc: ethan zhao, jbarnes@virtuousgeek.org, Linux Kernel Mailing List, Ethan Zhao, Jiang Liu, linux-pci@vger.kernel.org On Fri, Jul 26, 2013 at 10:39 AM, Bjorn Helgaas <bhelgaas@google.com> wrote: > [+cc Jiang, linux-pci, -cc bjorn.helgaas@hp.com (dead address)] > > On Fri, Jul 26, 2013 at 05:10:39PM +0800, ethan zhao wrote: >> Cleanup the -EINVAL return value handling and add warning message >> for invalid >> start,end,addr parameters. >> >> Signed-off-by: ethan.zhao <ethan.zhao@oracle.com> > > This patch was corrupted, so I couldn't apply it directly. See > Documentation/SubmittingPatches, sections 5-7. > >> --- >> arch/x86/pci/mmconfig-shared.c | 12 ++++++------ >> 1 files changed, 6 insertions(+), 6 deletions(-) >> >> diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c >> index 082e881..37f6c7f 100644 >> --- a/arch/x86/pci/mmconfig-shared.c >> +++ b/arch/x86/pci/mmconfig-shared.c >> @@ -700,8 +700,13 @@ int pci_mmconfig_insert(struct device *dev, u16 >> seg, u8 start, u8 end, >> if (!(pci_probe & PCI_PROBE_MMCONF) || pci_mmcfg_arch_init_failed) >> return -ENODEV; >> >> - if (start > end) >> + if (start > end || !addr) { >> + dev_warn(dev, FW_WARN >> + "Invalid address to add MMCONFIG" >> + "start %02x end %02x addr %pR\n", >> + start, end, addr); >> return -EINVAL; >> + } > > I like the "!addr" cleanup. > > Did you actually see this problem on a machine? > > I expect this would be a BIOS bug, and one that should be found > early in development, long before a machine is released. > Therefore, I doubt that it's worth adding another printk for it. > If an end-user sees this problem, I think we'll already get a > generic message from check_segment(). > > I propose the patch below; what do you think? > >> >> mutex_lock(&pci_mmcfg_lock); >> cfg = pci_mmconfig_lookup(seg, start); >> @@ -716,11 +721,6 @@ int pci_mmconfig_insert(struct device *dev, u16 >> seg, u8 start, u8 end, >> return -EEXIST; >> } >> >> - if (!addr) { >> - mutex_unlock(&pci_mmcfg_lock); >> - return -EINVAL; >> - } >> - >> rc = -EBUSY; >> cfg = pci_mmconfig_alloc(seg, start, end, addr); >> if (cfg == NULL) { > > > > Author: ethan.zhao <ethan.zhao@oracle.com> > Date: Fri Jul 26 11:21:24 2013 -0600 > > x86/PCI: MMCONFIG: Check earlier for MMCONFIG region at address zero > > We can check for addr being zero earlier and thus avoid the mutex_unlock() > cleanup path. > > [bhelgaas: changelog, drop printk] > Signed-off-by: ethan.zhao <ethan.zhao@oracle.com> > Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> > Acked-by: Yinghai Lu <yinghai@kerne.org> looks like I had typo in ack. please update to Acked-by: Yinghai Lu <yinghai@kernel.org> > > diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c > index 082e881..5596c7b 100644 > --- a/arch/x86/pci/mmconfig-shared.c > +++ b/arch/x86/pci/mmconfig-shared.c > @@ -700,7 +700,7 @@ int pci_mmconfig_insert(struct device *dev, u16 seg, u8 start, u8 end, > if (!(pci_probe & PCI_PROBE_MMCONF) || pci_mmcfg_arch_init_failed) > return -ENODEV; > > - if (start > end) > + if (start > end || !addr) > return -EINVAL; > > mutex_lock(&pci_mmcfg_lock); > @@ -716,11 +716,6 @@ int pci_mmconfig_insert(struct device *dev, u16 seg, u8 start, u8 end, > return -EEXIST; > } > > - if (!addr) { > - mutex_unlock(&pci_mmcfg_lock); > - return -EINVAL; > - } > - > rc = -EBUSY; > cfg = pci_mmconfig_alloc(seg, start, end, addr); > if (cfg == NULL) { ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] x86/PCI: MMCONFIG: cleanup and add address warning to pci_mmconfig_insert 2013-07-27 14:27 ` Yinghai Lu @ 2013-07-27 16:09 ` Bjorn Helgaas 2013-07-27 23:50 ` Ethan Zhao 0 siblings, 1 reply; 7+ messages in thread From: Bjorn Helgaas @ 2013-07-27 16:09 UTC (permalink / raw) To: Yinghai Lu Cc: ethan zhao, jbarnes@virtuousgeek.org, Linux Kernel Mailing List, Ethan Zhao, Jiang Liu, linux-pci@vger.kernel.org On Sat, Jul 27, 2013 at 8:27 AM, Yinghai Lu <yinghai@kernel.org> wrote: > On Fri, Jul 26, 2013 at 10:39 AM, Bjorn Helgaas <bhelgaas@google.com> wrote: >> [bhelgaas: changelog, drop printk] >> Signed-off-by: ethan.zhao <ethan.zhao@oracle.com> >> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> >> Acked-by: Yinghai Lu <yinghai@kerne.org> > > looks like I had typo in ack. please update to > > Acked-by: Yinghai Lu <yinghai@kernel.org> Done, thanks, sorry I didn't notice that :) ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] x86/PCI: MMCONFIG: cleanup and add address warning to pci_mmconfig_insert 2013-07-27 16:09 ` Bjorn Helgaas @ 2013-07-27 23:50 ` Ethan Zhao 0 siblings, 0 replies; 7+ messages in thread From: Ethan Zhao @ 2013-07-27 23:50 UTC (permalink / raw) To: Bjorn Helgaas Cc: Yinghai Lu, ethan zhao, jbarnes@virtuousgeek.org, Linux Kernel Mailing List, Jiang Liu, linux-pci@vger.kernel.org Seems there are code style issues etc after I pasted it in my mail client. I will correct it and resend v2. Thanks. On Sun, Jul 28, 2013 at 12:09 AM, Bjorn Helgaas <bhelgaas@google.com> wrote: > On Sat, Jul 27, 2013 at 8:27 AM, Yinghai Lu <yinghai@kernel.org> wrote: >> On Fri, Jul 26, 2013 at 10:39 AM, Bjorn Helgaas <bhelgaas@google.com> wrote: > >>> [bhelgaas: changelog, drop printk] >>> Signed-off-by: ethan.zhao <ethan.zhao@oracle.com> >>> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> >>> Acked-by: Yinghai Lu <yinghai@kerne.org> >> >> looks like I had typo in ack. please update to >> >> Acked-by: Yinghai Lu <yinghai@kernel.org> > > Done, thanks, sorry I didn't notice that :) ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] x86/PCI: MMCONFIG: cleanup and add address warning to pci_mmconfig_insert 2013-07-26 17:39 ` Bjorn Helgaas 2013-07-27 14:27 ` Yinghai Lu @ 2013-07-27 23:47 ` Ethan Zhao 1 sibling, 0 replies; 7+ messages in thread From: Ethan Zhao @ 2013-07-27 23:47 UTC (permalink / raw) To: Bjorn Helgaas; +Cc: ethan zhao, jbarnes, yinghai, LKML, Jiang Liu, linux-pci On Sat, Jul 27, 2013 at 1:39 AM, Bjorn Helgaas <bhelgaas@google.com> wrote: > [+cc Jiang, linux-pci, -cc bjorn.helgaas@hp.com (dead address)] > > On Fri, Jul 26, 2013 at 05:10:39PM +0800, ethan zhao wrote: >> Cleanup the -EINVAL return value handling and add warning message >> for invalid >> start,end,addr parameters. >> >> Signed-off-by: ethan.zhao <ethan.zhao@oracle.com> > > This patch was corrupted, so I couldn't apply it directly. See > Documentation/SubmittingPatches, sections 5-7. > >> --- >> arch/x86/pci/mmconfig-shared.c | 12 ++++++------ >> 1 files changed, 6 insertions(+), 6 deletions(-) >> >> diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c >> index 082e881..37f6c7f 100644 >> --- a/arch/x86/pci/mmconfig-shared.c >> +++ b/arch/x86/pci/mmconfig-shared.c >> @@ -700,8 +700,13 @@ int pci_mmconfig_insert(struct device *dev, u16 >> seg, u8 start, u8 end, >> if (!(pci_probe & PCI_PROBE_MMCONF) || pci_mmcfg_arch_init_failed) >> return -ENODEV; >> >> - if (start > end) >> + if (start > end || !addr) { >> + dev_warn(dev, FW_WARN >> + "Invalid address to add MMCONFIG" >> + "start %02x end %02x addr %pR\n", >> + start, end, addr); >> return -EINVAL; >> + } > > I like the "!addr" cleanup. > > Did you actually see this problem on a machine? > > I expect this would be a BIOS bug, and one that should be found > early in development, long before a machine is released. > Therefore, I doubt that it's worth adding another printk for it. > If an end-user sees this problem, I think we'll already get a > generic message from check_segment(). > Yes, Maybe I met a BIOS bug, but the mmconfig just yelled a failed message like this, no other information "fail to add MMCONFIG information, xx--xx can't access extended PCI configuration space under this bridge" While I look into the code, found there are detail messages for other return values in pci_mmconfig_insert(), But no for -EINVAL, that is not fair and force me to add more code to debug the cause. > I propose the patch below; what do you think? > >> >> mutex_lock(&pci_mmcfg_lock); >> cfg = pci_mmconfig_lookup(seg, start); >> @@ -716,11 +721,6 @@ int pci_mmconfig_insert(struct device *dev, u16 >> seg, u8 start, u8 end, >> return -EEXIST; >> } >> >> - if (!addr) { >> - mutex_unlock(&pci_mmcfg_lock); >> - return -EINVAL; >> - } >> - >> rc = -EBUSY; >> cfg = pci_mmconfig_alloc(seg, start, end, addr); >> if (cfg == NULL) { > > > > Author: ethan.zhao <ethan.zhao@oracle.com> > Date: Fri Jul 26 11:21:24 2013 -0600 > > x86/PCI: MMCONFIG: Check earlier for MMCONFIG region at address zero > > We can check for addr being zero earlier and thus avoid the mutex_unlock() > cleanup path. > > [bhelgaas: changelog, drop printk] > Signed-off-by: ethan.zhao <ethan.zhao@oracle.com> > Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> > Acked-by: Yinghai Lu <yinghai@kerne.org> > > diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c > index 082e881..5596c7b 100644 > --- a/arch/x86/pci/mmconfig-shared.c > +++ b/arch/x86/pci/mmconfig-shared.c > @@ -700,7 +700,7 @@ int pci_mmconfig_insert(struct device *dev, u16 seg, u8 start, u8 end, > if (!(pci_probe & PCI_PROBE_MMCONF) || pci_mmcfg_arch_init_failed) > return -ENODEV; > > - if (start > end) > + if (start > end || !addr) > return -EINVAL; > > mutex_lock(&pci_mmcfg_lock); > @@ -716,11 +716,6 @@ int pci_mmconfig_insert(struct device *dev, u16 seg, u8 start, u8 end, > return -EEXIST; > } > > - if (!addr) { > - mutex_unlock(&pci_mmcfg_lock); > - return -EINVAL; > - } > - > rc = -EBUSY; > cfg = pci_mmconfig_alloc(seg, start, end, addr); > if (cfg == NULL) { ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2013-07-27 23:50 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-07-26 9:10 [PATCH] x86/PCI: MMCONFIG: cleanup and add address warning to pci_mmconfig_insert ethan zhao 2013-07-26 12:36 ` Yinghai Lu 2013-07-26 17:39 ` Bjorn Helgaas 2013-07-27 14:27 ` Yinghai Lu 2013-07-27 16:09 ` Bjorn Helgaas 2013-07-27 23:50 ` Ethan Zhao 2013-07-27 23:47 ` Ethan Zhao
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox