[PATCH] drivers/char: Fix build when CET-IBT is enabled

[PATCH] drivers/char: Fix build when CET-IBT is enabled

[Andrew Cooper]

https://gitlab.com/xen-project/xen/-/jobs/3083068950#L1763

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Fixes: 022e40edd4dc ("drivers/char: allow using both dbgp=xhci and dbgp=ehci")
---
CC: Jan Beulich <JBeulich@suse.com>
CC: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
CC: Henry Wang <Henry.Wang@arm.com>
---
 xen/drivers/char/ehci-dbgp.c | 2 +-
 xen/drivers/char/xhci-dbc.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/xen/drivers/char/ehci-dbgp.c b/xen/drivers/char/ehci-dbgp.c
index 8a0b95850609..bb9d3198d9f2 100644
--- a/xen/drivers/char/ehci-dbgp.c
+++ b/xen/drivers/char/ehci-dbgp.c
@@ -1465,7 +1465,7 @@ static struct ehci_dbgp ehci_dbgp = { .state = dbgp_unsafe, .phys_port = 1 };
 
 static char __initdata opt_dbgp[30];
 
-static int __init parse_ehci_dbgp(const char *opt)
+static int __init cf_check parse_ehci_dbgp(const char *opt)
 {
     if ( strncmp(opt, "ehci", 4) )
         return 0;
diff --git a/xen/drivers/char/xhci-dbc.c b/xen/drivers/char/xhci-dbc.c
index 5f92234a9594..43ed64a004e2 100644
--- a/xen/drivers/char/xhci-dbc.c
+++ b/xen/drivers/char/xhci-dbc.c
@@ -1282,7 +1282,7 @@ struct dbc_dma_bufs {
 static struct dbc_dma_bufs __section(".bss.page_aligned") __aligned(PAGE_SIZE)
     dbc_dma_bufs;
 
-static int __init xhci_parse_dbgp(const char *opt_dbgp)
+static int __init cf_check xhci_parse_dbgp(const char *opt_dbgp)
 {
     struct dbc_uart *uart = &dbc_uart;
     struct dbc *dbc = &uart->dbc;
-- 
2.11.0

[For 4.17] Re: [PATCH] drivers/char: Fix build when CET-IBT is enabled

[Andrew Cooper]

On 26/09/2022 12:05, Andrew Cooper wrote:
> https://gitlab.com/xen-project/xen/-/jobs/3083068950#L1763
>
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
> Fixes: 022e40edd4dc ("drivers/char: allow using both dbgp=xhci and dbgp=ehci")
> ---
> CC: Jan Beulich <JBeulich@suse.com>
> CC: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
> CC: Henry Wang <Henry.Wang@arm.com>

Sorry - forgot to tag For-4.17 in the subject.

~Andrew

> ---
>  xen/drivers/char/ehci-dbgp.c | 2 +-
>  xen/drivers/char/xhci-dbc.c  | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/xen/drivers/char/ehci-dbgp.c b/xen/drivers/char/ehci-dbgp.c
> index 8a0b95850609..bb9d3198d9f2 100644
> --- a/xen/drivers/char/ehci-dbgp.c
> +++ b/xen/drivers/char/ehci-dbgp.c
> @@ -1465,7 +1465,7 @@ static struct ehci_dbgp ehci_dbgp = { .state = dbgp_unsafe, .phys_port = 1 };
>  
>  static char __initdata opt_dbgp[30];
>  
> -static int __init parse_ehci_dbgp(const char *opt)
> +static int __init cf_check parse_ehci_dbgp(const char *opt)
>  {
>      if ( strncmp(opt, "ehci", 4) )
>          return 0;
> diff --git a/xen/drivers/char/xhci-dbc.c b/xen/drivers/char/xhci-dbc.c
> index 5f92234a9594..43ed64a004e2 100644
> --- a/xen/drivers/char/xhci-dbc.c
> +++ b/xen/drivers/char/xhci-dbc.c
> @@ -1282,7 +1282,7 @@ struct dbc_dma_bufs {
>  static struct dbc_dma_bufs __section(".bss.page_aligned") __aligned(PAGE_SIZE)
>      dbc_dma_bufs;
>  
> -static int __init xhci_parse_dbgp(const char *opt_dbgp)
> +static int __init cf_check xhci_parse_dbgp(const char *opt_dbgp)
>  {
>      struct dbc_uart *uart = &dbc_uart;
>      struct dbc *dbc = &uart->dbc;

Re: [PATCH] drivers/char: Fix build when CET-IBT is enabled

[Luca Fancellu]

> On 26 Sep 2022, at 12:05, Andrew Cooper <andrew.cooper3@citrix.com> wrote:
> 
> https://gitlab.com/xen-project/xen/-/jobs/3083068950#L1763

Is this link permanent? Otherwise I think we should put just the reason of failure
as commit message.

Cheers,
Luca

Re: [PATCH] drivers/char: Fix build when CET-IBT is enabled

[Jan Beulich]

On 26.09.2022 13:05, Andrew Cooper wrote:
> https://gitlab.com/xen-project/xen/-/jobs/3083068950#L1763
> 
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
> Fixes: 022e40edd4dc ("drivers/char: allow using both dbgp=xhci and dbgp=ehci")

Reviewed-by: Jan Beulich <jbeulich@suse.com>

I'm sorry for having missed this during review - we were well aware this
is likely to be happening (and I'm quite certain it'll happen again).
Any news on the status of the compiler side patch?

Jan

Re: [PATCH] drivers/char: Fix build when CET-IBT is enabled

[Andrew Cooper]

On 26/09/2022 13:22, Jan Beulich wrote:
> On 26.09.2022 13:05, Andrew Cooper wrote:
>> https://gitlab.com/xen-project/xen/-/jobs/3083068950#L1763
>>
>> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
>> Fixes: 022e40edd4dc ("drivers/char: allow using both dbgp=xhci and dbgp=ehci")
> Reviewed-by: Jan Beulich <jbeulich@suse.com>

Thanks.

>
> I'm sorry for having missed this during review - we were well aware this
> is likely to be happening (and I'm quite certain it'll happen again).
> Any news on the status of the compiler side patch?

Nothing yet.  There are other more urgent fixes, and outstanding issues
with this one (has false negatives through function pointer casts), and
all bounded by no time.

~Andrew

Re: [PATCH] drivers/char: Fix build when CET-IBT is enabled

[Andrew Cooper]

On 26/09/2022 13:09, Luca Fancellu wrote:
>
>> On 26 Sep 2022, at 12:05, Andrew Cooper <andrew.cooper3@citrix.com> wrote:
>>
>> https://gitlab.com/xen-project/xen/-/jobs/3083068950#L1763
> Is this link permanent? Otherwise I think we should put just the reason of failure
> as commit message.

The link is stable, yes.

~Andrew

RE: [PATCH] drivers/char: Fix build when CET-IBT is enabled

[Henry Wang]

Hi Jan and Andrew,

> -----Original Message-----
> From: Andrew Cooper <Andrew.Cooper3@citrix.com>
> Subject: Re: [PATCH] drivers/char: Fix build when CET-IBT is enabled
> 
> On 26/09/2022 13:22, Jan Beulich wrote:
> > On 26.09.2022 13:05, Andrew Cooper wrote:
> >> https://gitlab.com/xen-project/xen/-/jobs/3083068950#L1763
> >>
> >> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
> >> Fixes: 022e40edd4dc ("drivers/char: allow using both dbgp=xhci and
> dbgp=ehci")
> > Reviewed-by: Jan Beulich <jbeulich@suse.com>
> 
> Thanks.

I think this patch should definitely be merged in 4.17, do you agree?

Anyway, in case the release ack tag is needed:
Release-acked-by: Henry Wang <Henry.Wang@arm.com>

Kind regards,
Henry