From patchwork Mon Aug 2 13:46:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhen Lei X-Patchwork-Id: 490346 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:1185:0:0:0:0 with SMTP id f5csp1940560jas; Mon, 2 Aug 2021 06:48:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyhtgLSyutdDH+AGRY0MHCgIdGvBUXKl8p7zBeSKwWNRxLS00aidTqfftJVEI/yR6kzo3/7 X-Received: by 2002:a92:d84e:: with SMTP id h14mr1092303ilq.267.1627912090376; Mon, 02 Aug 2021 06:48:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627912090; cv=none; d=google.com; s=arc-20160816; b=qTMMHDB6vxJc592RtneDW5oPVlRvcADD1Etw90IfNQ8cxkXFDYqwJ8MUXaS9G0LKq7 ma4Q0lenCgw/8SEmgMZkxGvbD2dbtPqaqk6z1dj9FBAglosMnD1NcG/qOfRnVE7Gb4do eSlQFcvvhhuDHS+6PdrhNIvkqyhorQI77g8sCmyN13KfgyM40uytmbPKogw7BzKzx7Hj q5pw5JB7ct83QoQQTOWMwaVr9wBWRLZQAjDl5eS1oac9Hv2/yIpKpUt2eEaSezMK/vYK EFuK6G0jLpfe/YSmLYNnEWCwdmF02J3VE94wGqr6XsOC7EQ0HF326w4KyH3LPjQ/h5Sb BILw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from; bh=lwoIno9aY/bGolKc1SBVjAEY65yM7tuSg5uS+i81Bac=; b=RMHAHQ6Veard5dZKKByONu9Bc6EwmEUwPNSqhMpjdFQhyUtXllsqL4P/ODecFC/pgQ N44daYCXe2fS0T88Sc7sq1+n3NFOQMqCIKpzy40gJy+NrfRBHp0wjaGs+nceWoW1coPU jM/2/8/ahG0FNnbPPTLrJnjGsG9LV1YwZawr7R7K8q8PdpPifVptO0iTgHrDrbmVLttA Y8gCuBOLTEZjBylzlWgU9KJHKbw3t/nXaIH64/x6RGDG1PFwUAQ5z8b0F2C3+sgVC/bJ CaX+lWaH3ZFWwuy4yEvOq+RgPxebDAYDc4RcPam9QSGMv4NvfJ+2ypw5Ci9R1IgTsrjw p+5g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b15si12624707ioj.7.2021.08.02.06.48.10; Mon, 02 Aug 2021 06:48:10 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-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 stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234494AbhHBNsR (ORCPT + 12 others); Mon, 2 Aug 2021 09:48:17 -0400 Received: from szxga03-in.huawei.com ([45.249.212.189]:12337 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234284AbhHBNrg (ORCPT ); Mon, 2 Aug 2021 09:47:36 -0400 Received: from dggemv704-chm.china.huawei.com (unknown [172.30.72.53]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4GdfM33TBhz81w6; Mon, 2 Aug 2021 21:42:23 +0800 (CST) Received: from dggpemm500006.china.huawei.com (7.185.36.236) by dggemv704-chm.china.huawei.com (10.3.19.47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Mon, 2 Aug 2021 21:47:12 +0800 Received: from thunder-town.china.huawei.com (10.174.179.0) by dggpemm500006.china.huawei.com (7.185.36.236) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Mon, 2 Aug 2021 21:47:11 +0800 From: Zhen Lei To: Greg Kroah-Hartman , stable CC: Zhen Lei , Anna-Maria Gleixner , Mike Galbraith , Sasha Levin , Ingo Molnar , Peter Zijlstra , Thomas Gleixner , linux-kernel Subject: [PATCH 4.4 01/11] futex: Rename free_pi_state() to put_pi_state() Date: Mon, 2 Aug 2021 21:46:14 +0800 Message-ID: <20210802134624.1934-2-thunder.leizhen@huawei.com> X-Mailer: git-send-email 2.26.0.windows.1 In-Reply-To: <20210802134624.1934-1-thunder.leizhen@huawei.com> References: <20210802134624.1934-1-thunder.leizhen@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.174.179.0] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggpemm500006.china.huawei.com (7.185.36.236) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Thomas Gleixner [ Upstream commit 29e9ee5d48c35d6cf8afe09bdf03f77125c9ac11 ] free_pi_state() is confusing as it is in fact only freeing/caching the pi state when the last reference is gone. Rename it to put_pi_state() which reflects better what it is doing. Signed-off-by: Thomas Gleixner Cc: Peter Zijlstra Cc: Darren Hart Cc: Davidlohr Bueso Cc: Bhuvanesh_Surachari@mentor.com Cc: Andy Lowe Link: http://lkml.kernel.org/r/20151219200607.259636467@linutronix.de Signed-off-by: Thomas Gleixner Signed-off-by: Zhen Lei --- kernel/futex.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) -- 2.26.0.106.g9fadedd diff --git a/kernel/futex.c b/kernel/futex.c index ff5499b0c5b34f7..dbb38e14f6fcc8e 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -859,9 +859,12 @@ static void pi_state_update_owner(struct futex_pi_state *pi_state, } /* + * Drops a reference to the pi_state object and frees or caches it + * when the last reference is gone. + * * Must be called with the hb lock held. */ -static void free_pi_state(struct futex_pi_state *pi_state) +static void put_pi_state(struct futex_pi_state *pi_state) { if (!pi_state) return; @@ -2121,7 +2124,7 @@ retry_private: case 0: break; case -EFAULT: - free_pi_state(pi_state); + put_pi_state(pi_state); pi_state = NULL; double_unlock_hb(hb1, hb2); hb_waiters_dec(hb2); @@ -2139,7 +2142,7 @@ retry_private: * exit to complete. * - EAGAIN: The user space value changed. */ - free_pi_state(pi_state); + put_pi_state(pi_state); pi_state = NULL; double_unlock_hb(hb1, hb2); hb_waiters_dec(hb2); @@ -2214,7 +2217,7 @@ retry_private: } else if (ret) { /* -EDEADLK */ this->pi_state = NULL; - free_pi_state(pi_state); + put_pi_state(pi_state); goto out_unlock; } } @@ -2223,7 +2226,7 @@ retry_private: } out_unlock: - free_pi_state(pi_state); + put_pi_state(pi_state); double_unlock_hb(hb1, hb2); wake_up_q(&wake_q); hb_waiters_dec(hb2); @@ -2376,7 +2379,7 @@ static void unqueue_me_pi(struct futex_q *q) __unqueue_futex(q); BUG_ON(!q->pi_state); - free_pi_state(q->pi_state); + put_pi_state(q->pi_state); q->pi_state = NULL; spin_unlock(q->lock_ptr); @@ -3210,7 +3213,7 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags, * Drop the reference to the pi state which * the requeue_pi() code acquired for us. */ - free_pi_state(q.pi_state); + put_pi_state(q.pi_state); spin_unlock(q.lock_ptr); /* * Adjust the return value. It's either -EFAULT or