From patchwork Thu Feb 4 17:29:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 376312 Delivered-To: patch@linaro.org Received: by 2002:a02:b18a:0:0:0:0:0 with SMTP id t10csp1491167jah; Thu, 4 Feb 2021 09:45:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJzsLwBZaNCud87H3x/km92Lwru3sEF3Gdrg1nqLytrjnZ1rvxZ7+x/VGn50lZ3DbwjacCqW X-Received: by 2002:a05:6402:318e:: with SMTP id di14mr77603edb.223.1612460755022; Thu, 04 Feb 2021 09:45:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612460755; cv=none; d=google.com; s=arc-20160816; b=gmZI+Lacfwh6FQkveMJR0pEhxF95MwedB+qK8H1yBs09MSEDLkdUMnAq+wbLWQL9V0 Td1hR7nzF2mZps4/EvHfG+QhV5h1z/ub4D0u8W0hymL1iaFOpLTGqRHeXoKi/cCogLib tHOHLdWS6+vxUTenKGXYrxlpElLMoXuq5QGRExYmmoI338KluGpG94GO7pQvz2NLMpmO EJzn4AC57Fi9J0D3wgIn59COPi4rc01kIfFDeCDiUJjleBKlVy6fAl7GD1zpMuWhm0kY 93LSlgQDiVLeEe0QN8X/+dVsSgm/iaiVtVwf4x/f3kF6YT9Npi7iUob3Um+Kl4oJ19Jo aUYQ== 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 :dkim-signature; bh=Jt6ppsBFHDM6FBIc6eMl8p62XKsDCQzpsx3kuToeRvA=; b=eVBFqsZ2/Wcw+kzf4DDjgLJPp5OvO2eUZX5CjzIzj48PfR/feTpcDfsU4MJ00qN4yW dBmAhUtWEFLHW2SmLU11TpnG6ksjdKoeA5LwAIAT3a5ulYy8eMTiGHEa5WoF1W4D8L5y hFYv0lVIA7zVu1FtHNiXePg9ycFcgM5NgbkkAu9lC85NQdwKR98HPrIidFwWETZxePfU v6TJEKz7brXfQjOLkZVlkTPhVL7kN/AuZ2jchmkqKB0I7rn33olITGPSRSZj2xpRHM5K VDD3nUNsl0iOGpSKs3pq7T/Pd0Wyq+afxD4P7Jmsy4yFjtjHmTuY/QcbcE0pxhkXWoAn oPlg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=C8kl80gO; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id 17si3691053ejv.562.2021.02.04.09.45.52; Thu, 04 Feb 2021 09:45:55 -0800 (PST) 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; dkim=pass header.i=@linaro.org header.s=google header.b=C8kl80gO; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238113AbhBDRpS (ORCPT + 13 others); Thu, 4 Feb 2021 12:45:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36714 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238505AbhBDRbE (ORCPT ); Thu, 4 Feb 2021 12:31:04 -0500 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E4181C0617A9 for ; Thu, 4 Feb 2021 09:29:18 -0800 (PST) Received: by mail-wm1-x32a.google.com with SMTP id o10so6360631wmc.1 for ; Thu, 04 Feb 2021 09:29:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Jt6ppsBFHDM6FBIc6eMl8p62XKsDCQzpsx3kuToeRvA=; b=C8kl80gOrI7VtnIXjE6O1j2+YqM/p5AY+wSB0/y2Zm6L4PXwqtc5uCcba4NzXR6ewy y7yebs2smS8wL+54kG0bwlRcSwajvoL/9yhlDgSxGvKrXBtCca+L501bYVVqROJoey1d WaMqLVZhDs67W5/ZFl7kB3Z7QnUQ31PMn2VTN1tbJYMElXQp/vciUUAkuWtdn8+KAW0t KR5Xg2cVQUfqs0Cdz+H3t9MxHzW48bSC9Dmz78sybyfCaEwDdrE5Mdu7mOY6lod2OGy3 ZDdSrlu0hD6Dga7i0f4iNfV2wMxnZ+84xJilL111lNp6BR7TkseZ4Olfb9HTSUbLvaBE m5UQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Jt6ppsBFHDM6FBIc6eMl8p62XKsDCQzpsx3kuToeRvA=; b=mNkNEFNeaPgYyauTPPKiRrHltklxVAW5nBi8aMgSZQxrQVUnCLkPQlrGMGEJFeolb5 oL/lxfRlpa/Yi8Wm2uOaGxx8l+HqTtag4X5U2brzM2+RHD9sqiJcEXK3feJs5YLSK8FW O6xb3ybaG51JUlmyrfsUa26EcEZyGiTof7edAr7juBNu2eterKjZGJ4pAHIOmIr4X1qi WWCNIKvnKwgZHC37Qnm1jvohvD4UIV6/b6E/fKShVuSW+XA2dD8JhaHMdLA5B0kw74Fp y2sKhHcckkk5n4g6WN3bRkqI34Q26XK4qHDn0x/d092wssXAueKMx+jOJ87yim/RWpad Rkww== X-Gm-Message-State: AOAM532yoKWdL5PrP8Rq8wpbcD05uwizhjZFZHwZtqGbcAiGA6w7iTXV lzKqYiYwMqJhHnd3VocFPBdojjXr9A5i2A== X-Received: by 2002:a1c:e90d:: with SMTP id q13mr238175wmc.136.1612459757185; Thu, 04 Feb 2021 09:29:17 -0800 (PST) Received: from dell.default ([91.110.221.188]) by smtp.gmail.com with ESMTPSA id j7sm9641334wrp.72.2021.02.04.09.29.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Feb 2021 09:29:16 -0800 (PST) From: Lee Jones To: stable@vger.kernel.org Cc: Thomas Gleixner , Peter Zijlstra , Lee Jones Subject: [PATCH 08/10] futex: Use pi_state_update_owner() in put_pi_state() Date: Thu, 4 Feb 2021 17:29:01 +0000 Message-Id: <20210204172903.2860981-9-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210204172903.2860981-1-lee.jones@linaro.org> References: <20210204172903.2860981-1-lee.jones@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Thomas Gleixner [ Upstream commit 6ccc84f917d33312eb2846bd7b567639f585ad6d ] No point in open coding it. This way it gains the extra sanity checks. Signed-off-by: Thomas Gleixner Acked-by: Peter Zijlstra (Intel) Cc: stable@vger.kernel.org Signed-off-by: Lee Jones --- kernel/futex.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) -- 2.25.1 diff --git a/kernel/futex.c b/kernel/futex.c index bf40921ef1200..d9bec8eb60969 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -874,10 +874,7 @@ static void free_pi_state(struct futex_pi_state *pi_state) * and has cleaned up the pi_state already */ if (pi_state->owner) { - raw_spin_lock_irq(&pi_state->owner->pi_lock); - list_del_init(&pi_state->list); - raw_spin_unlock_irq(&pi_state->owner->pi_lock); - + pi_state_update_owner(pi_state, NULL); rt_mutex_proxy_unlock(&pi_state->pi_mutex); }