From patchwork Sat Feb 11 08:54:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ingo Molnar X-Patchwork-Id: 55763 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1408760wrn; Sat, 11 Feb 2023 01:14:45 -0800 (PST) X-Google-Smtp-Source: AK7set93hHAXgdzv7Pt4THG1LAsI8voJSOKVqTSWhCzA46pY476aWtkGXAXnYq/8VgHqMnQlmlvK X-Received: by 2002:a62:79d1:0:b0:5a8:499f:8686 with SMTP id u200-20020a6279d1000000b005a8499f8686mr11234968pfc.28.1676106884832; Sat, 11 Feb 2023 01:14:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676106884; cv=none; d=google.com; s=arc-20160816; b=peq0QXxaCEOCMIL8tMr0dN/TnuZFkBA5XzPbYrSTq7kTV6lcG0ZV+q4O3OJAxF+jKP 4dt0tlkv4mhcNbo3HLYZ/AI5GbfOqwlpyata6AyXmKG82QfdgWmCM+fZdGFARQOuhg4J Upe3hgbDjfeXkbcl5lYm7Bx6gZNKKPdYYNoUNfY+LbCStueKjkpqLvS0+AoydfgFwlHL jwDkjYdc8C7cM+KFfYfDPsm7NeoZU3FTw7owvkTUn0VXbY5+m2N3zwLDEfBbVS6IS1Cq uRhwItL0gRL76jkd0GxO328uG/xtyVDszsD/sgQIxxFU3r+ofdW8UFqKqYg5XX14CiYj uuHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-disposition:mime-version:message-id :subject:cc:to:from:date:sender:dkim-signature; bh=kSW042nuuhVIYOcJ+JM+r/3KmzLEvzvNeRdEP8Qp3Hc=; b=XiPmMGmSBYAgP77jDxOSSNyRwBxJLQWvcydHM4uwBuLmqJct3oNCF0qPsVRPleApO0 A54meRIVBCPedMIMvHuOZwkC92MBRBo/A90UnZjfy79KPSVNSoNtlNnwLQxi5hxenCry BUuYcQ5J5QCGIhs+VuhYAj4PNNukPRhY9QWes/tiGE6TUtVDs6ZuiubBoUXfvoniUHB6 gUYSpX4Isw0N4QuUHb6x6/7QLkHtcdwnjybdu8NHfTz/dyBDhWvoJA/dA7/8vtEs2WMg drYLQcZIoSIM+Fuf4U8kBsrfj+wTzwGyYwXGFQArFyNBct9cTLcSVPxNGIthX6Pxx4OI 9i3A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=HteGXqVw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n127-20020a622785000000b0059338de4684si6168602pfn.255.2023.02.11.01.14.32; Sat, 11 Feb 2023 01:14:44 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=HteGXqVw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229828AbjBKIyg (ORCPT + 99 others); Sat, 11 Feb 2023 03:54:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48026 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229461AbjBKIye (ORCPT ); Sat, 11 Feb 2023 03:54:34 -0500 Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BF2BF17156 for ; Sat, 11 Feb 2023 00:54:32 -0800 (PST) Received: by mail-ej1-x62a.google.com with SMTP id sa10so21178416ejc.9 for ; Sat, 11 Feb 2023 00:54:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :sender:from:to:cc:subject:date:message-id:reply-to; bh=kSW042nuuhVIYOcJ+JM+r/3KmzLEvzvNeRdEP8Qp3Hc=; b=HteGXqVwWSAnxqXg19ooR++7+/FlFZB30Ws36WsCp0pxluvnDn9bTe/6EbqxIkP/m1 LVfe9LLeD/vUF86uZ39kOtldmbadmaVpQpfbiGZyYaLIWlKmPDFa2uGOp5k8a787mo0P wzF4BR4CNX23IF4onD+k0COcbUHQnCyGypaOJFjV1qYwA6Zd0/l0AokRt/clFbm6n0ID HjPnXsqgioZd9KhijdUkpxe4Mv4h7pcuT1ITE3AUczhvtk1oCuYIDMF7Ouq+DXELgVCu ZJPbjX1Xda42+hchpxcI3wWkP8pEnecKkKake68UjO1ojPPPaYEcu8uBTRf1zW3zqTpm O7AA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :sender:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=kSW042nuuhVIYOcJ+JM+r/3KmzLEvzvNeRdEP8Qp3Hc=; b=ayFgJ6zSzc3z04Bgd8QG6Sv6pjLWsd7c4XaLuw2OAj9xdkwoYfym4I3ktPyvEa1FcY IimhhdrAM1SvW7wrvmQ0x6RF4Nx46RNH5Ng9cNj3TLb8kxE+r/7XxJzliA7ptVzJON2J zR+vOpElCJ/1h4b8gQ1Ak6lDGUxoA9iWbpxKGsCRhXiQyFRv/ZftaUfGhAIZHQOMtPY0 sHsavNGVhpX7pbJdefkQBYM7Hys97t4fmpTX4pHWB5ub+ghZTaw8zo5Ti3rduuPNii3U TKDFLRHDkpMb0eiKnnncv1u4tkvnOLkOewGpRjSrvUBT8JseybQ8ZQjWZM1OzLtiN89J SPmA== X-Gm-Message-State: AO0yUKXu+Swtd9qBiN4TtQPCKs9WLVU/CQaaKdwJ0XyZjvz/pZQA2FGE EDH//WHZ3QMPJcSqYAbDNHI= X-Received: by 2002:a17:907:8e8b:b0:8aa:1f89:122e with SMTP id tx11-20020a1709078e8b00b008aa1f89122emr18730068ejc.39.1676105671189; Sat, 11 Feb 2023 00:54:31 -0800 (PST) Received: from gmail.com (1F2EF6B7.nat.pool.telekom.hu. [31.46.246.183]) by smtp.gmail.com with ESMTPSA id v1-20020a170906b00100b0087862f45a29sm3584457ejy.174.2023.02.11.00.54.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Feb 2023 00:54:30 -0800 (PST) Sender: Ingo Molnar Date: Sat, 11 Feb 2023 09:54:28 +0100 From: Ingo Molnar To: Linus Torvalds Cc: linux-kernel@vger.kernel.org, Thomas Gleixner , Peter Zijlstra , Andrew Morton , Borislav Petkov Subject: [GIT PULL] locking fix Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE, SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757525452972299512?= X-GMAIL-MSGID: =?utf-8?q?1757525452972299512?= Linus, Please pull the latest locking/urgent git tree from: git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking-urgent-2023-02-11 # HEAD: db370a8b9f67ae5f17e3d5482493294467784504 rtmutex: Ensure that the top waiter is always woken up Fix an rtmutex missed-wakeup bug. Thanks, Ingo ------------------> Wander Lairson Costa (1): rtmutex: Ensure that the top waiter is always woken up kernel/locking/rtmutex.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c index 010cf4e6d0b8..728f434de2bb 100644 --- a/kernel/locking/rtmutex.c +++ b/kernel/locking/rtmutex.c @@ -901,8 +901,9 @@ static int __sched rt_mutex_adjust_prio_chain(struct task_struct *task, * then we need to wake the new top waiter up to try * to get the lock. */ - if (prerequeue_top_waiter != rt_mutex_top_waiter(lock)) - wake_up_state(waiter->task, waiter->wake_state); + top_waiter = rt_mutex_top_waiter(lock); + if (prerequeue_top_waiter != top_waiter) + wake_up_state(top_waiter->task, top_waiter->wake_state); raw_spin_unlock_irq(&lock->wait_lock); return 0; }