[PATCH] arm64, pci, numa: Adding helper functions as required by pci

[PATCH] arm64, pci, numa: Adding helper functions as required by pci

[Ganapatrao Kulkarni]

Adding helper functions and necessary code to make
pci driver(pci-host-generic) numa aware.

This patch is on top of arm64-numa v7.
http://www.spinics.net/lists/arm-kernel/msg460813.html

Signed-off-by: Ganapatrao Kulkarni <gkulkarni@caviumnetworks.com>
---
 arch/arm64/include/asm/numa.h       | 8 +++++---
 arch/arm64/kernel/pci.c             | 8 ++++++++
 drivers/pci/host/pci-host-generic.c | 1 +
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/arch/arm64/include/asm/numa.h b/arch/arm64/include/asm/numa.h
index b8c2a3f..1eca4db 100644
--- a/arch/arm64/include/asm/numa.h
+++ b/arch/arm64/include/asm/numa.h
@@ -15,9 +15,11 @@
 extern int __node_distance(int from, int to);
 #define node_distance(a, b) __node_distance(a, b)
 
-/* dummy definitions for pci functions */
-#define pcibus_to_node(node)	0
-#define cpumask_of_pcibus(bus)	0
+struct pci_bus;
+extern int pcibus_to_node(struct pci_bus *bus);
+#define cpumask_of_pcibus(bus)	(pcibus_to_node(bus) == -1 ?		\
+				 cpu_all_mask :				\
+				 cpumask_of_node(pcibus_to_node(bus)))
 
 extern int cpu_to_node_map[NR_CPUS];
 extern nodemask_t numa_nodes_parsed __initdata;
diff --git a/arch/arm64/kernel/pci.c b/arch/arm64/kernel/pci.c
index b3d098b..37e2e9f 100644
--- a/arch/arm64/kernel/pci.c
+++ b/arch/arm64/kernel/pci.c
@@ -84,3 +84,11 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)
 	return NULL;
 }
 #endif
+
+#ifdef CONFIG_NUMA
+int pcibus_to_node(struct pci_bus *bus)
+{
+	return dev_to_node(&bus->dev);
+}
+EXPORT_SYMBOL(pcibus_to_node);
+#endif
diff --git a/drivers/pci/host/pci-host-generic.c b/drivers/pci/host/pci-host-generic.c
index 5434c90..a821e49 100644
--- a/drivers/pci/host/pci-host-generic.c
+++ b/drivers/pci/host/pci-host-generic.c
@@ -230,6 +230,7 @@ static int gen_pci_probe(struct platform_device *pdev)
 	of_pci_check_probe_only();
 
 	of_id = of_match_node(gen_pci_of_match, np);
+	set_dev_node(dev, of_node_to_nid(np));
 	pci->cfg.ops = (struct gen_pci_cfg_bus_ops *)of_id->data;
 	pci->host.dev.parent = dev;
 	INIT_LIST_HEAD(&pci->host.windows);
-- 
1.8.1.4

[PATCH] arm64, pci, numa: Adding helper functions as required by pci

[Ganapatrao Kulkarni]

Adding helper functions and necessary code to make
pci driver(pci-host-generic) numa aware.

This patch is on top of arm64-numa v7.
http://www.spinics.net/lists/arm-kernel/msg460813.html

Signed-off-by: Ganapatrao Kulkarni <gkulkarni@caviumnetworks.com>
---
 arch/arm64/include/asm/numa.h       | 8 +++++---
 arch/arm64/kernel/pci.c             | 8 ++++++++
 drivers/pci/host/pci-host-generic.c | 1 +
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/arch/arm64/include/asm/numa.h b/arch/arm64/include/asm/numa.h
index b8c2a3f..1eca4db 100644
--- a/arch/arm64/include/asm/numa.h
+++ b/arch/arm64/include/asm/numa.h
@@ -15,9 +15,11 @@
 extern int __node_distance(int from, int to);
 #define node_distance(a, b) __node_distance(a, b)
 
-/* dummy definitions for pci functions */
-#define pcibus_to_node(node)	0
-#define cpumask_of_pcibus(bus)	0
+struct pci_bus;
+extern int pcibus_to_node(struct pci_bus *bus);
+#define cpumask_of_pcibus(bus)	(pcibus_to_node(bus) == -1 ?		\
+				 cpu_all_mask :				\
+				 cpumask_of_node(pcibus_to_node(bus)))
 
 extern int cpu_to_node_map[NR_CPUS];
 extern nodemask_t numa_nodes_parsed __initdata;
diff --git a/arch/arm64/kernel/pci.c b/arch/arm64/kernel/pci.c
index b3d098b..37e2e9f 100644
--- a/arch/arm64/kernel/pci.c
+++ b/arch/arm64/kernel/pci.c
@@ -84,3 +84,11 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)
 	return NULL;
 }
 #endif
+
+#ifdef CONFIG_NUMA
+int pcibus_to_node(struct pci_bus *bus)
+{
+	return dev_to_node(&bus->dev);
+}
+EXPORT_SYMBOL(pcibus_to_node);
+#endif
diff --git a/drivers/pci/host/pci-host-generic.c b/drivers/pci/host/pci-host-generic.c
index 5434c90..a821e49 100644
--- a/drivers/pci/host/pci-host-generic.c
+++ b/drivers/pci/host/pci-host-generic.c
@@ -230,6 +230,7 @@ static int gen_pci_probe(struct platform_device *pdev)
 	of_pci_check_probe_only();
 
 	of_id = of_match_node(gen_pci_of_match, np);
+	set_dev_node(dev, of_node_to_nid(np));
 	pci->cfg.ops = (struct gen_pci_cfg_bus_ops *)of_id->data;
 	pci->host.dev.parent = dev;
 	INIT_LIST_HEAD(&pci->host.windows);
-- 
1.8.1.4

Re: [PATCH] arm64, pci, numa: Adding helper functions as required by pci

[Bjorn Helgaas]

On Tue, Dec 22, 2015 at 04:08:50PM +0530, Ganapatrao Kulkarni wrote:
> Adding helper functions and necessary code to make
> pci driver(pci-host-generic) numa aware.
> 
> This patch is on top of arm64-numa v7.
> http://www.spinics.net/lists/arm-kernel/msg460813.html
> 
> Signed-off-by: Ganapatrao Kulkarni <gkulkarni@caviumnetworks.com>
> ---
>  arch/arm64/include/asm/numa.h       | 8 +++++---
>  arch/arm64/kernel/pci.c             | 8 ++++++++
>  drivers/pci/host/pci-host-generic.c | 1 +
>  3 files changed, 14 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm64/include/asm/numa.h b/arch/arm64/include/asm/numa.h
> index b8c2a3f..1eca4db 100644
> --- a/arch/arm64/include/asm/numa.h
> +++ b/arch/arm64/include/asm/numa.h
> @@ -15,9 +15,11 @@
>  extern int __node_distance(int from, int to);
>  #define node_distance(a, b) __node_distance(a, b)
>  
> -/* dummy definitions for pci functions */
> -#define pcibus_to_node(node)	0
> -#define cpumask_of_pcibus(bus)	0
> +struct pci_bus;
> +extern int pcibus_to_node(struct pci_bus *bus);
> +#define cpumask_of_pcibus(bus)	(pcibus_to_node(bus) == -1 ?		\
> +				 cpu_all_mask :				\
> +				 cpumask_of_node(pcibus_to_node(bus)))

All the arch definitions of cpumask_of_pcibus() are pretty similar;
could they be made more generic?  At the very least, can you drop the
definition here and use the one in include/asm-generic/topology.h,
which is identical to what you're defining here?

>  extern int cpu_to_node_map[NR_CPUS];
>  extern nodemask_t numa_nodes_parsed __initdata;
> diff --git a/arch/arm64/kernel/pci.c b/arch/arm64/kernel/pci.c
> index b3d098b..37e2e9f 100644
> --- a/arch/arm64/kernel/pci.c
> +++ b/arch/arm64/kernel/pci.c
> @@ -84,3 +84,11 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)
>  	return NULL;
>  }
>  #endif
> +
> +#ifdef CONFIG_NUMA
> +int pcibus_to_node(struct pci_bus *bus)
> +{
> +	return dev_to_node(&bus->dev);
> +}
> +EXPORT_SYMBOL(pcibus_to_node);
> +#endif
> diff --git a/drivers/pci/host/pci-host-generic.c b/drivers/pci/host/pci-host-generic.c
> index 5434c90..a821e49 100644
> --- a/drivers/pci/host/pci-host-generic.c
> +++ b/drivers/pci/host/pci-host-generic.c
> @@ -230,6 +230,7 @@ static int gen_pci_probe(struct platform_device *pdev)
>  	of_pci_check_probe_only();
>  
>  	of_id = of_match_node(gen_pci_of_match, np);
> +	set_dev_node(dev, of_node_to_nid(np));
>  	pci->cfg.ops = (struct gen_pci_cfg_bus_ops *)of_id->data;
>  	pci->host.dev.parent = dev;
>  	INIT_LIST_HEAD(&pci->host.windows);
> -- 
> 1.8.1.4
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pci" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH] arm64, pci, numa: Adding helper functions as required by pci

[Bjorn Helgaas]

On Tue, Dec 22, 2015 at 04:08:50PM +0530, Ganapatrao Kulkarni wrote:
> Adding helper functions and necessary code to make
> pci driver(pci-host-generic) numa aware.
> 
> This patch is on top of arm64-numa v7.
> http://www.spinics.net/lists/arm-kernel/msg460813.html
> 
> Signed-off-by: Ganapatrao Kulkarni <gkulkarni@caviumnetworks.com>
> ---
>  arch/arm64/include/asm/numa.h       | 8 +++++---
>  arch/arm64/kernel/pci.c             | 8 ++++++++
>  drivers/pci/host/pci-host-generic.c | 1 +
>  3 files changed, 14 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm64/include/asm/numa.h b/arch/arm64/include/asm/numa.h
> index b8c2a3f..1eca4db 100644
> --- a/arch/arm64/include/asm/numa.h
> +++ b/arch/arm64/include/asm/numa.h
> @@ -15,9 +15,11 @@
>  extern int __node_distance(int from, int to);
>  #define node_distance(a, b) __node_distance(a, b)
>  
> -/* dummy definitions for pci functions */
> -#define pcibus_to_node(node)	0
> -#define cpumask_of_pcibus(bus)	0
> +struct pci_bus;
> +extern int pcibus_to_node(struct pci_bus *bus);
> +#define cpumask_of_pcibus(bus)	(pcibus_to_node(bus) == -1 ?		\
> +				 cpu_all_mask :				\
> +				 cpumask_of_node(pcibus_to_node(bus)))

All the arch definitions of cpumask_of_pcibus() are pretty similar;
could they be made more generic?  At the very least, can you drop the
definition here and use the one in include/asm-generic/topology.h,
which is identical to what you're defining here?

>  extern int cpu_to_node_map[NR_CPUS];
>  extern nodemask_t numa_nodes_parsed __initdata;
> diff --git a/arch/arm64/kernel/pci.c b/arch/arm64/kernel/pci.c
> index b3d098b..37e2e9f 100644
> --- a/arch/arm64/kernel/pci.c
> +++ b/arch/arm64/kernel/pci.c
> @@ -84,3 +84,11 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)
>  	return NULL;
>  }
>  #endif
> +
> +#ifdef CONFIG_NUMA
> +int pcibus_to_node(struct pci_bus *bus)
> +{
> +	return dev_to_node(&bus->dev);
> +}
> +EXPORT_SYMBOL(pcibus_to_node);
> +#endif
> diff --git a/drivers/pci/host/pci-host-generic.c b/drivers/pci/host/pci-host-generic.c
> index 5434c90..a821e49 100644
> --- a/drivers/pci/host/pci-host-generic.c
> +++ b/drivers/pci/host/pci-host-generic.c
> @@ -230,6 +230,7 @@ static int gen_pci_probe(struct platform_device *pdev)
>  	of_pci_check_probe_only();
>  
>  	of_id = of_match_node(gen_pci_of_match, np);
> +	set_dev_node(dev, of_node_to_nid(np));
>  	pci->cfg.ops = (struct gen_pci_cfg_bus_ops *)of_id->data;
>  	pci->host.dev.parent = dev;
>  	INIT_LIST_HEAD(&pci->host.windows);
> -- 
> 1.8.1.4
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pci" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] arm64, pci, numa: Adding helper functions as required by pci

[Will Deacon]

On Fri, Jan 08, 2016 at 12:01:31PM -0600, Bjorn Helgaas wrote:
> On Tue, Dec 22, 2015 at 04:08:50PM +0530, Ganapatrao Kulkarni wrote:
> > Adding helper functions and necessary code to make
> > pci driver(pci-host-generic) numa aware.
> > 
> > This patch is on top of arm64-numa v7.
> > http://www.spinics.net/lists/arm-kernel/msg460813.html
> > 
> > Signed-off-by: Ganapatrao Kulkarni <gkulkarni@caviumnetworks.com>
> > ---
> >  arch/arm64/include/asm/numa.h       | 8 +++++---
> >  arch/arm64/kernel/pci.c             | 8 ++++++++
> >  drivers/pci/host/pci-host-generic.c | 1 +
> >  3 files changed, 14 insertions(+), 3 deletions(-)
> > 
> > diff --git a/arch/arm64/include/asm/numa.h b/arch/arm64/include/asm/numa.h
> > index b8c2a3f..1eca4db 100644
> > --- a/arch/arm64/include/asm/numa.h
> > +++ b/arch/arm64/include/asm/numa.h
> > @@ -15,9 +15,11 @@
> >  extern int __node_distance(int from, int to);
> >  #define node_distance(a, b) __node_distance(a, b)
> >  
> > -/* dummy definitions for pci functions */
> > -#define pcibus_to_node(node)	0
> > -#define cpumask_of_pcibus(bus)	0
> > +struct pci_bus;
> > +extern int pcibus_to_node(struct pci_bus *bus);
> > +#define cpumask_of_pcibus(bus)	(pcibus_to_node(bus) == -1 ?		\
> > +				 cpu_all_mask :				\
> > +				 cpumask_of_node(pcibus_to_node(bus)))
> 
> All the arch definitions of cpumask_of_pcibus() are pretty similar;
> could they be made more generic?  At the very least, can you drop the
> definition here and use the one in include/asm-generic/topology.h,
> which is identical to what you're defining here?

+1 on that. I asked for exactly the same thing in my review of v7:

  http://www.spinics.net/lists/arm-kernel/msg469592.html

but it looks like I was just ignored.

Will

[PATCH] arm64, pci, numa: Adding helper functions as required by pci

[Will Deacon]

On Fri, Jan 08, 2016 at 12:01:31PM -0600, Bjorn Helgaas wrote:
> On Tue, Dec 22, 2015 at 04:08:50PM +0530, Ganapatrao Kulkarni wrote:
> > Adding helper functions and necessary code to make
> > pci driver(pci-host-generic) numa aware.
> > 
> > This patch is on top of arm64-numa v7.
> > http://www.spinics.net/lists/arm-kernel/msg460813.html
> > 
> > Signed-off-by: Ganapatrao Kulkarni <gkulkarni@caviumnetworks.com>
> > ---
> >  arch/arm64/include/asm/numa.h       | 8 +++++---
> >  arch/arm64/kernel/pci.c             | 8 ++++++++
> >  drivers/pci/host/pci-host-generic.c | 1 +
> >  3 files changed, 14 insertions(+), 3 deletions(-)
> > 
> > diff --git a/arch/arm64/include/asm/numa.h b/arch/arm64/include/asm/numa.h
> > index b8c2a3f..1eca4db 100644
> > --- a/arch/arm64/include/asm/numa.h
> > +++ b/arch/arm64/include/asm/numa.h
> > @@ -15,9 +15,11 @@
> >  extern int __node_distance(int from, int to);
> >  #define node_distance(a, b) __node_distance(a, b)
> >  
> > -/* dummy definitions for pci functions */
> > -#define pcibus_to_node(node)	0
> > -#define cpumask_of_pcibus(bus)	0
> > +struct pci_bus;
> > +extern int pcibus_to_node(struct pci_bus *bus);
> > +#define cpumask_of_pcibus(bus)	(pcibus_to_node(bus) == -1 ?		\
> > +				 cpu_all_mask :				\
> > +				 cpumask_of_node(pcibus_to_node(bus)))
> 
> All the arch definitions of cpumask_of_pcibus() are pretty similar;
> could they be made more generic?  At the very least, can you drop the
> definition here and use the one in include/asm-generic/topology.h,
> which is identical to what you're defining here?

+1 on that. I asked for exactly the same thing in my review of v7:

  http://www.spinics.net/lists/arm-kernel/msg469592.html

but it looks like I was just ignored.

Will

Re: [PATCH] arm64, pci, numa: Adding helper functions as required by pci

[Ganapatrao Kulkarni]

On Fri, Jan 8, 2016 at 11:36 PM, Will Deacon <will.deacon@arm.com> wrote:
> On Fri, Jan 08, 2016 at 12:01:31PM -0600, Bjorn Helgaas wrote:
>> On Tue, Dec 22, 2015 at 04:08:50PM +0530, Ganapatrao Kulkarni wrote:
>> > Adding helper functions and necessary code to make
>> > pci driver(pci-host-generic) numa aware.
>> >
>> > This patch is on top of arm64-numa v7.
>> > http://www.spinics.net/lists/arm-kernel/msg460813.html
>> >
>> > Signed-off-by: Ganapatrao Kulkarni <gkulkarni@caviumnetworks.com>
>> > ---
>> >  arch/arm64/include/asm/numa.h       | 8 +++++---
>> >  arch/arm64/kernel/pci.c             | 8 ++++++++
>> >  drivers/pci/host/pci-host-generic.c | 1 +
>> >  3 files changed, 14 insertions(+), 3 deletions(-)
>> >
>> > diff --git a/arch/arm64/include/asm/numa.h b/arch/arm64/include/asm/numa.h
>> > index b8c2a3f..1eca4db 100644
>> > --- a/arch/arm64/include/asm/numa.h
>> > +++ b/arch/arm64/include/asm/numa.h
>> > @@ -15,9 +15,11 @@
>> >  extern int __node_distance(int from, int to);
>> >  #define node_distance(a, b) __node_distance(a, b)
>> >
>> > -/* dummy definitions for pci functions */
>> > -#define pcibus_to_node(node)       0
>> > -#define cpumask_of_pcibus(bus)     0
>> > +struct pci_bus;
>> > +extern int pcibus_to_node(struct pci_bus *bus);
>> > +#define cpumask_of_pcibus(bus)     (pcibus_to_node(bus) == -1 ?            \
>> > +                            cpu_all_mask :                         \
>> > +                            cpumask_of_node(pcibus_to_node(bus)))
>>
>> All the arch definitions of cpumask_of_pcibus() are pretty similar;
>> could they be made more generic?  At the very least, can you drop the
>> definition here and use the one in include/asm-generic/topology.h,
>> which is identical to what you're defining here?
macro cpumask_of_pcibus is defined under #ifndef CONFIG_NUMA in
include/asm-generic/topology.h
and this macro is defined again for NUMA in respective arch header files.
i think moving this macro from ifndef will allow us to use without redefinition.

--- a/include/asm-generic/topology.h
+++ b/include/asm-generic/topology.h
@@ -54,14 +54,14 @@
 #define pcibus_to_node(bus)    ((void)(bus), -1)
 #endif

+#endif /* CONFIG_NUMA */
+
 #ifndef cpumask_of_pcibus
 #define cpumask_of_pcibus(bus) (pcibus_to_node(bus) == -1 ?            \
                                 cpu_all_mask :                         \
                                 cpumask_of_node(pcibus_to_node(bus)))
 #endif

-#endif /* CONFIG_NUMA */
-
 #if !defined(CONFIG_NUMA) || !defined(CONFIG_HAVE_MEMORYLESS_NODES)

 #ifndef set_numa_mem

i have got below compilation error withour macro defined in arch code.

drivers/pci/pci-sysfs.c: In function ‘cpuaffinity_show’:
drivers/pci/pci-sysfs.c:114:15: error: implicit declaration of
function ‘cpumask_of_pcibus’ [-Werror=implicit-function-declaration]
drivers/pci/pci-sysfs.c:114:34: warning: initialization makes pointer
from integer without a cast [enabled by default]
drivers/pci/pci-sysfs.c: In function ‘cpulistaffinity_show’:
drivers/pci/pci-sysfs.c:123:34: warning: initialization makes pointer
from integer without a cast [enabled by default]
cc1: some warnings being treated as errors


i can send this as separate patch( as a  fix patch).

>
> +1 on that. I asked for exactly the same thing in my review of v7:
>
>   http://www.spinics.net/lists/arm-kernel/msg469592.html
>
> but it looks like I was just ignored.
>
> Will
thanks
ganapat

Re: [PATCH] arm64, pci, numa: Adding helper functions as required by pci

[Ganapatrao Kulkarni]

On Fri, Jan 8, 2016 at 11:36 PM, Will Deacon <will.deacon@arm.com> wrote:
> On Fri, Jan 08, 2016 at 12:01:31PM -0600, Bjorn Helgaas wrote:
>> On Tue, Dec 22, 2015 at 04:08:50PM +0530, Ganapatrao Kulkarni wrote:
>> > Adding helper functions and necessary code to make
>> > pci driver(pci-host-generic) numa aware.
>> >
>> > This patch is on top of arm64-numa v7.
>> > http://www.spinics.net/lists/arm-kernel/msg460813.html
>> >
>> > Signed-off-by: Ganapatrao Kulkarni <gkulkarni@caviumnetworks.com>
>> > ---
>> >  arch/arm64/include/asm/numa.h       | 8 +++++---
>> >  arch/arm64/kernel/pci.c             | 8 ++++++++
>> >  drivers/pci/host/pci-host-generic.c | 1 +
>> >  3 files changed, 14 insertions(+), 3 deletions(-)
>> >
>> > diff --git a/arch/arm64/include/asm/numa.h b/arch/arm64/include/asm/numa.h
>> > index b8c2a3f..1eca4db 100644
>> > --- a/arch/arm64/include/asm/numa.h
>> > +++ b/arch/arm64/include/asm/numa.h
>> > @@ -15,9 +15,11 @@
>> >  extern int __node_distance(int from, int to);
>> >  #define node_distance(a, b) __node_distance(a, b)
>> >
>> > -/* dummy definitions for pci functions */
>> > -#define pcibus_to_node(node)       0
>> > -#define cpumask_of_pcibus(bus)     0
>> > +struct pci_bus;
>> > +extern int pcibus_to_node(struct pci_bus *bus);
>> > +#define cpumask_of_pcibus(bus)     (pcibus_to_node(bus) == -1 ?            \
>> > +                            cpu_all_mask :                         \
>> > +                            cpumask_of_node(pcibus_to_node(bus)))
>>
>> All the arch definitions of cpumask_of_pcibus() are pretty similar;
>> could they be made more generic?  At the very least, can you drop the
>> definition here and use the one in include/asm-generic/topology.h,
>> which is identical to what you're defining here?
macro cpumask_of_pcibus is defined under #ifndef CONFIG_NUMA in
include/asm-generic/topology.h
and this macro is defined again for NUMA in respective arch header files.
i think moving this macro from ifndef will allow us to use without redefinition.

--- a/include/asm-generic/topology.h
+++ b/include/asm-generic/topology.h
@@ -54,14 +54,14 @@
 #define pcibus_to_node(bus)    ((void)(bus), -1)
 #endif

+#endif /* CONFIG_NUMA */
+
 #ifndef cpumask_of_pcibus
 #define cpumask_of_pcibus(bus) (pcibus_to_node(bus) == -1 ?            \
                                 cpu_all_mask :                         \
                                 cpumask_of_node(pcibus_to_node(bus)))
 #endif

-#endif /* CONFIG_NUMA */
-
 #if !defined(CONFIG_NUMA) || !defined(CONFIG_HAVE_MEMORYLESS_NODES)

 #ifndef set_numa_mem

i have got below compilation error withour macro defined in arch code.

drivers/pci/pci-sysfs.c: In function ‘cpuaffinity_show’:
drivers/pci/pci-sysfs.c:114:15: error: implicit declaration of
function ‘cpumask_of_pcibus’ [-Werror=implicit-function-declaration]
drivers/pci/pci-sysfs.c:114:34: warning: initialization makes pointer
from integer without a cast [enabled by default]
drivers/pci/pci-sysfs.c: In function ‘cpulistaffinity_show’:
drivers/pci/pci-sysfs.c:123:34: warning: initialization makes pointer
from integer without a cast [enabled by default]
cc1: some warnings being treated as errors


i can send this as separate patch( as a  fix patch).

>
> +1 on that. I asked for exactly the same thing in my review of v7:
>
>   http://www.spinics.net/lists/arm-kernel/msg469592.html
>
> but it looks like I was just ignored.
>
> Will
thanks
ganapat

[PATCH] arm64, pci, numa: Adding helper functions as required by pci

[Ganapatrao Kulkarni]

On Fri, Jan 8, 2016 at 11:36 PM, Will Deacon <will.deacon@arm.com> wrote:
> On Fri, Jan 08, 2016 at 12:01:31PM -0600, Bjorn Helgaas wrote:
>> On Tue, Dec 22, 2015 at 04:08:50PM +0530, Ganapatrao Kulkarni wrote:
>> > Adding helper functions and necessary code to make
>> > pci driver(pci-host-generic) numa aware.
>> >
>> > This patch is on top of arm64-numa v7.
>> > http://www.spinics.net/lists/arm-kernel/msg460813.html
>> >
>> > Signed-off-by: Ganapatrao Kulkarni <gkulkarni@caviumnetworks.com>
>> > ---
>> >  arch/arm64/include/asm/numa.h       | 8 +++++---
>> >  arch/arm64/kernel/pci.c             | 8 ++++++++
>> >  drivers/pci/host/pci-host-generic.c | 1 +
>> >  3 files changed, 14 insertions(+), 3 deletions(-)
>> >
>> > diff --git a/arch/arm64/include/asm/numa.h b/arch/arm64/include/asm/numa.h
>> > index b8c2a3f..1eca4db 100644
>> > --- a/arch/arm64/include/asm/numa.h
>> > +++ b/arch/arm64/include/asm/numa.h
>> > @@ -15,9 +15,11 @@
>> >  extern int __node_distance(int from, int to);
>> >  #define node_distance(a, b) __node_distance(a, b)
>> >
>> > -/* dummy definitions for pci functions */
>> > -#define pcibus_to_node(node)       0
>> > -#define cpumask_of_pcibus(bus)     0
>> > +struct pci_bus;
>> > +extern int pcibus_to_node(struct pci_bus *bus);
>> > +#define cpumask_of_pcibus(bus)     (pcibus_to_node(bus) == -1 ?            \
>> > +                            cpu_all_mask :                         \
>> > +                            cpumask_of_node(pcibus_to_node(bus)))
>>
>> All the arch definitions of cpumask_of_pcibus() are pretty similar;
>> could they be made more generic?  At the very least, can you drop the
>> definition here and use the one in include/asm-generic/topology.h,
>> which is identical to what you're defining here?
macro cpumask_of_pcibus is defined under #ifndef CONFIG_NUMA in
include/asm-generic/topology.h
and this macro is defined again for NUMA in respective arch header files.
i think moving this macro from ifndef will allow us to use without redefinition.

--- a/include/asm-generic/topology.h
+++ b/include/asm-generic/topology.h
@@ -54,14 +54,14 @@
 #define pcibus_to_node(bus)    ((void)(bus), -1)
 #endif

+#endif /* CONFIG_NUMA */
+
 #ifndef cpumask_of_pcibus
 #define cpumask_of_pcibus(bus) (pcibus_to_node(bus) == -1 ?            \
                                 cpu_all_mask :                         \
                                 cpumask_of_node(pcibus_to_node(bus)))
 #endif

-#endif /* CONFIG_NUMA */
-
 #if !defined(CONFIG_NUMA) || !defined(CONFIG_HAVE_MEMORYLESS_NODES)

 #ifndef set_numa_mem

i have got below compilation error withour macro defined in arch code.

drivers/pci/pci-sysfs.c: In function ?cpuaffinity_show?:
drivers/pci/pci-sysfs.c:114:15: error: implicit declaration of
function ?cpumask_of_pcibus? [-Werror=implicit-function-declaration]
drivers/pci/pci-sysfs.c:114:34: warning: initialization makes pointer
from integer without a cast [enabled by default]
drivers/pci/pci-sysfs.c: In function ?cpulistaffinity_show?:
drivers/pci/pci-sysfs.c:123:34: warning: initialization makes pointer
from integer without a cast [enabled by default]
cc1: some warnings being treated as errors


i can send this as separate patch( as a  fix patch).

>
> +1 on that. I asked for exactly the same thing in my review of v7:
>
>   http://www.spinics.net/lists/arm-kernel/msg469592.html
>
> but it looks like I was just ignored.
>
> Will
thanks
ganapat

Re: [PATCH] arm64, pci, numa: Adding helper functions as required by pci

[Bjorn Helgaas]

On Sat, Jan 09, 2016 at 11:35:17AM +0530, Ganapatrao Kulkarni wrote:
> On Fri, Jan 8, 2016 at 11:36 PM, Will Deacon <will.deacon@arm.com> wrote:
> > On Fri, Jan 08, 2016 at 12:01:31PM -0600, Bjorn Helgaas wrote:
> >> On Tue, Dec 22, 2015 at 04:08:50PM +0530, Ganapatrao Kulkarni wrote:
> >> > Adding helper functions and necessary code to make
> >> > pci driver(pci-host-generic) numa aware.
> >> >
> >> > This patch is on top of arm64-numa v7.
> >> > http://www.spinics.net/lists/arm-kernel/msg460813.html
> >> >
> >> > Signed-off-by: Ganapatrao Kulkarni <gkulkarni@caviumnetworks.com>
> >> > ---
> >> >  arch/arm64/include/asm/numa.h       | 8 +++++---
> >> >  arch/arm64/kernel/pci.c             | 8 ++++++++
> >> >  drivers/pci/host/pci-host-generic.c | 1 +
> >> >  3 files changed, 14 insertions(+), 3 deletions(-)
> >> >
> >> > diff --git a/arch/arm64/include/asm/numa.h b/arch/arm64/include/asm/numa.h
> >> > index b8c2a3f..1eca4db 100644
> >> > --- a/arch/arm64/include/asm/numa.h
> >> > +++ b/arch/arm64/include/asm/numa.h
> >> > @@ -15,9 +15,11 @@
> >> >  extern int __node_distance(int from, int to);
> >> >  #define node_distance(a, b) __node_distance(a, b)
> >> >
> >> > -/* dummy definitions for pci functions */
> >> > -#define pcibus_to_node(node)       0
> >> > -#define cpumask_of_pcibus(bus)     0
> >> > +struct pci_bus;
> >> > +extern int pcibus_to_node(struct pci_bus *bus);
> >> > +#define cpumask_of_pcibus(bus)     (pcibus_to_node(bus) == -1 ?            \
> >> > +                            cpu_all_mask :                         \
> >> > +                            cpumask_of_node(pcibus_to_node(bus)))
> >>
> >> All the arch definitions of cpumask_of_pcibus() are pretty similar;
> >> could they be made more generic?  At the very least, can you drop the
> >> definition here and use the one in include/asm-generic/topology.h,
> >> which is identical to what you're defining here?
> macro cpumask_of_pcibus is defined under #ifndef CONFIG_NUMA in
> include/asm-generic/topology.h
> and this macro is defined again for NUMA in respective arch header files.
> i think moving this macro from ifndef will allow us to use without redefinition.
> 
> --- a/include/asm-generic/topology.h
> +++ b/include/asm-generic/topology.h
> @@ -54,14 +54,14 @@
>  #define pcibus_to_node(bus)    ((void)(bus), -1)
>  #endif
> 
> +#endif /* CONFIG_NUMA */
> +
>  #ifndef cpumask_of_pcibus
>  #define cpumask_of_pcibus(bus) (pcibus_to_node(bus) == -1 ?            \
>                                  cpu_all_mask :                         \
>                                  cpumask_of_node(pcibus_to_node(bus)))
>  #endif
> 
> -#endif /* CONFIG_NUMA */
> -
>  #if !defined(CONFIG_NUMA) || !defined(CONFIG_HAVE_MEMORYLESS_NODES)
> 
>  #ifndef set_numa_mem
> 
> i have got below compilation error withour macro defined in arch code.
> 
> drivers/pci/pci-sysfs.c: In function ‘cpuaffinity_show’:
> drivers/pci/pci-sysfs.c:114:15: error: implicit declaration of
> function ‘cpumask_of_pcibus’ [-Werror=implicit-function-declaration]
> drivers/pci/pci-sysfs.c:114:34: warning: initialization makes pointer
> from integer without a cast [enabled by default]
> drivers/pci/pci-sysfs.c: In function ‘cpulistaffinity_show’:
> drivers/pci/pci-sysfs.c:123:34: warning: initialization makes pointer
> from integer without a cast [enabled by default]
> cc1: some warnings being treated as errors
> 
> 
> i can send this as separate patch( as a  fix patch).

Unless your series has already been merged, I don't like the idea of a
separate fix patch.  The whole point of reviews is to try to fix as
many things as we can *before* merging.

Bjorn

Re: [PATCH] arm64, pci, numa: Adding helper functions as required by pci

[Bjorn Helgaas]

On Sat, Jan 09, 2016 at 11:35:17AM +0530, Ganapatrao Kulkarni wrote:
> On Fri, Jan 8, 2016 at 11:36 PM, Will Deacon <will.deacon@arm.com> wrote:
> > On Fri, Jan 08, 2016 at 12:01:31PM -0600, Bjorn Helgaas wrote:
> >> On Tue, Dec 22, 2015 at 04:08:50PM +0530, Ganapatrao Kulkarni wrote:
> >> > Adding helper functions and necessary code to make
> >> > pci driver(pci-host-generic) numa aware.
> >> >
> >> > This patch is on top of arm64-numa v7.
> >> > http://www.spinics.net/lists/arm-kernel/msg460813.html
> >> >
> >> > Signed-off-by: Ganapatrao Kulkarni <gkulkarni@caviumnetworks.com>
> >> > ---
> >> >  arch/arm64/include/asm/numa.h       | 8 +++++---
> >> >  arch/arm64/kernel/pci.c             | 8 ++++++++
> >> >  drivers/pci/host/pci-host-generic.c | 1 +
> >> >  3 files changed, 14 insertions(+), 3 deletions(-)
> >> >
> >> > diff --git a/arch/arm64/include/asm/numa.h b/arch/arm64/include/asm/numa.h
> >> > index b8c2a3f..1eca4db 100644
> >> > --- a/arch/arm64/include/asm/numa.h
> >> > +++ b/arch/arm64/include/asm/numa.h
> >> > @@ -15,9 +15,11 @@
> >> >  extern int __node_distance(int from, int to);
> >> >  #define node_distance(a, b) __node_distance(a, b)
> >> >
> >> > -/* dummy definitions for pci functions */
> >> > -#define pcibus_to_node(node)       0
> >> > -#define cpumask_of_pcibus(bus)     0
> >> > +struct pci_bus;
> >> > +extern int pcibus_to_node(struct pci_bus *bus);
> >> > +#define cpumask_of_pcibus(bus)     (pcibus_to_node(bus) == -1 ?            \
> >> > +                            cpu_all_mask :                         \
> >> > +                            cpumask_of_node(pcibus_to_node(bus)))
> >>
> >> All the arch definitions of cpumask_of_pcibus() are pretty similar;
> >> could they be made more generic?  At the very least, can you drop the
> >> definition here and use the one in include/asm-generic/topology.h,
> >> which is identical to what you're defining here?
> macro cpumask_of_pcibus is defined under #ifndef CONFIG_NUMA in
> include/asm-generic/topology.h
> and this macro is defined again for NUMA in respective arch header files.
> i think moving this macro from ifndef will allow us to use without redefinition.
> 
> --- a/include/asm-generic/topology.h
> +++ b/include/asm-generic/topology.h
> @@ -54,14 +54,14 @@
>  #define pcibus_to_node(bus)    ((void)(bus), -1)
>  #endif
> 
> +#endif /* CONFIG_NUMA */
> +
>  #ifndef cpumask_of_pcibus
>  #define cpumask_of_pcibus(bus) (pcibus_to_node(bus) == -1 ?            \
>                                  cpu_all_mask :                         \
>                                  cpumask_of_node(pcibus_to_node(bus)))
>  #endif
> 
> -#endif /* CONFIG_NUMA */
> -
>  #if !defined(CONFIG_NUMA) || !defined(CONFIG_HAVE_MEMORYLESS_NODES)
> 
>  #ifndef set_numa_mem
> 
> i have got below compilation error withour macro defined in arch code.
> 
> drivers/pci/pci-sysfs.c: In function ‘cpuaffinity_show’:
> drivers/pci/pci-sysfs.c:114:15: error: implicit declaration of
> function ‘cpumask_of_pcibus’ [-Werror=implicit-function-declaration]
> drivers/pci/pci-sysfs.c:114:34: warning: initialization makes pointer
> from integer without a cast [enabled by default]
> drivers/pci/pci-sysfs.c: In function ‘cpulistaffinity_show’:
> drivers/pci/pci-sysfs.c:123:34: warning: initialization makes pointer
> from integer without a cast [enabled by default]
> cc1: some warnings being treated as errors
> 
> 
> i can send this as separate patch( as a  fix patch).

Unless your series has already been merged, I don't like the idea of a
separate fix patch.  The whole point of reviews is to try to fix as
many things as we can *before* merging.

Bjorn

[PATCH] arm64, pci, numa: Adding helper functions as required by pci

[Bjorn Helgaas]

On Sat, Jan 09, 2016 at 11:35:17AM +0530, Ganapatrao Kulkarni wrote:
> On Fri, Jan 8, 2016 at 11:36 PM, Will Deacon <will.deacon@arm.com> wrote:
> > On Fri, Jan 08, 2016 at 12:01:31PM -0600, Bjorn Helgaas wrote:
> >> On Tue, Dec 22, 2015 at 04:08:50PM +0530, Ganapatrao Kulkarni wrote:
> >> > Adding helper functions and necessary code to make
> >> > pci driver(pci-host-generic) numa aware.
> >> >
> >> > This patch is on top of arm64-numa v7.
> >> > http://www.spinics.net/lists/arm-kernel/msg460813.html
> >> >
> >> > Signed-off-by: Ganapatrao Kulkarni <gkulkarni@caviumnetworks.com>
> >> > ---
> >> >  arch/arm64/include/asm/numa.h       | 8 +++++---
> >> >  arch/arm64/kernel/pci.c             | 8 ++++++++
> >> >  drivers/pci/host/pci-host-generic.c | 1 +
> >> >  3 files changed, 14 insertions(+), 3 deletions(-)
> >> >
> >> > diff --git a/arch/arm64/include/asm/numa.h b/arch/arm64/include/asm/numa.h
> >> > index b8c2a3f..1eca4db 100644
> >> > --- a/arch/arm64/include/asm/numa.h
> >> > +++ b/arch/arm64/include/asm/numa.h
> >> > @@ -15,9 +15,11 @@
> >> >  extern int __node_distance(int from, int to);
> >> >  #define node_distance(a, b) __node_distance(a, b)
> >> >
> >> > -/* dummy definitions for pci functions */
> >> > -#define pcibus_to_node(node)       0
> >> > -#define cpumask_of_pcibus(bus)     0
> >> > +struct pci_bus;
> >> > +extern int pcibus_to_node(struct pci_bus *bus);
> >> > +#define cpumask_of_pcibus(bus)     (pcibus_to_node(bus) == -1 ?            \
> >> > +                            cpu_all_mask :                         \
> >> > +                            cpumask_of_node(pcibus_to_node(bus)))
> >>
> >> All the arch definitions of cpumask_of_pcibus() are pretty similar;
> >> could they be made more generic?  At the very least, can you drop the
> >> definition here and use the one in include/asm-generic/topology.h,
> >> which is identical to what you're defining here?
> macro cpumask_of_pcibus is defined under #ifndef CONFIG_NUMA in
> include/asm-generic/topology.h
> and this macro is defined again for NUMA in respective arch header files.
> i think moving this macro from ifndef will allow us to use without redefinition.
> 
> --- a/include/asm-generic/topology.h
> +++ b/include/asm-generic/topology.h
> @@ -54,14 +54,14 @@
>  #define pcibus_to_node(bus)    ((void)(bus), -1)
>  #endif
> 
> +#endif /* CONFIG_NUMA */
> +
>  #ifndef cpumask_of_pcibus
>  #define cpumask_of_pcibus(bus) (pcibus_to_node(bus) == -1 ?            \
>                                  cpu_all_mask :                         \
>                                  cpumask_of_node(pcibus_to_node(bus)))
>  #endif
> 
> -#endif /* CONFIG_NUMA */
> -
>  #if !defined(CONFIG_NUMA) || !defined(CONFIG_HAVE_MEMORYLESS_NODES)
> 
>  #ifndef set_numa_mem
> 
> i have got below compilation error withour macro defined in arch code.
> 
> drivers/pci/pci-sysfs.c: In function ?cpuaffinity_show?:
> drivers/pci/pci-sysfs.c:114:15: error: implicit declaration of
> function ?cpumask_of_pcibus? [-Werror=implicit-function-declaration]
> drivers/pci/pci-sysfs.c:114:34: warning: initialization makes pointer
> from integer without a cast [enabled by default]
> drivers/pci/pci-sysfs.c: In function ?cpulistaffinity_show?:
> drivers/pci/pci-sysfs.c:123:34: warning: initialization makes pointer
> from integer without a cast [enabled by default]
> cc1: some warnings being treated as errors
> 
> 
> i can send this as separate patch( as a  fix patch).

Unless your series has already been merged, I don't like the idea of a
separate fix patch.  The whole point of reviews is to try to fix as
many things as we can *before* merging.

Bjorn

Re: [PATCH] arm64, pci, numa: Adding helper functions as required by pci

[Ganapatrao Kulkarni]

Hi Bjorn,

On Sat, Jan 9, 2016 at 8:54 PM, Bjorn Helgaas <helgaas@kernel.org> wrote:
> On Sat, Jan 09, 2016 at 11:35:17AM +0530, Ganapatrao Kulkarni wrote:
>> On Fri, Jan 8, 2016 at 11:36 PM, Will Deacon <will.deacon@arm.com> wrote:
>> > On Fri, Jan 08, 2016 at 12:01:31PM -0600, Bjorn Helgaas wrote:
>> >> On Tue, Dec 22, 2015 at 04:08:50PM +0530, Ganapatrao Kulkarni wrote:
>> >> > Adding helper functions and necessary code to make
>> >> > pci driver(pci-host-generic) numa aware.
>> >> >
>> >> > This patch is on top of arm64-numa v7.
>> >> > http://www.spinics.net/lists/arm-kernel/msg460813.html
>> >> >
>> >> > Signed-off-by: Ganapatrao Kulkarni <gkulkarni@caviumnetworks.com>
>> >> > ---
>> >> >  arch/arm64/include/asm/numa.h       | 8 +++++---
>> >> >  arch/arm64/kernel/pci.c             | 8 ++++++++
>> >> >  drivers/pci/host/pci-host-generic.c | 1 +
>> >> >  3 files changed, 14 insertions(+), 3 deletions(-)
>> >> >
>> >> > diff --git a/arch/arm64/include/asm/numa.h b/arch/arm64/include/asm/numa.h
>> >> > index b8c2a3f..1eca4db 100644
>> >> > --- a/arch/arm64/include/asm/numa.h
>> >> > +++ b/arch/arm64/include/asm/numa.h
>> >> > @@ -15,9 +15,11 @@
>> >> >  extern int __node_distance(int from, int to);
>> >> >  #define node_distance(a, b) __node_distance(a, b)
>> >> >
>> >> > -/* dummy definitions for pci functions */
>> >> > -#define pcibus_to_node(node)       0
>> >> > -#define cpumask_of_pcibus(bus)     0
>> >> > +struct pci_bus;
>> >> > +extern int pcibus_to_node(struct pci_bus *bus);
>> >> > +#define cpumask_of_pcibus(bus)     (pcibus_to_node(bus) == -1 ?            \
>> >> > +                            cpu_all_mask :                         \
>> >> > +                            cpumask_of_node(pcibus_to_node(bus)))
>> >>
>> >> All the arch definitions of cpumask_of_pcibus() are pretty similar;
>> >> could they be made more generic?  At the very least, can you drop the
>> >> definition here and use the one in include/asm-generic/topology.h,
>> >> which is identical to what you're defining here?
>> macro cpumask_of_pcibus is defined under #ifndef CONFIG_NUMA in
>> include/asm-generic/topology.h
>> and this macro is defined again for NUMA in respective arch header files.
>> i think moving this macro from ifndef will allow us to use without redefinition.
>>
>> --- a/include/asm-generic/topology.h
>> +++ b/include/asm-generic/topology.h
>> @@ -54,14 +54,14 @@
>>  #define pcibus_to_node(bus)    ((void)(bus), -1)
>>  #endif
>>
>> +#endif /* CONFIG_NUMA */
>> +
>>  #ifndef cpumask_of_pcibus
>>  #define cpumask_of_pcibus(bus) (pcibus_to_node(bus) == -1 ?            \
>>                                  cpu_all_mask :                         \
>>                                  cpumask_of_node(pcibus_to_node(bus)))
>>  #endif
>>
>> -#endif /* CONFIG_NUMA */
>> -
>>  #if !defined(CONFIG_NUMA) || !defined(CONFIG_HAVE_MEMORYLESS_NODES)
>>
>>  #ifndef set_numa_mem
>>
>> i have got below compilation error withour macro defined in arch code.
>>
>> drivers/pci/pci-sysfs.c: In function ‘cpuaffinity_show’:
>> drivers/pci/pci-sysfs.c:114:15: error: implicit declaration of
>> function ‘cpumask_of_pcibus’ [-Werror=implicit-function-declaration]
>> drivers/pci/pci-sysfs.c:114:34: warning: initialization makes pointer
>> from integer without a cast [enabled by default]
>> drivers/pci/pci-sysfs.c: In function ‘cpulistaffinity_show’:
>> drivers/pci/pci-sysfs.c:123:34: warning: initialization makes pointer
>> from integer without a cast [enabled by default]
>> cc1: some warnings being treated as errors
>>
>>
>> i can send this as separate patch( as a  fix patch).
>
> Unless your series has already been merged, I don't like the idea of a
> separate fix patch.  The whole point of reviews is to try to fix as
> many things as we can *before* merging.
thanks for the review.
sure, i will add  this as part of my numa patch series.
>
> Bjorn

thanks
Ganapat

Re: [PATCH] arm64, pci, numa: Adding helper functions as required by pci

[Ganapatrao Kulkarni]

Hi Bjorn,

On Sat, Jan 9, 2016 at 8:54 PM, Bjorn Helgaas <helgaas@kernel.org> wrote:
> On Sat, Jan 09, 2016 at 11:35:17AM +0530, Ganapatrao Kulkarni wrote:
>> On Fri, Jan 8, 2016 at 11:36 PM, Will Deacon <will.deacon@arm.com> wrote:
>> > On Fri, Jan 08, 2016 at 12:01:31PM -0600, Bjorn Helgaas wrote:
>> >> On Tue, Dec 22, 2015 at 04:08:50PM +0530, Ganapatrao Kulkarni wrote:
>> >> > Adding helper functions and necessary code to make
>> >> > pci driver(pci-host-generic) numa aware.
>> >> >
>> >> > This patch is on top of arm64-numa v7.
>> >> > http://www.spinics.net/lists/arm-kernel/msg460813.html
>> >> >
>> >> > Signed-off-by: Ganapatrao Kulkarni <gkulkarni@caviumnetworks.com>
>> >> > ---
>> >> >  arch/arm64/include/asm/numa.h       | 8 +++++---
>> >> >  arch/arm64/kernel/pci.c             | 8 ++++++++
>> >> >  drivers/pci/host/pci-host-generic.c | 1 +
>> >> >  3 files changed, 14 insertions(+), 3 deletions(-)
>> >> >
>> >> > diff --git a/arch/arm64/include/asm/numa.h b/arch/arm64/include/asm/numa.h
>> >> > index b8c2a3f..1eca4db 100644
>> >> > --- a/arch/arm64/include/asm/numa.h
>> >> > +++ b/arch/arm64/include/asm/numa.h
>> >> > @@ -15,9 +15,11 @@
>> >> >  extern int __node_distance(int from, int to);
>> >> >  #define node_distance(a, b) __node_distance(a, b)
>> >> >
>> >> > -/* dummy definitions for pci functions */
>> >> > -#define pcibus_to_node(node)       0
>> >> > -#define cpumask_of_pcibus(bus)     0
>> >> > +struct pci_bus;
>> >> > +extern int pcibus_to_node(struct pci_bus *bus);
>> >> > +#define cpumask_of_pcibus(bus)     (pcibus_to_node(bus) == -1 ?            \
>> >> > +                            cpu_all_mask :                         \
>> >> > +                            cpumask_of_node(pcibus_to_node(bus)))
>> >>
>> >> All the arch definitions of cpumask_of_pcibus() are pretty similar;
>> >> could they be made more generic?  At the very least, can you drop the
>> >> definition here and use the one in include/asm-generic/topology.h,
>> >> which is identical to what you're defining here?
>> macro cpumask_of_pcibus is defined under #ifndef CONFIG_NUMA in
>> include/asm-generic/topology.h
>> and this macro is defined again for NUMA in respective arch header files.
>> i think moving this macro from ifndef will allow us to use without redefinition.
>>
>> --- a/include/asm-generic/topology.h
>> +++ b/include/asm-generic/topology.h
>> @@ -54,14 +54,14 @@
>>  #define pcibus_to_node(bus)    ((void)(bus), -1)
>>  #endif
>>
>> +#endif /* CONFIG_NUMA */
>> +
>>  #ifndef cpumask_of_pcibus
>>  #define cpumask_of_pcibus(bus) (pcibus_to_node(bus) == -1 ?            \
>>                                  cpu_all_mask :                         \
>>                                  cpumask_of_node(pcibus_to_node(bus)))
>>  #endif
>>
>> -#endif /* CONFIG_NUMA */
>> -
>>  #if !defined(CONFIG_NUMA) || !defined(CONFIG_HAVE_MEMORYLESS_NODES)
>>
>>  #ifndef set_numa_mem
>>
>> i have got below compilation error withour macro defined in arch code.
>>
>> drivers/pci/pci-sysfs.c: In function ‘cpuaffinity_show’:
>> drivers/pci/pci-sysfs.c:114:15: error: implicit declaration of
>> function ‘cpumask_of_pcibus’ [-Werror=implicit-function-declaration]
>> drivers/pci/pci-sysfs.c:114:34: warning: initialization makes pointer
>> from integer without a cast [enabled by default]
>> drivers/pci/pci-sysfs.c: In function ‘cpulistaffinity_show’:
>> drivers/pci/pci-sysfs.c:123:34: warning: initialization makes pointer
>> from integer without a cast [enabled by default]
>> cc1: some warnings being treated as errors
>>
>>
>> i can send this as separate patch( as a  fix patch).
>
> Unless your series has already been merged, I don't like the idea of a
> separate fix patch.  The whole point of reviews is to try to fix as
> many things as we can *before* merging.
thanks for the review.
sure, i will add  this as part of my numa patch series.
>
> Bjorn

thanks
Ganapat

[PATCH] arm64, pci, numa: Adding helper functions as required by pci

[Ganapatrao Kulkarni]

Hi Bjorn,

On Sat, Jan 9, 2016 at 8:54 PM, Bjorn Helgaas <helgaas@kernel.org> wrote:
> On Sat, Jan 09, 2016 at 11:35:17AM +0530, Ganapatrao Kulkarni wrote:
>> On Fri, Jan 8, 2016 at 11:36 PM, Will Deacon <will.deacon@arm.com> wrote:
>> > On Fri, Jan 08, 2016 at 12:01:31PM -0600, Bjorn Helgaas wrote:
>> >> On Tue, Dec 22, 2015 at 04:08:50PM +0530, Ganapatrao Kulkarni wrote:
>> >> > Adding helper functions and necessary code to make
>> >> > pci driver(pci-host-generic) numa aware.
>> >> >
>> >> > This patch is on top of arm64-numa v7.
>> >> > http://www.spinics.net/lists/arm-kernel/msg460813.html
>> >> >
>> >> > Signed-off-by: Ganapatrao Kulkarni <gkulkarni@caviumnetworks.com>
>> >> > ---
>> >> >  arch/arm64/include/asm/numa.h       | 8 +++++---
>> >> >  arch/arm64/kernel/pci.c             | 8 ++++++++
>> >> >  drivers/pci/host/pci-host-generic.c | 1 +
>> >> >  3 files changed, 14 insertions(+), 3 deletions(-)
>> >> >
>> >> > diff --git a/arch/arm64/include/asm/numa.h b/arch/arm64/include/asm/numa.h
>> >> > index b8c2a3f..1eca4db 100644
>> >> > --- a/arch/arm64/include/asm/numa.h
>> >> > +++ b/arch/arm64/include/asm/numa.h
>> >> > @@ -15,9 +15,11 @@
>> >> >  extern int __node_distance(int from, int to);
>> >> >  #define node_distance(a, b) __node_distance(a, b)
>> >> >
>> >> > -/* dummy definitions for pci functions */
>> >> > -#define pcibus_to_node(node)       0
>> >> > -#define cpumask_of_pcibus(bus)     0
>> >> > +struct pci_bus;
>> >> > +extern int pcibus_to_node(struct pci_bus *bus);
>> >> > +#define cpumask_of_pcibus(bus)     (pcibus_to_node(bus) == -1 ?            \
>> >> > +                            cpu_all_mask :                         \
>> >> > +                            cpumask_of_node(pcibus_to_node(bus)))
>> >>
>> >> All the arch definitions of cpumask_of_pcibus() are pretty similar;
>> >> could they be made more generic?  At the very least, can you drop the
>> >> definition here and use the one in include/asm-generic/topology.h,
>> >> which is identical to what you're defining here?
>> macro cpumask_of_pcibus is defined under #ifndef CONFIG_NUMA in
>> include/asm-generic/topology.h
>> and this macro is defined again for NUMA in respective arch header files.
>> i think moving this macro from ifndef will allow us to use without redefinition.
>>
>> --- a/include/asm-generic/topology.h
>> +++ b/include/asm-generic/topology.h
>> @@ -54,14 +54,14 @@
>>  #define pcibus_to_node(bus)    ((void)(bus), -1)
>>  #endif
>>
>> +#endif /* CONFIG_NUMA */
>> +
>>  #ifndef cpumask_of_pcibus
>>  #define cpumask_of_pcibus(bus) (pcibus_to_node(bus) == -1 ?            \
>>                                  cpu_all_mask :                         \
>>                                  cpumask_of_node(pcibus_to_node(bus)))
>>  #endif
>>
>> -#endif /* CONFIG_NUMA */
>> -
>>  #if !defined(CONFIG_NUMA) || !defined(CONFIG_HAVE_MEMORYLESS_NODES)
>>
>>  #ifndef set_numa_mem
>>
>> i have got below compilation error withour macro defined in arch code.
>>
>> drivers/pci/pci-sysfs.c: In function ?cpuaffinity_show?:
>> drivers/pci/pci-sysfs.c:114:15: error: implicit declaration of
>> function ?cpumask_of_pcibus? [-Werror=implicit-function-declaration]
>> drivers/pci/pci-sysfs.c:114:34: warning: initialization makes pointer
>> from integer without a cast [enabled by default]
>> drivers/pci/pci-sysfs.c: In function ?cpulistaffinity_show?:
>> drivers/pci/pci-sysfs.c:123:34: warning: initialization makes pointer
>> from integer without a cast [enabled by default]
>> cc1: some warnings being treated as errors
>>
>>
>> i can send this as separate patch( as a  fix patch).
>
> Unless your series has already been merged, I don't like the idea of a
> separate fix patch.  The whole point of reviews is to try to fix as
> many things as we can *before* merging.
thanks for the review.
sure, i will add  this as part of my numa patch series.
>
> Bjorn

thanks
Ganapat

Re: [PATCH] arm64, pci, numa: Adding helper functions as required by pci

[Matthias Brugger]

On 09/01/16 16:35, Ganapatrao Kulkarni wrote:
> Hi Bjorn,
>
> On Sat, Jan 9, 2016 at 8:54 PM, Bjorn Helgaas <helgaas@kernel.org> wrote:
>> On Sat, Jan 09, 2016 at 11:35:17AM +0530, Ganapatrao Kulkarni wrote:
>>> On Fri, Jan 8, 2016 at 11:36 PM, Will Deacon <will.deacon@arm.com> wrote:
>>>> On Fri, Jan 08, 2016 at 12:01:31PM -0600, Bjorn Helgaas wrote:
>>>>> On Tue, Dec 22, 2015 at 04:08:50PM +0530, Ganapatrao Kulkarni wrote:
>>>>>> Adding helper functions and necessary code to make
>>>>>> pci driver(pci-host-generic) numa aware.
>>>>>>
>>>>>> This patch is on top of arm64-numa v7.
>>>>>> http://www.spinics.net/lists/arm-kernel/msg460813.html
>>>>>>
>>>>>> Signed-off-by: Ganapatrao Kulkarni <gkulkarni@caviumnetworks.com>
>>>>>> ---
>>>>>>   arch/arm64/include/asm/numa.h       | 8 +++++---
>>>>>>   arch/arm64/kernel/pci.c             | 8 ++++++++
>>>>>>   drivers/pci/host/pci-host-generic.c | 1 +

set_dev_node() in pci-host-generic.c is missing in v8 of your numa patches.
Was this forgotten?

Regards,
Matthias

>>>>>>   3 files changed, 14 insertions(+), 3 deletions(-)
>>>>>>
>>>>>> diff --git a/arch/arm64/include/asm/numa.h b/arch/arm64/include/asm/numa.h
>>>>>> index b8c2a3f..1eca4db 100644
>>>>>> --- a/arch/arm64/include/asm/numa.h
>>>>>> +++ b/arch/arm64/include/asm/numa.h
>>>>>> @@ -15,9 +15,11 @@
>>>>>>   extern int __node_distance(int from, int to);
>>>>>>   #define node_distance(a, b) __node_distance(a, b)
>>>>>>
>>>>>> -/* dummy definitions for pci functions */
>>>>>> -#define pcibus_to_node(node)       0
>>>>>> -#define cpumask_of_pcibus(bus)     0
>>>>>> +struct pci_bus;
>>>>>> +extern int pcibus_to_node(struct pci_bus *bus);
>>>>>> +#define cpumask_of_pcibus(bus)     (pcibus_to_node(bus) == -1 ?            \
>>>>>> +                            cpu_all_mask :                         \
>>>>>> +                            cpumask_of_node(pcibus_to_node(bus)))
>>>>>
>>>>> All the arch definitions of cpumask_of_pcibus() are pretty similar;
>>>>> could they be made more generic?  At the very least, can you drop the
>>>>> definition here and use the one in include/asm-generic/topology.h,
>>>>> which is identical to what you're defining here?
>>> macro cpumask_of_pcibus is defined under #ifndef CONFIG_NUMA in
>>> include/asm-generic/topology.h
>>> and this macro is defined again for NUMA in respective arch header files.
>>> i think moving this macro from ifndef will allow us to use without redefinition.
>>>
>>> --- a/include/asm-generic/topology.h
>>> +++ b/include/asm-generic/topology.h
>>> @@ -54,14 +54,14 @@
>>>   #define pcibus_to_node(bus)    ((void)(bus), -1)
>>>   #endif
>>>
>>> +#endif /* CONFIG_NUMA */
>>> +
>>>   #ifndef cpumask_of_pcibus
>>>   #define cpumask_of_pcibus(bus) (pcibus_to_node(bus) == -1 ?            \
>>>                                   cpu_all_mask :                         \
>>>                                   cpumask_of_node(pcibus_to_node(bus)))
>>>   #endif
>>>
>>> -#endif /* CONFIG_NUMA */
>>> -
>>>   #if !defined(CONFIG_NUMA) || !defined(CONFIG_HAVE_MEMORYLESS_NODES)
>>>
>>>   #ifndef set_numa_mem
>>>
>>> i have got below compilation error withour macro defined in arch code.
>>>
>>> drivers/pci/pci-sysfs.c: In function ‘cpuaffinity_show’:
>>> drivers/pci/pci-sysfs.c:114:15: error: implicit declaration of
>>> function ‘cpumask_of_pcibus’ [-Werror=implicit-function-declaration]
>>> drivers/pci/pci-sysfs.c:114:34: warning: initialization makes pointer
>>> from integer without a cast [enabled by default]
>>> drivers/pci/pci-sysfs.c: In function ‘cpulistaffinity_show’:
>>> drivers/pci/pci-sysfs.c:123:34: warning: initialization makes pointer
>>> from integer without a cast [enabled by default]
>>> cc1: some warnings being treated as errors
>>>
>>>
>>> i can send this as separate patch( as a  fix patch).
>>
>> Unless your series has already been merged, I don't like the idea of a
>> separate fix patch.  The whole point of reviews is to try to fix as
>> many things as we can *before* merging.
> thanks for the review.
> sure, i will add  this as part of my numa patch series.
>>
>> Bjorn
>
> thanks
> Ganapat
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>

Re: [PATCH] arm64, pci, numa: Adding helper functions as required by pci

[Matthias Brugger]

On 09/01/16 16:35, Ganapatrao Kulkarni wrote:
> Hi Bjorn,
>
> On Sat, Jan 9, 2016 at 8:54 PM, Bjorn Helgaas <helgaas@kernel.org> wrote:
>> On Sat, Jan 09, 2016 at 11:35:17AM +0530, Ganapatrao Kulkarni wrote:
>>> On Fri, Jan 8, 2016 at 11:36 PM, Will Deacon <will.deacon@arm.com> wrote:
>>>> On Fri, Jan 08, 2016 at 12:01:31PM -0600, Bjorn Helgaas wrote:
>>>>> On Tue, Dec 22, 2015 at 04:08:50PM +0530, Ganapatrao Kulkarni wrote:
>>>>>> Adding helper functions and necessary code to make
>>>>>> pci driver(pci-host-generic) numa aware.
>>>>>>
>>>>>> This patch is on top of arm64-numa v7.
>>>>>> http://www.spinics.net/lists/arm-kernel/msg460813.html
>>>>>>
>>>>>> Signed-off-by: Ganapatrao Kulkarni <gkulkarni@caviumnetworks.com>
>>>>>> ---
>>>>>>   arch/arm64/include/asm/numa.h       | 8 +++++---
>>>>>>   arch/arm64/kernel/pci.c             | 8 ++++++++
>>>>>>   drivers/pci/host/pci-host-generic.c | 1 +

set_dev_node() in pci-host-generic.c is missing in v8 of your numa patches.
Was this forgotten?

Regards,
Matthias

>>>>>>   3 files changed, 14 insertions(+), 3 deletions(-)
>>>>>>
>>>>>> diff --git a/arch/arm64/include/asm/numa.h b/arch/arm64/include/asm/numa.h
>>>>>> index b8c2a3f..1eca4db 100644
>>>>>> --- a/arch/arm64/include/asm/numa.h
>>>>>> +++ b/arch/arm64/include/asm/numa.h
>>>>>> @@ -15,9 +15,11 @@
>>>>>>   extern int __node_distance(int from, int to);
>>>>>>   #define node_distance(a, b) __node_distance(a, b)
>>>>>>
>>>>>> -/* dummy definitions for pci functions */
>>>>>> -#define pcibus_to_node(node)       0
>>>>>> -#define cpumask_of_pcibus(bus)     0
>>>>>> +struct pci_bus;
>>>>>> +extern int pcibus_to_node(struct pci_bus *bus);
>>>>>> +#define cpumask_of_pcibus(bus)     (pcibus_to_node(bus) == -1 ?            \
>>>>>> +                            cpu_all_mask :                         \
>>>>>> +                            cpumask_of_node(pcibus_to_node(bus)))
>>>>>
>>>>> All the arch definitions of cpumask_of_pcibus() are pretty similar;
>>>>> could they be made more generic?  At the very least, can you drop the
>>>>> definition here and use the one in include/asm-generic/topology.h,
>>>>> which is identical to what you're defining here?
>>> macro cpumask_of_pcibus is defined under #ifndef CONFIG_NUMA in
>>> include/asm-generic/topology.h
>>> and this macro is defined again for NUMA in respective arch header files.
>>> i think moving this macro from ifndef will allow us to use without redefinition.
>>>
>>> --- a/include/asm-generic/topology.h
>>> +++ b/include/asm-generic/topology.h
>>> @@ -54,14 +54,14 @@
>>>   #define pcibus_to_node(bus)    ((void)(bus), -1)
>>>   #endif
>>>
>>> +#endif /* CONFIG_NUMA */
>>> +
>>>   #ifndef cpumask_of_pcibus
>>>   #define cpumask_of_pcibus(bus) (pcibus_to_node(bus) == -1 ?            \
>>>                                   cpu_all_mask :                         \
>>>                                   cpumask_of_node(pcibus_to_node(bus)))
>>>   #endif
>>>
>>> -#endif /* CONFIG_NUMA */
>>> -
>>>   #if !defined(CONFIG_NUMA) || !defined(CONFIG_HAVE_MEMORYLESS_NODES)
>>>
>>>   #ifndef set_numa_mem
>>>
>>> i have got below compilation error withour macro defined in arch code.
>>>
>>> drivers/pci/pci-sysfs.c: In function ‘cpuaffinity_show’:
>>> drivers/pci/pci-sysfs.c:114:15: error: implicit declaration of
>>> function ‘cpumask_of_pcibus’ [-Werror=implicit-function-declaration]
>>> drivers/pci/pci-sysfs.c:114:34: warning: initialization makes pointer
>>> from integer without a cast [enabled by default]
>>> drivers/pci/pci-sysfs.c: In function ‘cpulistaffinity_show’:
>>> drivers/pci/pci-sysfs.c:123:34: warning: initialization makes pointer
>>> from integer without a cast [enabled by default]
>>> cc1: some warnings being treated as errors
>>>
>>>
>>> i can send this as separate patch( as a  fix patch).
>>
>> Unless your series has already been merged, I don't like the idea of a
>> separate fix patch.  The whole point of reviews is to try to fix as
>> many things as we can *before* merging.
> thanks for the review.
> sure, i will add  this as part of my numa patch series.
>>
>> Bjorn
>
> thanks
> Ganapat
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>

[PATCH] arm64, pci, numa: Adding helper functions as required by pci

[Matthias Brugger]

On 09/01/16 16:35, Ganapatrao Kulkarni wrote:
> Hi Bjorn,
>
> On Sat, Jan 9, 2016 at 8:54 PM, Bjorn Helgaas <helgaas@kernel.org> wrote:
>> On Sat, Jan 09, 2016 at 11:35:17AM +0530, Ganapatrao Kulkarni wrote:
>>> On Fri, Jan 8, 2016 at 11:36 PM, Will Deacon <will.deacon@arm.com> wrote:
>>>> On Fri, Jan 08, 2016 at 12:01:31PM -0600, Bjorn Helgaas wrote:
>>>>> On Tue, Dec 22, 2015 at 04:08:50PM +0530, Ganapatrao Kulkarni wrote:
>>>>>> Adding helper functions and necessary code to make
>>>>>> pci driver(pci-host-generic) numa aware.
>>>>>>
>>>>>> This patch is on top of arm64-numa v7.
>>>>>> http://www.spinics.net/lists/arm-kernel/msg460813.html
>>>>>>
>>>>>> Signed-off-by: Ganapatrao Kulkarni <gkulkarni@caviumnetworks.com>
>>>>>> ---
>>>>>>   arch/arm64/include/asm/numa.h       | 8 +++++---
>>>>>>   arch/arm64/kernel/pci.c             | 8 ++++++++
>>>>>>   drivers/pci/host/pci-host-generic.c | 1 +

set_dev_node() in pci-host-generic.c is missing in v8 of your numa patches.
Was this forgotten?

Regards,
Matthias

>>>>>>   3 files changed, 14 insertions(+), 3 deletions(-)
>>>>>>
>>>>>> diff --git a/arch/arm64/include/asm/numa.h b/arch/arm64/include/asm/numa.h
>>>>>> index b8c2a3f..1eca4db 100644
>>>>>> --- a/arch/arm64/include/asm/numa.h
>>>>>> +++ b/arch/arm64/include/asm/numa.h
>>>>>> @@ -15,9 +15,11 @@
>>>>>>   extern int __node_distance(int from, int to);
>>>>>>   #define node_distance(a, b) __node_distance(a, b)
>>>>>>
>>>>>> -/* dummy definitions for pci functions */
>>>>>> -#define pcibus_to_node(node)       0
>>>>>> -#define cpumask_of_pcibus(bus)     0
>>>>>> +struct pci_bus;
>>>>>> +extern int pcibus_to_node(struct pci_bus *bus);
>>>>>> +#define cpumask_of_pcibus(bus)     (pcibus_to_node(bus) == -1 ?            \
>>>>>> +                            cpu_all_mask :                         \
>>>>>> +                            cpumask_of_node(pcibus_to_node(bus)))
>>>>>
>>>>> All the arch definitions of cpumask_of_pcibus() are pretty similar;
>>>>> could they be made more generic?  At the very least, can you drop the
>>>>> definition here and use the one in include/asm-generic/topology.h,
>>>>> which is identical to what you're defining here?
>>> macro cpumask_of_pcibus is defined under #ifndef CONFIG_NUMA in
>>> include/asm-generic/topology.h
>>> and this macro is defined again for NUMA in respective arch header files.
>>> i think moving this macro from ifndef will allow us to use without redefinition.
>>>
>>> --- a/include/asm-generic/topology.h
>>> +++ b/include/asm-generic/topology.h
>>> @@ -54,14 +54,14 @@
>>>   #define pcibus_to_node(bus)    ((void)(bus), -1)
>>>   #endif
>>>
>>> +#endif /* CONFIG_NUMA */
>>> +
>>>   #ifndef cpumask_of_pcibus
>>>   #define cpumask_of_pcibus(bus) (pcibus_to_node(bus) == -1 ?            \
>>>                                   cpu_all_mask :                         \
>>>                                   cpumask_of_node(pcibus_to_node(bus)))
>>>   #endif
>>>
>>> -#endif /* CONFIG_NUMA */
>>> -
>>>   #if !defined(CONFIG_NUMA) || !defined(CONFIG_HAVE_MEMORYLESS_NODES)
>>>
>>>   #ifndef set_numa_mem
>>>
>>> i have got below compilation error withour macro defined in arch code.
>>>
>>> drivers/pci/pci-sysfs.c: In function ?cpuaffinity_show?:
>>> drivers/pci/pci-sysfs.c:114:15: error: implicit declaration of
>>> function ?cpumask_of_pcibus? [-Werror=implicit-function-declaration]
>>> drivers/pci/pci-sysfs.c:114:34: warning: initialization makes pointer
>>> from integer without a cast [enabled by default]
>>> drivers/pci/pci-sysfs.c: In function ?cpulistaffinity_show?:
>>> drivers/pci/pci-sysfs.c:123:34: warning: initialization makes pointer
>>> from integer without a cast [enabled by default]
>>> cc1: some warnings being treated as errors
>>>
>>>
>>> i can send this as separate patch( as a  fix patch).
>>
>> Unless your series has already been merged, I don't like the idea of a
>> separate fix patch.  The whole point of reviews is to try to fix as
>> many things as we can *before* merging.
> thanks for the review.
> sure, i will add  this as part of my numa patch series.
>>
>> Bjorn
>
> thanks
> Ganapat
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>

Re: [PATCH] arm64, pci, numa: Adding helper functions as required by pci

[Ganapatrao Kulkarni]

Hi Bjorn, Will,

On Mon, Jan 11, 2016 at 10:42 PM, Matthias Brugger <mbrugger@suse.com> wrote:
>
>
> On 09/01/16 16:35, Ganapatrao Kulkarni wrote:
>>
>> Hi Bjorn,
>>
>> On Sat, Jan 9, 2016 at 8:54 PM, Bjorn Helgaas <helgaas@kernel.org> wrote:
>>>
>>> On Sat, Jan 09, 2016 at 11:35:17AM +0530, Ganapatrao Kulkarni wrote:
>>>>
>>>> On Fri, Jan 8, 2016 at 11:36 PM, Will Deacon <will.deacon@arm.com>
>>>> wrote:
>>>>>
>>>>> On Fri, Jan 08, 2016 at 12:01:31PM -0600, Bjorn Helgaas wrote:
>>>>>>
>>>>>> On Tue, Dec 22, 2015 at 04:08:50PM +0530, Ganapatrao Kulkarni wrote:
>>>>>>>
>>>>>>> Adding helper functions and necessary code to make
>>>>>>> pci driver(pci-host-generic) numa aware.
>>>>>>>
>>>>>>> This patch is on top of arm64-numa v7.
>>>>>>> http://www.spinics.net/lists/arm-kernel/msg460813.html
>>>>>>>
>>>>>>> Signed-off-by: Ganapatrao Kulkarni <gkulkarni@caviumnetworks.com>
>>>>>>> ---
>>>>>>>   arch/arm64/include/asm/numa.h       | 8 +++++---
>>>>>>>   arch/arm64/kernel/pci.c             | 8 ++++++++
>>>>>>>   drivers/pci/host/pci-host-generic.c | 1 +
>
>
> set_dev_node() in pci-host-generic.c is missing in v8 of your numa patches.
> Was this forgotten?
i am not sure on adding numa required change(it is one line add) to
pci-host-generic.c in numa patchset itself.
Is it more appropriate to send as separate patch?
please suggest.


Thanks Matthias for your comment.
>
> Regards,
> Matthias
>
>>>>>>>   3 files changed, 14 insertions(+), 3 deletions(-)
>>>>>>>
>>>>>>> diff --git a/arch/arm64/include/asm/numa.h
>>>>>>> b/arch/arm64/include/asm/numa.h
>>>>>>> index b8c2a3f..1eca4db 100644
>>>>>>> --- a/arch/arm64/include/asm/numa.h
>>>>>>> +++ b/arch/arm64/include/asm/numa.h
>>>>>>> @@ -15,9 +15,11 @@
>>>>>>>   extern int __node_distance(int from, int to);
>>>>>>>   #define node_distance(a, b) __node_distance(a, b)
>>>>>>>
>>>>>>> -/* dummy definitions for pci functions */
>>>>>>> -#define pcibus_to_node(node)       0
>>>>>>> -#define cpumask_of_pcibus(bus)     0
>>>>>>> +struct pci_bus;
>>>>>>> +extern int pcibus_to_node(struct pci_bus *bus);
>>>>>>> +#define cpumask_of_pcibus(bus)     (pcibus_to_node(bus) == -1 ?
>>>>>>> \
>>>>>>> +                            cpu_all_mask :                         \
>>>>>>> +                            cpumask_of_node(pcibus_to_node(bus)))
>>>>>>
>>>>>>
>>>>>> All the arch definitions of cpumask_of_pcibus() are pretty similar;
>>>>>> could they be made more generic?  At the very least, can you drop the
>>>>>> definition here and use the one in include/asm-generic/topology.h,
>>>>>> which is identical to what you're defining here?
>>>>
>>>> macro cpumask_of_pcibus is defined under #ifndef CONFIG_NUMA in
>>>> include/asm-generic/topology.h
>>>> and this macro is defined again for NUMA in respective arch header
>>>> files.
>>>> i think moving this macro from ifndef will allow us to use without
>>>> redefinition.
>>>>
>>>> --- a/include/asm-generic/topology.h
>>>> +++ b/include/asm-generic/topology.h
>>>> @@ -54,14 +54,14 @@
>>>>   #define pcibus_to_node(bus)    ((void)(bus), -1)
>>>>   #endif
>>>>
>>>> +#endif /* CONFIG_NUMA */
>>>> +
>>>>   #ifndef cpumask_of_pcibus
>>>>   #define cpumask_of_pcibus(bus) (pcibus_to_node(bus) == -1 ?
>>>> \
>>>>                                   cpu_all_mask :
>>>> \
>>>>                                   cpumask_of_node(pcibus_to_node(bus)))
>>>>   #endif
>>>>
>>>> -#endif /* CONFIG_NUMA */
>>>> -
>>>>   #if !defined(CONFIG_NUMA) || !defined(CONFIG_HAVE_MEMORYLESS_NODES)
>>>>
>>>>   #ifndef set_numa_mem
>>>>
>>>> i have got below compilation error withour macro defined in arch code.
>>>>
>>>> drivers/pci/pci-sysfs.c: In function ‘cpuaffinity_show’:
>>>> drivers/pci/pci-sysfs.c:114:15: error: implicit declaration of
>>>> function ‘cpumask_of_pcibus’ [-Werror=implicit-function-declaration]
>>>> drivers/pci/pci-sysfs.c:114:34: warning: initialization makes pointer
>>>> from integer without a cast [enabled by default]
>>>> drivers/pci/pci-sysfs.c: In function ‘cpulistaffinity_show’:
>>>> drivers/pci/pci-sysfs.c:123:34: warning: initialization makes pointer
>>>> from integer without a cast [enabled by default]
>>>> cc1: some warnings being treated as errors
>>>>
>>>>
>>>> i can send this as separate patch( as a  fix patch).
>>>
>>>
>>> Unless your series has already been merged, I don't like the idea of a
>>> separate fix patch.  The whole point of reviews is to try to fix as
>>> many things as we can *before* merging.
>>
>> thanks for the review.
>> sure, i will add  this as part of my numa patch series.
>>>
>>>
>>> Bjorn
>>
>>
>> thanks
>> Ganapat
>>
>> _______________________________________________
>> linux-arm-kernel mailing list
>> linux-arm-kernel@lists.infradead.org
>> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>>
>

Re: [PATCH] arm64, pci, numa: Adding helper functions as required by pci

[Ganapatrao Kulkarni]

Hi Bjorn, Will,

On Mon, Jan 11, 2016 at 10:42 PM, Matthias Brugger <mbrugger@suse.com> wrote:
>
>
> On 09/01/16 16:35, Ganapatrao Kulkarni wrote:
>>
>> Hi Bjorn,
>>
>> On Sat, Jan 9, 2016 at 8:54 PM, Bjorn Helgaas <helgaas@kernel.org> wrote:
>>>
>>> On Sat, Jan 09, 2016 at 11:35:17AM +0530, Ganapatrao Kulkarni wrote:
>>>>
>>>> On Fri, Jan 8, 2016 at 11:36 PM, Will Deacon <will.deacon@arm.com>
>>>> wrote:
>>>>>
>>>>> On Fri, Jan 08, 2016 at 12:01:31PM -0600, Bjorn Helgaas wrote:
>>>>>>
>>>>>> On Tue, Dec 22, 2015 at 04:08:50PM +0530, Ganapatrao Kulkarni wrote:
>>>>>>>
>>>>>>> Adding helper functions and necessary code to make
>>>>>>> pci driver(pci-host-generic) numa aware.
>>>>>>>
>>>>>>> This patch is on top of arm64-numa v7.
>>>>>>> http://www.spinics.net/lists/arm-kernel/msg460813.html
>>>>>>>
>>>>>>> Signed-off-by: Ganapatrao Kulkarni <gkulkarni@caviumnetworks.com>
>>>>>>> ---
>>>>>>>   arch/arm64/include/asm/numa.h       | 8 +++++---
>>>>>>>   arch/arm64/kernel/pci.c             | 8 ++++++++
>>>>>>>   drivers/pci/host/pci-host-generic.c | 1 +
>
>
> set_dev_node() in pci-host-generic.c is missing in v8 of your numa patches.
> Was this forgotten?
i am not sure on adding numa required change(it is one line add) to
pci-host-generic.c in numa patchset itself.
Is it more appropriate to send as separate patch?
please suggest.


Thanks Matthias for your comment.
>
> Regards,
> Matthias
>
>>>>>>>   3 files changed, 14 insertions(+), 3 deletions(-)
>>>>>>>
>>>>>>> diff --git a/arch/arm64/include/asm/numa.h
>>>>>>> b/arch/arm64/include/asm/numa.h
>>>>>>> index b8c2a3f..1eca4db 100644
>>>>>>> --- a/arch/arm64/include/asm/numa.h
>>>>>>> +++ b/arch/arm64/include/asm/numa.h
>>>>>>> @@ -15,9 +15,11 @@
>>>>>>>   extern int __node_distance(int from, int to);
>>>>>>>   #define node_distance(a, b) __node_distance(a, b)
>>>>>>>
>>>>>>> -/* dummy definitions for pci functions */
>>>>>>> -#define pcibus_to_node(node)       0
>>>>>>> -#define cpumask_of_pcibus(bus)     0
>>>>>>> +struct pci_bus;
>>>>>>> +extern int pcibus_to_node(struct pci_bus *bus);
>>>>>>> +#define cpumask_of_pcibus(bus)     (pcibus_to_node(bus) == -1 ?
>>>>>>> \
>>>>>>> +                            cpu_all_mask :                         \
>>>>>>> +                            cpumask_of_node(pcibus_to_node(bus)))
>>>>>>
>>>>>>
>>>>>> All the arch definitions of cpumask_of_pcibus() are pretty similar;
>>>>>> could they be made more generic?  At the very least, can you drop the
>>>>>> definition here and use the one in include/asm-generic/topology.h,
>>>>>> which is identical to what you're defining here?
>>>>
>>>> macro cpumask_of_pcibus is defined under #ifndef CONFIG_NUMA in
>>>> include/asm-generic/topology.h
>>>> and this macro is defined again for NUMA in respective arch header
>>>> files.
>>>> i think moving this macro from ifndef will allow us to use without
>>>> redefinition.
>>>>
>>>> --- a/include/asm-generic/topology.h
>>>> +++ b/include/asm-generic/topology.h
>>>> @@ -54,14 +54,14 @@
>>>>   #define pcibus_to_node(bus)    ((void)(bus), -1)
>>>>   #endif
>>>>
>>>> +#endif /* CONFIG_NUMA */
>>>> +
>>>>   #ifndef cpumask_of_pcibus
>>>>   #define cpumask_of_pcibus(bus) (pcibus_to_node(bus) == -1 ?
>>>> \
>>>>                                   cpu_all_mask :
>>>> \
>>>>                                   cpumask_of_node(pcibus_to_node(bus)))
>>>>   #endif
>>>>
>>>> -#endif /* CONFIG_NUMA */
>>>> -
>>>>   #if !defined(CONFIG_NUMA) || !defined(CONFIG_HAVE_MEMORYLESS_NODES)
>>>>
>>>>   #ifndef set_numa_mem
>>>>
>>>> i have got below compilation error withour macro defined in arch code.
>>>>
>>>> drivers/pci/pci-sysfs.c: In function ‘cpuaffinity_show’:
>>>> drivers/pci/pci-sysfs.c:114:15: error: implicit declaration of
>>>> function ‘cpumask_of_pcibus’ [-Werror=implicit-function-declaration]
>>>> drivers/pci/pci-sysfs.c:114:34: warning: initialization makes pointer
>>>> from integer without a cast [enabled by default]
>>>> drivers/pci/pci-sysfs.c: In function ‘cpulistaffinity_show’:
>>>> drivers/pci/pci-sysfs.c:123:34: warning: initialization makes pointer
>>>> from integer without a cast [enabled by default]
>>>> cc1: some warnings being treated as errors
>>>>
>>>>
>>>> i can send this as separate patch( as a  fix patch).
>>>
>>>
>>> Unless your series has already been merged, I don't like the idea of a
>>> separate fix patch.  The whole point of reviews is to try to fix as
>>> many things as we can *before* merging.
>>
>> thanks for the review.
>> sure, i will add  this as part of my numa patch series.
>>>
>>>
>>> Bjorn
>>
>>
>> thanks
>> Ganapat
>>
>> _______________________________________________
>> linux-arm-kernel mailing list
>> linux-arm-kernel@lists.infradead.org
>> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>>
>

[PATCH] arm64, pci, numa: Adding helper functions as required by pci

[Ganapatrao Kulkarni]

Hi Bjorn, Will,

On Mon, Jan 11, 2016 at 10:42 PM, Matthias Brugger <mbrugger@suse.com> wrote:
>
>
> On 09/01/16 16:35, Ganapatrao Kulkarni wrote:
>>
>> Hi Bjorn,
>>
>> On Sat, Jan 9, 2016 at 8:54 PM, Bjorn Helgaas <helgaas@kernel.org> wrote:
>>>
>>> On Sat, Jan 09, 2016 at 11:35:17AM +0530, Ganapatrao Kulkarni wrote:
>>>>
>>>> On Fri, Jan 8, 2016 at 11:36 PM, Will Deacon <will.deacon@arm.com>
>>>> wrote:
>>>>>
>>>>> On Fri, Jan 08, 2016 at 12:01:31PM -0600, Bjorn Helgaas wrote:
>>>>>>
>>>>>> On Tue, Dec 22, 2015 at 04:08:50PM +0530, Ganapatrao Kulkarni wrote:
>>>>>>>
>>>>>>> Adding helper functions and necessary code to make
>>>>>>> pci driver(pci-host-generic) numa aware.
>>>>>>>
>>>>>>> This patch is on top of arm64-numa v7.
>>>>>>> http://www.spinics.net/lists/arm-kernel/msg460813.html
>>>>>>>
>>>>>>> Signed-off-by: Ganapatrao Kulkarni <gkulkarni@caviumnetworks.com>
>>>>>>> ---
>>>>>>>   arch/arm64/include/asm/numa.h       | 8 +++++---
>>>>>>>   arch/arm64/kernel/pci.c             | 8 ++++++++
>>>>>>>   drivers/pci/host/pci-host-generic.c | 1 +
>
>
> set_dev_node() in pci-host-generic.c is missing in v8 of your numa patches.
> Was this forgotten?
i am not sure on adding numa required change(it is one line add) to
pci-host-generic.c in numa patchset itself.
Is it more appropriate to send as separate patch?
please suggest.


Thanks Matthias for your comment.
>
> Regards,
> Matthias
>
>>>>>>>   3 files changed, 14 insertions(+), 3 deletions(-)
>>>>>>>
>>>>>>> diff --git a/arch/arm64/include/asm/numa.h
>>>>>>> b/arch/arm64/include/asm/numa.h
>>>>>>> index b8c2a3f..1eca4db 100644
>>>>>>> --- a/arch/arm64/include/asm/numa.h
>>>>>>> +++ b/arch/arm64/include/asm/numa.h
>>>>>>> @@ -15,9 +15,11 @@
>>>>>>>   extern int __node_distance(int from, int to);
>>>>>>>   #define node_distance(a, b) __node_distance(a, b)
>>>>>>>
>>>>>>> -/* dummy definitions for pci functions */
>>>>>>> -#define pcibus_to_node(node)       0
>>>>>>> -#define cpumask_of_pcibus(bus)     0
>>>>>>> +struct pci_bus;
>>>>>>> +extern int pcibus_to_node(struct pci_bus *bus);
>>>>>>> +#define cpumask_of_pcibus(bus)     (pcibus_to_node(bus) == -1 ?
>>>>>>> \
>>>>>>> +                            cpu_all_mask :                         \
>>>>>>> +                            cpumask_of_node(pcibus_to_node(bus)))
>>>>>>
>>>>>>
>>>>>> All the arch definitions of cpumask_of_pcibus() are pretty similar;
>>>>>> could they be made more generic?  At the very least, can you drop the
>>>>>> definition here and use the one in include/asm-generic/topology.h,
>>>>>> which is identical to what you're defining here?
>>>>
>>>> macro cpumask_of_pcibus is defined under #ifndef CONFIG_NUMA in
>>>> include/asm-generic/topology.h
>>>> and this macro is defined again for NUMA in respective arch header
>>>> files.
>>>> i think moving this macro from ifndef will allow us to use without
>>>> redefinition.
>>>>
>>>> --- a/include/asm-generic/topology.h
>>>> +++ b/include/asm-generic/topology.h
>>>> @@ -54,14 +54,14 @@
>>>>   #define pcibus_to_node(bus)    ((void)(bus), -1)
>>>>   #endif
>>>>
>>>> +#endif /* CONFIG_NUMA */
>>>> +
>>>>   #ifndef cpumask_of_pcibus
>>>>   #define cpumask_of_pcibus(bus) (pcibus_to_node(bus) == -1 ?
>>>> \
>>>>                                   cpu_all_mask :
>>>> \
>>>>                                   cpumask_of_node(pcibus_to_node(bus)))
>>>>   #endif
>>>>
>>>> -#endif /* CONFIG_NUMA */
>>>> -
>>>>   #if !defined(CONFIG_NUMA) || !defined(CONFIG_HAVE_MEMORYLESS_NODES)
>>>>
>>>>   #ifndef set_numa_mem
>>>>
>>>> i have got below compilation error withour macro defined in arch code.
>>>>
>>>> drivers/pci/pci-sysfs.c: In function ?cpuaffinity_show?:
>>>> drivers/pci/pci-sysfs.c:114:15: error: implicit declaration of
>>>> function ?cpumask_of_pcibus? [-Werror=implicit-function-declaration]
>>>> drivers/pci/pci-sysfs.c:114:34: warning: initialization makes pointer
>>>> from integer without a cast [enabled by default]
>>>> drivers/pci/pci-sysfs.c: In function ?cpulistaffinity_show?:
>>>> drivers/pci/pci-sysfs.c:123:34: warning: initialization makes pointer
>>>> from integer without a cast [enabled by default]
>>>> cc1: some warnings being treated as errors
>>>>
>>>>
>>>> i can send this as separate patch( as a  fix patch).
>>>
>>>
>>> Unless your series has already been merged, I don't like the idea of a
>>> separate fix patch.  The whole point of reviews is to try to fix as
>>> many things as we can *before* merging.
>>
>> thanks for the review.
>> sure, i will add  this as part of my numa patch series.
>>>
>>>
>>> Bjorn
>>
>>
>> thanks
>> Ganapat
>>
>> _______________________________________________
>> linux-arm-kernel mailing list
>> linux-arm-kernel at lists.infradead.org
>> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>>
>

Re: [PATCH] arm64, pci, numa: Adding helper functions as required by pci

[Bjorn Helgaas]

On Mon, Jan 11, 2016 at 10:56:59PM +0530, Ganapatrao Kulkarni wrote:
> Hi Bjorn, Will,
> 
> On Mon, Jan 11, 2016 at 10:42 PM, Matthias Brugger <mbrugger@suse.com> wrote:
> >
> >
> > On 09/01/16 16:35, Ganapatrao Kulkarni wrote:
> >>
> >> Hi Bjorn,
> >>
> >> On Sat, Jan 9, 2016 at 8:54 PM, Bjorn Helgaas <helgaas@kernel.org> wrote:
> >>>
> >>> On Sat, Jan 09, 2016 at 11:35:17AM +0530, Ganapatrao Kulkarni wrote:
> >>>>
> >>>> On Fri, Jan 8, 2016 at 11:36 PM, Will Deacon <will.deacon@arm.com>
> >>>> wrote:
> >>>>>
> >>>>> On Fri, Jan 08, 2016 at 12:01:31PM -0600, Bjorn Helgaas wrote:
> >>>>>>
> >>>>>> On Tue, Dec 22, 2015 at 04:08:50PM +0530, Ganapatrao Kulkarni wrote:
> >>>>>>>
> >>>>>>> Adding helper functions and necessary code to make
> >>>>>>> pci driver(pci-host-generic) numa aware.
> >>>>>>>
> >>>>>>> This patch is on top of arm64-numa v7.
> >>>>>>> http://www.spinics.net/lists/arm-kernel/msg460813.html
> >>>>>>>
> >>>>>>> Signed-off-by: Ganapatrao Kulkarni <gkulkarni@caviumnetworks.com>
> >>>>>>> ---
> >>>>>>>   arch/arm64/include/asm/numa.h       | 8 +++++---
> >>>>>>>   arch/arm64/kernel/pci.c             | 8 ++++++++
> >>>>>>>   drivers/pci/host/pci-host-generic.c | 1 +
> >
> >
> > set_dev_node() in pci-host-generic.c is missing in v8 of your numa patches.
> > Was this forgotten?
> i am not sure on adding numa required change(it is one line add) to
> pci-host-generic.c in numa patchset itself.
> Is it more appropriate to send as separate patch?
> please suggest.

I haven't seen the whole series, so I can't really give a suggestion.
If you want me to see it, please sent to linux-pci@vger.kernel.org or
helgaas@kernel.org.

Bjorn

Re: [PATCH] arm64, pci, numa: Adding helper functions as required by pci

[Bjorn Helgaas]

On Mon, Jan 11, 2016 at 10:56:59PM +0530, Ganapatrao Kulkarni wrote:
> Hi Bjorn, Will,
> 
> On Mon, Jan 11, 2016 at 10:42 PM, Matthias Brugger <mbrugger@suse.com> wrote:
> >
> >
> > On 09/01/16 16:35, Ganapatrao Kulkarni wrote:
> >>
> >> Hi Bjorn,
> >>
> >> On Sat, Jan 9, 2016 at 8:54 PM, Bjorn Helgaas <helgaas@kernel.org> wrote:
> >>>
> >>> On Sat, Jan 09, 2016 at 11:35:17AM +0530, Ganapatrao Kulkarni wrote:
> >>>>
> >>>> On Fri, Jan 8, 2016 at 11:36 PM, Will Deacon <will.deacon@arm.com>
> >>>> wrote:
> >>>>>
> >>>>> On Fri, Jan 08, 2016 at 12:01:31PM -0600, Bjorn Helgaas wrote:
> >>>>>>
> >>>>>> On Tue, Dec 22, 2015 at 04:08:50PM +0530, Ganapatrao Kulkarni wrote:
> >>>>>>>
> >>>>>>> Adding helper functions and necessary code to make
> >>>>>>> pci driver(pci-host-generic) numa aware.
> >>>>>>>
> >>>>>>> This patch is on top of arm64-numa v7.
> >>>>>>> http://www.spinics.net/lists/arm-kernel/msg460813.html
> >>>>>>>
> >>>>>>> Signed-off-by: Ganapatrao Kulkarni <gkulkarni@caviumnetworks.com>
> >>>>>>> ---
> >>>>>>>   arch/arm64/include/asm/numa.h       | 8 +++++---
> >>>>>>>   arch/arm64/kernel/pci.c             | 8 ++++++++
> >>>>>>>   drivers/pci/host/pci-host-generic.c | 1 +
> >
> >
> > set_dev_node() in pci-host-generic.c is missing in v8 of your numa patches.
> > Was this forgotten?
> i am not sure on adding numa required change(it is one line add) to
> pci-host-generic.c in numa patchset itself.
> Is it more appropriate to send as separate patch?
> please suggest.

I haven't seen the whole series, so I can't really give a suggestion.
If you want me to see it, please sent to linux-pci@vger.kernel.org or
helgaas@kernel.org.

Bjorn

[PATCH] arm64, pci, numa: Adding helper functions as required by pci

[Bjorn Helgaas]

On Mon, Jan 11, 2016 at 10:56:59PM +0530, Ganapatrao Kulkarni wrote:
> Hi Bjorn, Will,
> 
> On Mon, Jan 11, 2016 at 10:42 PM, Matthias Brugger <mbrugger@suse.com> wrote:
> >
> >
> > On 09/01/16 16:35, Ganapatrao Kulkarni wrote:
> >>
> >> Hi Bjorn,
> >>
> >> On Sat, Jan 9, 2016 at 8:54 PM, Bjorn Helgaas <helgaas@kernel.org> wrote:
> >>>
> >>> On Sat, Jan 09, 2016 at 11:35:17AM +0530, Ganapatrao Kulkarni wrote:
> >>>>
> >>>> On Fri, Jan 8, 2016 at 11:36 PM, Will Deacon <will.deacon@arm.com>
> >>>> wrote:
> >>>>>
> >>>>> On Fri, Jan 08, 2016 at 12:01:31PM -0600, Bjorn Helgaas wrote:
> >>>>>>
> >>>>>> On Tue, Dec 22, 2015 at 04:08:50PM +0530, Ganapatrao Kulkarni wrote:
> >>>>>>>
> >>>>>>> Adding helper functions and necessary code to make
> >>>>>>> pci driver(pci-host-generic) numa aware.
> >>>>>>>
> >>>>>>> This patch is on top of arm64-numa v7.
> >>>>>>> http://www.spinics.net/lists/arm-kernel/msg460813.html
> >>>>>>>
> >>>>>>> Signed-off-by: Ganapatrao Kulkarni <gkulkarni@caviumnetworks.com>
> >>>>>>> ---
> >>>>>>>   arch/arm64/include/asm/numa.h       | 8 +++++---
> >>>>>>>   arch/arm64/kernel/pci.c             | 8 ++++++++
> >>>>>>>   drivers/pci/host/pci-host-generic.c | 1 +
> >
> >
> > set_dev_node() in pci-host-generic.c is missing in v8 of your numa patches.
> > Was this forgotten?
> i am not sure on adding numa required change(it is one line add) to
> pci-host-generic.c in numa patchset itself.
> Is it more appropriate to send as separate patch?
> please suggest.

I haven't seen the whole series, so I can't really give a suggestion.
If you want me to see it, please sent to linux-pci at vger.kernel.org or
helgaas at kernel.org.

Bjorn