From patchwork Sun Nov 26 09:39:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ingo Molnar X-Patchwork-Id: 169848 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp2382208vqx; Sun, 26 Nov 2023 01:39:42 -0800 (PST) X-Google-Smtp-Source: AGHT+IH5i9ZdOjLZ3gcJs95dyhYGjJjJZyn2fdxILzpcdlLnKFJNrN9j0hu77XzITK4XeWU1aTIW X-Received: by 2002:a05:6808:b0b:b0:3b8:5dbd:3338 with SMTP id s11-20020a0568080b0b00b003b85dbd3338mr4112236oij.48.1700991581842; Sun, 26 Nov 2023 01:39:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700991581; cv=none; d=google.com; s=arc-20160816; b=lRrmZIohVf1GpN8Wk6nCKYFbcMre75bBP2M/niFUjwFO5O6+uBdJGaudHARpCWJTGB g+l3e8BlCizJuE2beJBd1jH7AHlWKVsVE6NdDY3PPbVBraaYEJG64YFsKlpHSOT+l2KD 2U78BZsnWh44Kmb+ICEpDytte/ZaNGE2bpymos8sy67Nzes/4+1R7Au0XaMJe1pPKDLV lEWSoBOHgHJZ2O8/vyg2qLz3tVGltRqaLKdPjVfcPg1xB9mfnl0SVT9xdaXjHzpgDQ1L GppAnvt0pk8P5bQ5X/0hCDqsJE3fOcomTFBTU8Xro5rCx6sngmKudp0XuJgGZmT0PY6z Xuyg== 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=OPk/i/oB8lqT1JkT4qcOFHig3Z2xZEfG6+EZza5vjsg=; fh=/voPoN/1n2Ud+6CUykgiSxKl4qgBQl2TM7au48aMnnU=; b=OqymJ8LUxRm7JvnZjdiAyfGrTcQxCDD0l2rpKUl7wYro7OLEF6OTFHPrHEPGgGIWkf CyRumOzoH2UIYecRYrklGjQ5j0gNUalbidUP2IL0vhxP7LCA50OiYv13G1M5qV5V9j6j IGxiPITnA3BAFsNKyGrF7uy7PMvYC0FqdTQ1+9dJ2aWWPQ6kiX995AhXSGsQnQ5Ajhkd GSawRaRhMWPJx80ZTY67LUAMdpmxlivElwjed4M9ohTSrfG/YXBcDsNFzbv4jRsARiNt 9NTD3yUzMkRUo/AYNQuAebg88mNVhR879LIjhjhQYkn7JOmr0ROANo0d7kBBKoz+s0M8 /GhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=IjOArQLI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 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 howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id by30-20020a056a02059e00b005b881b4ea84si8023217pgb.428.2023.11.26.01.39.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Nov 2023 01:39:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=IjOArQLI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id AB3AF80C4D66; Sun, 26 Nov 2023 01:39:39 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229504AbjKZJjZ (ORCPT + 99 others); Sun, 26 Nov 2023 04:39:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56468 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229437AbjKZJjX (ORCPT ); Sun, 26 Nov 2023 04:39:23 -0500 Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6F11285 for ; Sun, 26 Nov 2023 01:39:30 -0800 (PST) Received: by mail-ed1-x52f.google.com with SMTP id 4fb4d7f45d1cf-548ce28fd23so4286836a12.3 for ; Sun, 26 Nov 2023 01:39:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700991567; x=1701596367; darn=vger.kernel.org; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :sender:from:to:cc:subject:date:message-id:reply-to; bh=OPk/i/oB8lqT1JkT4qcOFHig3Z2xZEfG6+EZza5vjsg=; b=IjOArQLIYqFVzSSWAqc+owsBZsPuZcOacxFTlbRlQqt2bgJhxxGCM9q7LQk6ZQov2q Un64IKpFSPGIWPs5a4nQv5OMlJF0XblHmfPj4HFrs7gaygFIupyv8Ib8HbMuosup40ng qO5eDX0AhUY63ouDiMEs/a39h20Ol6ixXKEW9j03izdLFFsJULdMj+nvYjoE67Y8x/2q xiem1ISD7jLJNf3rJI6JjQCHxtDGpcNPMCzhzj4hAFxkec2hmAX0NNJp4qrtBGlsiyrQ 2B8UfaPQTU/Sv9GtBdaW8q9BCda2vw6r5XjIqw5+hXM3c2DQW42rfEeT7vkDaKXRD24H MH4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700991567; x=1701596367; 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=OPk/i/oB8lqT1JkT4qcOFHig3Z2xZEfG6+EZza5vjsg=; b=s+v7dxGOu1FT6fA/uKy+wJCT40n60CNEpfyJXmFGP5skFO85wdg4MXXVOwfnYH6Sb5 xMxQYA+B6Q8rwpmvx0MGunxXRwT3qC5IdC1Wc3wsdLA1g8FfWKL1cu4o8Ug3u4TFRlve OfE+3loLjjQI8Q0a2rjNohqK5lWcRckxp+lOPm8Njc7dVdghdOYh8yV7fFPH+IC39TH7 y8fYinvavfOrSh8iIZhzSGhzT0h7Urh5rMvkqq6v6GcyWm9jlxZ9IzXL8kBRgY4+n+5u CUUDo+hUieIwALDPxeLSgy4bfDmw+6SjmZ8488to9+Ryzarc2xmhmLJZF49kgvDLlL2p ig4g== X-Gm-Message-State: AOJu0YyqDcModNRjSUOSJHFUkwE825DgOejMZTcdOab/aB2WwwaDxy2E CcHx6WPcAMeYVs4sL+rH+lY= X-Received: by 2002:a50:aac3:0:b0:544:a153:cd19 with SMTP id r3-20020a50aac3000000b00544a153cd19mr4482943edc.41.1700991567497; Sun, 26 Nov 2023 01:39:27 -0800 (PST) Received: from gmail.com (1F2EF15C.nat.pool.telekom.hu. [31.46.241.92]) by smtp.gmail.com with ESMTPSA id ec27-20020a0564020d5b00b0054b14655134sm2077757edb.49.2023.11.26.01.39.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Nov 2023 01:39:26 -0800 (PST) Sender: Ingo Molnar Date: Sun, 26 Nov 2023 10:39:24 +0100 From: Ingo Molnar To: Linus Torvalds Cc: linux-kernel@vger.kernel.org, Peter Zijlstra , Thomas Gleixner , Will Deacon , Waiman Long , Boqun Feng Subject: [GIT PULL] locking fix Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=0.3 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, FSL_HELO_FAKE,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on howler.vger.email 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 (howler.vger.email [0.0.0.0]); Sun, 26 Nov 2023 01:39:39 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783618948881492150 X-GMAIL-MSGID: 1783618948881492150 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-11-26 # HEAD: bca4104b00fec60be330cd32818dd5c70db3d469 lockdep: Fix block chain corruption Fix lockdep block chain corruption resulting in KASAN warnings. Thanks, Ingo ------------------> Peter Zijlstra (1): lockdep: Fix block chain corruption kernel/locking/lockdep.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c index e85b5ad3e206..151bd3de5936 100644 --- a/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c @@ -3497,7 +3497,8 @@ static int alloc_chain_hlocks(int req) size = chain_block_size(curr); if (likely(size >= req)) { del_chain_block(0, size, chain_block_next(curr)); - add_chain_block(curr + req, size - req); + if (size > req) + add_chain_block(curr + req, size - req); return curr; } }