[PATCH 4.2-rc5] workqueue: Make flush_workqueue() available again to non GPL modules

[PATCH 4.2-rc5] workqueue: Make flush_workqueue() available again to non GPL modules

[tim.gardner]

From: Tim Gardner <tim.gardner@canonical.com>

Commit 37b1ef31a568fc02e53587620226e5f3c66454c8 ("workqueue: move
flush_scheduled_work() to workqueue.h") moved the exported non GPL
flush_scheduled_work() from a function to an inline wrapper.
Unfortunately, it directly calls flush_workqueue() which is a GPL function.
This has the effect of changing the licensing requirement for this function
and makes it unavailable to non GPL modules.

See commit ad7b1f841f8a54c6d61ff181451f55b68175e15a ("workqueue: Make
schedule_work() available again to non GPL modules") for precedent.

Cc: Tejun Heo <tj@kernel.org>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
 kernel/workqueue.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 4c4f061..a413acb 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -2614,7 +2614,7 @@ void flush_workqueue(struct workqueue_struct *wq)
 out_unlock:
 	mutex_unlock(&wq->mutex);
 }
-EXPORT_SYMBOL_GPL(flush_workqueue);
+EXPORT_SYMBOL(flush_workqueue);
 
 /**
  * drain_workqueue - drain a workqueue
-- 
1.9.1

Re: [PATCH 4.2-rc5] workqueue: Make flush_workqueue() available again to non GPL modules

[Tejun Heo]

On Tue, Aug 04, 2015 at 11:26:04AM -0600, tim.gardner@canonical.com wrote:
> From: Tim Gardner <tim.gardner@canonical.com>
> 
> Commit 37b1ef31a568fc02e53587620226e5f3c66454c8 ("workqueue: move
> flush_scheduled_work() to workqueue.h") moved the exported non GPL
> flush_scheduled_work() from a function to an inline wrapper.
> Unfortunately, it directly calls flush_workqueue() which is a GPL function.
> This has the effect of changing the licensing requirement for this function
> and makes it unavailable to non GPL modules.
> 
> See commit ad7b1f841f8a54c6d61ff181451f55b68175e15a ("workqueue: Make
> schedule_work() available again to non GPL modules") for precedent.
> 
> Cc: Tejun Heo <tj@kernel.org>
> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

Applied to wq/for-4.3.

Thanks.

-- 
tejun

Re: [PATCH 4.2-rc5] workqueue: Make flush_workqueue() available again to non GPL modules

[Hans-Peter Jansen]

On Dienstag, 4. August 2015 14:05:20 Tejun Heo wrote:
> On Tue, Aug 04, 2015 at 11:26:04AM -0600, tim.gardner@canonical.com wrote:
> > From: Tim Gardner <tim.gardner@canonical.com>
> > 
> > Commit 37b1ef31a568fc02e53587620226e5f3c66454c8 ("workqueue: move
> > flush_scheduled_work() to workqueue.h") moved the exported non GPL
> > flush_scheduled_work() from a function to an inline wrapper.
> > Unfortunately, it directly calls flush_workqueue() which is a GPL
> > function.
> > This has the effect of changing the licensing requirement for this
> > function
> > and makes it unavailable to non GPL modules.
> > 
> > See commit ad7b1f841f8a54c6d61ff181451f55b68175e15a ("workqueue: Make
> > schedule_work() available again to non GPL modules") for precedent.
> > 
> > Cc: Tejun Heo <tj@kernel.org>
> > Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
> 
> Applied to wq/for-4.3.
> 
> Thanks.

Tejun, mind CCing stable in this regard? 

As things stand right now, it's activily deferring 4.2 rollout for (evil, 
sure) nvidia users like me. 

Thanks,
Pete

Re: [PATCH 4.2-rc5] workqueue: Make flush_workqueue() available again to non GPL modules

[Tejun Heo]

Hello, Greg.

I forgot to add cc tag for stable for the following patch.  It's now
in mainline as commit 1dadafa86a779884f14a6e7a3ddde1a57b0a0a65.

Thanks.

On Tue, Aug 04, 2015 at 11:26:04AM -0600, tim.gardner@canonical.com wrote:
> From: Tim Gardner <tim.gardner@canonical.com>
> 
> Commit 37b1ef31a568fc02e53587620226e5f3c66454c8 ("workqueue: move
> flush_scheduled_work() to workqueue.h") moved the exported non GPL
> flush_scheduled_work() from a function to an inline wrapper.
> Unfortunately, it directly calls flush_workqueue() which is a GPL function.
> This has the effect of changing the licensing requirement for this function
> and makes it unavailable to non GPL modules.
> 
> See commit ad7b1f841f8a54c6d61ff181451f55b68175e15a ("workqueue: Make
> schedule_work() available again to non GPL modules") for precedent.
> 
> Cc: Tejun Heo <tj@kernel.org>
> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
> ---
>  kernel/workqueue.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/kernel/workqueue.c b/kernel/workqueue.c
> index 4c4f061..a413acb 100644
> --- a/kernel/workqueue.c
> +++ b/kernel/workqueue.c
> @@ -2614,7 +2614,7 @@ void flush_workqueue(struct workqueue_struct *wq)
>  out_unlock:
>  	mutex_unlock(&wq->mutex);
>  }
> -EXPORT_SYMBOL_GPL(flush_workqueue);
> +EXPORT_SYMBOL(flush_workqueue);
>  
>  /**
>   * drain_workqueue - drain a workqueue
> -- 
> 1.9.1
> 

-- 
tejun

Re: [PATCH 4.2-rc5] workqueue: Make flush_workqueue() available again to non GPL modules

[David Laight]

> From:       Tejun Heo 
> Date:       2015-08-04 18:05:20
> On Tue, Aug 04, 2015 at 11:26:04AM -0600, tim.gardner@canonical.com wrote:
> > From: Tim Gardner <tim.gardner@canonical.com>
> >
> > Commit 37b1ef31a568fc02e53587620226e5f3c66454c8 ("workqueue: move
> > flush_scheduled_work() to workqueue.h") moved the exported non GPL
> > flush_scheduled_work() from a function to an inline wrapper.
> > Unfortunately, it directly calls flush_workqueue() which is a GPL function.
> > This has the effect of changing the licensing requirement for this function
> > and makes it unavailable to non GPL modules.
> >
> > See commit ad7b1f841f8a54c6d61ff181451f55b68175e15a ("workqueue: Make
> > schedule_work() available again to non GPL modules") for precedent.
> >
> > Cc: Tejun Heo <tj@kernel.org>
> > Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
>
> Applied to wq/for-4.3.

I hit this yesterday afternoon as well!

Can we get the fix into 4.2 itself ?

	David