* [STABLE REQUEST] tipc: improve function tipc_wait_for_cond()
[not found] ` <20190219042048.23243-2-tung.q.nguyen@dektech.com.au>
@ 2023-03-14 17:45 ` Lee Jones
2023-03-14 17:57 ` Greg KH
0 siblings, 1 reply; 4+ messages in thread
From: Lee Jones @ 2023-03-14 17:45 UTC (permalink / raw)
To: Tung Nguyen, stable; +Cc: davem, netdev, tipc-discussion
Dear Stable,
> Commit 844cf763fba6 ("tipc: make macro tipc_wait_for_cond() smp safe")
> replaced finish_wait() with remove_wait_queue() but still used
> prepare_to_wait(). This causes unnecessary conditional
> checking before adding to wait queue in prepare_to_wait().
>
> This commit replaces prepare_to_wait() with add_wait_queue()
> as the pair function with remove_wait_queue().
>
> Acked-by: Ying Xue <ying.xue@windriver.com>
> Acked-by: Jon Maloy <jon.maloy@ericsson.com>
> Signed-off-by: Tung Nguyen <tung.q.nguyen@dektech.com.au>
> ---
> net/tipc/socket.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/tipc/socket.c b/net/tipc/socket.c
> index 1217c90a363b..81b87916a0eb 100644
> --- a/net/tipc/socket.c
> +++ b/net/tipc/socket.c
> @@ -388,7 +388,7 @@ static int tipc_sk_sock_err(struct socket *sock, long *timeout)
> rc_ = tipc_sk_sock_err((sock_), timeo_); \
> if (rc_) \
> break; \
> - prepare_to_wait(sk_sleep(sk_), &wait_, TASK_INTERRUPTIBLE); \
> + add_wait_queue(sk_sleep(sk_), &wait_); \
> release_sock(sk_); \
> *(timeo_) = wait_woken(&wait_, TASK_INTERRUPTIBLE, *(timeo_)); \
> sched_annotate_sleep(); \
Could we have this ol' classic backported to v4.19 and v4.14 please?
--
Lee Jones [李琼斯]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [STABLE REQUEST] tipc: improve function tipc_wait_for_cond()
2023-03-14 17:45 ` [STABLE REQUEST] tipc: improve function tipc_wait_for_cond() Lee Jones
@ 2023-03-14 17:57 ` Greg KH
2023-03-14 18:04 ` Lee Jones
0 siblings, 1 reply; 4+ messages in thread
From: Greg KH @ 2023-03-14 17:57 UTC (permalink / raw)
To: Lee Jones; +Cc: Tung Nguyen, stable, davem, netdev, tipc-discussion
On Tue, Mar 14, 2023 at 05:45:37PM +0000, Lee Jones wrote:
> Dear Stable,
>
> > Commit 844cf763fba6 ("tipc: make macro tipc_wait_for_cond() smp safe")
> > replaced finish_wait() with remove_wait_queue() but still used
> > prepare_to_wait(). This causes unnecessary conditional
> > checking before adding to wait queue in prepare_to_wait().
> >
> > This commit replaces prepare_to_wait() with add_wait_queue()
> > as the pair function with remove_wait_queue().
> >
> > Acked-by: Ying Xue <ying.xue@windriver.com>
> > Acked-by: Jon Maloy <jon.maloy@ericsson.com>
> > Signed-off-by: Tung Nguyen <tung.q.nguyen@dektech.com.au>
> > ---
> > net/tipc/socket.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/net/tipc/socket.c b/net/tipc/socket.c
> > index 1217c90a363b..81b87916a0eb 100644
> > --- a/net/tipc/socket.c
> > +++ b/net/tipc/socket.c
> > @@ -388,7 +388,7 @@ static int tipc_sk_sock_err(struct socket *sock, long *timeout)
> > rc_ = tipc_sk_sock_err((sock_), timeo_); \
> > if (rc_) \
> > break; \
> > - prepare_to_wait(sk_sleep(sk_), &wait_, TASK_INTERRUPTIBLE); \
> > + add_wait_queue(sk_sleep(sk_), &wait_); \
> > release_sock(sk_); \
> > *(timeo_) = wait_woken(&wait_, TASK_INTERRUPTIBLE, *(timeo_)); \
> > sched_annotate_sleep(); \
>
> Could we have this ol' classic backported to v4.19 and v4.14 please?
What is the git commit id?
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [STABLE REQUEST] tipc: improve function tipc_wait_for_cond()
2023-03-14 17:57 ` Greg KH
@ 2023-03-14 18:04 ` Lee Jones
2023-03-15 7:24 ` Greg KH
0 siblings, 1 reply; 4+ messages in thread
From: Lee Jones @ 2023-03-14 18:04 UTC (permalink / raw)
To: Greg KH; +Cc: Tung Nguyen, stable, davem, netdev, tipc-discussion
On Tue, 14 Mar 2023, Greg KH wrote:
> On Tue, Mar 14, 2023 at 05:45:37PM +0000, Lee Jones wrote:
> > Dear Stable,
> >
> > > Commit 844cf763fba6 ("tipc: make macro tipc_wait_for_cond() smp safe")
> > > replaced finish_wait() with remove_wait_queue() but still used
> > > prepare_to_wait(). This causes unnecessary conditional
> > > checking before adding to wait queue in prepare_to_wait().
> > >
> > > This commit replaces prepare_to_wait() with add_wait_queue()
> > > as the pair function with remove_wait_queue().
> > >
> > > Acked-by: Ying Xue <ying.xue@windriver.com>
> > > Acked-by: Jon Maloy <jon.maloy@ericsson.com>
> > > Signed-off-by: Tung Nguyen <tung.q.nguyen@dektech.com.au>
> > > ---
> > > net/tipc/socket.c | 2 +-
> > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/net/tipc/socket.c b/net/tipc/socket.c
> > > index 1217c90a363b..81b87916a0eb 100644
> > > --- a/net/tipc/socket.c
> > > +++ b/net/tipc/socket.c
> > > @@ -388,7 +388,7 @@ static int tipc_sk_sock_err(struct socket *sock, long *timeout)
> > > rc_ = tipc_sk_sock_err((sock_), timeo_); \
> > > if (rc_) \
> > > break; \
> > > - prepare_to_wait(sk_sleep(sk_), &wait_, TASK_INTERRUPTIBLE); \
> > > + add_wait_queue(sk_sleep(sk_), &wait_); \
> > > release_sock(sk_); \
> > > *(timeo_) = wait_woken(&wait_, TASK_INTERRUPTIBLE, *(timeo_)); \
> > > sched_annotate_sleep(); \
> >
> > Could we have this ol' classic backported to v4.19 and v4.14 please?
>
> What is the git commit id?
Sorry, it's 223b7329ec6a0.
--
Lee Jones [李琼斯]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [STABLE REQUEST] tipc: improve function tipc_wait_for_cond()
2023-03-14 18:04 ` Lee Jones
@ 2023-03-15 7:24 ` Greg KH
0 siblings, 0 replies; 4+ messages in thread
From: Greg KH @ 2023-03-15 7:24 UTC (permalink / raw)
To: Lee Jones; +Cc: Tung Nguyen, stable, davem, netdev, tipc-discussion
On Tue, Mar 14, 2023 at 06:04:30PM +0000, Lee Jones wrote:
> On Tue, 14 Mar 2023, Greg KH wrote:
>
> > On Tue, Mar 14, 2023 at 05:45:37PM +0000, Lee Jones wrote:
> > > Dear Stable,
> > >
> > > > Commit 844cf763fba6 ("tipc: make macro tipc_wait_for_cond() smp safe")
> > > > replaced finish_wait() with remove_wait_queue() but still used
> > > > prepare_to_wait(). This causes unnecessary conditional
> > > > checking before adding to wait queue in prepare_to_wait().
> > > >
> > > > This commit replaces prepare_to_wait() with add_wait_queue()
> > > > as the pair function with remove_wait_queue().
> > > >
> > > > Acked-by: Ying Xue <ying.xue@windriver.com>
> > > > Acked-by: Jon Maloy <jon.maloy@ericsson.com>
> > > > Signed-off-by: Tung Nguyen <tung.q.nguyen@dektech.com.au>
> > > > ---
> > > > net/tipc/socket.c | 2 +-
> > > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > > >
> > > > diff --git a/net/tipc/socket.c b/net/tipc/socket.c
> > > > index 1217c90a363b..81b87916a0eb 100644
> > > > --- a/net/tipc/socket.c
> > > > +++ b/net/tipc/socket.c
> > > > @@ -388,7 +388,7 @@ static int tipc_sk_sock_err(struct socket *sock, long *timeout)
> > > > rc_ = tipc_sk_sock_err((sock_), timeo_); \
> > > > if (rc_) \
> > > > break; \
> > > > - prepare_to_wait(sk_sleep(sk_), &wait_, TASK_INTERRUPTIBLE); \
> > > > + add_wait_queue(sk_sleep(sk_), &wait_); \
> > > > release_sock(sk_); \
> > > > *(timeo_) = wait_woken(&wait_, TASK_INTERRUPTIBLE, *(timeo_)); \
> > > > sched_annotate_sleep(); \
> > >
> > > Could we have this ol' classic backported to v4.19 and v4.14 please?
> >
> > What is the git commit id?
>
> Sorry, it's 223b7329ec6a0.
Now queued up, thanks.
greg k-h
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-03-15 7:24 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20190219042048.23243-1-tung.q.nguyen@dektech.com.au>
[not found] ` <20190219042048.23243-2-tung.q.nguyen@dektech.com.au>
2023-03-14 17:45 ` [STABLE REQUEST] tipc: improve function tipc_wait_for_cond() Lee Jones
2023-03-14 17:57 ` Greg KH
2023-03-14 18:04 ` Lee Jones
2023-03-15 7:24 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox