| Message ID | 20211004133453.18881-2-mgurtovoy@nvidia.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
| Series | [v3,1/2] driver core: use NUMA_NO_NODE during device_initialize | expand |
Hi Max! > Use the proper macro instead of hard-coded (-1) value. > > Suggested-by: Krzysztof Wilczyński <kw@linux.com> > Reviewed-by: Krzysztof Wilczyński <kw@linux.com> > Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> > Signed-off-by: Max Gurtovoy <mgurtovoy@nvidia.com> > --- > drivers/pci/pci-sysfs.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c > index 7fb5cd17cc98..f807b92afa6c 100644 > --- a/drivers/pci/pci-sysfs.c > +++ b/drivers/pci/pci-sysfs.c > @@ -81,8 +81,10 @@ static ssize_t pci_dev_show_local_cpu(struct device *dev, bool list, > const struct cpumask *mask; > > #ifdef CONFIG_NUMA > - mask = (dev_to_node(dev) == -1) ? cpu_online_mask : > - cpumask_of_node(dev_to_node(dev)); > + if (dev_to_node(dev) == NUMA_NO_NODE) > + mask = cpu_online_mask; > + else > + mask = cpumask_of_node(dev_to_node(dev)); > #else > mask = cpumask_of_pcibus(to_pci_dev(dev)->bus); > #endif > -- > 2.18.1 Thank you! Krzysztof
On Mon, Oct 04, 2021 at 04:34:53PM +0300, Max Gurtovoy wrote: > Use the proper macro instead of hard-coded (-1) value. > > Suggested-by: Krzysztof Wilczyński <kw@linux.com> > Reviewed-by: Krzysztof Wilczyński <kw@linux.com> > Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> > Signed-off-by: Max Gurtovoy <mgurtovoy@nvidia.com> These two patches are independent, so I applied this patch only to pci/sysfs for v5.16, thanks! I assume Greg will take the drivers/base patch. > --- > drivers/pci/pci-sysfs.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c > index 7fb5cd17cc98..f807b92afa6c 100644 > --- a/drivers/pci/pci-sysfs.c > +++ b/drivers/pci/pci-sysfs.c > @@ -81,8 +81,10 @@ static ssize_t pci_dev_show_local_cpu(struct device *dev, bool list, > const struct cpumask *mask; > > #ifdef CONFIG_NUMA > - mask = (dev_to_node(dev) == -1) ? cpu_online_mask : > - cpumask_of_node(dev_to_node(dev)); > + if (dev_to_node(dev) == NUMA_NO_NODE) > + mask = cpu_online_mask; > + else > + mask = cpumask_of_node(dev_to_node(dev)); > #else > mask = cpumask_of_pcibus(to_pci_dev(dev)->bus); > #endif > -- > 2.18.1 >
On 10/9/2021 1:25 AM, Bjorn Helgaas wrote: > On Mon, Oct 04, 2021 at 04:34:53PM +0300, Max Gurtovoy wrote: >> Use the proper macro instead of hard-coded (-1) value. >> >> Suggested-by: Krzysztof Wilczyński <kw@linux.com> >> Reviewed-by: Krzysztof Wilczyński <kw@linux.com> >> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> >> Signed-off-by: Max Gurtovoy <mgurtovoy@nvidia.com> > These two patches are independent, so I applied this patch only to > pci/sysfs for v5.16, thanks! > > I assume Greg will take the drivers/base patch. I saw both patches in his git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core-next So I guess there is no need for taking it separately, right Greg ? >> --- >> drivers/pci/pci-sysfs.c | 6 ++++-- >> 1 file changed, 4 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c >> index 7fb5cd17cc98..f807b92afa6c 100644 >> --- a/drivers/pci/pci-sysfs.c >> +++ b/drivers/pci/pci-sysfs.c >> @@ -81,8 +81,10 @@ static ssize_t pci_dev_show_local_cpu(struct device *dev, bool list, >> const struct cpumask *mask; >> >> #ifdef CONFIG_NUMA >> - mask = (dev_to_node(dev) == -1) ? cpu_online_mask : >> - cpumask_of_node(dev_to_node(dev)); >> + if (dev_to_node(dev) == NUMA_NO_NODE) >> + mask = cpu_online_mask; >> + else >> + mask = cpumask_of_node(dev_to_node(dev)); >> #else >> mask = cpumask_of_pcibus(to_pci_dev(dev)->bus); >> #endif >> -- >> 2.18.1 >>
On Sun, Oct 10, 2021 at 11:36:49AM +0300, Max Gurtovoy wrote: > > On 10/9/2021 1:25 AM, Bjorn Helgaas wrote: > > On Mon, Oct 04, 2021 at 04:34:53PM +0300, Max Gurtovoy wrote: > > > Use the proper macro instead of hard-coded (-1) value. > > > > > > Suggested-by: Krzysztof Wilczyński <kw@linux.com> > > > Reviewed-by: Krzysztof Wilczyński <kw@linux.com> > > > Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> > > > Signed-off-by: Max Gurtovoy <mgurtovoy@nvidia.com> > > These two patches are independent, so I applied this patch only to > > pci/sysfs for v5.16, thanks! > > > > I assume Greg will take the drivers/base patch. > > I saw both patches in his > git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git > driver-core-next > > So I guess there is no need for taking it separately, right Greg ? No problem, I dropped the pci-sysfs.c patch. Thanks for letting me know! > > > --- > > > drivers/pci/pci-sysfs.c | 6 ++++-- > > > 1 file changed, 4 insertions(+), 2 deletions(-) > > > > > > diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c > > > index 7fb5cd17cc98..f807b92afa6c 100644 > > > --- a/drivers/pci/pci-sysfs.c > > > +++ b/drivers/pci/pci-sysfs.c > > > @@ -81,8 +81,10 @@ static ssize_t pci_dev_show_local_cpu(struct device *dev, bool list, > > > const struct cpumask *mask; > > > #ifdef CONFIG_NUMA > > > - mask = (dev_to_node(dev) == -1) ? cpu_online_mask : > > > - cpumask_of_node(dev_to_node(dev)); > > > + if (dev_to_node(dev) == NUMA_NO_NODE) > > > + mask = cpu_online_mask; > > > + else > > > + mask = cpumask_of_node(dev_to_node(dev)); > > > #else > > > mask = cpumask_of_pcibus(to_pci_dev(dev)->bus); > > > #endif > > > -- > > > 2.18.1 > > >
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c index 7fb5cd17cc98..f807b92afa6c 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c @@ -81,8 +81,10 @@ static ssize_t pci_dev_show_local_cpu(struct device *dev, bool list, const struct cpumask *mask; #ifdef CONFIG_NUMA - mask = (dev_to_node(dev) == -1) ? cpu_online_mask : - cpumask_of_node(dev_to_node(dev)); + if (dev_to_node(dev) == NUMA_NO_NODE) + mask = cpu_online_mask; + else + mask = cpumask_of_node(dev_to_node(dev)); #else mask = cpumask_of_pcibus(to_pci_dev(dev)->bus); #endif