From patchwork Thu Oct 12 09:00:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hao Jia X-Patchwork-Id: 151836 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp1081633vqb; Thu, 12 Oct 2023 02:01:32 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE4DUa73jZ9FGgrbYMy6IAMXG4uZxBE66SC6Vzjo4KxDJqPBZxPDD750ZBXdqFcGS7j5Iic X-Received: by 2002:a05:6a00:1d94:b0:690:d314:38d with SMTP id z20-20020a056a001d9400b00690d314038dmr26493971pfw.1.1697101292468; Thu, 12 Oct 2023 02:01:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697101292; cv=none; d=google.com; s=arc-20160816; b=qNDwLpoL6GZ/W55B2c+d0fo5hVIN7rHpMIDN4PZD1h8699jemwJCC5A7E47a5CIlg5 H6MZ/kM7b9Wc529XzPi97s+iI0dIqu+sSvuoKQdRSUOPWkKQVDkirzFSvojBu0DhU/ot Vn70lWfOWDbWAEf6bmHPBQAGax2tA/3ZRiOQqTY/cjqYXVEZLaTGRbUyZBPL0ZL+9Sos zWzed54lGSjoTdFohX6Z3u1nLzFZM+TBhhlL4qvazGeGMqfS3Qi7zBbQh55KQApYJ+BT k0gfkvmHdFr7dAUgV6UuNv5egoJWSA7X5+ZAmtSNGsCkXK5e5+zsaNB7Af88TNW24vDT 5Ldw== 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:dkim-signature; bh=0VwF/DnjzvrQBpX9Fi3ADecurBEx2NpUXKTS2sPKDzc=; fh=Hkri1z8gAqDVJeB0nn/tZ+dtBee7OytRb/vRM28uXko=; b=YHWvu3vrdhuWpuQ9dIKUCXRPCQmWyCLXzxFCviN+9UGkgB+U1zXQuvqoR15GDmBdqM eYwIc47i/nGomvThyHj1sMgRmXPXBvzt0OtPekP5+vr11ebyc/GhRdur8puHD7e3XZQ2 6O1CfHMnga3PPDrTpzLYF2Z62+jehfIOQROT5B1v7RQexuLZ6ckOiAwsLKhELHfVrAwW v/YmU/SZCeMxN5bj6PMvAIuG3JClkj4/FNKCUlGKlD91T5LrGu0SGL8+N2EmYV2zEJwv U00X//Qekcsk5a30ngBZEfx52XqfUI0WqON5plDOtNMvlFxzVXN12AmaxEHeW3BoPncJ huRA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bytedance.com header.s=google header.b=TM9uyuY9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=bytedance.com Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id bv71-20020a632e4a000000b00569fd44093fsi1709137pgb.230.2023.10.12.02.01.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Oct 2023 02:01:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@bytedance.com header.s=google header.b=TM9uyuY9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=bytedance.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id E1950806136B; Thu, 12 Oct 2023 02:00:56 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235393AbjJLJAp (ORCPT + 19 others); Thu, 12 Oct 2023 05:00:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54992 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234155AbjJLJAk (ORCPT ); Thu, 12 Oct 2023 05:00:40 -0400 Received: from mail-ot1-x333.google.com (mail-ot1-x333.google.com [IPv6:2607:f8b0:4864:20::333]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5A58F91 for ; Thu, 12 Oct 2023 02:00:16 -0700 (PDT) Received: by mail-ot1-x333.google.com with SMTP id 46e09a7af769-6c7bbfb7a73so464719a34.3 for ; Thu, 12 Oct 2023 02:00:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1697101215; x=1697706015; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=0VwF/DnjzvrQBpX9Fi3ADecurBEx2NpUXKTS2sPKDzc=; b=TM9uyuY9ungupFSVt6HqPNVMuXwA1JzreG/hDY8MX7iJWzEbFNgeOTMdr0KeMc7iUu 01dyTdn3y4gnFN3HjsS6ggwI0i5q2NqnsUM/BMT8lQQLb7NwtaxgfmH/8JwPaKOm7qXS D347fQssZWBjxRzp6Cg///iq89yU7uxGzg0aggVnlZi9+O3nuHcDWymCTK38n06CTnge AdNXH8oKfVtBDvi3jJ1rF/2ssguUS7FJXDIqrlNvQBqUvCSvdmNlhvhwsNfpFRNYNlO2 doT3ZlclpsseO0tJRAU3/ET3+B4DDjtIKJGi/zCxxqMTiRsQCbDGv+0mOkHBVY3dmps7 ZE1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697101215; x=1697706015; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=0VwF/DnjzvrQBpX9Fi3ADecurBEx2NpUXKTS2sPKDzc=; b=c95Hk+dbWf6LTz2XJE1bRPHuGQcYPzJ53iVbnrfNlpmj+Mmwf4H5yV9psTs9fUUgF4 U6h5ylQaVkczT2vlYC+WeawUVP4GDUd+qfAJPuQGWo6z6NTZ9FjrmXCVdlsYsayLffh6 oHNRttt4mjg6VCvr9HBmaNocobK40brA87VE6Ogs8hckm1BcTCRVYBztj2g7dIRPLlMA 3/jMk0A2WNHju9MD0c9/pMq1ugoasrcXnC1DOgsKdwyJLRi11PCH5097wX2NoupyX9CR QUOPdEjh1yJKqMabTk1rhTXunA0AsEZL0nbrR0fEv+VTYkef6kuzxl5Sf1MMpTv1g4Ze PFJA== X-Gm-Message-State: AOJu0YzY9jkFWmWQ6VQFaf/TnmtN5SuHA/uodtbOjKKbWxRnJAATW+li ICEIS1xpOhMFulyxjdN06WYFOQ== X-Received: by 2002:a9d:6b05:0:b0:6c4:cda6:ff3e with SMTP id g5-20020a9d6b05000000b006c4cda6ff3emr23327998otp.18.1697101215449; Thu, 12 Oct 2023 02:00:15 -0700 (PDT) Received: from C02G87K0MD6R.bytedance.net ([203.208.167.147]) by smtp.gmail.com with ESMTPSA id q25-20020a62e119000000b006933866f49dsm11796595pfh.19.2023.10.12.02.00.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Oct 2023 02:00:15 -0700 (PDT) From: Hao Jia To: mingo@redhat.com, peterz@infradead.org, mingo@kernel.org, juri.lelli@redhat.com, vincent.guittot@linaro.org, dietmar.eggemann@arm.com, rostedt@goodmis.org, bsegall@google.com, mgorman@suse.de, bristot@redhat.com, vschneid@redhat.com Cc: linux-kernel@vger.kernel.org, Hao Jia , stable@vger.kernel.org, Igor Raits , Bagas Sanjaya Subject: [PATCH v2] sched/core: Fix RQCF_ACT_SKIP leak Date: Thu, 12 Oct 2023 17:00:03 +0800 Message-Id: <20231012090003.11450-1-jiahao.os@bytedance.com> X-Mailer: git-send-email 2.39.2 (Apple Git-143) MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Thu, 12 Oct 2023 02:00:56 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779539684575758273 X-GMAIL-MSGID: 1779539684575758273 Igor Raits and Bagas Sanjaya report a RQCF_ACT_SKIP leak warning. Link: https://lore.kernel.org/all/a5dd536d-041a-2ce9-f4b7-64d8d85c86dc@gmail.com This warning may be triggered in the following situations: CPU0 CPU1 __schedule() *rq->clock_update_flags <<= 1;* unregister_fair_sched_group() pick_next_task_fair+0x4a/0x410 destroy_cfs_bandwidth() newidle_balance+0x115/0x3e0 for_each_possible_cpu(i) *i=0* rq_unpin_lock(this_rq, rf) __cfsb_csd_unthrottle() raw_spin_rq_unlock(this_rq) rq_lock(*CPU0_rq*, &rf) rq_clock_start_loop_update() rq->clock_update_flags & RQCF_ACT_SKIP <-- raw_spin_rq_lock(this_rq) The purpose of RQCF_ACT_SKIP is to skip the update rq clock, but the update is very early in __schedule(), but we clear RQCF_*_SKIP very late, causing it to span that gap above and triggering this warning. In __schedule() we can clear the RQCF_*_SKIP flag immediately after update_rq_clock() to avoid this RQCF_ACT_SKIP leak warning. And set rq->clock_update_flags to RQCF_UPDATED to avoid rq->clock_update_flags < RQCF_ACT_SKIP warning that may be triggered later. Fixes: ebb83d84e49b ("sched/core: Avoid multiple calling update_rq_clock() in __cfsb_csd_unthrottle()") Cc: stable@vger.kernel.org Reported-by: Igor Raits Reported-by: Bagas Sanjaya Closes: https://lore.kernel.org/all/20230913082424.73252-1-jiahao.os@bytedance.com Suggested-by: Peter Zijlstra (Intel) Signed-off-by: Hao Jia --- kernel/sched/core.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 802551e0009b..afb8d213155b 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -5374,8 +5374,6 @@ context_switch(struct rq *rq, struct task_struct *prev, /* switch_mm_cid() requires the memory barriers above. */ switch_mm_cid(rq, prev, next); - rq->clock_update_flags &= ~(RQCF_ACT_SKIP|RQCF_REQ_SKIP); - prepare_lock_switch(rq, next, rf); /* Here we just switch the register state and the stack. */ @@ -6615,6 +6613,7 @@ static void __sched notrace __schedule(unsigned int sched_mode) /* Promote REQ to ACT */ rq->clock_update_flags <<= 1; update_rq_clock(rq); + rq->clock_update_flags = RQCF_UPDATED; switch_count = &prev->nivcsw; @@ -6694,8 +6693,6 @@ static void __sched notrace __schedule(unsigned int sched_mode) /* Also unlocks the rq: */ rq = context_switch(rq, prev, next, &rf); } else { - rq->clock_update_flags &= ~(RQCF_ACT_SKIP|RQCF_REQ_SKIP); - rq_unpin_lock(rq, &rf); __balance_callbacks(rq); raw_spin_rq_unlock_irq(rq);