Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp1367796pxb; Sun, 21 Feb 2021 23:07:03 -0800 (PST) X-Google-Smtp-Source: ABdhPJypiLRcbc0B9HTlkR+ZK7BA5JBt761iz5ngXpXdJWZ/sm8te3k69g2gkp6RJXkbvHqdFG2B X-Received: by 2002:a17:906:3a10:: with SMTP id z16mr19591345eje.483.1613977623171; Sun, 21 Feb 2021 23:07:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1613977623; cv=none; d=google.com; s=arc-20160816; b=W1Sx0z7wxX1Qc4TM8fl0Qpq4Jl4iMRtVlvpRzG9FSYz4p2rYTrcSJOiWzoNK40zm/B k7vripCmhPsF+humtvjY7ZKXa49jBnU8nUrNKTg32+B3xZy5hu5Cs6iMX686YU4Jq0YZ qaH+rPPyIeCKtqOv7raDccZmlq3BbTEROPXWcPc1n9lOYkJ1plJjej0WdU1QlnD6fuqU PraREAye4PZr5GUoakNG95gV8a4rlYLNlzgkpkgaMk21SPfbDfprs9MKDFCVo2SM6a8L BysU99mI0ykxSojke6tzc8zXmldXb/YVJcI0dJHPv+4QHIQ5XJpm1eVxpkB23CaP0xlX 3NLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=5o8haF5GvqQepjRTuYtFtlTEY62+VKET++nlM43U6H4=; b=LVOePbZTrE5VEcdP0OitL0YP1uG3xruq75ah7bX8SJ2gdIddFitx+sEXnCq5c2KmRw 0GgFDM1NuNgbYbWP62kbd7IY25XWkwequVB4NjjtgwvHYUm1yqyfzNt5KeJYeh2y3K8h zIPzCOasM7Xrsq3h0J4HGlcdql32UIRB1sYTcEEgSyLjLBrFtVj1sWu9H+MHaJO/Yj2F BFFi99IqxjV2j0laIQYt0Q5TkrKPqa7b3nmWIGIhBVOYEORQDUyIPvm9HgqvWNok64lN nKx8wYxtxzofaYIh9iIEjjOdT1NphjeMXxFAHw5RCVszHcMbx3IwHWJTI59xdotQnRlD 4NXw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id dn4si13499750ejc.686.2021.02.21.23.06.39; Sun, 21 Feb 2021 23:07:03 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230018AbhBVHE1 (ORCPT + 99 others); Mon, 22 Feb 2021 02:04:27 -0500 Received: from szxga04-in.huawei.com ([45.249.212.190]:12630 "EHLO szxga04-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229996AbhBVHE0 (ORCPT ); Mon, 22 Feb 2021 02:04:26 -0500 Received: from DGGEMS408-HUB.china.huawei.com (unknown [172.30.72.58]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4DkY5T4tmhz16BKd; Mon, 22 Feb 2021 15:02:05 +0800 (CST) Received: from use12-sp2.huawei.com (10.67.189.174) by DGGEMS408-HUB.china.huawei.com (10.3.19.208) with Microsoft SMTP Server id 14.3.498.0; Mon, 22 Feb 2021 15:03:31 +0800 From: Xiaoming Ni To: , , , , CC: , , Subject: [PATCH stable-rc queue/4.9 0/1] repatch Date: Mon, 22 Feb 2021 15:03:27 +0800 Message-ID: <20210222070328.102384-1-nixiaoming@huawei.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.67.189.174] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org I found a dead code in the queue/4.9 branch of the stable-rc repository. 2021-02-03: commit c27f392040e2f6 ("futex: Provide distinct return value when owner is exiting") The function handle_exit_race does not exist. Therefore, the change in handle_exit_race() is ignored in the patch round. 2021-02-22: commit e55cb811e612 ("futex: Cure exit race") Define the handle_exit_race() function, but no branch in the function returns EBUSY. As a result, dead code occurs in the attach_to_pi_owner(): int ret = handle_exit_race(uaddr, uval, p); ... if (ret == -EBUSY) *exiting = p; /* dead code */ To fix the dead code, modify the commit e55cb811e612 ("futex: Cure exit race"), or install a patch to incorporate the changes in handle_exit_race(). I am unfamiliar with the processing of the stable-rc queue branch, and I cannot find the patch mail of the current branch in https://lore.kernel.org/lkml/?q=%22futex%3A+Cure+exit+race%22 Therefore, I re-integrated commit ac31c7ff8624 ("futex: Provide distinct return value when owner is exiting"). ----- Thomas Gleixner (1): futex: Provide distinct return value when owner is exiting kernel/futex.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.27.0