From: Yinghai Lu <yinghai@kernel.org>
To: Bjorn Helgaas <bhelgaas@google.com>
Cc: Ingo Molnar <mingo@kernel.org>,
lenb@kernel.org, x86@kernel.org,
Ulrich Drepper <drepper@gmail.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
linux-pci@vger.kernel.org
Subject: Re: [PATCH] PCI, X86: busnum/node boot command line for pci dev node setting.
Date: Mon, 25 Jun 2012 15:55:12 -0700 [thread overview]
Message-ID: <CAE9FiQVhL+5y9n7n8JkPMwdTd-N14rcOc7Sm_5WHN+w8nVg-4Q@mail.gmail.com> (raw)
In-Reply-To: <CAE9FiQXhGLwSH4gq7L9DrhVAXcDu_NbjLA5QkCDOEqaFO09m7w@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 963 bytes --]
On Mon, Jun 25, 2012 at 3:38 PM, Yinghai Lu <yinghai@kernel.org> wrote:
> On Mon, Jun 25, 2012 at 1:59 PM, Bjorn Helgaas <bhelgaas@google.com> wrote:
>>
>> Can you convince me this is safe? pci_setup() is an early_param, so
>> it looks to me like we might be saving a pointer to initdata in this
>> call path:
>>
>> setup_arch
>> parse_early_param
>> strlcpy(tmp_cmdline, boot_command_line)
>> parse_early_options(__initdata tmp_cmdline)
>> parse_args
>> do_early_param
>> ...
>> pci_setup (early_param)
>> pcibios_setup
>> remember_busnum_node
>>
>> And then we use that saved pointer to parse the string at host bridge
>> add-time, which might be after initdata has been freed.
>
> ok, that will need one separate buffer.
could used saved_command_line directly.
also do we need to include this one to upsteam ?
Thanks
Yinghai
[-- Attachment #2: busnum_node_v3_x.patch --]
[-- Type: application/octet-stream, Size: 4021 bytes --]
Subject: [PATCH] PCI, X86: busnum/node boot command line for pci dev node setting.
Some intel new sandybridge or newer two sockets system do support support numa
for pci devices. But BIOS does not provide _PXM under those root bus in DSDT.
Add boot command line, so user could have chance to input node info before
BIOS guys figure out to add _PXM.
Fold fix from Ulrich to use ";" instead of ",".
| The problem is the pci= parameter
| handling uses ',' to separate parameters and therefore the second PCI
| root information, separated by a comma, is interpreted as a new pci=
| parameter.
-v3: According to Bjorn and Ingo, change to use "user input first" policy
so it could cover wrong _PXM case.
-v5: revert back to -v3, and change to use saved_command_line.
Reported-by: Ulrich Drepper <drepper@gmail.com>
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
Documentation/kernel-parameters.txt | 5 +++++
arch/x86/include/asm/pci_x86.h | 3 +++
arch/x86/pci/acpi.c | 22 +++++++++++++---------
arch/x86/pci/common.c | 28 ++++++++++++++++++++++++++++
4 files changed, 49 insertions(+), 9 deletions(-)
Index: linux-2.6/Documentation/kernel-parameters.txt
===================================================================
--- linux-2.6.orig/Documentation/kernel-parameters.txt
+++ linux-2.6/Documentation/kernel-parameters.txt
@@ -2195,6 +2195,11 @@ bytes respectively. Such letter suffixes
only look for one device below a PCIe downstream
port.
+ busnum_node= [X86] Set node for root bus.
+ Format:
+ <bus>:<node>[; ...]
+ Specifies node for bus, will override bios _PXM
+ or probed value from hostbridge.
pcie_aspm= [PCIE] Forcibly enable or disable PCIe Active State Power
Management.
off Disable ASPM.
Index: linux-2.6/arch/x86/pci/common.c
===================================================================
--- linux-2.6.orig/arch/x86/pci/common.c
+++ linux-2.6/arch/x86/pci/common.c
@@ -494,6 +494,34 @@ int __init pcibios_init(void)
return 0;
}
+int get_user_busnum_node(int busnum)
+{
+ int bus, node, count;
+ char *p;
+
+ p = strstr(saved_command_line, "busnum_node=");
+ if (!p)
+ return -1;
+
+ p += 12; /* strlen("busnum_node=") */
+ while (*p) {
+ count = 0;
+ if (sscanf(p, "%x:%x%n", &bus, &node, &count) != 2) {
+ printk(KERN_ERR "PCI: Can't parse busnum_node input: %s\n",
+ p);
+ break;
+ }
+ if (bus == busnum)
+ return node;
+ p += count;
+ if (*p != ';')
+ break;
+ p++;
+ }
+
+ return -1;
+}
+
char * __devinit pcibios_setup(char *str)
{
if (!strcmp(str, "off")) {
Index: linux-2.6/arch/x86/include/asm/pci_x86.h
===================================================================
--- linux-2.6.orig/arch/x86/include/asm/pci_x86.h
+++ linux-2.6/arch/x86/include/asm/pci_x86.h
@@ -46,6 +46,9 @@ enum pci_bf_sort_state {
pci_dmi_bf,
};
+/* pci-common.c */
+int get_user_busnum_node(int busnum);
+
/* pci-i386.c */
void pcibios_resource_survey(void);
Index: linux-2.6/arch/x86/pci/acpi.c
===================================================================
--- linux-2.6.orig/arch/x86/pci/acpi.c
+++ linux-2.6/arch/x86/pci/acpi.c
@@ -433,7 +433,7 @@ struct pci_bus * __devinit pci_acpi_scan
struct pci_sysdata *sd;
int node;
#ifdef CONFIG_ACPI_NUMA
- int pxm;
+ int pxm = -1;
#endif
if (domain && !pci_domains_supported) {
@@ -443,16 +443,20 @@ struct pci_bus * __devinit pci_acpi_scan
return NULL;
}
- node = -1;
+ node = get_user_busnum_node(busnum);
+ if (node == -1) {
#ifdef CONFIG_ACPI_NUMA
- pxm = acpi_get_pxm(device->handle);
- if (pxm >= 0)
- node = pxm_to_node(pxm);
- if (node != -1)
- set_mp_bus_to_node(busnum, node);
- else
-#endif
+ pxm = acpi_get_pxm(device->handle);
+ if (pxm >= 0)
+ node = pxm_to_node(pxm);
+ if (node != -1)
+ set_mp_bus_to_node(busnum, node);
+ else
+ node = get_mp_bus_to_node(busnum);
+#else
node = get_mp_bus_to_node(busnum);
+#endif
+ }
if (node != -1 && !node_online(node))
node = -1;
next prev parent reply other threads:[~2012-06-25 22:55 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-25 18:59 [PATCH] PCI, X86: busnum/node boot command line for pci dev node setting Yinghai Lu
2012-06-25 20:59 ` Bjorn Helgaas
2012-06-25 22:38 ` Yinghai Lu
2012-06-25 22:55 ` Yinghai Lu [this message]
2012-06-26 12:42 ` Bjorn Helgaas
-- strict thread matches above, loose matches on Subject: below --
2012-06-25 18:21 Yinghai Lu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAE9FiQVhL+5y9n7n8JkPMwdTd-N14rcOc7Sm_5WHN+w8nVg-4Q@mail.gmail.com \
--to=yinghai@kernel.org \
--cc=bhelgaas@google.com \
--cc=drepper@gmail.com \
--cc=lenb@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).