2024-02-15 10:12:57

by Naresh Kamboju

Subject: next-20240215: workqueue.c: undefined reference to `irq_work_queue_on'

On today's Linux next-20240215 tinyconfig builds failed on arm, arm64, powerpc,
s390 and riscv with gcc-13 and clang.

Reported-by: Linux Kernel Functional Testing <[email protected]>

build error:
-------
aarch64-linux-gnu-ld: kernel/workqueue.o: in function `kick_pool':
workqueue.c:(.text+0x9e4): undefined reference to `irq_work_queue_on'
workqueue.c:(.text+0x9e4): relocation truncated to fit:
R_AARCH64_CALL26 against undefined symbol `irq_work_queue_on'

Links:
- https://storage.tuxsuite.com/public/linaro/lkft/builds/2cO8iztCdxtnbSeW3ekjN25sY6G/

--
Linaro LKFT
https://lkft.linaro.org

2024-02-15 11:14:41

by Naresh Kamboju

Subject: Re: next-20240215: workqueue.c: undefined reference to `irq_work_queue_on'

On Thu, 15 Feb 2024 at 15:41, Naresh Kamboju <[email protected]> wrote:
>
> On today's Linux next-20240215 tinyconfig builds failed on arm, arm64, powerpc,
> s390 and riscv with gcc-13 and clang.
>
> Reported-by: Linux Kernel Functional Testing <[email protected]>
>
> build error:
> -------
> aarch64-linux-gnu-ld: kernel/workqueue.o: in function `kick_pool':
> workqueue.c:(.text+0x9e4): undefined reference to `irq_work_queue_on'
> workqueue.c:(.text+0x9e4): relocation truncated to fit:
> R_AARCH64_CALL26 against undefined symbol `irq_work_queue_on'

Anders bisect this build regression and found first bad commit,

# first bad commit: [3bc1e711c26bff01d41ad71145ecb8dcb4412576]
workqueue: Don't implicitly make UNBOUND workqueues w/ @max_active==1
ordered

- Naresh

2024-02-15 13:41:09

by Tejun Heo

Subject: Re: next-20240215: workqueue.c: undefined reference to `irq_work_queue_on'

Hello,

Can you see whether the following patch fixes the build?

diff --git a/init/Kconfig b/init/Kconfig
index 8df18f3a9748..41be05a8ba5e 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -107,6 +107,8 @@ config CONSTRUCTORS

config IRQ_WORK
bool
+ depends on SMP
+ default y

config BUILDTIME_TABLE_SORT
bool
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 04e35dbe6799..6ae441e13804 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -1209,6 +1209,20 @@ static struct irq_work *bh_pool_irq_work(struct worker_pool *pool)
return &per_cpu(bh_pool_irq_works, pool->cpu)[high];
}

+static void kick_bh_pool(struct worker_pool *pool)
+{
+#ifdef CONFIG_SMP
+ if (unlikely(pool->cpu != smp_processor_id())) {
+ irq_work_queue_on(bh_pool_irq_work(pool), pool->cpu);
+ return;
+ }
+#endif
+ if (pool->attrs->nice == HIGHPRI_NICE_LEVEL)
+ raise_softirq_irqoff(HI_SOFTIRQ);
+ else
+ raise_softirq_irqoff(TASKLET_SOFTIRQ);
+}
+
/**
* kick_pool - wake up an idle worker if necessary
* @pool: pool to kick
@@ -1227,15 +1241,7 @@ static bool kick_pool(struct worker_pool *pool)
return false;

if (pool->flags & POOL_BH) {
- if (likely(pool->cpu == smp_processor_id())) {
- if (pool->attrs->nice == HIGHPRI_NICE_LEVEL)
- raise_softirq_irqoff(HI_SOFTIRQ);
- else
- raise_softirq_irqoff(TASKLET_SOFTIRQ);
- } else {
- irq_work_queue_on(bh_pool_irq_work(pool), pool->cpu);
- }
-
+ kick_bh_pool(pool);
return true;
}

2024-02-15 15:53:29

by Anders Roxell

Subject: Re: next-20240215: workqueue.c: undefined reference to `irq_work_queue_on'

On Thu, 15 Feb 2024 at 14:40, Tejun Heo <[email protected]> wrote:
>
> Hello,

Hey Tejun,

>
> Can you see whether the following patch fixes the build?

This patch fixes the build. Thank you for the quick fix.

Tested-by: Anders Roxell <[email protected]>

>
> diff --git a/init/Kconfig b/init/Kconfig
> index 8df18f3a9748..41be05a8ba5e 100644
> --- a/init/Kconfig
> +++ b/init/Kconfig
> @@ -107,6 +107,8 @@ config CONSTRUCTORS
>
> config IRQ_WORK
> bool
> + depends on SMP
> + default y
>
> config BUILDTIME_TABLE_SORT
> bool
> diff --git a/kernel/workqueue.c b/kernel/workqueue.c
> index 04e35dbe6799..6ae441e13804 100644
> --- a/kernel/workqueue.c
> +++ b/kernel/workqueue.c
> @@ -1209,6 +1209,20 @@ static struct irq_work *bh_pool_irq_work(struct worker_pool *pool)
> return &per_cpu(bh_pool_irq_works, pool->cpu)[high];
> }
>
> +static void kick_bh_pool(struct worker_pool *pool)
> +{
> +#ifdef CONFIG_SMP
> + if (unlikely(pool->cpu != smp_processor_id())) {
> + irq_work_queue_on(bh_pool_irq_work(pool), pool->cpu);
> + return;
> + }
> +#endif
> + if (pool->attrs->nice == HIGHPRI_NICE_LEVEL)
> + raise_softirq_irqoff(HI_SOFTIRQ);
> + else
> + raise_softirq_irqoff(TASKLET_SOFTIRQ);
> +}
> +
> /**
> * kick_pool - wake up an idle worker if necessary
> * @pool: pool to kick
> @@ -1227,15 +1241,7 @@ static bool kick_pool(struct worker_pool *pool)
> return false;
>
> if (pool->flags & POOL_BH) {
> - if (likely(pool->cpu == smp_processor_id())) {
> - if (pool->attrs->nice == HIGHPRI_NICE_LEVEL)
> - raise_softirq_irqoff(HI_SOFTIRQ);
> - else
> - raise_softirq_irqoff(TASKLET_SOFTIRQ);
> - } else {
> - irq_work_queue_on(bh_pool_irq_work(pool), pool->cpu);
> - }
> -
> + kick_bh_pool(pool);
> return true;
> }
>