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 X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AF721C433E6 for ; Thu, 25 Feb 2021 08:26:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 62D8E64F0A for ; Thu, 25 Feb 2021 08:26:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235838AbhBYI0V (ORCPT ); Thu, 25 Feb 2021 03:26:21 -0500 Received: from mail.kernel.org ([198.145.29.99]:38850 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232601AbhBYI0V (ORCPT ); Thu, 25 Feb 2021 03:26:21 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 73F0664EC8; Thu, 25 Feb 2021 08:25:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1614241540; bh=RwokqPiVETJX28uISu7iObNBcTWEjC5c9EqPt2h2nJk=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=XRsybevjiPEkWP/o9R8jrmCnFCRbb3pJmgoSoJdt06Iq1u/iUKLpSJ8r3AfflNXjm KAmVf48u8WRsfAZADyNPmMaGNxCT65WYVV8QxaS8q9E69GquFeptfB4jrQFfGWCvc/ 7QP5OO4hA05OmT0stAGMVSMPYP1mZ2MNuzzEmJfI= Date: Thu, 25 Feb 2021 09:25:37 +0100 From: Greg KH To: Xiaoming Ni Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org, sashal@kernel.org, tglx@linutronix.de, lee.jones@linaro.org, wangle6@huawei.com, zhengyejian1@huawei.com Subject: Re: [PATCH] futex: fix dead code in attach_to_pi_owner() Message-ID: References: <20210222125352.110124-1-nixiaoming@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210222125352.110124-1-nixiaoming@huawei.com> Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On Mon, Feb 22, 2021 at 08:53:52PM +0800, Xiaoming Ni wrote: > From: Thomas Gleixner > > The handle_exit_race() function is defined in commit c158b461306df82 > ("futex: Cure exit race"), which never returns -EBUSY. This results > in a small piece of dead code in the attach_to_pi_owner() function: > > int ret = handle_exit_race(uaddr, uval, p); /* Never return -EBUSY */ > ... > if (ret == -EBUSY) > *exiting = p; /* dead code */ > > The return value -EBUSY is added to handle_exit_race() in upsteam > commit ac31c7ff8624409 ("futex: Provide distinct return value when > owner is exiting"). This commit was incorporated into v4.9.255, before > the function handle_exit_race() was introduced, whitout Modify > handle_exit_race(). > > To fix dead code, extract the change of handle_exit_race() from > commit ac31c7ff8624409 ("futex: Provide distinct return value when owner > is exiting"), re-incorporated. > > Fixes: c158b461306df82 ("futex: Cure exit race") > Cc: stable@vger.kernel.org # 4.9.258-rc1 > Signed-off-by: Xiaoming Ni > --- > kernel/futex.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) What is the git commit id of this patch in Linus's tree? Also, what kernel tree(s) is this supposed to go to? thanks, greg k-h