1. Patchew
  2. Xen
  3. View series

[PATCH v2] xen/arm: mark handle_linux_pci_domain() __init

Stewart Hildebrand posted 1 patch 3 years, 3 months ago
Failed in applying to current master (apply log)
xen/arch/arm/domain_build.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
[PATCH v2] xen/arm: mark handle_linux_pci_domain() __init
Posted by Stewart Hildebrand 3 years, 3 months ago 
All functions in domain_build.c should be marked __init. This was
spotted when building the hypervisor with -Og.

Fixes: 1050a7b91c xen/arm: add pci-domain for disabled devices
Signed-off-by: Stewart Hildebrand <stewart.hildebrand@amd.com>

---
v1 -> v2:
  Add Fixes: tag
  Add patch description
---
 xen/arch/arm/domain_build.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
index 61cda8e843..fc2961895b 100644
--- a/xen/arch/arm/domain_build.c
+++ b/xen/arch/arm/domain_build.c
@@ -1051,8 +1051,8 @@ static void __init assign_static_memory_11(struct domain *d,
  * The current heuristic assumes that a device is a host bridge
  * if the type is "pci" and then parent type is not "pci".
  */
-static int handle_linux_pci_domain(struct kernel_info *kinfo,
-                                   const struct dt_device_node *node)
+static int __init handle_linux_pci_domain(struct kernel_info *kinfo,
+                                          const struct dt_device_node *node)
 {
     uint16_t segment;
     int res;
-- 
2.38.0
Re: [PATCH v2] xen/arm: mark handle_linux_pci_domain() __init
Posted by Julien Grall 3 years, 3 months ago 
Hi Stewart,

I nearly missed this one because it was threaded under v1. In the 
future, would you be able to send new version in a separate thread? This 
makes easier to track it.

On 14/10/2022 21:09, Stewart Hildebrand wrote:
> All functions in domain_build.c should be marked __init. This was
> spotted when building the hypervisor with -Og.
> 
> Fixes: 1050a7b91c xen/arm: add pci-domain for disabled devices
> Signed-off-by: Stewart Hildebrand <stewart.hildebrand@amd.com>

Acked-by: Julien Grall <jgrall@amazon.com>

Henry, this patch is fixing a potential build failure on some compiler 
(at the moment we are relying on the compiler to inline 
handle_linux_pci_domain). AFAIU, the problem was introduced in Xen 4.17. 
Would you be happy if we include it in the release?

Cheers,

> 
> ---
> v1 -> v2:
>    Add Fixes: tag
>    Add patch description
> ---
>   xen/arch/arm/domain_build.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
> index 61cda8e843..fc2961895b 100644
> --- a/xen/arch/arm/domain_build.c
> +++ b/xen/arch/arm/domain_build.c
> @@ -1051,8 +1051,8 @@ static void __init assign_static_memory_11(struct domain *d,
>    * The current heuristic assumes that a device is a host bridge
>    * if the type is "pci" and then parent type is not "pci".
>    */
> -static int handle_linux_pci_domain(struct kernel_info *kinfo,
> -                                   const struct dt_device_node *node)
> +static int __init handle_linux_pci_domain(struct kernel_info *kinfo,
> +                                          const struct dt_device_node *node)
>   {
>       uint16_t segment;
>       int res;

-- 
Julien Grall
RE: [PATCH v2] xen/arm: mark handle_linux_pci_domain() __init
Posted by Henry Wang 3 years, 3 months ago 
Hi Julien,

> -----Original Message-----
> From: Julien Grall <julien@xen.org>
> Subject: Re: [PATCH v2] xen/arm: mark handle_linux_pci_domain() __init
> 
> Hi Stewart,
> 
> I nearly missed this one because it was threaded under v1. In the
> future, would you be able to send new version in a separate thread? This
> makes easier to track it.
> 
> On 14/10/2022 21:09, Stewart Hildebrand wrote:
> > All functions in domain_build.c should be marked __init. This was
> > spotted when building the hypervisor with -Og.
> >
> > Fixes: 1050a7b91c xen/arm: add pci-domain for disabled devices
> > Signed-off-by: Stewart Hildebrand <stewart.hildebrand@amd.com>
> 
> Acked-by: Julien Grall <jgrall@amazon.com>
> 
> Henry, this patch is fixing a potential build failure on some compiler
> (at the moment we are relying on the compiler to inline
> handle_linux_pci_domain). AFAIU, the problem was introduced in Xen 4.17.
> Would you be happy if we include it in the release?

Of course. Thanks for the ping :)

Release-acked-by: Henry Wang <Henry.Wang@arm.com>

Kind regards,
Henry

> 
> Cheers,
> 
> >
> > ---
> > v1 -> v2:
> >    Add Fixes: tag
> >    Add patch description
> > ---
> >   xen/arch/arm/domain_build.c | 4 ++--
> >   1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
> > index 61cda8e843..fc2961895b 100644
> > --- a/xen/arch/arm/domain_build.c
> > +++ b/xen/arch/arm/domain_build.c
> > @@ -1051,8 +1051,8 @@ static void __init assign_static_memory_11(struct
> domain *d,
> >    * The current heuristic assumes that a device is a host bridge
> >    * if the type is "pci" and then parent type is not "pci".
> >    */
> > -static int handle_linux_pci_domain(struct kernel_info *kinfo,
> > -                                   const struct dt_device_node *node)
> > +static int __init handle_linux_pci_domain(struct kernel_info *kinfo,
> > +                                          const struct dt_device_node *node)
> >   {
> >       uint16_t segment;
> >       int res;
> 
> --
> Julien Grall
Re: [PATCH v2] xen/arm: mark handle_linux_pci_domain() __init
Posted by Stewart Hildebrand 3 years, 3 months ago 
On 10/20/22 14:19, Julien Grall wrote:
> Hi Stewart,

Hi Julien,

> I nearly missed this one because it was threaded under v1. In the
> future, would you be able to send new version in a separate thread? This
> makes easier to track it.

I will keep this in mind for next time.

> On 14/10/2022 21:09, Stewart Hildebrand wrote:
>> All functions in domain_build.c should be marked __init. This was
>> spotted when building the hypervisor with -Og.
>>
>> Fixes: 1050a7b91c xen/arm: add pci-domain for disabled devices

I missed parenthesis and quotes around the referenced commit. To keep it in the same format as other Fixes: tags, can you please add during commit (pending release ack)?

>> Signed-off-by: Stewart Hildebrand <stewart.hildebrand@amd.com>
> 
> Acked-by: Julien Grall <jgrall@amazon.com>
> 
> Henry, this patch is fixing a potential build failure on some compiler
> (at the moment we are relying on the compiler to inline
> handle_linux_pci_domain). AFAIU, the problem was introduced in Xen 4.17.
> Would you be happy if we include it in the release?
> 
> Cheers,
> 
>>
>> ---
>> v1 -> v2:
>>    Add Fixes: tag
>>    Add patch description
>> ---
>>   xen/arch/arm/domain_build.c | 4 ++--
>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
>> index 61cda8e843..fc2961895b 100644
>> --- a/xen/arch/arm/domain_build.c
>> +++ b/xen/arch/arm/domain_build.c
>> @@ -1051,8 +1051,8 @@ static void __init assign_static_memory_11(struct domain *d,
>>    * The current heuristic assumes that a device is a host bridge
>>    * if the type is "pci" and then parent type is not "pci".
>>    */
>> -static int handle_linux_pci_domain(struct kernel_info *kinfo,
>> -                                   const struct dt_device_node *node)
>> +static int __init handle_linux_pci_domain(struct kernel_info *kinfo,
>> +                                          const struct dt_device_node *node)
>>   {
>>       uint16_t segment;
>>       int res;
> 
> -- 
> Julien Grall
Re: [PATCH v2] xen/arm: mark handle_linux_pci_domain() __init
Posted by Julien Grall 3 years, 3 months ago 

On 20/10/2022 19:53, Stewart Hildebrand wrote:
> On 10/20/22 14:19, Julien Grall wrote:
>> Hi Stewart,
> 
> Hi Julien,
> 
>> I nearly missed this one because it was threaded under v1. In the
>> future, would you be able to send new version in a separate thread? This
>> makes easier to track it.
> 
> I will keep this in mind for next time.
> 
>> On 14/10/2022 21:09, Stewart Hildebrand wrote:
>>> All functions in domain_build.c should be marked __init. This was
>>> spotted when building the hypervisor with -Og.
>>>
>>> Fixes: 1050a7b91c xen/arm: add pci-domain for disabled devices
> 
> I missed parenthesis and quotes around the referenced commit. To keep it in the same format as other Fixes: tags, can you please add during commit (pending release ack)?

Will do.

Cheers,

-- 
Julien Grall
Re: [PATCH v2] xen/arm: mark handle_linux_pci_domain() __init
Posted by Julien Grall 3 years, 3 months ago 

On 20/10/2022 19:56, Julien Grall wrote:
> On 20/10/2022 19:53, Stewart Hildebrand wrote:
>> On 10/20/22 14:19, Julien Grall wrote:
>>> Hi Stewart,
>>
>> Hi Julien,
>>
>>> I nearly missed this one because it was threaded under v1. In the
>>> future, would you be able to send new version in a separate thread? This
>>> makes easier to track it.
>>
>> I will keep this in mind for next time.
>>
>>> On 14/10/2022 21:09, Stewart Hildebrand wrote:
>>>> All functions in domain_build.c should be marked __init. This was
>>>> spotted when building the hypervisor with -Og.
>>>>
>>>> Fixes: 1050a7b91c xen/arm: add pci-domain for disabled devices
>>
>> I missed parenthesis and quotes around the referenced commit. To keep 
>> it in the same format as other Fixes: tags, can you please add during 
>> commit (pending release ack)?
> 
> Will do.

The commit ID was also too short. Xen (and Linux) moved to 12 characters 
because 10 is not enough anymore to uniquely distinguish a commit.

You can ask git to change its default value by adding the following 
lines in either the global config or per-repo one:

[core]
         abbrev = 12

It is now committed.

Cheers,

-- 
Julien Grall

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.