From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DD7C4C6FD1F for ; Tue, 14 Mar 2023 17:58:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229827AbjCNR6F (ORCPT ); Tue, 14 Mar 2023 13:58:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34164 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230345AbjCNR6E (ORCPT ); Tue, 14 Mar 2023 13:58:04 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BE44BAF6B0; Tue, 14 Mar 2023 10:58:00 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 0E6C8B81ACE; Tue, 14 Mar 2023 17:57:59 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 43723C4339E; Tue, 14 Mar 2023 17:57:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678816677; bh=PxAXma8E2YMTQhE7YVsT+iWT8trKEYvfN4qVOVxfihc=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=NaU8PO/f8e+5t5P19LhsfB/wXs9e79H0g+OR75Y4yyxqDWO1fqLUr/Rln8lvbvaOr RdKvWgx0oTovQ+AV6IcntY14tQSp09MG7M5AOWxVyFry3rn87Cg4AlSccY0kUc9dod Vd8MpbI0MqtfP+7sti5AsAq/YGPXtqTX7UWFUQD4= Date: Tue, 14 Mar 2023 18:57:54 +0100 From: Greg KH To: Lee Jones Cc: Tung Nguyen , stable@vger.kernel.org, davem@davemloft.net, netdev@vger.kernel.org, tipc-discussion@lists.sourceforge.net Subject: Re: [STABLE REQUEST] tipc: improve function tipc_wait_for_cond() Message-ID: References: <20190219042048.23243-1-tung.q.nguyen@dektech.com.au> <20190219042048.23243-2-tung.q.nguyen@dektech.com.au> <20230314174537.GA1642994@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230314174537.GA1642994@google.com> Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 > > Acked-by: Jon Maloy > > Signed-off-by: Tung Nguyen > > --- > > 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?