From nobody Sun Feb 8 22:05:36 2026 Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EC74112E1F0; Fri, 24 May 2024 15:30:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716564614; cv=none; b=lAMbJ+ByPOvE3RZ5t2OH86R59AIh48oKkLv1f262n3IdOMolyJDXd6AyUW4k656PhUUYjn+dNaQhkIRoIHbylM05H5XgnMhnzhpkUtrawh4Vb0YcvMJKIRetdHyxeQy7AbxyfphQ57tBiPvlZpsInCR/CWXS+l0dluFKF+/UD0E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716564614; c=relaxed/simple; bh=Vb+x/ZZbyvOZEx4tZHTKF+8NUAMDYHXMfePXFUeJ064=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=S98koyxykmvhEVH6vlnIO/2tHJuxLiQl24e8eZ6PBKCyA3VinjiU4yBD5rCCSs/yBsrRIEm+7tudRdFuDddBmPAbuh2eBq81mqANYrkgz6EZRzpCri1SonGE5XbRaFfDAHCkkhjpKWBqlkF3LvTri6J61mT46Y3DnQ9lFJbmu8I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=mS36Wfrp; arc=none smtp.client-ip=209.85.216.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="mS36Wfrp" Received: by mail-pj1-f54.google.com with SMTP id 98e67ed59e1d1-2bdf1f8949dso281883a91.2; Fri, 24 May 2024 08:30:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716564612; x=1717169412; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yA2giIirIzyk3qPOvNZ+vbWO0ihNMW8s6ZdoXXb+0f0=; b=mS36WfrpESjyxqavrHIddNCRyikMXSUeriNs7YFrucN4Sl5KHyeZjdEfMh2CJYDqcC mkTkSS2aVIp2JPp7hhWRD48Y9PgW7R+FRPMUaKtXZzjH5aODDdddrL/6L5U2cOiT9eMq 1UAQAHfuRuwSaOvEqg9KhLbVQM9QGjxPkuRJzjtMfbNPOiMmvWo3TqhAO01QnhS4NvPD p3mz/5YV9kOM3ou0Xjt3B50tyiM4oaGlA/v1daLqdV6oeyRgEfvK8hppz/CcVZ4HwZd7 6i7mohJWMEhBpHuWtzS/T6MGviaGyBIFd5re3b7FwDOdnOfNOyQ5jcwct7m0wiTcQ4UI mCIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716564612; x=1717169412; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yA2giIirIzyk3qPOvNZ+vbWO0ihNMW8s6ZdoXXb+0f0=; b=OjYQcyRcBehylTsaByR3yyUfwfhvzLlxzTMa4kebg/5KxVtLDe6EpO6zYpIYrAXMvn CM41PyxM3Q87CmBXndQqIA+3rN4oVVEx9QO/Z40HFoY55l254DSSrxIBimv3PYX0/h0k w3BqrezMiIMF/ttXSoiyMjbbiA1s6wtfdZVJun4w4SzTTj3Vw1ovOqgmUj37fVmXizRa /rdRMexMX5gcVOeCRIHGv8gdsTcWlLWkK8rPLoB1OfW8nwp/xCBcMWye29TeE1RQQxUH qUSZ+KnQOohg3MCVgc8GJRn1ZWltb9/WTgnTwjAkXmh1rx1iqVUi0FUAeNj5R3Gu55Ce nJaw== X-Forwarded-Encrypted: i=1; AJvYcCXf3lH7LVcm4MQEADAib7DKmm8Rb5zLdRixkWqn+jZEfnzb1yvVr2U/xZJ82Y8fdc0Lx+6s9Q57Tk4aq+Tjm7l4BuJfiHoq9eH2PJiZ9ZNnJH0/tNHH6q7X71dpG6ndxQa5MFyzcy+lB4D3AHmEus0dsZuPIGdkLbYj1ifiifjcPj4JTG4Hu6o1Ug/vrWn+ZATIv/WQwtyhIImWZsUyy5yETq1XJ64CU7zbpCBz X-Gm-Message-State: AOJu0YyUD28ehoZadZbWhQ1wju+Bo1MYbuwty+EE6iaN3N1o2OjVv0i+ W4v8e5GmzWzCt/B078UA+tppeRz/L/y6EWdNSaysBh/Ylxnw2t3M X-Google-Smtp-Source: AGHT+IGLArb7OqWEB6CrXg11EyYlnXTDni6xakbN7NY6EO02Mt7rz76EsWl65GGah93FseFaBLmQUg== X-Received: by 2002:a17:90a:df13:b0:2bd:7e73:6628 with SMTP id 98e67ed59e1d1-2bf5e0c1bc4mr2586413a91.0.1716564612133; Fri, 24 May 2024 08:30:12 -0700 (PDT) Received: from visitorckw-System-Product-Name.. ([140.113.216.168]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2bf5f50d294sm1525556a91.20.2024.05.24.08.30.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 May 2024 08:30:11 -0700 (PDT) From: Kuan-Wei Chiu To: colyli@suse.de, kent.overstreet@linux.dev, msakai@redhat.com, peterz@infradead.org, mingo@redhat.com, acme@kernel.org, namhyung@kernel.org, akpm@linux-foundation.org Cc: bfoster@redhat.com, mark.rutland@arm.com, alexander.shishkin@linux.intel.com, jolsa@kernel.org, irogers@google.com, adrian.hunter@intel.com, bagasdotme@gmail.com, jserv@ccns.ncku.edu.tw, linux-bcache@vger.kernel.org, linux-kernel@vger.kernel.org, dm-devel@lists.linux.dev, linux-bcachefs@vger.kernel.org, linux-perf-users@vger.kernel.org, Kuan-Wei Chiu , Randy Dunlap Subject: [PATCH v6 01/16] perf/core: Fix several typos Date: Fri, 24 May 2024 23:29:43 +0800 Message-Id: <20240524152958.919343-2-visitorckw@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240524152958.919343-1-visitorckw@gmail.com> References: <20240524152958.919343-1-visitorckw@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Replace 'artifically' with 'artificially'. Replace 'irrespecive' with 'irrespective'. Replace 'futher' with 'further'. Replace 'sufficent' with 'sufficient'. Signed-off-by: Kuan-Wei Chiu Reviewed-by: Ian Rogers Reviewed-by: Randy Dunlap --- kernel/events/core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kernel/events/core.c b/kernel/events/core.c index f0128c5ff278..5e4ad32aeb71 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -534,7 +534,7 @@ void perf_sample_event_took(u64 sample_len_ns) __this_cpu_write(running_sample_length, running_len); =20 /* - * Note: this will be biased artifically low until we have + * Note: this will be biased artificially low until we have * seen NR_ACCUMULATED_SAMPLES. Doing it this way keeps us * from having to maintain a count. */ @@ -596,10 +596,10 @@ static inline u64 perf_event_clock(struct perf_event = *event) * * Event groups make things a little more complicated, but not terribly so= . The * rules for a group are that if the group leader is OFF the entire group = is - * OFF, irrespecive of what the group member states are. This results in + * OFF, irrespective of what the group member states are. This results in * __perf_effective_state(). * - * A futher ramification is that when a group leader flips between OFF and + * A further ramification is that when a group leader flips between OFF and * !OFF, we need to update all group member times. * * @@ -891,7 +891,7 @@ static int perf_cgroup_ensure_storage(struct perf_event= *event, int cpu, heap_size, ret =3D 0; =20 /* - * Allow storage to have sufficent space for an iterator for each + * Allow storage to have sufficient space for an iterator for each * possibly nested cgroup plus an iterator for events with no cgroup. */ for (heap_size =3D 1; css; css =3D css->parent) --=20 2.34.1 From nobody Sun Feb 8 22:05:36 2026 Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1C48412E1F0; Fri, 24 May 2024 15:30:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716564619; cv=none; b=Vnh6rvvabZcIYFVVcVYLotHXS4EBzXuAY55u9lemY1Ap3z1Tnl1XMROTuA3XRrft17WB5/75AvUS0AY+ibML+ikJ7OE2SIRb9UVn6d5ZfY5rR5wO4BZk5K9fKsQvmhwjyC3yOqDI4pXl8/NYv9xSnA1h9v2A2YUS2hXpRgZfd/o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716564619; c=relaxed/simple; bh=UN1Xetleeq5Nz5tLKfuxk8/opVO9kM/FjVJ/CVGswXI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=CQbHdIGkn94GZSVq74akq/pdl5ECb8JUSd5Fzmxh9bTyqggARuJN3QvjolRB0uSDiX5NAY0IBlM7IEVxd3746SUq49DhGsOo0UeppQAmjm3JbZI5Mpl6uwdb3gdorTYEXhrC9nyAX92mJN07PM1vhIty8W4Q7IwA/XY1yRIIyek= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=GFZgBhED; arc=none smtp.client-ip=209.85.216.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="GFZgBhED" Received: by mail-pj1-f52.google.com with SMTP id 98e67ed59e1d1-2bded7f6296so212082a91.1; Fri, 24 May 2024 08:30:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716564617; x=1717169417; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/7grr21+dk77QDv4Gfk7ePfGBs40BXM1/CLzaulLK98=; b=GFZgBhEDWMktf6tWuHX5kTvTLxir43nfLnRK1R/sYQ3+aaMTgbLkWHcvSw2IDvrxGA wwpNv8HfvWPoEvGSLe7Jx7IAJqYa6z+KvFoceKcp5ztzj4ajHciMq/TTaySJH6ZjMk1F MS0d0IJLXaMaY0MG6GUz2hZm81q7bML1eyLlVrqs44y5eVvuiYzttiLxIP5yKpIGWdR6 0WUVrwOlITq0fpLy+KL1c9MWihw7EJeGTr1HZNXveYLzQZXL3YysEuFM61ZVcJfcQKve VGKqgtST7zIBW9dnOG7TR07nMH5UabRL2CZrqUxqpYw0pLd29CAWQIfhbg6ljTxlO/zU 8iNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716564617; x=1717169417; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/7grr21+dk77QDv4Gfk7ePfGBs40BXM1/CLzaulLK98=; b=Efdwvn/+OpRnUvIbD/ftMXB+IrMYLRL13yCT6DmduIXg2D+0+0FqGn7nJbuXoyQvxC zg4RuqFQ6Dpxk6orRHUEuC+g8Dk0gVFw16h6UYU4h+aFZpLaeWs1pC1lbWebVAuMd3iz YyYwVACpJiSUc5cz7IQ7vSHzxZQ/f+/oQZ4yW+zn50bUboJqmDiisyoIiRR4kt18+pRx OlPy38r+fNE9GD4sRJ9bLdjCQ5gPDtADxI+O86HAJcoRGswsvLBrdrL5pT+kNjHFlQUQ 4Eucel/o3IkRXCySKOxX+j71Gxuu0BmkFRj+DYHY5QFQX21xRSQVlHeW4n6Mot8xyDGZ Fv8w== X-Forwarded-Encrypted: i=1; AJvYcCX9vSGYh37Zozw43X1WkiEJHU4DBFHjaKMpwlTbt0XN9I3v/oeXpTARd8/x8TA3V1FXBH9gr0Mh9o1YdaQiGeMymuOC2u2XqHEaSKjMSqYFs4gJo1zV/ESO+LqkN6RiB3XHQb4dDoV7wv04spEL1A2LgrQmyyFyiSglrNCIom+QCQL0556UfXPI01BKApaQrZd5hnv3Jq80GUNYWLDntDSEVaImH5QxoppVTP/W X-Gm-Message-State: AOJu0YxReUukqHDkowoABqs3ayp+lYLr/8LaptbLe48W5uRIqP81lyIb 5UWvaySUj+ye0JL3JsA85u8PS/hpq7VEn6Km8al0mux/aQtB0TBv X-Google-Smtp-Source: AGHT+IHJimdIMmMybcJm9rH5sITCKczMXcjO3LFGPLj00xSs2zLYla0SwJEjxRlWlGP0XYpBUqSPBA== X-Received: by 2002:a17:90b:24c:b0:2b4:329e:eac5 with SMTP id 98e67ed59e1d1-2bf5f202ac5mr2504048a91.2.1716564617341; Fri, 24 May 2024 08:30:17 -0700 (PDT) Received: from visitorckw-System-Product-Name.. ([140.113.216.168]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2bf5f50d294sm1525556a91.20.2024.05.24.08.30.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 May 2024 08:30:16 -0700 (PDT) From: Kuan-Wei Chiu To: colyli@suse.de, kent.overstreet@linux.dev, msakai@redhat.com, peterz@infradead.org, mingo@redhat.com, acme@kernel.org, namhyung@kernel.org, akpm@linux-foundation.org Cc: bfoster@redhat.com, mark.rutland@arm.com, alexander.shishkin@linux.intel.com, jolsa@kernel.org, irogers@google.com, adrian.hunter@intel.com, bagasdotme@gmail.com, jserv@ccns.ncku.edu.tw, linux-bcache@vger.kernel.org, linux-kernel@vger.kernel.org, dm-devel@lists.linux.dev, linux-bcachefs@vger.kernel.org, linux-perf-users@vger.kernel.org, Kuan-Wei Chiu , Randy Dunlap Subject: [PATCH v6 02/16] bcache: Fix typo Date: Fri, 24 May 2024 23:29:44 +0800 Message-Id: <20240524152958.919343-3-visitorckw@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240524152958.919343-1-visitorckw@gmail.com> References: <20240524152958.919343-1-visitorckw@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Replace 'utiility' with 'utility'. Signed-off-by: Kuan-Wei Chiu Reviewed-by: Ian Rogers Reviewed-by: Randy Dunlap --- drivers/md/bcache/util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/md/bcache/util.c b/drivers/md/bcache/util.c index ae380bc3992e..410d8cb49e50 100644 --- a/drivers/md/bcache/util.c +++ b/drivers/md/bcache/util.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * random utiility code, for bcache but in theory not specific to bcache + * random utility code, for bcache but in theory not specific to bcache * * Copyright 2010, 2011 Kent Overstreet * Copyright 2012 Google, Inc. --=20 2.34.1 From nobody Sun Feb 8 22:05:36 2026 Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DC2FB12E1F0; Fri, 24 May 2024 15:30:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716564624; cv=none; b=XOrXvjVZ9fP8idzO9F2DEaWl+z/EXomjstoV0nCYt8m0Boq4ANNB9k+sjdEjPprq8MBPWjv7ckvyzALYLxXMsiTj1LaSCGCThelETIpb5GxJmQCSyXc1n9T501eoZ27tKT62SgbAH9SvX9jeK9rMgPsjYwjOJTMHg+TSscXzfCs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716564624; c=relaxed/simple; bh=QITT4KyTCrPxTa74Hi4WwUV4Z/BKsxAIzezFgyBB9RY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ivlf+s6XAg3bsq9MCnGxzdLwxQeJdxREykqlJ2ErR4R4uECJbZQI2speXUZ1c2JTKZw5J4TWST/qvsL7vZc0u4Tp4v2WXYWUJrB9L5VG00oEl87cywOlw3UspcqBcdgsVAjZDZWQ0qFG9VZBE6LvooldBp4FV3qVXUHUq/G987s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=CNBuae5x; arc=none smtp.client-ip=209.85.216.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="CNBuae5x" Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-2bde32de7c6so339672a91.0; Fri, 24 May 2024 08:30:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716564622; x=1717169422; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7KHs5Ddv3q6AjsWj+2TI+65ShPcrkPx2MBMg1+BRFwU=; b=CNBuae5xzT1d3f2ezSRbXQ8mnWYGffW1rAeG7nAnlAO9JJQSivv5CGwEGiVeT5JgTp KfRAQYLbncF57SanQ9nR8OA32AUcmfl7sq8cleUgGIRrQfPK074+4d0q7stB3B2313mH jdNbiMCZ4/v2KJBplnKRliPVpAMV1xG8ausgG2P6KUBFfsvKIEPsYRaVkLPNWwkoirYP GBn0AfVZIlWL5qcCew0mpxXdlS4MG3M9XFY85kuLECZBxGdjSGtc6dmr4Qnptg0ic5ax oeDjhr0SsrCJYphYwFlmtXJ1eo/QKK9kjEgoW48eIDU2GpecpPmys+ym3cRW6aWaxu5I Wa2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716564622; x=1717169422; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7KHs5Ddv3q6AjsWj+2TI+65ShPcrkPx2MBMg1+BRFwU=; b=cz/u6b/IrVn2a1ppeXs5b2dpVS6eisODc853ShucbV1H5BUD0plX6zQeDyuTT0TmbO zqyp9lPjBxcg9QkUbLdlwo7DJ1m6YCCg5m2cESh5/wkhgh0kECByfW3vd8dIFX4yYJp7 e8ZxMIGPtU6TlHJwuo77ZLlW29ac7BW3m6/Vt/EgtcOlsdsEgnMfbJWXZPoM3aRBlmZ1 YeTsJ//7SxNK6Hq+g27uam7RiwMIAVrQIo/qPfZAAzYWoELmylmm4724wCX8KNzrWAqo 2OqMB4bgqUsIldp3ny1zXJ/3cVUgGPRx0WUPv/c6eQfDwtgVRdHVUvjuMMt3aODLqdKr fHfA== X-Forwarded-Encrypted: i=1; AJvYcCWTqt9R+JN4PuI8weNjottkNEls14QCRtcQT5rQROTRTD2RPpfv6jzdIMZ1x6k6KwI0+Yd/fQpu2ICZELblLKZZuh7sBchuqsDWHNPqMuokmv0zdWRr9GZ1MuFh0MhvKa5QA0PV0GRZOoK78VD97wQ4r9ucHDTOjHliqLPom4zXeUlaB7fQfImRz+g7c0muGy49VSS/K3g5hosSDu+vid6p6W3PterCbwJoQCp2 X-Gm-Message-State: AOJu0YyjaG8CNhT4qyr+WZ9k6c2pxX/oed/wjGe9RVzMqMJS4T403X1u IbgUQO533lIJ2mpN5/eJxCW5N8QSijA2UBdS+Ec9rQP/kCMySoH2 X-Google-Smtp-Source: AGHT+IFVINOfwr0HWjlNIswXxzjjUbfsZzMCUUBzLvajmMapEMWFdTSr6TxSvcR9NlquE4fAbl3ZAw== X-Received: by 2002:a17:90a:ac05:b0:2bd:f770:f95e with SMTP id 98e67ed59e1d1-2bf5e068cd9mr2464878a91.0.1716564622110; Fri, 24 May 2024 08:30:22 -0700 (PDT) Received: from visitorckw-System-Product-Name.. ([140.113.216.168]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2bf5f50d294sm1525556a91.20.2024.05.24.08.30.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 May 2024 08:30:21 -0700 (PDT) From: Kuan-Wei Chiu To: colyli@suse.de, kent.overstreet@linux.dev, msakai@redhat.com, peterz@infradead.org, mingo@redhat.com, acme@kernel.org, namhyung@kernel.org, akpm@linux-foundation.org Cc: bfoster@redhat.com, mark.rutland@arm.com, alexander.shishkin@linux.intel.com, jolsa@kernel.org, irogers@google.com, adrian.hunter@intel.com, bagasdotme@gmail.com, jserv@ccns.ncku.edu.tw, linux-bcache@vger.kernel.org, linux-kernel@vger.kernel.org, dm-devel@lists.linux.dev, linux-bcachefs@vger.kernel.org, linux-perf-users@vger.kernel.org, Kuan-Wei Chiu , Randy Dunlap Subject: [PATCH v6 03/16] bcachefs: Fix typo Date: Fri, 24 May 2024 23:29:45 +0800 Message-Id: <20240524152958.919343-4-visitorckw@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240524152958.919343-1-visitorckw@gmail.com> References: <20240524152958.919343-1-visitorckw@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Replace 'utiility' with 'utility'. Signed-off-by: Kuan-Wei Chiu Reviewed-by: Ian Rogers Reviewed-by: Randy Dunlap --- fs/bcachefs/util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/bcachefs/util.c b/fs/bcachefs/util.c index de331dec2a99..65d42206703c 100644 --- a/fs/bcachefs/util.c +++ b/fs/bcachefs/util.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * random utiility code, for bcache but in theory not specific to bcache + * random utility code, for bcache but in theory not specific to bcache * * Copyright 2010, 2011 Kent Overstreet * Copyright 2012 Google, Inc. --=20 2.34.1 From nobody Sun Feb 8 22:05:36 2026 Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DC1FF12C495; Fri, 24 May 2024 15:30:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716564629; cv=none; b=bq2JYJ09LbYzBgwToImyjN1/FYe/dloY+zQUCiNtv8MIh00mqNspIoFAn3i5qVgRAbDpKWIUXGOdvvbHNapNcV0XenDhuXnB58G9pFZNtzghWpfq3Yg6a7U7IblUGdIKgRa0EYytZEd5F1Spn7ngyj9qImw0bFFrSF9l77ORsfw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716564629; c=relaxed/simple; bh=ePi8L1Dgp9M/7rNmWmbd88wo37MGpDoo2T93Fy5mlRE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=fl8VyOcwnBi4ZGPhTxHTptsJ5oROhxpj1oTDrbR/eDjLHC6hFHmrPAteZqXmH6zwxTCk3cbjCrnqDamLWvxAfWp5ZSB6MOnowHS3/9IOjyLGgYsaXzoKduKcwuWcyt4dlXLmq5ZhOiNiMHvmrSxu5jWgpS/zJeoJPQEope/pbKg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=CiUFo96V; arc=none smtp.client-ip=209.85.216.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="CiUFo96V" Received: by mail-pj1-f54.google.com with SMTP id 98e67ed59e1d1-2bddbaae779so377031a91.2; Fri, 24 May 2024 08:30:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716564627; x=1717169427; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YZOhw1zTk3nl6+RUSDFXGPLEVykYLCbUVY2/3joTnBw=; b=CiUFo96VuUxBcCzJGFzO6ZRLGkzepAADhQmFAEwU9lQAomLRGbw3LYpHza21IlKnIq 6YPsMevNh6Ub3mNNXCiBDe6FUZ4wvpHbMlv+rMwgREkVRRACEgZLEUfzYJpjWDWloHwW nERa0j0h2bcI7WCW9PnKJSLHV1Z7/GVdIVLDhuvLolfB5wfWsYcqwgxvwAZ7D9GMYNpX m9SIjWfe7M8vg3VnVUsb2RVQdZf1eGA22Kt7CreuMnvXKOJntNc8KAvXwauCu2iYgVkk yNUGB19TtnVsFwGNkWkN7zscnx3/xicBC/2iYMJ7eJBIn3TSNOdPxP6wHJLaiZ9W3/Vt eq0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716564627; x=1717169427; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YZOhw1zTk3nl6+RUSDFXGPLEVykYLCbUVY2/3joTnBw=; b=saFZZKCAxKYPcwIKGscUXmuI6gGrni8kkqwyCVivNXIbTmZRHomvBehxn1irSVBcoz +NLu7L7Hap5yo3uAUUIRTRT+K3xvMKWuwku8nC96NHbjJ9T17KoUogWm46X7ShCo9MRR qexLMc+DGle702iQEDcwMw+zgh1MN1qC1GPIaT+dwDdIijqsPhIKBpwwURPqKLKfh8Gf VFUpGfhUeSodpMGTkxJaYWgJW27xzjhK4osknrkr4Q3/UZuH/syPa8C+5UmOAnN5eiHR 3vkLyqqeLfy1dXvD+JMiddSa77fLH1ktG5zb8NXEr200purA3tDPT4ZtI9QeEFnzGVYg LVwg== X-Forwarded-Encrypted: i=1; AJvYcCVn20h8lq8ViKh+DJZ+0FFX//mUjzofQ+yuDmCD8PTn4QOpyK1hhWa/EVkNJHBxVSQ8syfz+SHv0mz8kq5jmyMRUF3cthiSBBXtuYxwtHDBRHTEodSxpsusLLJbCdKjtQix5VUEVuU/N0eYPt5KBgZ3z3rzZeqEwgnkwobF7IZlQGxCE9qLGIitSc5OFO9WsVj2eBqiGVqtgiFFgiyVuSZdQqdXe+qbqKibM2JA X-Gm-Message-State: AOJu0YzwF6PE+FuQXOIsRLCAVxCw5Q3MumIIKZfXahPw0b3QZuz1TTQa q75oBwDboAAQQNLTKso4NN/1WWxvaN9U8ferNEhTbnigxcZJ9PeM X-Google-Smtp-Source: AGHT+IEm0DAELitU2xTpSXIl0owMJuCUhEg4Hzj7wSLb3bLHlQBpbX9eRpm7XSFnoEn2iXFvJv/mSw== X-Received: by 2002:a17:90b:30d8:b0:2b2:4bff:67b7 with SMTP id 98e67ed59e1d1-2bf5f20893dmr2409291a91.3.1716564626935; Fri, 24 May 2024 08:30:26 -0700 (PDT) Received: from visitorckw-System-Product-Name.. ([140.113.216.168]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2bf5f50d294sm1525556a91.20.2024.05.24.08.30.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 May 2024 08:30:26 -0700 (PDT) From: Kuan-Wei Chiu To: colyli@suse.de, kent.overstreet@linux.dev, msakai@redhat.com, peterz@infradead.org, mingo@redhat.com, acme@kernel.org, namhyung@kernel.org, akpm@linux-foundation.org Cc: bfoster@redhat.com, mark.rutland@arm.com, alexander.shishkin@linux.intel.com, jolsa@kernel.org, irogers@google.com, adrian.hunter@intel.com, bagasdotme@gmail.com, jserv@ccns.ncku.edu.tw, linux-bcache@vger.kernel.org, linux-kernel@vger.kernel.org, dm-devel@lists.linux.dev, linux-bcachefs@vger.kernel.org, linux-perf-users@vger.kernel.org, Kuan-Wei Chiu Subject: [PATCH v6 04/16] lib min_heap: Add type safe interface Date: Fri, 24 May 2024 23:29:46 +0800 Message-Id: <20240524152958.919343-5-visitorckw@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240524152958.919343-1-visitorckw@gmail.com> References: <20240524152958.919343-1-visitorckw@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Implement a type-safe interface for min_heap using strong type pointers instead of void * in the data field. This change includes adding small macro wrappers around functions, enabling the use of __minheap_cast and __minheap_obj_size macros for type casting and obtaining element size. This implementation removes the necessity of passing element size in min_heap_callbacks. Additionally, introduce the MIN_HEAP_PREALLOCATED macro for preallocating some elements. Link: https://lkml.kernel.org/ioyfizrzq7w7mjrqcadtzsfgpuntowtjdw5pgn4qhvsdp= 4mqqg@nrlek5vmisbu Signed-off-by: Kuan-Wei Chiu Reviewed-by: Ian Rogers --- Changes in v6: - Rename the MIN_HEAP() macro to DEFINE_MIN_HEAP(). drivers/md/dm-vdo/repair.c | 9 ++-- drivers/md/dm-vdo/slab-depot.c | 5 +-- include/linux/min_heap.h | 79 ++++++++++++++++++++++------------ kernel/events/core.c | 11 ++--- lib/test_min_heap.c | 13 +++--- 5 files changed, 70 insertions(+), 47 deletions(-) diff --git a/drivers/md/dm-vdo/repair.c b/drivers/md/dm-vdo/repair.c index defc9359f10e..e8ad611fe7c1 100644 --- a/drivers/md/dm-vdo/repair.c +++ b/drivers/md/dm-vdo/repair.c @@ -51,6 +51,8 @@ struct recovery_point { bool increment_applied; }; =20 +DEFINE_MIN_HEAP(struct numbered_block_mapping, replay_heap); + struct repair_completion { /* The completion header */ struct vdo_completion completion; @@ -97,7 +99,7 @@ struct repair_completion { * order, then original journal order. This permits efficient iteration o= ver the journal * entries in order. */ - struct min_heap replay_heap; + struct replay_heap replay_heap; /* Fields tracking progress through the journal entries. */ struct numbered_block_mapping *current_entry; struct numbered_block_mapping *current_unfetched_entry; @@ -163,14 +165,13 @@ static void swap_mappings(void *item1, void *item2) } =20 static const struct min_heap_callbacks repair_min_heap =3D { - .elem_size =3D sizeof(struct numbered_block_mapping), .less =3D mapping_is_less_than, .swp =3D swap_mappings, }; =20 static struct numbered_block_mapping *sort_next_heap_element(struct repair= _completion *repair) { - struct min_heap *heap =3D &repair->replay_heap; + struct replay_heap *heap =3D &repair->replay_heap; struct numbered_block_mapping *last; =20 if (heap->nr =3D=3D 0) @@ -1117,7 +1118,7 @@ static void recover_block_map(struct vdo_completion *= completion) * Organize the journal entries into a binary heap so we can iterate over= them in sorted * order incrementally, avoiding an expensive sort call. */ - repair->replay_heap =3D (struct min_heap) { + repair->replay_heap =3D (struct replay_heap) { .data =3D repair->entries, .nr =3D repair->block_map_entry_count, .size =3D repair->block_map_entry_count, diff --git a/drivers/md/dm-vdo/slab-depot.c b/drivers/md/dm-vdo/slab-depot.c index 46e4721e5b4f..ef9a6e53109c 100644 --- a/drivers/md/dm-vdo/slab-depot.c +++ b/drivers/md/dm-vdo/slab-depot.c @@ -3309,7 +3309,6 @@ static void swap_slab_statuses(void *item1, void *ite= m2) } =20 static const struct min_heap_callbacks slab_status_min_heap =3D { - .elem_size =3D sizeof(struct slab_status), .less =3D slab_status_is_less_than, .swp =3D swap_slab_statuses, }; @@ -3509,7 +3508,7 @@ static int get_slab_statuses(struct block_allocator *= allocator, static int __must_check vdo_prepare_slabs_for_allocation(struct block_allo= cator *allocator) { struct slab_status current_slab_status; - struct min_heap heap; + DEFINE_MIN_HEAP(struct slab_status, heap) heap; int result; struct slab_status *slab_statuses; struct slab_depot *depot =3D allocator->depot; @@ -3521,7 +3520,7 @@ static int __must_check vdo_prepare_slabs_for_allocat= ion(struct block_allocator return result; =20 /* Sort the slabs by cleanliness, then by emptiness hint. */ - heap =3D (struct min_heap) { + heap =3D (struct heap) { .data =3D slab_statuses, .nr =3D allocator->slab_count, .size =3D allocator->slab_count, diff --git a/include/linux/min_heap.h b/include/linux/min_heap.h index d52daf45861b..92830f41642a 100644 --- a/include/linux/min_heap.h +++ b/include/linux/min_heap.h @@ -7,45 +7,53 @@ #include =20 /** - * struct min_heap - Data structure to hold a min-heap. - * @data: Start of array holding the heap elements. + * Data structure to hold a min-heap. * @nr: Number of elements currently in the heap. * @size: Maximum number of elements that can be held in current storage. + * @data: Pointer to the start of array holding the heap elements. + * @preallocated: Start of the static preallocated array holding the heap = elements. */ -struct min_heap { - void *data; - int nr; - int size; -}; +#define MIN_HEAP_PREALLOCATED(_type, _name, _nr) \ +struct _name { \ + int nr; \ + int size; \ + _type *data; \ + _type preallocated[_nr]; \ +} + +#define DEFINE_MIN_HEAP(_type, _name) MIN_HEAP_PREALLOCATED(_type, _name, = 0) + +typedef DEFINE_MIN_HEAP(char, min_heap_char) min_heap_char; + +#define __minheap_cast(_heap) (typeof((_heap)->data[0]) *) +#define __minheap_obj_size(_heap) sizeof((_heap)->data[0]) =20 /** * struct min_heap_callbacks - Data/functions to customise the min_heap. - * @elem_size: The nr of each element in bytes. * @less: Partial order function for this heap. * @swp: Swap elements function. */ struct min_heap_callbacks { - int elem_size; bool (*less)(const void *lhs, const void *rhs); void (*swp)(void *lhs, void *rhs); }; =20 /* Sift the element at pos down the heap. */ static __always_inline -void min_heapify(struct min_heap *heap, int pos, +void __min_heapify(min_heap_char *heap, int pos, size_t elem_size, const struct min_heap_callbacks *func) { void *left, *right; void *data =3D heap->data; - void *root =3D data + pos * func->elem_size; + void *root =3D data + pos * elem_size; int i =3D pos, j; =20 /* Find the sift-down path all the way to the leaves. */ for (;;) { if (i * 2 + 2 >=3D heap->nr) break; - left =3D data + (i * 2 + 1) * func->elem_size; - right =3D data + (i * 2 + 2) * func->elem_size; + left =3D data + (i * 2 + 1) * elem_size; + right =3D data + (i * 2 + 2) * elem_size; i =3D func->less(left, right) ? i * 2 + 1 : i * 2 + 2; } =20 @@ -54,31 +62,37 @@ void min_heapify(struct min_heap *heap, int pos, i =3D i * 2 + 1; =20 /* Backtrack to the correct location. */ - while (i !=3D pos && func->less(root, data + i * func->elem_size)) + while (i !=3D pos && func->less(root, data + i * elem_size)) i =3D (i - 1) / 2; =20 /* Shift the element into its correct place. */ j =3D i; while (i !=3D pos) { i =3D (i - 1) / 2; - func->swp(data + i * func->elem_size, data + j * func->elem_size); + func->swp(data + i * elem_size, data + j * elem_size); } } =20 +#define min_heapify(_heap, _pos, _func) \ + __min_heapify((min_heap_char *)_heap, _pos, __minheap_obj_size(_heap), _f= unc) + /* Floyd's approach to heapification that is O(nr). */ static __always_inline -void min_heapify_all(struct min_heap *heap, +void __min_heapify_all(min_heap_char *heap, size_t elem_size, const struct min_heap_callbacks *func) { int i; =20 for (i =3D heap->nr / 2 - 1; i >=3D 0; i--) - min_heapify(heap, i, func); + __min_heapify(heap, i, elem_size, func); } =20 +#define min_heapify_all(_heap, _func) \ + __min_heapify_all((min_heap_char *)_heap, __minheap_obj_size(_heap), _fun= c) + /* Remove minimum element from the heap, O(log2(nr)). */ static __always_inline -void min_heap_pop(struct min_heap *heap, +void __min_heap_pop(min_heap_char *heap, size_t elem_size, const struct min_heap_callbacks *func) { void *data =3D heap->data; @@ -88,27 +102,33 @@ void min_heap_pop(struct min_heap *heap, =20 /* Place last element at the root (position 0) and then sift down. */ heap->nr--; - memcpy(data, data + (heap->nr * func->elem_size), func->elem_size); - min_heapify(heap, 0, func); + memcpy(data, data + (heap->nr * elem_size), elem_size); + __min_heapify(heap, 0, elem_size, func); } =20 +#define min_heap_pop(_heap, _func) \ + __min_heap_pop((min_heap_char *)_heap, __minheap_obj_size(_heap), _func) + /* * Remove the minimum element and then push the given element. The * implementation performs 1 sift (O(log2(nr))) and is therefore more * efficient than a pop followed by a push that does 2. */ static __always_inline -void min_heap_pop_push(struct min_heap *heap, - const void *element, +void __min_heap_pop_push(min_heap_char *heap, + const void *element, size_t elem_size, const struct min_heap_callbacks *func) { - memcpy(heap->data, element, func->elem_size); - min_heapify(heap, 0, func); + memcpy(heap->data, element, elem_size); + __min_heapify(heap, 0, elem_size, func); } =20 +#define min_heap_pop_push(_heap, _element, _func) \ + __min_heap_pop_push((min_heap_char *)_heap, _element, __minheap_obj_size(= _heap), _func) + /* Push an element on to the heap, O(log2(nr)). */ static __always_inline -void min_heap_push(struct min_heap *heap, const void *element, +void __min_heap_push(min_heap_char *heap, const void *element, size_t elem= _size, const struct min_heap_callbacks *func) { void *data =3D heap->data; @@ -120,17 +140,20 @@ void min_heap_push(struct min_heap *heap, const void = *element, =20 /* Place at the end of data. */ pos =3D heap->nr; - memcpy(data + (pos * func->elem_size), element, func->elem_size); + memcpy(data + (pos * elem_size), element, elem_size); heap->nr++; =20 /* Sift child at pos up. */ for (; pos > 0; pos =3D (pos - 1) / 2) { - child =3D data + (pos * func->elem_size); - parent =3D data + ((pos - 1) / 2) * func->elem_size; + child =3D data + (pos * elem_size); + parent =3D data + ((pos - 1) / 2) * elem_size; if (func->less(parent, child)) break; func->swp(parent, child); } } =20 +#define min_heap_push(_heap, _element, _func) \ + __min_heap_push((min_heap_char *)_heap, _element, __minheap_obj_size(_hea= p), _func) + #endif /* _LINUX_MIN_HEAP_H */ diff --git a/kernel/events/core.c b/kernel/events/core.c index 5e4ad32aeb71..47cb17adf858 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -3701,13 +3701,14 @@ static void swap_ptr(void *l, void *r) swap(*lp, *rp); } =20 +DEFINE_MIN_HEAP(struct perf_event *, perf_event_min_heap); + static const struct min_heap_callbacks perf_min_heap =3D { - .elem_size =3D sizeof(struct perf_event *), .less =3D perf_less_group_idx, .swp =3D swap_ptr, }; =20 -static void __heap_add(struct min_heap *heap, struct perf_event *event) +static void __heap_add(struct perf_event_min_heap *heap, struct perf_event= *event) { struct perf_event **itrs =3D heap->data; =20 @@ -3741,7 +3742,7 @@ static noinline int visit_groups_merge(struct perf_ev= ent_context *ctx, struct perf_cpu_context *cpuctx =3D NULL; /* Space for per CPU and/or any CPU event iterators. */ struct perf_event *itrs[2]; - struct min_heap event_heap; + struct perf_event_min_heap event_heap; struct perf_event **evt; int ret; =20 @@ -3750,7 +3751,7 @@ static noinline int visit_groups_merge(struct perf_ev= ent_context *ctx, =20 if (!ctx->task) { cpuctx =3D this_cpu_ptr(&perf_cpu_context); - event_heap =3D (struct min_heap){ + event_heap =3D (struct perf_event_min_heap){ .data =3D cpuctx->heap, .nr =3D 0, .size =3D cpuctx->heap_size, @@ -3763,7 +3764,7 @@ static noinline int visit_groups_merge(struct perf_ev= ent_context *ctx, css =3D &cpuctx->cgrp->css; #endif } else { - event_heap =3D (struct min_heap){ + event_heap =3D (struct perf_event_min_heap){ .data =3D itrs, .nr =3D 0, .size =3D ARRAY_SIZE(itrs), diff --git a/lib/test_min_heap.c b/lib/test_min_heap.c index 7b01b4387cfb..52efab9fb2f1 100644 --- a/lib/test_min_heap.c +++ b/lib/test_min_heap.c @@ -11,6 +11,8 @@ #include #include =20 +DEFINE_MIN_HEAP(int, min_heap_test); + static __init bool less_than(const void *lhs, const void *rhs) { return *(int *)lhs < *(int *)rhs; @@ -30,7 +32,7 @@ static __init void swap_ints(void *lhs, void *rhs) } =20 static __init int pop_verify_heap(bool min_heap, - struct min_heap *heap, + struct min_heap_test *heap, const struct min_heap_callbacks *funcs) { int *values =3D heap->data; @@ -63,13 +65,12 @@ static __init int test_heapify_all(bool min_heap) { int values[] =3D { 3, 1, 2, 4, 0x8000000, 0x7FFFFFF, 0, -3, -1, -2, -4, 0x8000000, 0x7FFFFFF }; - struct min_heap heap =3D { + struct min_heap_test heap =3D { .data =3D values, .nr =3D ARRAY_SIZE(values), .size =3D ARRAY_SIZE(values), }; struct min_heap_callbacks funcs =3D { - .elem_size =3D sizeof(int), .less =3D min_heap ? less_than : greater_than, .swp =3D swap_ints, }; @@ -96,13 +97,12 @@ static __init int test_heap_push(bool min_heap) const int data[] =3D { 3, 1, 2, 4, 0x80000000, 0x7FFFFFFF, 0, -3, -1, -2, -4, 0x80000000, 0x7FFFFFFF }; int values[ARRAY_SIZE(data)]; - struct min_heap heap =3D { + struct min_heap_test heap =3D { .data =3D values, .nr =3D 0, .size =3D ARRAY_SIZE(values), }; struct min_heap_callbacks funcs =3D { - .elem_size =3D sizeof(int), .less =3D min_heap ? less_than : greater_than, .swp =3D swap_ints, }; @@ -129,13 +129,12 @@ static __init int test_heap_pop_push(bool min_heap) const int data[] =3D { 3, 1, 2, 4, 0x80000000, 0x7FFFFFFF, 0, -3, -1, -2, -4, 0x80000000, 0x7FFFFFFF }; int values[ARRAY_SIZE(data)]; - struct min_heap heap =3D { + struct min_heap_test heap =3D { .data =3D values, .nr =3D 0, .size =3D ARRAY_SIZE(values), }; struct min_heap_callbacks funcs =3D { - .elem_size =3D sizeof(int), .less =3D min_heap ? less_than : greater_than, .swp =3D swap_ints, }; --=20 2.34.1 From nobody Sun Feb 8 22:05:36 2026 Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4F8D0130484; Fri, 24 May 2024 15:30:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716564633; cv=none; b=K7UuR8mKxjXYunR/xntXZXC4TJj5b+LnyjSBpVeFfWF4/rNvBjEcB+vb3sivAzlRQWse8qwFjY++qL2F46iSisDlaSqADB9l34V48s1hXzv0oZKEkhcBptlz/3O3M7J3RUzpqfmZYGksYHAfiy+kmWoZO9Fjh3E9KMri4UBufQ0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716564633; c=relaxed/simple; bh=3Cv/NEYxtL7rses18dsQW99Ih1hbxSO8VST7jRlzjCU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=GsGRT7I3UBf3+QUz0wWLItOwsqWsJ4bAib2Z8FoakGRFTzvM60qyJiKIidfvYOMd4pNV+GbdlwtV/oMGRSLSAoDZeIrSWG8JHjtZ5zSk61MmoDAtYIBgwtvSUPkEHJIYqK+3ZAS40ZvgsKRR1KYIKgaoDH7G8Ei4IOkZQJXBbZM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Ds5O3Zkp; arc=none smtp.client-ip=209.85.216.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Ds5O3Zkp" Received: by mail-pj1-f54.google.com with SMTP id 98e67ed59e1d1-2bf5baa6034so216150a91.0; Fri, 24 May 2024 08:30:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716564632; x=1717169432; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=T0fYqR9rcSvYbrkD+sBe/h5jrjzbrTBXD1r+tuRTAZk=; b=Ds5O3Zkpr94eCX52WOGzUVrJedFZvUbUzyJRh0KkXcQA6cN4IGv/4Yi2UiIPQDKMl2 gRRLuewm7yLyDs9cXYZFoRbpRdxg6Gw/mBW9j8cbfXsRce6xLOdA/nPzTYVO9dZ8P3E9 ZAV4hI4p0ujntcHnVRGzreVxgoZju9RrvVGY4JorvT/rnj0ZXYdOKZhcMTn5KN2sX4k2 s6qgwLAqXG0lJrIboF/6eL5kvEBx1+3rJtM1bW43DtMLVtMVpZjKtW/znfGtqeOApoZg rznm9WhI4y8gkRk5vzPxshed3GNhC4IHVUrvMdGao8vSRy8KFTnsnbzBYN8Z/0B0LpWL 6gYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716564632; x=1717169432; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=T0fYqR9rcSvYbrkD+sBe/h5jrjzbrTBXD1r+tuRTAZk=; b=tgefL3nVn07vZF8VG/hRyhki3qPfPrcG4p1fyiyKvHyuotC+QyuGm2B47orsXMnedM kOHCi2RamJFOCucTCXLlT9mt0sX7pKcGpiyYklYyrLc5lmf1Wjap4nVCSKb19ImE5fVD jp/SfRO244jKSIrZbbEhtQvKDBHfNRrsc28RXraTDMsLdnxxQ7DxITZEayUavgFSBJJl 91OxSKHPlcV81aDZQF0wY1/NGm01ARMYm81foOpc/c/C8wjuaSzm59AO2jv851sAQw3B RTz8NooNN10xNaT2rBJtKUPn/vdceIwyN5AQX1JgYnSoDRjedP2sR79dPn1PT3fz4YBo q7wg== X-Forwarded-Encrypted: i=1; AJvYcCVSzvKZxQXRQ5bqCCkIr+KizOqUcWTZBXAofTWijhSzej7bUO4/Gj4RtJp3lv1enPbQ4NwoCGZSuXzhmsCCG3Yw1SKYPpUZTxKi+ikQr7FvrfX2JOrHi1Z8/buVmo/uVlqB5eZ1zT9ol6vU3RifJHNHuO7DxH+DP7qtVbqDyePxR2YXva3845znWUpxmTQE7O+ZRfIUQ3nV8+508hSkXNKMhiobqMsvBWoKcb5O X-Gm-Message-State: AOJu0YxMSQV7N0bJEwgTh5VKvmlaQEhOPHnsfZQp6i2VpMA4mevGCHAa x+B8pTakknKpBn1GH25X9VPEW2znPfKb/qW+g6OMgzDm7VBieIbo X-Google-Smtp-Source: AGHT+IF8luE1cdHm1AfcM0WoDjZHudhzFqofZ1FcFKJ69yRGqwL7AZUhIIsbkDXV3LM7TdHAleFXCQ== X-Received: by 2002:a17:90b:230e:b0:2bd:76ee:48c2 with SMTP id 98e67ed59e1d1-2bf5e0a7a56mr2494152a91.0.1716564631729; Fri, 24 May 2024 08:30:31 -0700 (PDT) Received: from visitorckw-System-Product-Name.. ([140.113.216.168]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2bf5f50d294sm1525556a91.20.2024.05.24.08.30.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 May 2024 08:30:31 -0700 (PDT) From: Kuan-Wei Chiu To: colyli@suse.de, kent.overstreet@linux.dev, msakai@redhat.com, peterz@infradead.org, mingo@redhat.com, acme@kernel.org, namhyung@kernel.org, akpm@linux-foundation.org Cc: bfoster@redhat.com, mark.rutland@arm.com, alexander.shishkin@linux.intel.com, jolsa@kernel.org, irogers@google.com, adrian.hunter@intel.com, bagasdotme@gmail.com, jserv@ccns.ncku.edu.tw, linux-bcache@vger.kernel.org, linux-kernel@vger.kernel.org, dm-devel@lists.linux.dev, linux-bcachefs@vger.kernel.org, linux-perf-users@vger.kernel.org, Kuan-Wei Chiu Subject: [PATCH v6 05/16] lib min_heap: Add min_heap_init() Date: Fri, 24 May 2024 23:29:47 +0800 Message-Id: <20240524152958.919343-6-visitorckw@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240524152958.919343-1-visitorckw@gmail.com> References: <20240524152958.919343-1-visitorckw@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add min_heap_init() for initializing heap with data, nr, and size. Signed-off-by: Kuan-Wei Chiu Reviewed-by: Ian Rogers --- include/linux/min_heap.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/include/linux/min_heap.h b/include/linux/min_heap.h index 92830f41642a..b384a4ea2afa 100644 --- a/include/linux/min_heap.h +++ b/include/linux/min_heap.h @@ -38,6 +38,21 @@ struct min_heap_callbacks { void (*swp)(void *lhs, void *rhs); }; =20 +/* Initialize a min-heap. */ +static __always_inline +void __min_heap_init(min_heap_char *heap, void *data, int size) +{ + heap->nr =3D 0; + heap->size =3D size; + if (data) + heap->data =3D data; + else + heap->data =3D heap->preallocated; +} + +#define min_heap_init(_heap, _data, _size) \ + __min_heap_init((min_heap_char *)_heap, _data, _size) + /* Sift the element at pos down the heap. */ static __always_inline void __min_heapify(min_heap_char *heap, int pos, size_t elem_size, --=20 2.34.1 From nobody Sun Feb 8 22:05:36 2026 Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B70BD12DDAB; Fri, 24 May 2024 15:30:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716564639; cv=none; b=Hb6LGbmi0VLJgKlvrPO9nuk3dkREOrNVHyj2a46I9IA8aTxdDSV/6ziCluEV8e7TTR10zCQa8Zavws/fI8yv3ZRMGw0hnjJNbggnsyUwJMP2C773Fy29i7dJXBg7jaZoNx9opaPLBmhxuL9CV34U6cd9fazOAlFm3s0vsgF30nI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716564639; c=relaxed/simple; bh=CtmjnUhCovWSsS0eLtHZkP1gRg/+o2/rih6xjavgouM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=tV/WnlX5EkpCIhbl5/MzGX8c5o9DwUijFJbU+c1wbMfbNFrPCk6doiZly7S97hnrHiemNu2uY7Pz6hG29MRnfzj4pdIxxmDro/GxArJ3JpAwdy/OqaZXZaWamal3Ikh8zCoTbFft8b8mo4vpIBTVWg7tKARLPUAqWCJ2l/Vxbjc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=BxoOblvg; arc=none smtp.client-ip=209.85.216.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="BxoOblvg" Received: by mail-pj1-f49.google.com with SMTP id 98e67ed59e1d1-2bf5baa5b76so103284a91.0; Fri, 24 May 2024 08:30:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716564637; x=1717169437; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=cYJrwbsUSMlgZtHUd20UudtqnzPzA+Nu3Je7Gypyz6k=; b=BxoOblvgWca93mml1Z8752CixmUuvnRuoFqphVkZnqlGWli8wcNzz+S5faEHTxT/Zw GJxFGG1vInrZgWZYJCewA1Ph3/iSpoaRsFYoi70mx5rvNC7mpqvcAEoiy6YJV+mFtKOm TvymQYjRpOqXZ+7UafNCc9TtOUuO8jQIP7XWjZj2QkM6ZiFMzM/I7jWPuaJOZbRZLibW kyO4oErn2M1aW/+xzx/+tqNurFpff1Pnhs9KKFWRM6IqAqlcKISpfi4BEnFFBcfjqnRk MDQIlzikp59nqpmrtP44i4cTh54gtbOCFmLQFFSpUuw4buTkF/o2zsQ0K79HqKfriZN2 L9FQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716564637; x=1717169437; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cYJrwbsUSMlgZtHUd20UudtqnzPzA+Nu3Je7Gypyz6k=; b=N+5Jal0CEyCI83dVF2MR+wu85DH9pznsbWhL0MiyuTtSFDxG6Idg/KeMQY4vBNHTPE l8bJ5ACqZXWiftkpWHIjGVWl6s7J9EEwvIsdxVUTQhMoRQvjW9AXuP4kOYTwJUTa30G2 Awy+XvMJNqOGQdrJ9S5xDpfNh9uo9UHLgkEPMwjlQVidPOUSg3OpOgnOd1DKz3VTMMKD zAWOo6VGkMWrmZG2McmqPW/ayVmlMk+1q2oDOvw6cBkKcV/jY1/gJR2kQKMW8TNF4APW FmfOi2fmJzFo03ier9QUi+swXiZ3cTgYX+/YCGFP+d1+UG+ltqvuempWxYovV2xosOdF OeVg== X-Forwarded-Encrypted: i=1; AJvYcCXLZPXhCH5T9fLBNSJlAFscAp/b7XJ4eQ/2qaiNZRb1kPVnY3ty+7vYWodmgOIXoSmoj3b4UwYjYC0ONbJWE4qUc6z1bS/8KOBV8MeDMvHutyUoDYRa3w3s5V5OjCVBbpihXFhNuIuV3UIqrQRJmQaeTCCSHAxbOyvxyPyy9zblQcSBoZxhb2u1Esci+aJCeKiQdOE5lms6H1/mQhyNZ5azqZ6Q/cddcP3Lf/2r X-Gm-Message-State: AOJu0Yxh2rAQ45AD7DfGCVgGopxLzrPOe2zLP9enaSBg2QZuHZs0wsaG SepotaUxRvjkiwfozhmByMCQHUvWyz9W9gyWSY2LjLV4ZgEXXk0G X-Google-Smtp-Source: AGHT+IHoYwOCUaxc1eEkPVdFwpRkMAzYQsOk0wv11TzpiDNFWzl8TbRA7I/ssjXw7Wzjhb+pC2mgVw== X-Received: by 2002:a17:90b:2286:b0:2bd:e806:49e4 with SMTP id 98e67ed59e1d1-2bf5f511c5amr2497068a91.4.1716564636772; Fri, 24 May 2024 08:30:36 -0700 (PDT) Received: from visitorckw-System-Product-Name.. ([140.113.216.168]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2bf5f50d294sm1525556a91.20.2024.05.24.08.30.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 May 2024 08:30:36 -0700 (PDT) From: Kuan-Wei Chiu To: colyli@suse.de, kent.overstreet@linux.dev, msakai@redhat.com, peterz@infradead.org, mingo@redhat.com, acme@kernel.org, namhyung@kernel.org, akpm@linux-foundation.org Cc: bfoster@redhat.com, mark.rutland@arm.com, alexander.shishkin@linux.intel.com, jolsa@kernel.org, irogers@google.com, adrian.hunter@intel.com, bagasdotme@gmail.com, jserv@ccns.ncku.edu.tw, linux-bcache@vger.kernel.org, linux-kernel@vger.kernel.org, dm-devel@lists.linux.dev, linux-bcachefs@vger.kernel.org, linux-perf-users@vger.kernel.org, Kuan-Wei Chiu Subject: [PATCH v6 06/16] lib min_heap: Add min_heap_peek() Date: Fri, 24 May 2024 23:29:48 +0800 Message-Id: <20240524152958.919343-7-visitorckw@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240524152958.919343-1-visitorckw@gmail.com> References: <20240524152958.919343-1-visitorckw@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add min_heap_peek() function to retrieve a pointer to the smallest element. The pointer is cast to the appropriate type of heap elements. Signed-off-by: Kuan-Wei Chiu Reviewed-by: Ian Rogers --- include/linux/min_heap.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/linux/min_heap.h b/include/linux/min_heap.h index b384a4ea2afa..d9c4ae7ad0cc 100644 --- a/include/linux/min_heap.h +++ b/include/linux/min_heap.h @@ -53,6 +53,16 @@ void __min_heap_init(min_heap_char *heap, void *data, in= t size) #define min_heap_init(_heap, _data, _size) \ __min_heap_init((min_heap_char *)_heap, _data, _size) =20 +/* Get the minimum element from the heap. */ +static __always_inline +void *__min_heap_peek(struct min_heap_char *heap) +{ + return heap->nr ? heap->data : NULL; +} + +#define min_heap_peek(_heap) \ + (__minheap_cast(_heap) __min_heap_peek((min_heap_char *)_heap)) + /* Sift the element at pos down the heap. */ static __always_inline void __min_heapify(min_heap_char *heap, int pos, size_t elem_size, --=20 2.34.1 From nobody Sun Feb 8 22:05:36 2026 Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 31848130ACF; Fri, 24 May 2024 15:30:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716564643; cv=none; b=QTyx3A7tF571G6aLdTexG5jyCIZTVBUSnzc0Y0Pi8c0QC/XnYbjWpSXKZcD74QDrpmrTl0TivYG/Y8jb85iY8xO56VsjrqUbN/wkrWCq1jlkbRrfOy0P8BEsLmOb/X/BUVW+cfcn66SNN+n8FrwZjOhgXLBaiq3OFlPxSSyd0W0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716564643; c=relaxed/simple; bh=KituFP5FWvyk4tf0TCLoKJP1Ug399E1uez9KXSPSXO0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=fsPzdOs8fGcqDSKHm6KZ76HeeBU2cQh9f1tRDPLVZmwfDVIu9yU70w51EanBI7UV3ssmNNe42xppATNFa9f1ORSj/oVOPI0LJ3KzFJuQsPIHgU60wZFYJi/f2n7krMbIhYJbLFoiGJAHcAjEck6yTwPSBFI56d5T2rHJQs+8Hxs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=R8U3o2Ie; arc=none smtp.client-ip=209.85.216.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="R8U3o2Ie" Received: by mail-pj1-f49.google.com with SMTP id 98e67ed59e1d1-2bf5baa5b76so103306a91.0; Fri, 24 May 2024 08:30:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716564641; x=1717169441; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=L6wGqg1Bkc6VloO/r5wptzdiAzti723DW6TYEbY9ymY=; b=R8U3o2IechSXYCc2t9e+2bV7+BR8oV5zWVDFmXgJ2xQQcsFvIX3rOKn8xcnjb1ZLbC yV8joStOtlxdWO5OO4oggyOdVZNqnv/gaQN4hTzmNJpaM91oW6zrDMYjd5x/meT3aEFz wLFBDGE/kwhCqxlW3r4x32KYP/mU7CWQZ2E8E2VePmV1W1VJWm1zuAw6YArPPC/OTzXN QTGmH6vUOKw9EZ6Uj2uG+T6BuRwxBETQ/t5+Z/L1FVc5xWW9Cvc2eMXKBdI4XaqNpjrO UKjoMm+jY3nMhtBxyhEv6xpkUO8Xvgff01UUbsUmKU9DBd9DqThjrzokGfJefEAj+GwT emRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716564641; x=1717169441; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=L6wGqg1Bkc6VloO/r5wptzdiAzti723DW6TYEbY9ymY=; b=uInm1J4IVwhrwWtifgiQrwq/Lm4uWZ2yccWq/lvZYGgNtKUphh849aLRkU4iYuHa0r 23jy1b0b+vX6Ydr+t3ehIpd/g5XulzNKHG9WT4A0kM82KSmmlfUpjmWyaLk4HpqokYYd L3igPr4UB6jN3U5SV++4ewnBJLll+9HnxXr4KRdComYTHMu4PAvoFILxUSj1UOKrWfBe USx+vj13kFy5Gbv4wOhAw5l7eBQT6ANZDl7esUX/hEZzWYdhbiJAULA9f8fwqSXfm2QH eqy6OUZxgDbyNn5rsT7J86Bzsq9aEhRIJuTdRuJrlqV50yqXmQCnMVhKA8oxh7mcYrs1 MD9w== X-Forwarded-Encrypted: i=1; AJvYcCUMHrrBp4z3C+zwBSqQlsHGEUEnHlATc0MudJPpYei2RlAfEfH5vWFFnEKRXOWGXduV3Sm86xMVxGssAucTDUpbufC1hg8jo9fkM8dyKG4Hyx0S4JSg3wYbZbfSEofLaVUoH/2PqSr6W78lX5GZmRXMB8AUwHDqxTAVp7kCcKbBN8eN7tYjdgmidw7OSi8dqqWlxVBHfBh2FUhrpp0qp1rKY7LnLNsj2/UzJ2En X-Gm-Message-State: AOJu0YwNddzvlX+WNnDGVbGCIjeM4d9XQytQulqPutQgxRB8X/CphG3k 3dRhRcmajeNzqIB+SOiS5FkibQrr6lgh/UdIpDPuQm16U2pxP+HB X-Google-Smtp-Source: AGHT+IEFZigwBsVU3DQ0U9XwesSc/pScEk6hYtsY4XibOuLDALe7YcoghUfWtHqjA5Lb2EftoZr+ZA== X-Received: by 2002:a17:90b:24c:b0:2b4:329e:eac5 with SMTP id 98e67ed59e1d1-2bf5f202ac5mr2505228a91.2.1716564641436; Fri, 24 May 2024 08:30:41 -0700 (PDT) Received: from visitorckw-System-Product-Name.. ([140.113.216.168]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2bf5f50d294sm1525556a91.20.2024.05.24.08.30.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 May 2024 08:30:41 -0700 (PDT) From: Kuan-Wei Chiu To: colyli@suse.de, kent.overstreet@linux.dev, msakai@redhat.com, peterz@infradead.org, mingo@redhat.com, acme@kernel.org, namhyung@kernel.org, akpm@linux-foundation.org Cc: bfoster@redhat.com, mark.rutland@arm.com, alexander.shishkin@linux.intel.com, jolsa@kernel.org, irogers@google.com, adrian.hunter@intel.com, bagasdotme@gmail.com, jserv@ccns.ncku.edu.tw, linux-bcache@vger.kernel.org, linux-kernel@vger.kernel.org, dm-devel@lists.linux.dev, linux-bcachefs@vger.kernel.org, linux-perf-users@vger.kernel.org, Kuan-Wei Chiu Subject: [PATCH v6 07/16] lib min_heap: Add min_heap_full() Date: Fri, 24 May 2024 23:29:49 +0800 Message-Id: <20240524152958.919343-8-visitorckw@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240524152958.919343-1-visitorckw@gmail.com> References: <20240524152958.919343-1-visitorckw@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add min_heap_full() which returns a boolean value indicating whether the heap has reached its maximum capacity. Signed-off-by: Kuan-Wei Chiu Reviewed-by: Ian Rogers --- include/linux/min_heap.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/linux/min_heap.h b/include/linux/min_heap.h index d9c4ae7ad0cc..f41898c05f5a 100644 --- a/include/linux/min_heap.h +++ b/include/linux/min_heap.h @@ -63,6 +63,16 @@ void *__min_heap_peek(struct min_heap_char *heap) #define min_heap_peek(_heap) \ (__minheap_cast(_heap) __min_heap_peek((min_heap_char *)_heap)) =20 +/* Check if the heap is full. */ +static __always_inline +bool __min_heap_full(min_heap_char *heap) +{ + return heap->nr =3D=3D heap->size; +} + +#define min_heap_full(_heap) \ + __min_heap_full((min_heap_char *)_heap) + /* Sift the element at pos down the heap. */ static __always_inline void __min_heapify(min_heap_char *heap, int pos, size_t elem_size, --=20 2.34.1 From nobody Sun Feb 8 22:05:36 2026 Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D0110130E33; Fri, 24 May 2024 15:30:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716564649; cv=none; b=my97ovm2QIjCNkjYVsYBZ/GbOPyUbx1uVjrqKuky8kImffhCssQDDd7RYe2pouX1+rXy8JzeZkk4vJ6kBJ0YzBg32WjIht/vqus0o1R91HAkClYr1hnX0HTq5QrgxsFNvRWIu6hx6qKxfvt74ErJQioO3IJ9C/5NSesXtdXonBY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716564649; c=relaxed/simple; bh=5JV2AA9diyVR/jhZ7mA96ORCdqkrw1iZVnaL99IKYaU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=lvsapsdQYeBb5KW4z5igv0wgiNYrb0vQbKemyhc9Q70oatOfQ/HzbxvgTlOoMxuFGWO2XPZgAKehQCa96cjFfakGtAGoxOgl3Y9mch1kv0+b8TOBakfq2k1zYyM+XvLA0xw0zZb0TkY4UbWb4BDAZ6duUybhC8r1pRY/55oinw4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=PxoXbJ3c; arc=none smtp.client-ip=209.85.216.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="PxoXbJ3c" Received: by mail-pj1-f45.google.com with SMTP id 98e67ed59e1d1-2bda88e2b23so405819a91.1; Fri, 24 May 2024 08:30:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716564646; x=1717169446; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=RgdKTQ9TRzB3tK0yK840spkB6vBL+E81+KCmSeSmC9s=; b=PxoXbJ3c7tKoMURYok/NtdO458MSxS/YIC9BhZjUPYYGbukVw8gj8piSEg1xRLSuAt PwoSEKDG5TdAZEmaFwJx11cZE71j8uFhgPPc5UGmEdvV1MyWWNyqzpfZh47q5vP0WylD MeK8u/ImCgoK+04EC7tqDjsIE5Vwfx+e8vOXSkdFVE7B3FufBOj6frWN1SzHCaPYEfp+ RaEBHqh/AHN1xcQIqmB6O0ks1vr9C5SZS/y7/6GfiBJCikpAu1b815/ujXJ2is7LKU0D r2bb38332pyYBmCsE2UzxqASJcR37fyJ7udbLoLVzUrYWxV1rO+9tmeCPLdT/UAOu4Tr y9gQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716564646; x=1717169446; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RgdKTQ9TRzB3tK0yK840spkB6vBL+E81+KCmSeSmC9s=; b=kSKemedhxx6bJz7BmrVgC+gIuhSSjHbrtxGPyOV0aYQvjL7bTQbcaDbQPGtxuFARBJ q5vfR7qqHsbFtjYSA2jrgUqkXH/BNqW5adiU/PMithwK8KyO1O2h5QL6EEvx8GieOwjU qAWCNMWLG8/WcGC/DP6bw+oBG4CAv9RpIa5VOOAbZR80FtT4bn8/WiTwqdsIBKmy87Em ckhN0fOHFxFqJKJytRCxK6KPk1Qxka+X8IKtOqKueAHeTK5uKYTQ6jWKFQbC1lA4fUsf UzBBL/QIlQwPCCw5Cep+TyykibZW/iYW2DTnof+WdBbLkdE16rYnq+7pueJIm6RXboPL WF2g== X-Forwarded-Encrypted: i=1; AJvYcCUc1VIL2qrRo/9tm9i6c8jYCZQYqvMo0NXGh1d6w3dhPmTcCV020iByeJwMKliIZJll77TaRUgfo5i5ei377aCVEB+88RuDkG5FxqrroURXsT9UtrYfr7yKxsvxij7cHokchyfZL+RP0b4Gl4k799ufQZKtWqC4cpfViP1df4FTdEoUCy13lkyZHm6DFXhIPmc25/PwroaJOFgD1bk6+KZtYs7CNrTvwUryKk91 X-Gm-Message-State: AOJu0YzPEHmEiVkSVFeHbW852Q2K2Tms7BG7IC9IQ5QasUQVfHLP2j7b ueNJqA5ehN43TvDO3e4i1ENxiMI9jCI5SQMhL2ZkP3aUrrIJxjle X-Google-Smtp-Source: AGHT+IEGJ2+mzq88evUgGn5Sd4K8keindmtGW/gViVN8yChHqEhyKBZDlPxKuzfS8inrfZBzHsW2WQ== X-Received: by 2002:a17:90b:30d8:b0:2b2:4bff:67b7 with SMTP id 98e67ed59e1d1-2bf5f20893dmr2410233a91.3.1716564646105; Fri, 24 May 2024 08:30:46 -0700 (PDT) Received: from visitorckw-System-Product-Name.. ([140.113.216.168]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2bf5f50d294sm1525556a91.20.2024.05.24.08.30.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 May 2024 08:30:45 -0700 (PDT) From: Kuan-Wei Chiu To: colyli@suse.de, kent.overstreet@linux.dev, msakai@redhat.com, peterz@infradead.org, mingo@redhat.com, acme@kernel.org, namhyung@kernel.org, akpm@linux-foundation.org Cc: bfoster@redhat.com, mark.rutland@arm.com, alexander.shishkin@linux.intel.com, jolsa@kernel.org, irogers@google.com, adrian.hunter@intel.com, bagasdotme@gmail.com, jserv@ccns.ncku.edu.tw, linux-bcache@vger.kernel.org, linux-kernel@vger.kernel.org, dm-devel@lists.linux.dev, linux-bcachefs@vger.kernel.org, linux-perf-users@vger.kernel.org, Kuan-Wei Chiu Subject: [PATCH v6 08/16] lib min_heap: Add args for min_heap_callbacks Date: Fri, 24 May 2024 23:29:50 +0800 Message-Id: <20240524152958.919343-9-visitorckw@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240524152958.919343-1-visitorckw@gmail.com> References: <20240524152958.919343-1-visitorckw@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add a third parameter 'args' for the 'less' and 'swp' functions in the 'struct min_heap_callbacks'. This additional parameter allows these comparison and swap functions to handle extra arguments when necessary. Signed-off-by: Kuan-Wei Chiu Reviewed-by: Ian Rogers --- drivers/md/dm-vdo/repair.c | 10 +++---- drivers/md/dm-vdo/slab-depot.c | 9 +++--- include/linux/min_heap.h | 51 +++++++++++++++++----------------- kernel/events/core.c | 10 +++---- lib/test_min_heap.c | 26 ++++++++--------- 5 files changed, 54 insertions(+), 52 deletions(-) diff --git a/drivers/md/dm-vdo/repair.c b/drivers/md/dm-vdo/repair.c index e8ad611fe7c1..eae990859db4 100644 --- a/drivers/md/dm-vdo/repair.c +++ b/drivers/md/dm-vdo/repair.c @@ -137,7 +137,7 @@ struct repair_completion { * to sort by slot while still ensuring we replay all entries with the sam= e slot in the exact order * as they appeared in the journal. */ -static bool mapping_is_less_than(const void *item1, const void *item2) +static bool mapping_is_less_than(const void *item1, const void *item2, voi= d __always_unused *args) { const struct numbered_block_mapping *mapping1 =3D (const struct numbered_block_mapping *) item1; @@ -156,7 +156,7 @@ static bool mapping_is_less_than(const void *item1, con= st void *item2) return 0; } =20 -static void swap_mappings(void *item1, void *item2) +static void swap_mappings(void *item1, void *item2, void __always_unused *= args) { struct numbered_block_mapping *mapping1 =3D item1; struct numbered_block_mapping *mapping2 =3D item2; @@ -182,8 +182,8 @@ static struct numbered_block_mapping *sort_next_heap_el= ement(struct repair_compl * restore the heap invariant, and return a pointer to the popped element. */ last =3D &repair->entries[--heap->nr]; - swap_mappings(heap->data, last); - min_heapify(heap, 0, &repair_min_heap); + swap_mappings(heap->data, last, NULL); + min_heapify(heap, 0, &repair_min_heap, NULL); return last; } =20 @@ -1123,7 +1123,7 @@ static void recover_block_map(struct vdo_completion *= completion) .nr =3D repair->block_map_entry_count, .size =3D repair->block_map_entry_count, }; - min_heapify_all(&repair->replay_heap, &repair_min_heap); + min_heapify_all(&repair->replay_heap, &repair_min_heap, NULL); =20 vdo_log_info("Replaying %zu recovery entries into block map", repair->block_map_entry_count); diff --git a/drivers/md/dm-vdo/slab-depot.c b/drivers/md/dm-vdo/slab-depot.c index ef9a6e53109c..274f9ccd072f 100644 --- a/drivers/md/dm-vdo/slab-depot.c +++ b/drivers/md/dm-vdo/slab-depot.c @@ -3288,7 +3288,8 @@ int vdo_release_block_reference(struct block_allocato= r *allocator, * Thus, the ordering is reversed from the usual sense since min_heap retu= rns smaller elements * before larger ones. */ -static bool slab_status_is_less_than(const void *item1, const void *item2) +static bool slab_status_is_less_than(const void *item1, const void *item2, + void __always_unused *args) { const struct slab_status *info1 =3D item1; const struct slab_status *info2 =3D item2; @@ -3300,7 +3301,7 @@ static bool slab_status_is_less_than(const void *item= 1, const void *item2) return info1->slab_number < info2->slab_number; } =20 -static void swap_slab_statuses(void *item1, void *item2) +static void swap_slab_statuses(void *item1, void *item2, void __always_unu= sed *args) { struct slab_status *info1 =3D item1; struct slab_status *info2 =3D item2; @@ -3525,7 +3526,7 @@ static int __must_check vdo_prepare_slabs_for_allocat= ion(struct block_allocator .nr =3D allocator->slab_count, .size =3D allocator->slab_count, }; - min_heapify_all(&heap, &slab_status_min_heap); + min_heapify_all(&heap, &slab_status_min_heap, NULL); =20 while (heap.nr > 0) { bool high_priority; @@ -3533,7 +3534,7 @@ static int __must_check vdo_prepare_slabs_for_allocat= ion(struct block_allocator struct slab_journal *journal; =20 current_slab_status =3D slab_statuses[0]; - min_heap_pop(&heap, &slab_status_min_heap); + min_heap_pop(&heap, &slab_status_min_heap, NULL); slab =3D depot->slabs[current_slab_status.slab_number]; =20 if ((depot->load_type =3D=3D VDO_SLAB_DEPOT_REBUILD_LOAD) || diff --git a/include/linux/min_heap.h b/include/linux/min_heap.h index f41898c05f5a..4acd0f4b3faf 100644 --- a/include/linux/min_heap.h +++ b/include/linux/min_heap.h @@ -34,8 +34,8 @@ typedef DEFINE_MIN_HEAP(char, min_heap_char) min_heap_cha= r; * @swp: Swap elements function. */ struct min_heap_callbacks { - bool (*less)(const void *lhs, const void *rhs); - void (*swp)(void *lhs, void *rhs); + bool (*less)(const void *lhs, const void *rhs, void *args); + void (*swp)(void *lhs, void *rhs, void *args); }; =20 /* Initialize a min-heap. */ @@ -76,7 +76,7 @@ bool __min_heap_full(min_heap_char *heap) /* Sift the element at pos down the heap. */ static __always_inline void __min_heapify(min_heap_char *heap, int pos, size_t elem_size, - const struct min_heap_callbacks *func) + const struct min_heap_callbacks *func, void *args) { void *left, *right; void *data =3D heap->data; @@ -89,7 +89,7 @@ void __min_heapify(min_heap_char *heap, int pos, size_t e= lem_size, break; left =3D data + (i * 2 + 1) * elem_size; right =3D data + (i * 2 + 2) * elem_size; - i =3D func->less(left, right) ? i * 2 + 1 : i * 2 + 2; + i =3D func->less(left, right, args) ? i * 2 + 1 : i * 2 + 2; } =20 /* Special case for the last leaf with no sibling. */ @@ -97,38 +97,38 @@ void __min_heapify(min_heap_char *heap, int pos, size_t= elem_size, i =3D i * 2 + 1; =20 /* Backtrack to the correct location. */ - while (i !=3D pos && func->less(root, data + i * elem_size)) + while (i !=3D pos && func->less(root, data + i * elem_size, args)) i =3D (i - 1) / 2; =20 /* Shift the element into its correct place. */ j =3D i; while (i !=3D pos) { i =3D (i - 1) / 2; - func->swp(data + i * elem_size, data + j * elem_size); + func->swp(data + i * elem_size, data + j * elem_size, args); } } =20 -#define min_heapify(_heap, _pos, _func) \ - __min_heapify((min_heap_char *)_heap, _pos, __minheap_obj_size(_heap), _f= unc) +#define min_heapify(_heap, _pos, _func, _args) \ + __min_heapify((min_heap_char *)_heap, _pos, __minheap_obj_size(_heap), _f= unc, _args) =20 /* Floyd's approach to heapification that is O(nr). */ static __always_inline void __min_heapify_all(min_heap_char *heap, size_t elem_size, - const struct min_heap_callbacks *func) + const struct min_heap_callbacks *func, void *args) { int i; =20 for (i =3D heap->nr / 2 - 1; i >=3D 0; i--) - __min_heapify(heap, i, elem_size, func); + __min_heapify(heap, i, elem_size, func, args); } =20 -#define min_heapify_all(_heap, _func) \ - __min_heapify_all((min_heap_char *)_heap, __minheap_obj_size(_heap), _fun= c) +#define min_heapify_all(_heap, _func, _args) \ + __min_heapify_all((min_heap_char *)_heap, __minheap_obj_size(_heap), _fun= c, _args) =20 /* Remove minimum element from the heap, O(log2(nr)). */ static __always_inline void __min_heap_pop(min_heap_char *heap, size_t elem_size, - const struct min_heap_callbacks *func) + const struct min_heap_callbacks *func, void *args) { void *data =3D heap->data; =20 @@ -138,11 +138,11 @@ void __min_heap_pop(min_heap_char *heap, size_t elem_= size, /* Place last element at the root (position 0) and then sift down. */ heap->nr--; memcpy(data, data + (heap->nr * elem_size), elem_size); - __min_heapify(heap, 0, elem_size, func); + __min_heapify(heap, 0, elem_size, func, args); } =20 -#define min_heap_pop(_heap, _func) \ - __min_heap_pop((min_heap_char *)_heap, __minheap_obj_size(_heap), _func) +#define min_heap_pop(_heap, _func, _args) \ + __min_heap_pop((min_heap_char *)_heap, __minheap_obj_size(_heap), _func, = _args) =20 /* * Remove the minimum element and then push the given element. The @@ -152,19 +152,20 @@ void __min_heap_pop(min_heap_char *heap, size_t elem_= size, static __always_inline void __min_heap_pop_push(min_heap_char *heap, const void *element, size_t elem_size, - const struct min_heap_callbacks *func) + const struct min_heap_callbacks *func, + void *args) { memcpy(heap->data, element, elem_size); - __min_heapify(heap, 0, elem_size, func); + __min_heapify(heap, 0, elem_size, func, args); } =20 -#define min_heap_pop_push(_heap, _element, _func) \ - __min_heap_pop_push((min_heap_char *)_heap, _element, __minheap_obj_size(= _heap), _func) +#define min_heap_pop_push(_heap, _element, _func, _args) \ + __min_heap_pop_push((min_heap_char *)_heap, _element, __minheap_obj_size(= _heap), _func, _args) =20 /* Push an element on to the heap, O(log2(nr)). */ static __always_inline void __min_heap_push(min_heap_char *heap, const void *element, size_t elem= _size, - const struct min_heap_callbacks *func) + const struct min_heap_callbacks *func, void *args) { void *data =3D heap->data; void *child, *parent; @@ -182,13 +183,13 @@ void __min_heap_push(min_heap_char *heap, const void = *element, size_t elem_size, for (; pos > 0; pos =3D (pos - 1) / 2) { child =3D data + (pos * elem_size); parent =3D data + ((pos - 1) / 2) * elem_size; - if (func->less(parent, child)) + if (func->less(parent, child, args)) break; - func->swp(parent, child); + func->swp(parent, child, args); } } =20 -#define min_heap_push(_heap, _element, _func) \ - __min_heap_push((min_heap_char *)_heap, _element, __minheap_obj_size(_hea= p), _func) +#define min_heap_push(_heap, _element, _func, _args) \ + __min_heap_push((min_heap_char *)_heap, _element, __minheap_obj_size(_hea= p), _func, _args) =20 #endif /* _LINUX_MIN_HEAP_H */ diff --git a/kernel/events/core.c b/kernel/events/core.c index 47cb17adf858..c843af8fa6f0 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -3686,7 +3686,7 @@ void __perf_event_task_sched_out(struct task_struct *= task, perf_cgroup_switch(next); } =20 -static bool perf_less_group_idx(const void *l, const void *r) +static bool perf_less_group_idx(const void *l, const void *r, void __alway= s_unused *args) { const struct perf_event *le =3D *(const struct perf_event **)l; const struct perf_event *re =3D *(const struct perf_event **)r; @@ -3694,7 +3694,7 @@ static bool perf_less_group_idx(const void *l, const = void *r) return le->group_index < re->group_index; } =20 -static void swap_ptr(void *l, void *r) +static void swap_ptr(void *l, void *r, void __always_unused *args) { void **lp =3D l, **rp =3D r; =20 @@ -3786,7 +3786,7 @@ static noinline int visit_groups_merge(struct perf_ev= ent_context *ctx, perf_assert_pmu_disabled((*evt)->pmu_ctx->pmu); } =20 - min_heapify_all(&event_heap, &perf_min_heap); + min_heapify_all(&event_heap, &perf_min_heap, NULL); =20 while (event_heap.nr) { ret =3D func(*evt, data); @@ -3795,9 +3795,9 @@ static noinline int visit_groups_merge(struct perf_ev= ent_context *ctx, =20 *evt =3D perf_event_groups_next(*evt, pmu); if (*evt) - min_heapify(&event_heap, 0, &perf_min_heap); + min_heapify(&event_heap, 0, &perf_min_heap, NULL); else - min_heap_pop(&event_heap, &perf_min_heap); + min_heap_pop(&event_heap, &perf_min_heap, NULL); } =20 return 0; diff --git a/lib/test_min_heap.c b/lib/test_min_heap.c index 52efab9fb2f1..f59638cf5dfa 100644 --- a/lib/test_min_heap.c +++ b/lib/test_min_heap.c @@ -13,17 +13,17 @@ =20 DEFINE_MIN_HEAP(int, min_heap_test); =20 -static __init bool less_than(const void *lhs, const void *rhs) +static __init bool less_than(const void *lhs, const void *rhs, void __alwa= ys_unused *args) { return *(int *)lhs < *(int *)rhs; } =20 -static __init bool greater_than(const void *lhs, const void *rhs) +static __init bool greater_than(const void *lhs, const void *rhs, void __a= lways_unused *args) { return *(int *)lhs > *(int *)rhs; } =20 -static __init void swap_ints(void *lhs, void *rhs) +static __init void swap_ints(void *lhs, void *rhs, void __always_unused *a= rgs) { int temp =3D *(int *)lhs; =20 @@ -40,7 +40,7 @@ static __init int pop_verify_heap(bool min_heap, int last; =20 last =3D values[0]; - min_heap_pop(heap, funcs); + min_heap_pop(heap, funcs, NULL); while (heap->nr > 0) { if (min_heap) { if (last > values[0]) { @@ -56,7 +56,7 @@ static __init int pop_verify_heap(bool min_heap, } } last =3D values[0]; - min_heap_pop(heap, funcs); + min_heap_pop(heap, funcs, NULL); } return err; } @@ -77,7 +77,7 @@ static __init int test_heapify_all(bool min_heap) int i, err; =20 /* Test with known set of values. */ - min_heapify_all(&heap, &funcs); + min_heapify_all(&heap, &funcs, NULL); err =3D pop_verify_heap(min_heap, &heap, &funcs); =20 =20 @@ -86,7 +86,7 @@ static __init int test_heapify_all(bool min_heap) for (i =3D 0; i < heap.nr; i++) values[i] =3D get_random_u32(); =20 - min_heapify_all(&heap, &funcs); + min_heapify_all(&heap, &funcs, NULL); err +=3D pop_verify_heap(min_heap, &heap, &funcs); =20 return err; @@ -110,14 +110,14 @@ static __init int test_heap_push(bool min_heap) =20 /* Test with known set of values copied from data. */ for (i =3D 0; i < ARRAY_SIZE(data); i++) - min_heap_push(&heap, &data[i], &funcs); + min_heap_push(&heap, &data[i], &funcs, NULL); =20 err =3D pop_verify_heap(min_heap, &heap, &funcs); =20 /* Test with randomly generated values. */ while (heap.nr < heap.size) { temp =3D get_random_u32(); - min_heap_push(&heap, &temp, &funcs); + min_heap_push(&heap, &temp, &funcs, NULL); } err +=3D pop_verify_heap(min_heap, &heap, &funcs); =20 @@ -143,22 +143,22 @@ static __init int test_heap_pop_push(bool min_heap) /* Fill values with data to pop and replace. */ temp =3D min_heap ? 0x80000000 : 0x7FFFFFFF; for (i =3D 0; i < ARRAY_SIZE(data); i++) - min_heap_push(&heap, &temp, &funcs); + min_heap_push(&heap, &temp, &funcs, NULL); =20 /* Test with known set of values copied from data. */ for (i =3D 0; i < ARRAY_SIZE(data); i++) - min_heap_pop_push(&heap, &data[i], &funcs); + min_heap_pop_push(&heap, &data[i], &funcs, NULL); =20 err =3D pop_verify_heap(min_heap, &heap, &funcs); =20 heap.nr =3D 0; for (i =3D 0; i < ARRAY_SIZE(data); i++) - min_heap_push(&heap, &temp, &funcs); + min_heap_push(&heap, &temp, &funcs, NULL); =20 /* Test with randomly generated values. */ for (i =3D 0; i < ARRAY_SIZE(data); i++) { temp =3D get_random_u32(); - min_heap_pop_push(&heap, &temp, &funcs); + min_heap_pop_push(&heap, &temp, &funcs, NULL); } err +=3D pop_verify_heap(min_heap, &heap, &funcs); =20 --=20 2.34.1 From nobody Sun Feb 8 22:05:36 2026 Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7D52C131195; Fri, 24 May 2024 15:30:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716564652; cv=none; b=C0FsD8uEIvMihdnKvvrDWPZLCvi6TM06nbp7+YCWQOuUvF+7tm05ZZhnpx0abBKEUw7y6Pdx5hyg/+/b/qoGAQE4ObHorMagCrVOMsL8+87qNlxTCgkjV6TY4f7pI15+5ownxVLo+tyTExylDK8htEmDF0ZJ8YctymHs1B9EDfg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716564652; c=relaxed/simple; bh=tby2ZpUX+BlnLTwxvgk6fPnVU4TaOjJxMlCJa4gIREI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=eHjC8JWhFHakWcIB9uBNzsLAbMo0zDYCGVV7pZM5VxOhOzFOQw46TvsgnoQ44yGRZq3d+6L5JacbR4JFNs8B+6WvPUBJyCwNPc/aqeQhM5nMRrQwNHdmKlmRdQ93uWtGGWsyQARXO1CDHdm5AM+mmravOaJwKpjOqeGvz21ciXI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Fc+sFDaS; arc=none smtp.client-ip=209.85.216.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Fc+sFDaS" Received: by mail-pj1-f42.google.com with SMTP id 98e67ed59e1d1-2bded7f6296so212194a91.1; Fri, 24 May 2024 08:30:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716564651; x=1717169451; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Uvl2xRBhY8ekhTJXesACHkl46vqc2VrA3GO40P8QBlE=; b=Fc+sFDaSuP8YoWpUM8hRd1qaVY2/VxEeBb5yy90799vN74b7xGNZ/6VsnPghqf/X8D sx2Smb0dRyxSDKGVLJwREc+SgzeL4BO5GL9fo/HSGMq0CLZazTga5JF+W94018C2Dix9 sSb2tCE55P+ocUIiZO5DaCOW062l9PXSL2fY1i9qIJf/G3fL35ldBgj8g9/yJ7Lqk6wM ZrXfmLRrIZ4GDo9Q+R2OXv9ODoSEPXzz1zWE9gO10CGO9/p0AmapgyMMXhHhuWyDvxpw aD/juetLT84kHAoQjpiplxPUOZ2IECSwDoGXIuy1Mx8s+sCf64zft8EMEe0Qi9yDVtw8 y7Dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716564651; x=1717169451; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Uvl2xRBhY8ekhTJXesACHkl46vqc2VrA3GO40P8QBlE=; b=IP06gu5uSA+nvXzwfC0T9qfcSB5LsyS8HhTz/4aBZgrBJZ/eY/A8cr6I4JxRRRraH1 a/TfddoJsEatzf+xx8VAtPrh0GATPrXFTQan2ckg1AgpHQ6HRrLGrlrHyxHi/tu3w25w +ktZKEEnc5myiFj/tDusclvhg7lYoSuqgSxPFzWQoxpETp4KDSKP53qHg6ughFmnAlEa LKU3s0rX7maCaOxi+Qh0AdF+h+jbhPflAL6pIqNz8s/uwH6vvyNsOwCZEe7zTpe3zHrf MmJnlsLEvGXZqNdzJwtuakzhOXxJoS/KJgTAlLlub9YO5jmdJZquUpeup8R20U2qxN6f +nXw== X-Forwarded-Encrypted: i=1; AJvYcCWHnQ3mBwoj8PkDghS6ZoPzd3YTgAQG4MhdZ4GBxytdtHmKnQnhSEQ8oDXd+dOeF7t5YVYDYCZiFQgPSUIX4GWNzMQqm44Mcu4avEx/HOuH8zPlc63EzhH8bpghZzH1C+r+aezq+1Rd0Y6zw6ITllBbo8B3woWgMUWW+QoXk8Xszgmg9suWgol8xYzRqiKB2v38QFl3vwn1SSBAROZv65irZ5Ib+bOqQnX038vX X-Gm-Message-State: AOJu0Yx21SLYEC1X9yurf1KhpnsGGZ3UXykCBqEk2QGYh9JXUjtDQZKT lWgLq9f0++AMTbPBwUvrqOKHgNyXTn4bYyG1yyNch4B1nAE5NN4C X-Google-Smtp-Source: AGHT+IFsxgebjZlr1dxx1chJSleAIrK43REkyeW81P4lfYkP9NwmgKQYjYTGz/eljOWV8fOLiCwwGQ== X-Received: by 2002:a17:90b:24c:b0:2b4:329e:eac5 with SMTP id 98e67ed59e1d1-2bf5f202ac5mr2505679a91.2.1716564650793; Fri, 24 May 2024 08:30:50 -0700 (PDT) Received: from visitorckw-System-Product-Name.. ([140.113.216.168]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2bf5f50d294sm1525556a91.20.2024.05.24.08.30.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 May 2024 08:30:50 -0700 (PDT) From: Kuan-Wei Chiu To: colyli@suse.de, kent.overstreet@linux.dev, msakai@redhat.com, peterz@infradead.org, mingo@redhat.com, acme@kernel.org, namhyung@kernel.org, akpm@linux-foundation.org Cc: bfoster@redhat.com, mark.rutland@arm.com, alexander.shishkin@linux.intel.com, jolsa@kernel.org, irogers@google.com, adrian.hunter@intel.com, bagasdotme@gmail.com, jserv@ccns.ncku.edu.tw, linux-bcache@vger.kernel.org, linux-kernel@vger.kernel.org, dm-devel@lists.linux.dev, linux-bcachefs@vger.kernel.org, linux-perf-users@vger.kernel.org, Kuan-Wei Chiu Subject: [PATCH v6 09/16] lib min_heap: Add min_heap_sift_up() Date: Fri, 24 May 2024 23:29:51 +0800 Message-Id: <20240524152958.919343-10-visitorckw@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240524152958.919343-1-visitorckw@gmail.com> References: <20240524152958.919343-1-visitorckw@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add min_heap_sift_up() to sift up the element at index 'idx' in the heap. Signed-off-by: Kuan-Wei Chiu Reviewed-by: Ian Rogers --- include/linux/min_heap.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/include/linux/min_heap.h b/include/linux/min_heap.h index 4acd0f4b3faf..ddd0186afb77 100644 --- a/include/linux/min_heap.h +++ b/include/linux/min_heap.h @@ -111,6 +111,26 @@ void __min_heapify(min_heap_char *heap, int pos, size_= t elem_size, #define min_heapify(_heap, _pos, _func, _args) \ __min_heapify((min_heap_char *)_heap, _pos, __minheap_obj_size(_heap), _f= unc, _args) =20 +/* Sift up ith element from the heap, O(log2(nr)). */ +static __always_inline +void __min_heap_sift_up(min_heap_char *heap, size_t elem_size, size_t idx, + const struct min_heap_callbacks *func, void *args) +{ + void *data =3D heap->data; + size_t parent; + + while (idx) { + parent =3D (idx - 1) / 2; + if (func->less(data + parent * elem_size, data + idx * elem_size, args)) + break; + func->swp(data + parent * elem_size, data + idx * elem_size, args); + idx =3D parent; + } +} + +#define min_heap_sift_up(_heap, _idx, _func, _args) \ + __min_heap_sift_up((min_heap_char *)_heap, __minheap_obj_size(_heap), _id= x, _func, _args) + /* Floyd's approach to heapification that is O(nr). */ static __always_inline void __min_heapify_all(min_heap_char *heap, size_t elem_size, --=20 2.34.1 From nobody Sun Feb 8 22:05:36 2026 Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 42CBD13173A; Fri, 24 May 2024 15:30:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716564657; cv=none; b=hVF8UZVcQNs3rMEfbnEY76pv5hszIn0wA+ql2mXXQSjp1q0G6U6y9Qdhbwd1AXoea8N/NKRdLoqV9XpcU0CzIHOOIkAQCEBgUT92242VuFBV3txjz4PTtkY7Dx1EuhiOx6IzirPm+LzwnP36f+sPfdaGqfDCfIjWggZa1odxrXc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716564657; c=relaxed/simple; bh=sJJvbSyrqr9RfqPlGBQxs9diGbsYUKhy8zMD1EMctXM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=X0swQvJQ+FSnHbaCXS1MpNKVF5MoXPB6u13fpHE+eHkpnUnhNF9/jlYYdyotx7NfcyBL7Y+UBro0O+1QMHOYd4RyIOv36aRtBj3uACMPnN1FscAb0d6ds7GEbnkz3Z5toczLsDKv69csWanCiY+D/UtMixoyn+WloYNsFq3+cqA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=EA4UTc3X; arc=none smtp.client-ip=209.85.216.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="EA4UTc3X" Received: by mail-pj1-f54.google.com with SMTP id 98e67ed59e1d1-2bde4d15867so247252a91.3; Fri, 24 May 2024 08:30:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716564655; x=1717169455; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5lfmbsG5rvd+B8+9dE2AYffkU5kvksfUycCfh2ZKaE4=; b=EA4UTc3XhW0yt1ktCzdFOpnVVhdDjdZeB14UUWor17OpP58shereyfIufWfcNlXGl7 uLEvFVzHxGgA7zlUgHVqaCkh7ZnNixsasmxrpIELEkLvvHUxznhrerU06kWO5aiLDXTW BfgwWqK6qmiRJ5Cz5HUQQm04PHXguHRtLZrBcT7tauvAV71edkv8Pri0qD4UIu1mmQjV bL4x6Ibt3BzBRX2sAnztpbsDZ68o8re6vYHdR8v5FfnthUNZZ02H9/mujs7o10AoA5es d0jsoxrD1zr3YORB4hUxY/avzBoZxjR+HRw9WBe3wZ+v+ok6ZEPYSDNQd0+ItUBCtY/c Qocg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716564655; x=1717169455; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5lfmbsG5rvd+B8+9dE2AYffkU5kvksfUycCfh2ZKaE4=; b=vjOxjx1O9F3BwMP8krnhiKetmoLmP+7yhV6fijFAn8xSYsiJwlHy7y67fEXHQU7Nj6 oOCmACIOMSFXLSV3SF5teRX8zNQkPnBPx/IlOIkllUY1cfYZyCv4BX7t1lFiu8zFAise SwgOeWMj0mw5CuxWb6FLJYA2vyFtBM8cK0Hy51n8dFkFoWJsGE3ZwY+ZagRUExtF2tRz jwIRUrLT+Cf80HVhHuPOtyr0bZAYpSGQ6i/KMZyaaQumwQZD53GTlUOCXDo5cnG4PMCE iFS3kJFNynkqjZDCcNDFl2GxIw9SNLBCUCDCxGGv4CC6eToo1bxFwxmXxMpYqUh7pbSV rT6w== X-Forwarded-Encrypted: i=1; AJvYcCVIC1MEP7Y3szPXql+iy/OVd+nwzXQsCzSMRcB6VdFIIHmDX40AlYfNKMwQwZPIZsFdBqc+lXMXZQ9f4x7OuxSmOX1hToDT5ASm1oAgOfm8BtzFyflll72oVuxWQxuSsEspl4w6BbppLkG+rVW7h0OPQwF2XX8QFxs+avb6sARmde+Hmn5bBvhb6cUpt2ujQETmG5qBMfu0Annf/W182GgZc2aqCWN4xvq7qiZm X-Gm-Message-State: AOJu0Yxhiy5nVs3P0BN/Ms/ObqHSAONvywMDuDGp0IcLPEnmQhvr6hWf 6vvLadc7QVIVyfUm7TdcsuMhIucv+RDJthxz02Y1cnHhJr5e/8VK X-Google-Smtp-Source: AGHT+IGLW9yYebnTwkf31N4DQ42MfzPeT3rNQKrGi7/d2boEiBvS/PxpOdbDpM6nd0O3UUnbvMIB5A== X-Received: by 2002:a17:90b:24c:b0:2b4:329e:eac5 with SMTP id 98e67ed59e1d1-2bf5f202ac5mr2505960a91.2.1716564655542; Fri, 24 May 2024 08:30:55 -0700 (PDT) Received: from visitorckw-System-Product-Name.. ([140.113.216.168]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2bf5f50d294sm1525556a91.20.2024.05.24.08.30.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 May 2024 08:30:55 -0700 (PDT) From: Kuan-Wei Chiu To: colyli@suse.de, kent.overstreet@linux.dev, msakai@redhat.com, peterz@infradead.org, mingo@redhat.com, acme@kernel.org, namhyung@kernel.org, akpm@linux-foundation.org Cc: bfoster@redhat.com, mark.rutland@arm.com, alexander.shishkin@linux.intel.com, jolsa@kernel.org, irogers@google.com, adrian.hunter@intel.com, bagasdotme@gmail.com, jserv@ccns.ncku.edu.tw, linux-bcache@vger.kernel.org, linux-kernel@vger.kernel.org, dm-devel@lists.linux.dev, linux-bcachefs@vger.kernel.org, linux-perf-users@vger.kernel.org, Kuan-Wei Chiu Subject: [PATCH v6 10/16] lib min_heap: Add min_heap_del() Date: Fri, 24 May 2024 23:29:52 +0800 Message-Id: <20240524152958.919343-11-visitorckw@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240524152958.919343-1-visitorckw@gmail.com> References: <20240524152958.919343-1-visitorckw@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add min_heap_del() to delete the element at index 'idx' in the heap. Signed-off-by: Kuan-Wei Chiu Reviewed-by: Ian Rogers --- include/linux/min_heap.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/include/linux/min_heap.h b/include/linux/min_heap.h index ddd0186afb77..98e838195e7e 100644 --- a/include/linux/min_heap.h +++ b/include/linux/min_heap.h @@ -212,4 +212,28 @@ void __min_heap_push(min_heap_char *heap, const void *= element, size_t elem_size, #define min_heap_push(_heap, _element, _func, _args) \ __min_heap_push((min_heap_char *)_heap, _element, __minheap_obj_size(_hea= p), _func, _args) =20 +/* Remove ith element from the heap, O(log2(nr)). */ +static __always_inline +bool __min_heap_del(min_heap_char *heap, size_t elem_size, size_t idx, + const struct min_heap_callbacks *func, void *args) +{ + void *data =3D heap->data; + + if (WARN_ONCE(heap->nr <=3D 0, "Popping an empty heap")) + return false; + + /* Place last element at the root (position 0) and then sift down. */ + heap->nr--; + if (idx =3D=3D heap->nr) + return true; + func->swp(data + (idx * elem_size), data + (heap->nr * elem_size), args); + __min_heap_sift_up(heap, elem_size, idx, func, args); + __min_heapify(heap, idx, elem_size, func, args); + + return true; +} + +#define min_heap_del(_heap, _idx, _func, _args) \ + __min_heap_del((min_heap_char *)_heap, __minheap_obj_size(_heap), _idx, _= func, _args) + #endif /* _LINUX_MIN_HEAP_H */ --=20 2.34.1 From nobody Sun Feb 8 22:05:36 2026 Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 50EDA13173A; Fri, 24 May 2024 15:31:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716564662; cv=none; b=VyWOpKVKE9Qmy0zYvR4GkG3Hdc8bzBbS1K/AFvjbE9hDn9WnuU+a4z3bHGPk75a1GX+QzZpBr3ozpg8Ecmb4hjQveH4ZNGWUKJaoUENMyIDaGtc3yPWOsuHaXAp0J3I21xxbYhZlzdzfhPeWOGByAMtI4Q84Kk5jAld3huLlJGQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716564662; c=relaxed/simple; bh=FajLBoy+P54V5d595ptYE3zStWRI7+JF3jA/AgpkBC8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=JZO7WFcGwoasPQZkGJOMkWyxLsJ+RbGikDKwzeeUKKsZ0R9/FL9VA0Bvfv7ddrjx/Z/pSfArMQ1OF27dv+zod4HMdaUJe4TR1lMyvlArQwS49TOSyHKd/bo3OIqWsnXGVXX82X1IDsKFT7ZA8aA7a03AN3kwkQOHjCHHQ0RqKr4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=hwY+A9zx; arc=none smtp.client-ip=209.85.215.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="hwY+A9zx" Received: by mail-pg1-f171.google.com with SMTP id 41be03b00d2f7-667fbbbf36dso348878a12.1; Fri, 24 May 2024 08:31:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716564660; x=1717169460; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fHh8oRo5IgsV+IU2cDnhd1mUOloCdZwamTIL5z7K9Kg=; b=hwY+A9zx0WxIsqgpUM4Y92npaDfNVZCLxZdEdM0SCn/pobZTahcgyixcsH7fSegwv0 7HPB3cQTJK7ohunB/QW8cIjXQtgMfccc3dKthd4jQ47iYkzKzCLwqNt8fH0KMkvxrQ9A 7ND5xsqq/H57JMGImaenTTe6YVWKW1niSEGRkBRdoeHEMNbKS3FLa2+sFlVv3+eN/aCf UBA1KOCnQBnKEuSkFuyz7fgiWYOi7HSxG4wL2/PKGsDGbMuBaah+Pp8Nyr1PK75oLHwn VTmz1glY23d3vWTWeoiF3TfOrBtzAPm11w2Sj7Z6f9mkw73LuTD/M4S1VwXIyX6rX5hm 2nKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716564660; x=1717169460; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fHh8oRo5IgsV+IU2cDnhd1mUOloCdZwamTIL5z7K9Kg=; b=HUDp8o7/tbBsHbUNXwgW5VWjmYXwtbnJ5CUzcFeEIibYVbrx1iHrMfaRXz7t44Ls7S h7uWhKL7SpvEqLah2rVxnMZhX28lcjTZTUbD0ISVhnx97cIPGYm+ieBgc241/T3S/eKL taytDI6dZbkNy+Depsgn0yR8OyqBOz8AERCQSTX1jms0dC6UZr3fWZTRCGNCU9/e9znm c4orI543SuyBFdkia8mFIu2XUY/9ub5/U8ad/I/VCNFYb/GsvaaHvASshqQ3Mi7h8SwX GZuk1s96dc9dr92Mq8SwqUrB3nNRXzEIiw1A5HIAsu96HkADnXa+FKS9AXfQflc7/9ig +G0Q== X-Forwarded-Encrypted: i=1; AJvYcCUk3L2j/EjMzRbqWQIV6fLlQQHHdIVY8102BDsvH1mD2P1UY8NLyhz9Qdp/oW6sFsQWhgn/6JubCKhxRy1VhACKJdKCvJdC5fPtk+hkElrjC6zSKmtzvb9rCqCSYcHjgDtsmovSx+2CkZFU43+na8li4QEx9gw0NDBM18tN2gtbv0MirN81aGfaVBY5+kI3Idq13zb+CAnX+DGnYhGjvYs+hDGYrtUIUmz2EUxu X-Gm-Message-State: AOJu0Yxckcrxsp9Ijk7s8qGEEM3yZVVUhy7VdLctxIR6JzR6T+qBuI2w NWfUzWY0ldkn2NjXZi0OpC1Ov3VC6jWrhYTjNIVaUGI9YdlfaOt6 X-Google-Smtp-Source: AGHT+IFciQWF2Y7yTOkGCbHq/4hq/tcnGDrn20ayUbkM9iebbc5ly95hjv5xZNwCquKeXBM/4haULQ== X-Received: by 2002:a17:90b:230e:b0:2bd:76ee:48c2 with SMTP id 98e67ed59e1d1-2bf5e0a7a56mr2495670a91.0.1716564660327; Fri, 24 May 2024 08:31:00 -0700 (PDT) Received: from visitorckw-System-Product-Name.. ([140.113.216.168]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2bf5f50d294sm1525556a91.20.2024.05.24.08.30.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 May 2024 08:30:59 -0700 (PDT) From: Kuan-Wei Chiu To: colyli@suse.de, kent.overstreet@linux.dev, msakai@redhat.com, peterz@infradead.org, mingo@redhat.com, acme@kernel.org, namhyung@kernel.org, akpm@linux-foundation.org Cc: bfoster@redhat.com, mark.rutland@arm.com, alexander.shishkin@linux.intel.com, jolsa@kernel.org, irogers@google.com, adrian.hunter@intel.com, bagasdotme@gmail.com, jserv@ccns.ncku.edu.tw, linux-bcache@vger.kernel.org, linux-kernel@vger.kernel.org, dm-devel@lists.linux.dev, linux-bcachefs@vger.kernel.org, linux-perf-users@vger.kernel.org, Kuan-Wei Chiu Subject: [PATCH v6 11/16] lib min_heap: Update min_heap_push() and min_heap_pop() to return bool values Date: Fri, 24 May 2024 23:29:53 +0800 Message-Id: <20240524152958.919343-12-visitorckw@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240524152958.919343-1-visitorckw@gmail.com> References: <20240524152958.919343-1-visitorckw@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Modify the min_heap_push() and min_heap_pop() to return a boolean value. They now return false when the operation fails and true when it succeeds. Signed-off-by: Kuan-Wei Chiu Reviewed-by: Ian Rogers --- include/linux/min_heap.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/include/linux/min_heap.h b/include/linux/min_heap.h index 98e838195e7e..3410a5f907ad 100644 --- a/include/linux/min_heap.h +++ b/include/linux/min_heap.h @@ -147,18 +147,20 @@ void __min_heapify_all(min_heap_char *heap, size_t el= em_size, =20 /* Remove minimum element from the heap, O(log2(nr)). */ static __always_inline -void __min_heap_pop(min_heap_char *heap, size_t elem_size, +bool __min_heap_pop(min_heap_char *heap, size_t elem_size, const struct min_heap_callbacks *func, void *args) { void *data =3D heap->data; =20 if (WARN_ONCE(heap->nr <=3D 0, "Popping an empty heap")) - return; + return false; =20 /* Place last element at the root (position 0) and then sift down. */ heap->nr--; memcpy(data, data + (heap->nr * elem_size), elem_size); __min_heapify(heap, 0, elem_size, func, args); + + return true; } =20 #define min_heap_pop(_heap, _func, _args) \ @@ -184,7 +186,7 @@ void __min_heap_pop_push(min_heap_char *heap, =20 /* Push an element on to the heap, O(log2(nr)). */ static __always_inline -void __min_heap_push(min_heap_char *heap, const void *element, size_t elem= _size, +bool __min_heap_push(min_heap_char *heap, const void *element, size_t elem= _size, const struct min_heap_callbacks *func, void *args) { void *data =3D heap->data; @@ -192,7 +194,7 @@ void __min_heap_push(min_heap_char *heap, const void *e= lement, size_t elem_size, int pos; =20 if (WARN_ONCE(heap->nr >=3D heap->size, "Pushing on a full heap")) - return; + return false; =20 /* Place at the end of data. */ pos =3D heap->nr; @@ -207,6 +209,8 @@ void __min_heap_push(min_heap_char *heap, const void *e= lement, size_t elem_size, break; func->swp(parent, child, args); } + + return true; } =20 #define min_heap_push(_heap, _element, _func, _args) \ --=20 2.34.1 From nobody Sun Feb 8 22:05:36 2026 Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B81E4131BDA; Fri, 24 May 2024 15:31:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716564667; cv=none; b=p9fCFZkNWm/eNOs3TD6rFG+fwK/sI86ohH6b+2UJ2O34AhyvhOHXgjhqbRcsooyxN2HzoJRI1O/O8mZH918MQBiuTp1OD/I14VT35N5uudabptZ2cKx2IsLTkyWzpiICRe1Z2oAB2pdV0KBPmL+mCtb+3TaSWV0vMtxcNiI0J14= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716564667; c=relaxed/simple; bh=XBbTFxTKTTd12S0apVryE3PcI4APeLL8xosQ1q7yRmI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=DzS+aX8Y5heC+xRXn2kn847Kngbz8K4OZdp5CuxiCrDbJmpDtH/W2lwHMwHmrvdkBtAWovfyAGBaVbfTtkzddFVQQ8/gVt1KcPox029qkHtEWMrNh91DYt3V4afr+zQ2hMfQL0GWXcbd7QklB8KCZHjyQ1D49Pi3M3EYsnLbgGs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=kmNfQ3Im; arc=none smtp.client-ip=209.85.216.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="kmNfQ3Im" Received: by mail-pj1-f51.google.com with SMTP id 98e67ed59e1d1-2bf196037a7so247031a91.1; Fri, 24 May 2024 08:31:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716564665; x=1717169465; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=eJxc7A3KFbtC/I5z6jADokbslyusd4Od8ho0PKKKHBc=; b=kmNfQ3ImZkb1iN+NVvPO2x6ppJxwfv8scIu626kf8RZ/XRI6fkUn5EcheK1urcY51Z 3AxPwEN+NyviUKpOdr/OwWe8vT2v0oWRnCbz5vHFW7rPu76Pw2UHX5qQpbLaTLQrEB0c 9DRYdLEukpXrAwywRAh+4JOXaDjDRGcrD1uZj0QXtrcu7HfirU5lAx9yvfgmfBHA0VyI M0pK/v7bELMm9tyDSaeEGkdyuJwctXfg7KLfcNT9wiEUyUVtJPy3ILEQb1jg6ahOg49i E/a5YMyfZ2QUiAeBG2IdMWZXDI59Apy46eabo+BwIy8ENSXw3Jq4He8X8A559PAjoJC4 Ix/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716564665; x=1717169465; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eJxc7A3KFbtC/I5z6jADokbslyusd4Od8ho0PKKKHBc=; b=qj4s22HNNjWrVRfbZzlgfcWd/k+rD3UZmJoWBzAWGJCbSzkpyb/+i4jc/iojn4Jzzm nJwZjEjresk+zB7IAH5t3EBpSgBzQL127Y60UqwZCpXLwtnBxW8bx5n43cAWYD7V90pW n6+0ynz7UzjfCLoYnoBU/MHglfb2Ykq5ynsR6CzkvfRxM63fg/NwpNfoFvMyb4xWbt2s LWfYr1jOnQQiON/IFAXjIezJ4kvZJ1LXMw2RDng0GIhZ1apgFRCB7/ldcOJhYDK4Q7CD fQ+ty/jslNLWztbAsa1DUrPTAxnYbT9XHBVwqjKcDtIq6sW5aNBJoyH4DJYOMr51RKtr eVhQ== X-Forwarded-Encrypted: i=1; AJvYcCUd1TGGjYa8X3jIHCZbwcDrRV9uYnIXJqSn3lQJKUivLSnlw3Ez8VYsPo9BlhJoKYsPdjmNonLj2HD9SaGhQlQl8T1yuaSX+IZoxolksl1Bx3AKJGRtxNDwy76r+YQ1oq6QyPBlExRnJMbuVLTBUuupgVZ6QMtOpWArDWhOEqmlZTg8zhPOVr4weM+1C3qJyu85eQcd8UVk5d6qjt6M4TD5cguaNvn7dkluY+Jv X-Gm-Message-State: AOJu0YwN9XfCCxxMlpDfCQH3tFCbQjMIHSiXqsKNJYLSK9lT4Vmuv2a6 T5dyCAT4qq0qRYUvNKyQ+rGeVzTvWngoTBpJSXUwHxY4XvaKqgq5 X-Google-Smtp-Source: AGHT+IEuU6jpX9orINJlPXkOYySiaFGvoUViUJAIEwsd0ETqDsNgaoXn1NDqH0zGyIfxWZx4lsu+oQ== X-Received: by 2002:a17:90b:4fc8:b0:2af:6b92:ff6a with SMTP id 98e67ed59e1d1-2bf5f30e8a2mr2443714a91.3.1716564665094; Fri, 24 May 2024 08:31:05 -0700 (PDT) Received: from visitorckw-System-Product-Name.. ([140.113.216.168]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2bf5f50d294sm1525556a91.20.2024.05.24.08.31.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 May 2024 08:31:04 -0700 (PDT) From: Kuan-Wei Chiu To: colyli@suse.de, kent.overstreet@linux.dev, msakai@redhat.com, peterz@infradead.org, mingo@redhat.com, acme@kernel.org, namhyung@kernel.org, akpm@linux-foundation.org Cc: bfoster@redhat.com, mark.rutland@arm.com, alexander.shishkin@linux.intel.com, jolsa@kernel.org, irogers@google.com, adrian.hunter@intel.com, bagasdotme@gmail.com, jserv@ccns.ncku.edu.tw, linux-bcache@vger.kernel.org, linux-kernel@vger.kernel.org, dm-devel@lists.linux.dev, linux-bcachefs@vger.kernel.org, linux-perf-users@vger.kernel.org, Kuan-Wei Chiu Subject: [PATCH v6 12/16] lib min_heap: Rename min_heapify() to min_heap_sift_down() Date: Fri, 24 May 2024 23:29:54 +0800 Message-Id: <20240524152958.919343-13-visitorckw@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240524152958.919343-1-visitorckw@gmail.com> References: <20240524152958.919343-1-visitorckw@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" After adding min_heap_sift_up(), the naming convention has been adjusted to maintain consistency with the min_heap_sift_up(). Consequently, min_heapify() has been renamed to min_heap_sift_down(). Link: https://lkml.kernel.org/CAP-5=3DfVcBAxt8Mw72=3DNCJPRJfjDaJcqk4rjbadgo= uAEAHz_q1A@mail.gmail.com Signed-off-by: Kuan-Wei Chiu Reviewed-by: Ian Rogers --- drivers/md/dm-vdo/repair.c | 2 +- include/linux/min_heap.h | 14 +++++++------- kernel/events/core.c | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/md/dm-vdo/repair.c b/drivers/md/dm-vdo/repair.c index eae990859db4..ff09e4a14333 100644 --- a/drivers/md/dm-vdo/repair.c +++ b/drivers/md/dm-vdo/repair.c @@ -183,7 +183,7 @@ static struct numbered_block_mapping *sort_next_heap_el= ement(struct repair_compl */ last =3D &repair->entries[--heap->nr]; swap_mappings(heap->data, last, NULL); - min_heapify(heap, 0, &repair_min_heap, NULL); + min_heap_sift_down(heap, 0, &repair_min_heap, NULL); return last; } =20 diff --git a/include/linux/min_heap.h b/include/linux/min_heap.h index 3410a5f907ad..0baee5787247 100644 --- a/include/linux/min_heap.h +++ b/include/linux/min_heap.h @@ -75,7 +75,7 @@ bool __min_heap_full(min_heap_char *heap) =20 /* Sift the element at pos down the heap. */ static __always_inline -void __min_heapify(min_heap_char *heap, int pos, size_t elem_size, +void __min_heap_sift_down(min_heap_char *heap, int pos, size_t elem_size, const struct min_heap_callbacks *func, void *args) { void *left, *right; @@ -108,8 +108,8 @@ void __min_heapify(min_heap_char *heap, int pos, size_t= elem_size, } } =20 -#define min_heapify(_heap, _pos, _func, _args) \ - __min_heapify((min_heap_char *)_heap, _pos, __minheap_obj_size(_heap), _f= unc, _args) +#define min_heap_sift_down(_heap, _pos, _func, _args) \ + __min_heap_sift_down((min_heap_char *)_heap, _pos, __minheap_obj_size(_he= ap), _func, _args) =20 /* Sift up ith element from the heap, O(log2(nr)). */ static __always_inline @@ -139,7 +139,7 @@ void __min_heapify_all(min_heap_char *heap, size_t elem= _size, int i; =20 for (i =3D heap->nr / 2 - 1; i >=3D 0; i--) - __min_heapify(heap, i, elem_size, func, args); + __min_heap_sift_down(heap, i, elem_size, func, args); } =20 #define min_heapify_all(_heap, _func, _args) \ @@ -158,7 +158,7 @@ bool __min_heap_pop(min_heap_char *heap, size_t elem_si= ze, /* Place last element at the root (position 0) and then sift down. */ heap->nr--; memcpy(data, data + (heap->nr * elem_size), elem_size); - __min_heapify(heap, 0, elem_size, func, args); + __min_heap_sift_down(heap, 0, elem_size, func, args); =20 return true; } @@ -178,7 +178,7 @@ void __min_heap_pop_push(min_heap_char *heap, void *args) { memcpy(heap->data, element, elem_size); - __min_heapify(heap, 0, elem_size, func, args); + __min_heap_sift_down(heap, 0, elem_size, func, args); } =20 #define min_heap_pop_push(_heap, _element, _func, _args) \ @@ -232,7 +232,7 @@ bool __min_heap_del(min_heap_char *heap, size_t elem_si= ze, size_t idx, return true; func->swp(data + (idx * elem_size), data + (heap->nr * elem_size), args); __min_heap_sift_up(heap, elem_size, idx, func, args); - __min_heapify(heap, idx, elem_size, func, args); + __min_heap_sift_down(heap, idx, elem_size, func, args); =20 return true; } diff --git a/kernel/events/core.c b/kernel/events/core.c index c843af8fa6f0..fad272aaeb65 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -3795,7 +3795,7 @@ static noinline int visit_groups_merge(struct perf_ev= ent_context *ctx, =20 *evt =3D perf_event_groups_next(*evt, pmu); if (*evt) - min_heapify(&event_heap, 0, &perf_min_heap, NULL); + min_heap_sift_down(&event_heap, 0, &perf_min_heap, NULL); else min_heap_pop(&event_heap, &perf_min_heap, NULL); } --=20 2.34.1 From nobody Sun Feb 8 22:05:36 2026 Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A8914132483; Fri, 24 May 2024 15:31:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716564672; cv=none; b=QmPs2X6WVhfRQBNZaYw4y75n1vrGfgepgsyqFVZdMP/oOK858qYyNHeXbsfTrYvn0rbNwWiPUBMGQO1Dle0kIN3oteFH8LJOEXOTC7WfLsGBE6PFjvkZbMwdsUs0i2Z3RSow3k4dzQb5xY+F46VOde/qr61sAADB9Wk4BdB3c6E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716564672; c=relaxed/simple; bh=77HUtebVrJzxuUnhxHqdoyCrlqlYVs7r4OSNokoaFRU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=BrrPsPUWeaYKNsyn05vBXt2yrJGMyM3hD0Sw2zzp+JoNjmDT38TK64Xrh2U5c6WReQ/Mo4za09MC1vSbHWRqgR/7SB/k6wVfrVKipj3HRH1tSuHq8AozSVJ0WLh5iMLpKt575TGz5HcLIEexzhhA4vCMp8CxS/6iX7umcv0QDaY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=GmM3o9zS; arc=none smtp.client-ip=209.85.216.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="GmM3o9zS" Received: by mail-pj1-f54.google.com with SMTP id 98e67ed59e1d1-2bdf439c664so314861a91.3; Fri, 24 May 2024 08:31:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716564670; x=1717169470; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=JeiLg0XMliHOkIglYnFk3DvCIMxfANwaibZSEhPQVEc=; b=GmM3o9zSn15kPTaCsWavxPrfFkiZFrWPF4l5WHJhPCIvrxCjPbaawtwodzBfUviywB c8C7OSG8o8+RMcZCX8O+NmOO+msU4ty6KBTbQFK2wWuvc2JFUpfR88i/lK/XXbZae2Rc qaMpGaDgomlx1upCi1Na9PQ6xtxFPQrqoVYv64DP8p2b1zSI3dBOVpuHhv3Y6Q/fxjbh rsHswsWWkus2381hEirmaB5y83sGXCnwMLJKd5/dq+xkw+gnE/VEhFiq+RZUPBBvs/aL VK1Tboa8XlIz7BAu7sn4Hrd5BGvMZ+NztWqWEDPXNd8JXFn84E5kJSyMY2sdBLmxOME+ dg2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716564670; x=1717169470; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JeiLg0XMliHOkIglYnFk3DvCIMxfANwaibZSEhPQVEc=; b=B4rUsaBJe/rGhxzIuUsMND5z4SZaY7XKz0/zNgTKp6zSz3oJEzQJomI4SuG8WsAqi8 Tx6ORfF4FUl+tbfSYnnXt5QW4uUEqReiSa7yvqEcjzoMHyva0moqhQehAUfRWGOlEcdj womqowgCi3Efw5au6nou8UBQVtPlt95+g4yMIqXRa6dbetNe7fuRt2zQfL/NYKFpKj7K +gFwW5ret2/xcH9lRvF8vhbxiFH75aPOCA7AUXTfWZS34nf5F2t4X42kbDzQil3ofP0N WapBUuQzReeNSkginDb2nARwWsMmPqkgWPMDjp7qOt40ARZrwdgRdsme0Nb18q0ND7Q9 KQiw== X-Forwarded-Encrypted: i=1; AJvYcCX95IOpv7PL+RMgYF/IZktTVjpqMeMq0YV+5pJj4A8huL83LkP8V7mx8MQwac5tCST1PI5EKIxsDSfHfmfJ/GQ9SxLyMTxj3vYYasmyZnc8/haolKcOJEZYTITOhDUJCRRxPBhuDB9nu/bIdipXEkxJzPjuMztlMjpOoALBPtl8xQyS9qadtd8UclnML35gz4ahvX2jKXcyzl0IKj+UOzxi1bPPAGZTb/ul5eNi X-Gm-Message-State: AOJu0YxOKSc1ToVQGtqhuGrCY3TrFcWQivDq/584xeYSjOh4QOet6ODO NfTZTUSD63JtkPX1qjSUBOxDU9RIPckgSZMLoCXGRE7uijJx2+gN X-Google-Smtp-Source: AGHT+IHbcXWiDmwxfe4l1q+/LLknHHuRnxu4d+1rEJ1rLFTk0UBMcC74U6va1+XSc6Jx655Pg8nFDA== X-Received: by 2002:a17:90b:8b:b0:2bf:7c50:1f6c with SMTP id 98e67ed59e1d1-2bf7c502036mr785217a91.2.1716564670052; Fri, 24 May 2024 08:31:10 -0700 (PDT) Received: from visitorckw-System-Product-Name.. ([140.113.216.168]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2bf5f50d294sm1525556a91.20.2024.05.24.08.31.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 May 2024 08:31:09 -0700 (PDT) From: Kuan-Wei Chiu To: colyli@suse.de, kent.overstreet@linux.dev, msakai@redhat.com, peterz@infradead.org, mingo@redhat.com, acme@kernel.org, namhyung@kernel.org, akpm@linux-foundation.org Cc: bfoster@redhat.com, mark.rutland@arm.com, alexander.shishkin@linux.intel.com, jolsa@kernel.org, irogers@google.com, adrian.hunter@intel.com, bagasdotme@gmail.com, jserv@ccns.ncku.edu.tw, linux-bcache@vger.kernel.org, linux-kernel@vger.kernel.org, dm-devel@lists.linux.dev, linux-bcachefs@vger.kernel.org, linux-perf-users@vger.kernel.org, Kuan-Wei Chiu Subject: [PATCH v6 13/16] lib min_heap: Update min_heap_push() to use min_heap_sift_up() Date: Fri, 24 May 2024 23:29:55 +0800 Message-Id: <20240524152958.919343-14-visitorckw@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240524152958.919343-1-visitorckw@gmail.com> References: <20240524152958.919343-1-visitorckw@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Update min_heap_push() to use min_heap_sift_up() rather than its origin inline version. Signed-off-by: Kuan-Wei Chiu Reviewed-by: Ian Rogers --- include/linux/min_heap.h | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/include/linux/min_heap.h b/include/linux/min_heap.h index 0baee5787247..43a7b9dcf15e 100644 --- a/include/linux/min_heap.h +++ b/include/linux/min_heap.h @@ -190,7 +190,6 @@ bool __min_heap_push(min_heap_char *heap, const void *e= lement, size_t elem_size, const struct min_heap_callbacks *func, void *args) { void *data =3D heap->data; - void *child, *parent; int pos; =20 if (WARN_ONCE(heap->nr >=3D heap->size, "Pushing on a full heap")) @@ -202,13 +201,7 @@ bool __min_heap_push(min_heap_char *heap, const void *= element, size_t elem_size, heap->nr++; =20 /* Sift child at pos up. */ - for (; pos > 0; pos =3D (pos - 1) / 2) { - child =3D data + (pos * elem_size); - parent =3D data + ((pos - 1) / 2) * elem_size; - if (func->less(parent, child, args)) - break; - func->swp(parent, child, args); - } + __min_heap_sift_up(heap, elem_size, pos, func, args); =20 return true; } --=20 2.34.1 From nobody Sun Feb 8 22:05:36 2026 Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B27C5132483; Fri, 24 May 2024 15:31:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716564677; cv=none; b=rWK5a8wuugJpY9cOKhLlK7TKRcYG2g7QG95WyiC8aHSxsXsl5+bgo2wuJ1bhr1/zbAH4srMmzSIUNkfhlUkT4LsOVadop1Z0z6XOlKjJb2KTwRSL2iNx9yoOI4qibDCcxw9roALBPP72DAsc9IFIevxtpfOMWcfp0uBHxAAn/DI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716564677; c=relaxed/simple; bh=C6lI1Yu2VUekRoVzlYxR8HKgrkH4BaCTdukv7Ke6t5U=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=DsgletLguZlSC/0RJH8gRAOWB6f87RM+2LTxnpVuzT65LVsF8laHn6p9vSv83Lt0IS1HM3Dl91wZjVJ6rQt9qac2XZLK/5MItMAtrMVDYAfopTM7Gysncsdhhmxo6vyBPZClDUOLxvW6w/t9BirYbqG8yPgsVWbHjKVrAcUHqTY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=JpH8LH9G; arc=none smtp.client-ip=209.85.216.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="JpH8LH9G" Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-2bde4d15867so247322a91.3; Fri, 24 May 2024 08:31:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716564675; x=1717169475; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4zTq8cqNIQvJ49hOaLr5qxuS4444ShA09a0gTe29cD8=; b=JpH8LH9GFbdOp39a2TjUhlS2O0WBNHTPOUo39d/eJ7uF8S86/vjCkdX3C0WP28xPEB TKYPllqs9tQ2h1nQFjiWT5l2EAAGSV7OsBAjn+GZJuQu/S+H+5GXHAt3JFoTNyvbUk2j bmrcsbTeBLiOFw/KqtthmlXtSa8bsfcfnTrG2YtYZxK+5NtBoU4wJ6rYsBkFXUEpuuD9 14KdCbEYZ6gSgE1IhZEj6+Ml7gUJ6dkA/SL/avu2CTR0PXhqleWJWmDwmTFyt02SABv/ psrUvghlXa9YKHwthvDnrQME57SJmQrCsoVWZLmQOq3vTndCQ5q+NxDf8xc4faV+9gID kzLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716564675; x=1717169475; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4zTq8cqNIQvJ49hOaLr5qxuS4444ShA09a0gTe29cD8=; b=Fx4KboBAOQCDOohoNsCjU2P+H857gmyV0rtnXwXvs/A9TWz8qLMNLu9qKVdUy+bK0A ruzmTNYR/KalUCbua61ZRC1g9vZzepmA6DoaAmhMxNamfOki9eWigJUN9rV+YVi97eJC JZFgJHtUi8/3Y1bMXyZcWnjHwrnwdcvx70JaAszQVEXMbgbTIaXkUA7A6WOj5WSyb2MY mHGOIIJ575TDIDShvk1tJUCZN5yRlRh51Dz42ec0ecPTQw7SQTtD6LsgmnrP9um5TgtE rZU8m5ZZTxgVlEB093/oKmqtsvKilQWKnLDyPUD/YHVBfErZWhLG26kUUB6HLeMUWD37 zjFA== X-Forwarded-Encrypted: i=1; AJvYcCVrWgw632KmofPuAjqmR/rRVkB1l03IH9qDF+DooHv4CBPjuwbZms2X6PBvQpjXMHjwGKDABLwsJtlLHMbdYjSj9KqexkvttFAsBlYrOTYynryqaiP9/X7PR1qAdjq1zU5fUv2XwVkuqjoYbagbtVLlsiDk7H9nJqL3vvrRfxRQe+3a1bfCfPlKtMOj4cmk0XuQpr4RlS+F10rRT6cGOElvJsLGgNjefyibdto+ X-Gm-Message-State: AOJu0YwRgmOHKT/DBhiePBZvcqxAuhFsA6JwH/MC4JgklFhtg3Y6ymSP sSQS8LntlVvOCLRz4xE+H4TX/boMAYxNA+UAfIWwMzr0Ffd3E5Vw X-Google-Smtp-Source: AGHT+IEeQ+fm8GB2+MgEGzsYh4oQsjju6O48NEnmfaOO2wHIeT/FbppTUO/N8jps5HE+L8khfiX4jw== X-Received: by 2002:a17:90b:3d10:b0:2bd:feb6:b09b with SMTP id 98e67ed59e1d1-2bf5e161326mr2523612a91.1.1716564675125; Fri, 24 May 2024 08:31:15 -0700 (PDT) Received: from visitorckw-System-Product-Name.. ([140.113.216.168]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2bf5f50d294sm1525556a91.20.2024.05.24.08.31.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 May 2024 08:31:14 -0700 (PDT) From: Kuan-Wei Chiu To: colyli@suse.de, kent.overstreet@linux.dev, msakai@redhat.com, peterz@infradead.org, mingo@redhat.com, acme@kernel.org, namhyung@kernel.org, akpm@linux-foundation.org Cc: bfoster@redhat.com, mark.rutland@arm.com, alexander.shishkin@linux.intel.com, jolsa@kernel.org, irogers@google.com, adrian.hunter@intel.com, bagasdotme@gmail.com, jserv@ccns.ncku.edu.tw, linux-bcache@vger.kernel.org, linux-kernel@vger.kernel.org, dm-devel@lists.linux.dev, linux-bcachefs@vger.kernel.org, linux-perf-users@vger.kernel.org, Kuan-Wei Chiu Subject: [PATCH v6 14/16] lib/test_min_heap: Add test for heap_del() Date: Fri, 24 May 2024 23:29:56 +0800 Message-Id: <20240524152958.919343-15-visitorckw@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240524152958.919343-1-visitorckw@gmail.com> References: <20240524152958.919343-1-visitorckw@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add test cases for the min_heap_del() to ensure its functionality is thoroughly tested. Signed-off-by: Kuan-Wei Chiu Reviewed-by: Ian Rogers --- lib/test_min_heap.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/lib/test_min_heap.c b/lib/test_min_heap.c index f59638cf5dfa..9e1feb9b679c 100644 --- a/lib/test_min_heap.c +++ b/lib/test_min_heap.c @@ -165,6 +165,40 @@ static __init int test_heap_pop_push(bool min_heap) return err; } =20 +static __init int test_heap_del(bool min_heap) +{ + int values[] =3D { 3, 1, 2, 4, 0x8000000, 0x7FFFFFF, 0, + -3, -1, -2, -4, 0x8000000, 0x7FFFFFF }; + struct min_heap_test heap; + + min_heap_init(&heap, values, ARRAY_SIZE(values)); + heap.nr =3D ARRAY_SIZE(values); + struct min_heap_callbacks funcs =3D { + .less =3D min_heap ? less_than : greater_than, + .swp =3D swap_ints, + }; + int i, err; + + /* Test with known set of values. */ + min_heapify_all(&heap, &funcs, NULL); + for (i =3D 0; i < ARRAY_SIZE(values) / 2; i++) + min_heap_del(&heap, get_random_u32() % heap.nr, &funcs, NULL); + err =3D pop_verify_heap(min_heap, &heap, &funcs); + + + /* Test with randomly generated values. */ + heap.nr =3D ARRAY_SIZE(values); + for (i =3D 0; i < heap.nr; i++) + values[i] =3D get_random_u32(); + min_heapify_all(&heap, &funcs, NULL); + + for (i =3D 0; i < ARRAY_SIZE(values) / 2; i++) + min_heap_del(&heap, get_random_u32() % heap.nr, &funcs, NULL); + err +=3D pop_verify_heap(min_heap, &heap, &funcs); + + return err; +} + static int __init test_min_heap_init(void) { int err =3D 0; @@ -175,6 +209,8 @@ static int __init test_min_heap_init(void) err +=3D test_heap_push(false); err +=3D test_heap_pop_push(true); err +=3D test_heap_pop_push(false); + err +=3D test_heap_del(true); + err +=3D test_heap_del(false); if (err) { pr_err("test failed with %d errors\n", err); return -EINVAL; --=20 2.34.1 From nobody Sun Feb 8 22:05:36 2026 Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EC0C912F37B; Fri, 24 May 2024 15:31:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716564683; cv=none; b=ked82GM9eAIrLuSaLug8UHB5BiVcPBy588CCWWWHURPN+RspwwNNib/qV1EK7jQDREU0QIdOJzLbaiAQvEqc/gz0Khznsy08jJ/Rooq6XdbJluIIi4ekDaTaebMHRQG0QlL+io8Temk06FC3mPQr5B0v6YuJnLIgm5e3LeBQZOs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716564683; c=relaxed/simple; bh=8ni4GszjCg1d16gUtlXYLKOso948yR1YzfvIQYs3v1Y=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=uiEEmPgQDHz0Yme4jtoJTMv0TQIcAo7I5nsY6e0N8rsbec+92gg++z47LEu5nQo26PXQX53xMz386GbAKsEa75TetQE/WBLC/pbQH1YM3PHALg9aeabUJtU/6asSNy0oE7hfymjrXC1FhHRZ3UpPHozGIS1E5FnUnBZG5wgZ7BQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=KqmS/Qwj; arc=none smtp.client-ip=209.85.216.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="KqmS/Qwj" Received: by mail-pj1-f46.google.com with SMTP id 98e67ed59e1d1-2bf5ba9a2c5so184676a91.0; Fri, 24 May 2024 08:31:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716564680; x=1717169480; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=loEl3bDm1i3rglr+E7pMHIQM/WYUDmzuHJmkhLtvK58=; b=KqmS/QwjsAAGxlKsCaJUOAHzTNJoj6eGiR7oJqAZIxJS5AhksHW8J9KIOLviHixDxE iVN+wFo3+HWsygGTV9Y05pPclgR3FYwRpNgXRpvZdhInnqTUS8pTEijDHQ7AW3/z4S/Y Uq3hGbfcUSKIgQNLpvZzsDm043XTdAKvQanmhSQ0pCbbGGWaxI6gnOBPIIpjTXBHf9QO UV3H3T7X4Hkl5if7lu/IUQGmFLgZcEtDMWCV92wjDW9iRsH0FSfl8T6oXB6Cvzeww+8t DDRGEaFqH7H3eiWsT7fbbK2emqAOfgvSAQ/JQdlKD0J9U6cbCosk2WgR9Fw/w4IgEpAs o7wg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716564680; x=1717169480; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=loEl3bDm1i3rglr+E7pMHIQM/WYUDmzuHJmkhLtvK58=; b=Ex1pOdOCeI4+53T2X63oexbDbpWsKufYa9+bQkoDBN1TMae5BF/2gFI7OReTuZ89AF oVWrtDJuRsma2zoDjQn65AwpwakHxm9Urw7e+1fPdQaXrVyVhY3nFyxeBOQ+1gI/pMyI hw9MGWncw5WM5FAGJpiveyPJjhlH/FBkK1aEAMDWu6NYr4zJgN5PXUrrA7zNp8gxRfPk YQz60ix2qA0JjMsdZklWDYhWYQNAXwLMOTrVjXZH6MEwJhWTSBHofuXvBLdBQeAjHn+S lNwHqDMsxyG7rR3ZVJXshAGA4JzELd6Huzajgj69YbtnLb+1HhzlA3R8zsuWF2n7U6bR jyqw== X-Forwarded-Encrypted: i=1; AJvYcCUgVTxV2daHgdff/w9mQt57640+/yN8F9veEjQ5tOJwQM/fYYk92hPCG13XU7eL87yMx/s/QdFfo0qLHP44XNsHa1DKvtT0mgZiOirdJ6C2maKOEaETyTSCizwzR21uB2gRF2XhBQt9ArC6uG0EPqAUBPmzc1ERO0aikeNnnYhxpRDf9qCVMYp2sVYZQhNhjAdABtLEW9Pr+16NFSsRJLuSSPJhcxRslRk+O7+D X-Gm-Message-State: AOJu0YzX1l4fVIKPYmi8t4BCTd7a/EfbcE+wc1GAO1eaqYdd9MDy6gWP jVJje1CbzwtLz5VV6ZBThHhx5kzX+qvuqbD2H+Q0fCD+BOdMopb4DD86mg== X-Google-Smtp-Source: AGHT+IEUrmf8Z35K242qMLJqeIL3rN/4RH5KOBL/mOgyJGBua28SrFZ793tEirU4bxPTRbl1ZL/b1g== X-Received: by 2002:a17:90a:b883:b0:2b6:208f:7ef0 with SMTP id 98e67ed59e1d1-2bf5f40b09fmr2542180a91.3.1716564680040; Fri, 24 May 2024 08:31:20 -0700 (PDT) Received: from visitorckw-System-Product-Name.. ([140.113.216.168]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2bf5f50d294sm1525556a91.20.2024.05.24.08.31.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 May 2024 08:31:19 -0700 (PDT) From: Kuan-Wei Chiu To: colyli@suse.de, kent.overstreet@linux.dev, msakai@redhat.com, peterz@infradead.org, mingo@redhat.com, acme@kernel.org, namhyung@kernel.org, akpm@linux-foundation.org Cc: bfoster@redhat.com, mark.rutland@arm.com, alexander.shishkin@linux.intel.com, jolsa@kernel.org, irogers@google.com, adrian.hunter@intel.com, bagasdotme@gmail.com, jserv@ccns.ncku.edu.tw, linux-bcache@vger.kernel.org, linux-kernel@vger.kernel.org, dm-devel@lists.linux.dev, linux-bcachefs@vger.kernel.org, linux-perf-users@vger.kernel.org, Kuan-Wei Chiu Subject: [PATCH v6 15/16] bcache: Remove heap-related macros and switch to generic min_heap Date: Fri, 24 May 2024 23:29:57 +0800 Message-Id: <20240524152958.919343-16-visitorckw@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240524152958.919343-1-visitorckw@gmail.com> References: <20240524152958.919343-1-visitorckw@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Drop the heap-related macros from bcache and replacing them with the generic min_heap implementation from include/linux. By doing so, code readability is improved by using functions instead of macros. Moreover, the min_heap implementation in include/linux adopts a bottom-up variation compared to the textbook version currently used in bcache. This bottom-up variation allows for approximately 50% reduction in the number of comparison operations during heap siftdown, without changing the number of swaps, thus making it more efficient. Link: https://lkml.kernel.org/ioyfizrzq7w7mjrqcadtzsfgpuntowtjdw5pgn4qhvsdp= 4mqqg@nrlek5vmisbu Signed-off-by: Kuan-Wei Chiu Reviewed-by: Ian Rogers Acked-by: Coly Li --- Changes in v6: - Rename the MIN_HEAP() macro to DEFINE_MIN_HEAP(). drivers/md/bcache/alloc.c | 64 +++++++++++++----- drivers/md/bcache/bcache.h | 2 +- drivers/md/bcache/bset.c | 124 ++++++++++++++++++++++------------ drivers/md/bcache/bset.h | 40 +++++------ drivers/md/bcache/btree.c | 69 +++++++++++-------- drivers/md/bcache/extents.c | 53 +++++++++------ drivers/md/bcache/movinggc.c | 41 ++++++++--- drivers/md/bcache/super.c | 3 +- drivers/md/bcache/sysfs.c | 4 +- drivers/md/bcache/util.h | 67 +----------------- drivers/md/bcache/writeback.c | 13 ++-- 11 files changed, 263 insertions(+), 217 deletions(-) diff --git a/drivers/md/bcache/alloc.c b/drivers/md/bcache/alloc.c index ce13c272c387..8cfa15ea32b4 100644 --- a/drivers/md/bcache/alloc.c +++ b/drivers/md/bcache/alloc.c @@ -166,40 +166,68 @@ static void bch_invalidate_one_bucket(struct cache *c= a, struct bucket *b) * prio is worth 1/8th of what INITIAL_PRIO is worth. */ =20 -#define bucket_prio(b) \ -({ \ - unsigned int min_prio =3D (INITIAL_PRIO - ca->set->min_prio) / 8; \ - \ - (b->prio - ca->set->min_prio + min_prio) * GC_SECTORS_USED(b); \ -}) +static inline unsigned int new_bucket_prio(struct cache *ca, struct bucket= *b) +{ + unsigned int min_prio =3D (INITIAL_PRIO - ca->set->min_prio) / 8; + + return (b->prio - ca->set->min_prio + min_prio) * GC_SECTORS_USED(b); +} + +static inline bool new_bucket_max_cmp(const void *l, const void *r, void *= args) +{ + struct bucket **lhs =3D (struct bucket **)l; + struct bucket **rhs =3D (struct bucket **)r; + struct cache *ca =3D args; + + return new_bucket_prio(ca, *lhs) > new_bucket_prio(ca, *rhs); +} =20 -#define bucket_max_cmp(l, r) (bucket_prio(l) < bucket_prio(r)) -#define bucket_min_cmp(l, r) (bucket_prio(l) > bucket_prio(r)) +static inline bool new_bucket_min_cmp(const void *l, const void *r, void *= args) +{ + struct bucket **lhs =3D (struct bucket **)l; + struct bucket **rhs =3D (struct bucket **)r; + struct cache *ca =3D args; + + return new_bucket_prio(ca, *lhs) < new_bucket_prio(ca, *rhs); +} + +static inline void new_bucket_swap(void *l, void *r, void __always_unused = *args) +{ + struct bucket **lhs =3D l, **rhs =3D r; + + swap(*lhs, *rhs); +} =20 static void invalidate_buckets_lru(struct cache *ca) { struct bucket *b; - ssize_t i; + const struct min_heap_callbacks bucket_max_cmp_callback =3D { + .less =3D new_bucket_max_cmp, + .swp =3D new_bucket_swap, + }; + const struct min_heap_callbacks bucket_min_cmp_callback =3D { + .less =3D new_bucket_min_cmp, + .swp =3D new_bucket_swap, + }; =20 - ca->heap.used =3D 0; + ca->heap.nr =3D 0; =20 for_each_bucket(b, ca) { if (!bch_can_invalidate_bucket(ca, b)) continue; =20 - if (!heap_full(&ca->heap)) - heap_add(&ca->heap, b, bucket_max_cmp); - else if (bucket_max_cmp(b, heap_peek(&ca->heap))) { + if (!min_heap_full(&ca->heap)) + min_heap_push(&ca->heap, &b, &bucket_max_cmp_callback, ca); + else if (!new_bucket_max_cmp(&b, min_heap_peek(&ca->heap), ca)) { ca->heap.data[0] =3D b; - heap_sift(&ca->heap, 0, bucket_max_cmp); + min_heap_sift_down(&ca->heap, 0, &bucket_max_cmp_callback, ca); } } =20 - for (i =3D ca->heap.used / 2 - 1; i >=3D 0; --i) - heap_sift(&ca->heap, i, bucket_min_cmp); + min_heapify_all(&ca->heap, &bucket_min_cmp_callback, ca); =20 while (!fifo_full(&ca->free_inc)) { - if (!heap_pop(&ca->heap, b, bucket_min_cmp)) { + if (!ca->heap.nr) { /* * We don't want to be calling invalidate_buckets() * multiple times when it can't do anything @@ -208,6 +236,8 @@ static void invalidate_buckets_lru(struct cache *ca) wake_up_gc(ca->set); return; } + b =3D min_heap_peek(&ca->heap)[0]; + min_heap_pop(&ca->heap, &bucket_min_cmp_callback, ca); =20 bch_invalidate_one_bucket(ca, b); } diff --git a/drivers/md/bcache/bcache.h b/drivers/md/bcache/bcache.h index 4e6afa89921f..654df8b7d344 100644 --- a/drivers/md/bcache/bcache.h +++ b/drivers/md/bcache/bcache.h @@ -457,7 +457,7 @@ struct cache { /* Allocation stuff: */ struct bucket *buckets; =20 - DECLARE_HEAP(struct bucket *, heap); + DEFINE_MIN_HEAP(struct bucket *, cache_heap) heap; =20 /* * If nonzero, we know we aren't going to find any buckets to invalidate diff --git a/drivers/md/bcache/bset.c b/drivers/md/bcache/bset.c index 463eb13bd0b2..bd97d8626887 100644 --- a/drivers/md/bcache/bset.c +++ b/drivers/md/bcache/bset.c @@ -54,9 +54,11 @@ void bch_dump_bucket(struct btree_keys *b) int __bch_count_data(struct btree_keys *b) { unsigned int ret =3D 0; - struct btree_iter_stack iter; + struct btree_iter iter; struct bkey *k; =20 + min_heap_init(&iter.heap, NULL, MAX_BSETS); + if (b->ops->is_extents) for_each_key(b, k, &iter) ret +=3D KEY_SIZE(k); @@ -67,9 +69,11 @@ void __bch_check_keys(struct btree_keys *b, const char *= fmt, ...) { va_list args; struct bkey *k, *p =3D NULL; - struct btree_iter_stack iter; + struct btree_iter iter; const char *err; =20 + min_heap_init(&iter.heap, NULL, MAX_BSETS); + for_each_key(b, k, &iter) { if (b->ops->is_extents) { err =3D "Keys out of order"; @@ -110,9 +114,9 @@ void __bch_check_keys(struct btree_keys *b, const char = *fmt, ...) =20 static void bch_btree_iter_next_check(struct btree_iter *iter) { - struct bkey *k =3D iter->data->k, *next =3D bkey_next(k); + struct bkey *k =3D iter->heap.data->k, *next =3D bkey_next(k); =20 - if (next < iter->data->end && + if (next < iter->heap.data->end && bkey_cmp(k, iter->b->ops->is_extents ? &START_KEY(next) : next) > 0) { bch_dump_bucket(iter->b); @@ -879,12 +883,14 @@ unsigned int bch_btree_insert_key(struct btree_keys *= b, struct bkey *k, unsigned int status =3D BTREE_INSERT_STATUS_NO_INSERT; struct bset *i =3D bset_tree_last(b)->data; struct bkey *m, *prev =3D NULL; - struct btree_iter_stack iter; + struct btree_iter iter; struct bkey preceding_key_on_stack =3D ZERO_KEY; struct bkey *preceding_key_p =3D &preceding_key_on_stack; =20 BUG_ON(b->ops->is_extents && !KEY_SIZE(k)); =20 + min_heap_init(&iter.heap, NULL, MAX_BSETS); + /* * If k has preceding key, preceding_key_p will be set to address * of k's preceding key; otherwise preceding_key_p will be set @@ -895,9 +901,9 @@ unsigned int bch_btree_insert_key(struct btree_keys *b,= struct bkey *k, else preceding_key(k, &preceding_key_p); =20 - m =3D bch_btree_iter_stack_init(b, &iter, preceding_key_p); + m =3D bch_btree_iter_init(b, &iter, preceding_key_p); =20 - if (b->ops->insert_fixup(b, k, &iter.iter, replace_key)) + if (b->ops->insert_fixup(b, k, &iter, replace_key)) return status; =20 status =3D BTREE_INSERT_STATUS_INSERT; @@ -1077,79 +1083,102 @@ struct bkey *__bch_bset_search(struct btree_keys *= b, struct bset_tree *t, =20 /* Btree iterator */ =20 -typedef bool (btree_iter_cmp_fn)(struct btree_iter_set, - struct btree_iter_set); +typedef bool (new_btree_iter_cmp_fn)(const void *, const void *, void *); + +static inline bool new_btree_iter_cmp(const void *l, const void *r, void _= _always_unused *args) +{ + const struct btree_iter_set *_l =3D l; + const struct btree_iter_set *_r =3D r; + + return bkey_cmp(_l->k, _r->k) <=3D 0; +} =20 -static inline bool btree_iter_cmp(struct btree_iter_set l, - struct btree_iter_set r) +static inline void new_btree_iter_swap(void *iter1, void *iter2, void __al= ways_unused *args) { - return bkey_cmp(l.k, r.k) > 0; + struct btree_iter_set *_iter1 =3D iter1; + struct btree_iter_set *_iter2 =3D iter2; + + swap(*_iter1, *_iter2); } =20 static inline bool btree_iter_end(struct btree_iter *iter) { - return !iter->used; + return !iter->heap.nr; } =20 void bch_btree_iter_push(struct btree_iter *iter, struct bkey *k, struct bkey *end) { + const struct min_heap_callbacks callbacks =3D { + .less =3D new_btree_iter_cmp, + .swp =3D new_btree_iter_swap, + }; + if (k !=3D end) - BUG_ON(!heap_add(iter, - ((struct btree_iter_set) { k, end }), - btree_iter_cmp)); + BUG_ON(!min_heap_push(&iter->heap, + &((struct btree_iter_set) { k, end }), + &callbacks, + NULL)); } =20 -static struct bkey *__bch_btree_iter_stack_init(struct btree_keys *b, - struct btree_iter_stack *iter, - struct bkey *search, - struct bset_tree *start) +static struct bkey *__bch_btree_iter_init(struct btree_keys *b, + struct btree_iter *iter, + struct bkey *search, + struct bset_tree *start) { struct bkey *ret =3D NULL; =20 - iter->iter.size =3D ARRAY_SIZE(iter->stack_data); - iter->iter.used =3D 0; + iter->heap.size =3D ARRAY_SIZE(iter->heap.preallocated); + iter->heap.nr =3D 0; =20 #ifdef CONFIG_BCACHE_DEBUG - iter->iter.b =3D b; + iter->b =3D b; #endif =20 for (; start <=3D bset_tree_last(b); start++) { ret =3D bch_bset_search(b, start, search); - bch_btree_iter_push(&iter->iter, ret, bset_bkey_last(start->data)); + bch_btree_iter_push(iter, ret, bset_bkey_last(start->data)); } =20 return ret; } =20 -struct bkey *bch_btree_iter_stack_init(struct btree_keys *b, - struct btree_iter_stack *iter, +struct bkey *bch_btree_iter_init(struct btree_keys *b, + struct btree_iter *iter, struct bkey *search) { - return __bch_btree_iter_stack_init(b, iter, search, b->set); + return __bch_btree_iter_init(b, iter, search, b->set); } =20 static inline struct bkey *__bch_btree_iter_next(struct btree_iter *iter, - btree_iter_cmp_fn *cmp) + new_btree_iter_cmp_fn *cmp) { struct btree_iter_set b __maybe_unused; struct bkey *ret =3D NULL; + const struct min_heap_callbacks callbacks =3D { + .less =3D cmp, + .swp =3D new_btree_iter_swap, + }; =20 if (!btree_iter_end(iter)) { bch_btree_iter_next_check(iter); =20 - ret =3D iter->data->k; - iter->data->k =3D bkey_next(iter->data->k); + ret =3D iter->heap.data->k; + iter->heap.data->k =3D bkey_next(iter->heap.data->k); =20 - if (iter->data->k > iter->data->end) { + if (iter->heap.data->k > iter->heap.data->end) { WARN_ONCE(1, "bset was corrupt!\n"); - iter->data->k =3D iter->data->end; + iter->heap.data->k =3D iter->heap.data->end; } =20 - if (iter->data->k =3D=3D iter->data->end) - heap_pop(iter, b, cmp); + if (iter->heap.data->k =3D=3D iter->heap.data->end) { + if (iter->heap.nr) { + b =3D min_heap_peek(&iter->heap)[0]; + min_heap_pop(&iter->heap, &callbacks, NULL); + } + } else - heap_sift(iter, 0, cmp); + min_heap_sift_down(&iter->heap, 0, &callbacks, NULL); } =20 return ret; @@ -1157,7 +1186,7 @@ static inline struct bkey *__bch_btree_iter_next(stru= ct btree_iter *iter, =20 struct bkey *bch_btree_iter_next(struct btree_iter *iter) { - return __bch_btree_iter_next(iter, btree_iter_cmp); + return __bch_btree_iter_next(iter, new_btree_iter_cmp); =20 } =20 @@ -1195,16 +1224,18 @@ static void btree_mergesort(struct btree_keys *b, s= truct bset *out, struct btree_iter *iter, bool fixup, bool remove_stale) { - int i; struct bkey *k, *last =3D NULL; BKEY_PADDED(k) tmp; bool (*bad)(struct btree_keys *, const struct bkey *) =3D remove_stale ? bch_ptr_bad : bch_ptr_invalid; + const struct min_heap_callbacks callbacks =3D { + .less =3D b->ops->sort_cmp, + .swp =3D new_btree_iter_swap, + }; =20 /* Heapify the iterator, using our comparison function */ - for (i =3D iter->used / 2 - 1; i >=3D 0; --i) - heap_sift(iter, i, b->ops->sort_cmp); + min_heapify_all(&iter->heap, &callbacks, NULL); =20 while (!btree_iter_end(iter)) { if (b->ops->sort_fixup && fixup) @@ -1293,10 +1324,11 @@ void bch_btree_sort_partial(struct btree_keys *b, u= nsigned int start, struct bset_sort_state *state) { size_t order =3D b->page_order, keys =3D 0; - struct btree_iter_stack iter; + struct btree_iter iter; int oldsize =3D bch_count_data(b); =20 - __bch_btree_iter_stack_init(b, &iter, NULL, &b->set[start]); + min_heap_init(&iter.heap, NULL, MAX_BSETS); + __bch_btree_iter_init(b, &iter, NULL, &b->set[start]); =20 if (start) { unsigned int i; @@ -1307,7 +1339,7 @@ void bch_btree_sort_partial(struct btree_keys *b, uns= igned int start, order =3D get_order(__set_bytes(b->set->data, keys)); } =20 - __btree_sort(b, &iter.iter, start, order, false, state); + __btree_sort(b, &iter, start, order, false, state); =20 EBUG_ON(oldsize >=3D 0 && bch_count_data(b) !=3D oldsize); } @@ -1323,11 +1355,13 @@ void bch_btree_sort_into(struct btree_keys *b, stru= ct btree_keys *new, struct bset_sort_state *state) { uint64_t start_time =3D local_clock(); - struct btree_iter_stack iter; + struct btree_iter iter; + + min_heap_init(&iter.heap, NULL, MAX_BSETS); =20 - bch_btree_iter_stack_init(b, &iter, NULL); + bch_btree_iter_init(b, &iter, NULL); =20 - btree_mergesort(b, new->set->data, &iter.iter, false, true); + btree_mergesort(b, new->set->data, &iter, false, true); =20 bch_time_stats_update(&state->time, start_time); =20 diff --git a/drivers/md/bcache/bset.h b/drivers/md/bcache/bset.h index 011f6062c4c0..f79441acd4c1 100644 --- a/drivers/md/bcache/bset.h +++ b/drivers/md/bcache/bset.h @@ -187,8 +187,9 @@ struct bset_tree { }; =20 struct btree_keys_ops { - bool (*sort_cmp)(struct btree_iter_set l, - struct btree_iter_set r); + bool (*sort_cmp)(const void *l, + const void *r, + void *args); struct bkey *(*sort_fixup)(struct btree_iter *iter, struct bkey *tmp); bool (*insert_fixup)(struct btree_keys *b, @@ -312,23 +313,17 @@ enum { BTREE_INSERT_STATUS_FRONT_MERGE, }; =20 +struct btree_iter_set { + struct bkey *k, *end; +}; + /* Btree key iteration */ =20 struct btree_iter { - size_t size, used; #ifdef CONFIG_BCACHE_DEBUG struct btree_keys *b; #endif - struct btree_iter_set { - struct bkey *k, *end; - } data[]; -}; - -/* Fixed-size btree_iter that can be allocated on the stack */ - -struct btree_iter_stack { - struct btree_iter iter; - struct btree_iter_set stack_data[MAX_BSETS]; + MIN_HEAP_PREALLOCATED(struct btree_iter_set, btree_iter_heap, MAX_BSETS) = heap; }; =20 typedef bool (*ptr_filter_fn)(struct btree_keys *b, const struct bkey *k); @@ -340,9 +335,9 @@ struct bkey *bch_btree_iter_next_filter(struct btree_it= er *iter, =20 void bch_btree_iter_push(struct btree_iter *iter, struct bkey *k, struct bkey *end); -struct bkey *bch_btree_iter_stack_init(struct btree_keys *b, - struct btree_iter_stack *iter, - struct bkey *search); +struct bkey *bch_btree_iter_init(struct btree_keys *b, + struct btree_iter *iter, + struct bkey *search); =20 struct bkey *__bch_bset_search(struct btree_keys *b, struct bset_tree *t, const struct bkey *search); @@ -357,14 +352,13 @@ static inline struct bkey *bch_bset_search(struct btr= ee_keys *b, return search ? __bch_bset_search(b, t, search) : t->data->start; } =20 -#define for_each_key_filter(b, k, stack_iter, filter) = \ - for (bch_btree_iter_stack_init((b), (stack_iter), NULL); \ - ((k) =3D bch_btree_iter_next_filter(&((stack_iter)->iter), (b), \ - filter));) +#define for_each_key_filter(b, k, iter, filter) \ + for (bch_btree_iter_init((b), (iter), NULL); \ + ((k) =3D bch_btree_iter_next_filter((iter), (b), filter));) =20 -#define for_each_key(b, k, stack_iter) \ - for (bch_btree_iter_stack_init((b), (stack_iter), NULL); \ - ((k) =3D bch_btree_iter_next(&((stack_iter)->iter)));) +#define for_each_key(b, k, iter) \ + for (bch_btree_iter_init((b), (iter), NULL); \ + ((k) =3D bch_btree_iter_next(iter));) =20 /* Sorting */ =20 diff --git a/drivers/md/bcache/btree.c b/drivers/md/bcache/btree.c index d011a7154d33..ce9d729bc8ff 100644 --- a/drivers/md/bcache/btree.c +++ b/drivers/md/bcache/btree.c @@ -149,19 +149,19 @@ void bch_btree_node_read_done(struct btree *b) { const char *err =3D "bad btree header"; struct bset *i =3D btree_bset_first(b); - struct btree_iter *iter; + struct btree_iter iter; =20 /* * c->fill_iter can allocate an iterator with more memory space * than static MAX_BSETS. * See the comment arount cache_set->fill_iter. */ - iter =3D mempool_alloc(&b->c->fill_iter, GFP_NOIO); - iter->size =3D b->c->cache->sb.bucket_size / b->c->cache->sb.block_size; - iter->used =3D 0; + iter.heap.data =3D mempool_alloc(&b->c->fill_iter, GFP_NOIO); + iter.heap.size =3D b->c->cache->sb.bucket_size / b->c->cache->sb.block_si= ze; + iter.heap.nr =3D 0; =20 #ifdef CONFIG_BCACHE_DEBUG - iter->b =3D &b->keys; + iter.b =3D &b->keys; #endif =20 if (!i->seq) @@ -199,7 +199,7 @@ void bch_btree_node_read_done(struct btree *b) if (i !=3D b->keys.set[0].data && !i->keys) goto err; =20 - bch_btree_iter_push(iter, i->start, bset_bkey_last(i)); + bch_btree_iter_push(&iter, i->start, bset_bkey_last(i)); =20 b->written +=3D set_blocks(i, block_bytes(b->c->cache)); } @@ -211,7 +211,7 @@ void bch_btree_node_read_done(struct btree *b) if (i->seq =3D=3D b->keys.set[0].data->seq) goto err; =20 - bch_btree_sort_and_fix_extents(&b->keys, iter, &b->c->sort); + bch_btree_sort_and_fix_extents(&b->keys, &iter, &b->c->sort); =20 i =3D b->keys.set[0].data; err =3D "short btree key"; @@ -223,7 +223,7 @@ void bch_btree_node_read_done(struct btree *b) bch_bset_init_next(&b->keys, write_block(b), bset_magic(&b->c->cache->sb)); out: - mempool_free(iter, &b->c->fill_iter); + mempool_free(iter.heap.data, &b->c->fill_iter); return; err: set_btree_node_io_error(b); @@ -1309,9 +1309,11 @@ static bool btree_gc_mark_node(struct btree *b, stru= ct gc_stat *gc) uint8_t stale =3D 0; unsigned int keys =3D 0, good_keys =3D 0; struct bkey *k; - struct btree_iter_stack iter; + struct btree_iter iter; struct bset_tree *t; =20 + min_heap_init(&iter.heap, NULL, MAX_BSETS); + gc->nodes++; =20 for_each_key_filter(&b->keys, k, &iter, bch_ptr_invalid) { @@ -1570,9 +1572,11 @@ static int btree_gc_rewrite_node(struct btree *b, st= ruct btree_op *op, static unsigned int btree_gc_count_keys(struct btree *b) { struct bkey *k; - struct btree_iter_stack iter; + struct btree_iter iter; unsigned int ret =3D 0; =20 + min_heap_init(&iter.heap, NULL, MAX_BSETS); + for_each_key_filter(&b->keys, k, &iter, bch_ptr_bad) ret +=3D bkey_u64s(k); =20 @@ -1611,18 +1615,18 @@ static int btree_gc_recurse(struct btree *b, struct= btree_op *op, int ret =3D 0; bool should_rewrite; struct bkey *k; - struct btree_iter_stack iter; + struct btree_iter iter; struct gc_merge_info r[GC_MERGE_NODES]; struct gc_merge_info *i, *last =3D r + ARRAY_SIZE(r) - 1; =20 - bch_btree_iter_stack_init(&b->keys, &iter, &b->c->gc_done); + min_heap_init(&iter.heap, NULL, MAX_BSETS); + bch_btree_iter_init(&b->keys, &iter, &b->c->gc_done); =20 for (i =3D r; i < r + ARRAY_SIZE(r); i++) i->b =3D ERR_PTR(-EINTR); =20 while (1) { - k =3D bch_btree_iter_next_filter(&iter.iter, &b->keys, - bch_ptr_bad); + k =3D bch_btree_iter_next_filter(&iter, &b->keys, bch_ptr_bad); if (k) { r->b =3D bch_btree_node_get(b->c, op, k, b->level - 1, true, b); @@ -1912,7 +1916,9 @@ static int bch_btree_check_recurse(struct btree *b, s= truct btree_op *op) { int ret =3D 0; struct bkey *k, *p =3D NULL; - struct btree_iter_stack iter; + struct btree_iter iter; + + min_heap_init(&iter.heap, NULL, MAX_BSETS); =20 for_each_key_filter(&b->keys, k, &iter, bch_ptr_invalid) bch_initial_mark_key(b->c, b->level, k); @@ -1920,10 +1926,10 @@ static int bch_btree_check_recurse(struct btree *b,= struct btree_op *op) bch_initial_mark_key(b->c, b->level + 1, &b->key); =20 if (b->level) { - bch_btree_iter_stack_init(&b->keys, &iter, NULL); + bch_btree_iter_init(&b->keys, &iter, NULL); =20 do { - k =3D bch_btree_iter_next_filter(&iter.iter, &b->keys, + k =3D bch_btree_iter_next_filter(&iter, &b->keys, bch_ptr_bad); if (k) { btree_node_prefetch(b, k); @@ -1951,7 +1957,7 @@ static int bch_btree_check_thread(void *arg) struct btree_check_info *info =3D arg; struct btree_check_state *check_state =3D info->state; struct cache_set *c =3D check_state->c; - struct btree_iter_stack iter; + struct btree_iter iter; struct bkey *k, *p; int cur_idx, prev_idx, skip_nr; =20 @@ -1959,9 +1965,11 @@ static int bch_btree_check_thread(void *arg) cur_idx =3D prev_idx =3D 0; ret =3D 0; =20 + min_heap_init(&iter.heap, NULL, MAX_BSETS); + /* root node keys are checked before thread created */ - bch_btree_iter_stack_init(&c->root->keys, &iter, NULL); - k =3D bch_btree_iter_next_filter(&iter.iter, &c->root->keys, bch_ptr_bad); + bch_btree_iter_init(&c->root->keys, &iter, NULL); + k =3D bch_btree_iter_next_filter(&iter, &c->root->keys, bch_ptr_bad); BUG_ON(!k); =20 p =3D k; @@ -1979,7 +1987,7 @@ static int bch_btree_check_thread(void *arg) skip_nr =3D cur_idx - prev_idx; =20 while (skip_nr) { - k =3D bch_btree_iter_next_filter(&iter.iter, + k =3D bch_btree_iter_next_filter(&iter, &c->root->keys, bch_ptr_bad); if (k) @@ -2052,9 +2060,11 @@ int bch_btree_check(struct cache_set *c) int ret =3D 0; int i; struct bkey *k =3D NULL; - struct btree_iter_stack iter; + struct btree_iter iter; struct btree_check_state check_state; =20 + min_heap_init(&iter.heap, NULL, MAX_BSETS); + /* check and mark root node keys */ for_each_key_filter(&c->root->keys, k, &iter, bch_ptr_invalid) bch_initial_mark_key(c, c->root->level, k); @@ -2548,11 +2558,12 @@ static int bch_btree_map_nodes_recurse(struct btree= *b, struct btree_op *op, =20 if (b->level) { struct bkey *k; - struct btree_iter_stack iter; + struct btree_iter iter; =20 - bch_btree_iter_stack_init(&b->keys, &iter, from); + min_heap_init(&iter.heap, NULL, MAX_BSETS); + bch_btree_iter_init(&b->keys, &iter, from); =20 - while ((k =3D bch_btree_iter_next_filter(&iter.iter, &b->keys, + while ((k =3D bch_btree_iter_next_filter(&iter, &b->keys, bch_ptr_bad))) { ret =3D bcache_btree(map_nodes_recurse, k, b, op, from, fn, flags); @@ -2581,12 +2592,12 @@ int bch_btree_map_keys_recurse(struct btree *b, str= uct btree_op *op, { int ret =3D MAP_CONTINUE; struct bkey *k; - struct btree_iter_stack iter; + struct btree_iter iter; =20 - bch_btree_iter_stack_init(&b->keys, &iter, from); + min_heap_init(&iter.heap, NULL, MAX_BSETS); + bch_btree_iter_init(&b->keys, &iter, from); =20 - while ((k =3D bch_btree_iter_next_filter(&iter.iter, &b->keys, - bch_ptr_bad))) { + while ((k =3D bch_btree_iter_next_filter(&iter, &b->keys, bch_ptr_bad))) { ret =3D !b->level ? fn(op, b, k) : bcache_btree(map_keys_recurse, k, diff --git a/drivers/md/bcache/extents.c b/drivers/md/bcache/extents.c index d626ffcbecb9..a7221e5dbe81 100644 --- a/drivers/md/bcache/extents.c +++ b/drivers/md/bcache/extents.c @@ -33,15 +33,16 @@ static void sort_key_next(struct btree_iter *iter, i->k =3D bkey_next(i->k); =20 if (i->k =3D=3D i->end) - *i =3D iter->data[--iter->used]; + *i =3D iter->heap.data[--iter->heap.nr]; } =20 -static bool bch_key_sort_cmp(struct btree_iter_set l, - struct btree_iter_set r) +static bool new_bch_key_sort_cmp(const void *l, const void *r, void *args) { - int64_t c =3D bkey_cmp(l.k, r.k); + struct btree_iter_set *_l =3D (struct btree_iter_set *)l; + struct btree_iter_set *_r =3D (struct btree_iter_set *)r; + int64_t c =3D bkey_cmp(_l->k, _r->k); =20 - return c ? c > 0 : l.k < r.k; + return !(c ? c > 0 : _l->k < _r->k); } =20 static bool __ptr_invalid(struct cache_set *c, const struct bkey *k) @@ -238,7 +239,7 @@ static bool bch_btree_ptr_insert_fixup(struct btree_key= s *bk, } =20 const struct btree_keys_ops bch_btree_keys_ops =3D { - .sort_cmp =3D bch_key_sort_cmp, + .sort_cmp =3D new_bch_key_sort_cmp, .insert_fixup =3D bch_btree_ptr_insert_fixup, .key_invalid =3D bch_btree_ptr_invalid, .key_bad =3D bch_btree_ptr_bad, @@ -255,22 +256,36 @@ const struct btree_keys_ops bch_btree_keys_ops =3D { * Necessary for btree_sort_fixup() - if there are multiple keys that comp= are * equal in different sets, we have to process them newest to oldest. */ -static bool bch_extent_sort_cmp(struct btree_iter_set l, - struct btree_iter_set r) + +static bool new_bch_extent_sort_cmp(const void *l, const void *r, void __a= lways_unused *args) +{ + struct btree_iter_set *_l =3D (struct btree_iter_set *)l; + struct btree_iter_set *_r =3D (struct btree_iter_set *)r; + int64_t c =3D bkey_cmp(&START_KEY(_l->k), &START_KEY(_r->k)); + + return !(c ? c > 0 : _l->k < _r->k); +} + +static inline void new_btree_iter_swap(void *iter1, void *iter2, void __al= ways_unused *args) { - int64_t c =3D bkey_cmp(&START_KEY(l.k), &START_KEY(r.k)); + struct btree_iter_set *_iter1 =3D iter1; + struct btree_iter_set *_iter2 =3D iter2; =20 - return c ? c > 0 : l.k < r.k; + swap(*_iter1, *_iter2); } =20 static struct bkey *bch_extent_sort_fixup(struct btree_iter *iter, struct bkey *tmp) { - while (iter->used > 1) { - struct btree_iter_set *top =3D iter->data, *i =3D top + 1; - - if (iter->used > 2 && - bch_extent_sort_cmp(i[0], i[1])) + const struct min_heap_callbacks callbacks =3D { + .less =3D new_bch_extent_sort_cmp, + .swp =3D new_btree_iter_swap, + }; + while (iter->heap.nr > 1) { + struct btree_iter_set *top =3D iter->heap.data, *i =3D top + 1; + + if (iter->heap.nr > 2 && + !new_bch_extent_sort_cmp(&i[0], &i[1], NULL)) i++; =20 if (bkey_cmp(top->k, &START_KEY(i->k)) <=3D 0) @@ -278,7 +293,7 @@ static struct bkey *bch_extent_sort_fixup(struct btree_= iter *iter, =20 if (!KEY_SIZE(i->k)) { sort_key_next(iter, i); - heap_sift(iter, i - top, bch_extent_sort_cmp); + min_heap_sift_down(&iter->heap, i - top, &callbacks, NULL); continue; } =20 @@ -288,7 +303,7 @@ static struct bkey *bch_extent_sort_fixup(struct btree_= iter *iter, else bch_cut_front(top->k, i->k); =20 - heap_sift(iter, i - top, bch_extent_sort_cmp); + min_heap_sift_down(&iter->heap, i - top, &callbacks, NULL); } else { /* can't happen because of comparison func */ BUG_ON(!bkey_cmp(&START_KEY(top->k), &START_KEY(i->k))); @@ -298,7 +313,7 @@ static struct bkey *bch_extent_sort_fixup(struct btree_= iter *iter, =20 bch_cut_back(&START_KEY(i->k), tmp); bch_cut_front(i->k, top->k); - heap_sift(iter, 0, bch_extent_sort_cmp); + min_heap_sift_down(&iter->heap, 0, &callbacks, NULL); =20 return tmp; } else { @@ -618,7 +633,7 @@ static bool bch_extent_merge(struct btree_keys *bk, } =20 const struct btree_keys_ops bch_extent_keys_ops =3D { - .sort_cmp =3D bch_extent_sort_cmp, + .sort_cmp =3D new_bch_extent_sort_cmp, .sort_fixup =3D bch_extent_sort_fixup, .insert_fixup =3D bch_extent_insert_fixup, .key_invalid =3D bch_extent_invalid, diff --git a/drivers/md/bcache/movinggc.c b/drivers/md/bcache/movinggc.c index ebd500bdf0b2..7f482729c56d 100644 --- a/drivers/md/bcache/movinggc.c +++ b/drivers/md/bcache/movinggc.c @@ -182,16 +182,27 @@ err: if (!IS_ERR_OR_NULL(w->private)) closure_sync(&cl); } =20 -static bool bucket_cmp(struct bucket *l, struct bucket *r) +static bool new_bucket_cmp(const void *l, const void *r, void __always_unu= sed *args) { - return GC_SECTORS_USED(l) < GC_SECTORS_USED(r); + struct bucket **_l =3D (struct bucket **)l; + struct bucket **_r =3D (struct bucket **)r; + + return GC_SECTORS_USED(*_l) >=3D GC_SECTORS_USED(*_r); +} + +static void new_bucket_swap(void *l, void *r, void __always_unused *args) +{ + struct bucket **_l =3D l; + struct bucket **_r =3D r; + + swap(*_l, *_r); } =20 static unsigned int bucket_heap_top(struct cache *ca) { struct bucket *b; =20 - return (b =3D heap_peek(&ca->heap)) ? GC_SECTORS_USED(b) : 0; + return (b =3D min_heap_peek(&ca->heap)[0]) ? GC_SECTORS_USED(b) : 0; } =20 void bch_moving_gc(struct cache_set *c) @@ -199,6 +210,10 @@ void bch_moving_gc(struct cache_set *c) struct cache *ca =3D c->cache; struct bucket *b; unsigned long sectors_to_move, reserve_sectors; + const struct min_heap_callbacks callbacks =3D { + .less =3D new_bucket_cmp, + .swp =3D new_bucket_swap, + }; =20 if (!c->copy_gc_enabled) return; @@ -209,7 +224,7 @@ void bch_moving_gc(struct cache_set *c) reserve_sectors =3D ca->sb.bucket_size * fifo_used(&ca->free[RESERVE_MOVINGGC]); =20 - ca->heap.used =3D 0; + ca->heap.nr =3D 0; =20 for_each_bucket(b, ca) { if (GC_MARK(b) =3D=3D GC_MARK_METADATA || @@ -218,25 +233,31 @@ void bch_moving_gc(struct cache_set *c) atomic_read(&b->pin)) continue; =20 - if (!heap_full(&ca->heap)) { + if (!min_heap_full(&ca->heap)) { sectors_to_move +=3D GC_SECTORS_USED(b); - heap_add(&ca->heap, b, bucket_cmp); - } else if (bucket_cmp(b, heap_peek(&ca->heap))) { + min_heap_push(&ca->heap, &b, &callbacks, NULL); + } else if (!new_bucket_cmp(&b, min_heap_peek(&ca->heap), ca)) { sectors_to_move -=3D bucket_heap_top(ca); sectors_to_move +=3D GC_SECTORS_USED(b); =20 ca->heap.data[0] =3D b; - heap_sift(&ca->heap, 0, bucket_cmp); + min_heap_sift_down(&ca->heap, 0, &callbacks, NULL); } } =20 while (sectors_to_move > reserve_sectors) { - heap_pop(&ca->heap, b, bucket_cmp); + if (ca->heap.nr) { + b =3D min_heap_peek(&ca->heap)[0]; + min_heap_pop(&ca->heap, &callbacks, NULL); + } sectors_to_move -=3D GC_SECTORS_USED(b); } =20 - while (heap_pop(&ca->heap, b, bucket_cmp)) + while (ca->heap.nr) { + b =3D min_heap_peek(&ca->heap)[0]; + min_heap_pop(&ca->heap, &callbacks, NULL); SET_GC_MOVE(b, 1); + } =20 mutex_unlock(&c->bucket_lock); =20 diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c index 4d11fc664cb0..1240d1b09e8c 100644 --- a/drivers/md/bcache/super.c +++ b/drivers/md/bcache/super.c @@ -1914,8 +1914,7 @@ struct cache_set *bch_cache_set_alloc(struct cache_sb= *sb) INIT_LIST_HEAD(&c->btree_cache_freed); INIT_LIST_HEAD(&c->data_buckets); =20 - iter_size =3D sizeof(struct btree_iter) + - ((meta_bucket_pages(sb) * PAGE_SECTORS) / sb->block_size) * + iter_size =3D ((meta_bucket_pages(sb) * PAGE_SECTORS) / sb->block_size) * sizeof(struct btree_iter_set); =20 c->devices =3D kcalloc(c->nr_uuids, sizeof(void *), GFP_KERNEL); diff --git a/drivers/md/bcache/sysfs.c b/drivers/md/bcache/sysfs.c index 826b14cae4e5..e8f696cb58c0 100644 --- a/drivers/md/bcache/sysfs.c +++ b/drivers/md/bcache/sysfs.c @@ -660,7 +660,9 @@ static unsigned int bch_root_usage(struct cache_set *c) unsigned int bytes =3D 0; struct bkey *k; struct btree *b; - struct btree_iter_stack iter; + struct btree_iter iter; + + min_heap_init(&iter.heap, NULL, MAX_BSETS); =20 goto lock_root; =20 diff --git a/drivers/md/bcache/util.h b/drivers/md/bcache/util.h index f61ab1bada6c..539454d8e2d0 100644 --- a/drivers/md/bcache/util.h +++ b/drivers/md/bcache/util.h @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -30,16 +31,10 @@ struct closure; =20 #endif =20 -#define DECLARE_HEAP(type, name) \ - struct { \ - size_t size, used; \ - type *data; \ - } name - #define init_heap(heap, _size, gfp) \ ({ \ size_t _bytes; \ - (heap)->used =3D 0; \ + (heap)->nr =3D 0; \ (heap)->size =3D (_size); \ _bytes =3D (heap)->size * sizeof(*(heap)->data); \ (heap)->data =3D kvmalloc(_bytes, (gfp) & GFP_KERNEL); \ @@ -52,64 +47,6 @@ do { \ (heap)->data =3D NULL; \ } while (0) =20 -#define heap_swap(h, i, j) swap((h)->data[i], (h)->data[j]) - -#define heap_sift(h, i, cmp) \ -do { \ - size_t _r, _j =3D i; \ - \ - for (; _j * 2 + 1 < (h)->used; _j =3D _r) { \ - _r =3D _j * 2 + 1; \ - if (_r + 1 < (h)->used && \ - cmp((h)->data[_r], (h)->data[_r + 1])) \ - _r++; \ - \ - if (cmp((h)->data[_r], (h)->data[_j])) \ - break; \ - heap_swap(h, _r, _j); \ - } \ -} while (0) - -#define heap_sift_down(h, i, cmp) \ -do { \ - while (i) { \ - size_t p =3D (i - 1) / 2; \ - if (cmp((h)->data[i], (h)->data[p])) \ - break; \ - heap_swap(h, i, p); \ - i =3D p; \ - } \ -} while (0) - -#define heap_add(h, d, cmp) \ -({ \ - bool _r =3D !heap_full(h); \ - if (_r) { \ - size_t _i =3D (h)->used++; \ - (h)->data[_i] =3D d; \ - \ - heap_sift_down(h, _i, cmp); \ - heap_sift(h, _i, cmp); \ - } \ - _r; \ -}) - -#define heap_pop(h, d, cmp) \ -({ \ - bool _r =3D (h)->used; \ - if (_r) { \ - (d) =3D (h)->data[0]; \ - (h)->used--; \ - heap_swap(h, 0, (h)->used); \ - heap_sift(h, 0, cmp); \ - } \ - _r; \ -}) - -#define heap_peek(h) ((h)->used ? (h)->data[0] : NULL) - -#define heap_full(h) ((h)->used =3D=3D (h)->size) - #define DECLARE_FIFO(type, name) \ struct { \ size_t front, back, size, mask; \ diff --git a/drivers/md/bcache/writeback.c b/drivers/md/bcache/writeback.c index 792e070ccf38..c1d28e365910 100644 --- a/drivers/md/bcache/writeback.c +++ b/drivers/md/bcache/writeback.c @@ -908,15 +908,16 @@ static int bch_dirty_init_thread(void *arg) struct dirty_init_thrd_info *info =3D arg; struct bch_dirty_init_state *state =3D info->state; struct cache_set *c =3D state->c; - struct btree_iter_stack iter; + struct btree_iter iter; struct bkey *k, *p; int cur_idx, prev_idx, skip_nr; =20 k =3D p =3D NULL; prev_idx =3D 0; =20 - bch_btree_iter_stack_init(&c->root->keys, &iter, NULL); - k =3D bch_btree_iter_next_filter(&iter.iter, &c->root->keys, bch_ptr_bad); + min_heap_init(&iter.heap, NULL, MAX_BSETS); + bch_btree_iter_init(&c->root->keys, &iter, NULL); + k =3D bch_btree_iter_next_filter(&iter, &c->root->keys, bch_ptr_bad); BUG_ON(!k); =20 p =3D k; @@ -930,7 +931,7 @@ static int bch_dirty_init_thread(void *arg) skip_nr =3D cur_idx - prev_idx; =20 while (skip_nr) { - k =3D bch_btree_iter_next_filter(&iter.iter, + k =3D bch_btree_iter_next_filter(&iter, &c->root->keys, bch_ptr_bad); if (k) @@ -979,11 +980,13 @@ void bch_sectors_dirty_init(struct bcache_device *d) int i; struct btree *b =3D NULL; struct bkey *k =3D NULL; - struct btree_iter_stack iter; + struct btree_iter iter; struct sectors_dirty_init op; struct cache_set *c =3D d->c; struct bch_dirty_init_state state; =20 + min_heap_init(&iter.heap, NULL, MAX_BSETS); + retry_lock: b =3D c->root; rw_lock(0, b, b->level); --=20 2.34.1 From nobody Sun Feb 8 22:05:36 2026 Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7D51C12F381; Fri, 24 May 2024 15:31:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716564689; cv=none; b=ROMYmHj2V3olwIbhE6dVa3wZ7kOXpnQ+lkUzCHEgxeamraWVGVAUdI2xhbe+DHt0WKuf5J+urLYfCV/CqSoIyzNrn1eVBsl2oyN5CoB4PnV/RyhaHKNAxuQJH6nQU40xQqg8spzL+B43PXLVNyeibhI8hSQOSIzPKA2WixQiiY4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716564689; c=relaxed/simple; bh=A6nkXhDo3vRgC0ouJzd/jrZPACR0P+/9713U0Tn3QY0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=GIQL49sSm94Slv76nDpWhuzUBCbUv3dZtlgb9E2mPSyEexoojey9diQwNAuiAQwJrc931Csp8WE9cbWuGYfFb9tQYncUVsd/Tu/j1Bfv4ZstXjsKah+L9Nirl9A77qU3hrk/WOJYFQMqfEDqZfjTkEpUFN1et2yxNwpuZSZ0TVA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=MXBorRCB; arc=none smtp.client-ip=209.85.216.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="MXBorRCB" Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-2bf5baa5b76so103453a91.0; Fri, 24 May 2024 08:31:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716564687; x=1717169487; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5uL7niTDxIwgtvT483XQdSOjcKJiY9fkFNHM4CoL7As=; b=MXBorRCB8HdkiB+c7iTIlj1BHW2VeMCxoCQQRNaCL6+Jyz2XOm4RdxFUFthEtOwCVe cArT/puBgdO36T1ytiD/wbafihoVb4uwwEC7muEh+SQeN/1pRa/eF5yR3z1ZZgdppkvg LmnC0i+r1Wx9RDdhNNnuFnJZnwcNroIPJIB/ZqBijn7zQd/1QGHNVDjiADbEqVuvCd3r RlqT8mDl7YXJcxn3BJBzKCVAfmkQxhO0DRqZn48HCzwiySlYBJGrdglHmQ+GXffdJsUi ieHVKQLCGING4d+5cDdj/g9rUJhH5e+mnEkKTTdIGxanT8OUsPfQXJ4bXW2sOsa7cl6q 7NJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716564687; x=1717169487; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5uL7niTDxIwgtvT483XQdSOjcKJiY9fkFNHM4CoL7As=; b=oyi0D1Z+xaaeB8Khn/4WRvakzy/r3IRhlGw5WXPl5rfupaOcVWx/hOkONnNEZR3TnF UgfinEZkiQ1eryzRATbFKdGh51wUw0kI9bwGjAY/aA2W2mSh7y4KCSjaSQDQKIsnv9uf 0RYfMX10uOslvpIbuvBSVFaz2fsZRIYk43T0zQZ+0Ha6euYDiGayfQF36HkD0qTy1az9 P1MeiCWAWK0v+xPOCQVvUhzzL8AB7blkwN/OsnahmdKX3Or2B/JQk+CXuT/uWxi+gtjj MeWOxwE/klrXlKrpsPhZVVRJMRDEMRiaw4sBchOV/BW2pakga6dOipBX7PTj9fnCGIta obyw== X-Forwarded-Encrypted: i=1; AJvYcCVKfwqzZS7Qs4H7KufUxq2oqdB34iQ5Jpcgvxj1UMVnSZEQSIoYMf+3KyX1IKyhZqdXKKX4JzH7jJMSadbHfygcXqCS1XbtykYJayGaGCpSosLeTj7w3uxjdy3bVlPyQ1OfYBcjpAydrJuq7AtMYUM956blK/TeCglwxardzeQ9AvwFGAI+gIPeTExnNFq778AKRlLkW/tnzy/y4alRQ8BCD6LNAlkQ/RQvQORz X-Gm-Message-State: AOJu0YxT6eG0RzaLuAql9iRio2Liivi3KnBMmYhVYB+Yaw+Cq1P+KNlR K4auQV100wFtQFG1TBLkegd/BUoeopZx2u7whRAZCMZhgwtbC7wf4YidAA== X-Google-Smtp-Source: AGHT+IGHGxs6xYS1pxOoTReksRT5lb2eG9Sec99+HTPhjDOGe5bGI7HQWqGqKuRY3Cvudglt4fu64g== X-Received: by 2002:a17:90b:3110:b0:2bd:8b85:d7ca with SMTP id 98e67ed59e1d1-2bf5e0a753emr2553910a91.0.1716564686682; Fri, 24 May 2024 08:31:26 -0700 (PDT) Received: from visitorckw-System-Product-Name.. ([140.113.216.168]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2bf5f50d294sm1525556a91.20.2024.05.24.08.31.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 May 2024 08:31:24 -0700 (PDT) From: Kuan-Wei Chiu To: colyli@suse.de, kent.overstreet@linux.dev, msakai@redhat.com, peterz@infradead.org, mingo@redhat.com, acme@kernel.org, namhyung@kernel.org, akpm@linux-foundation.org Cc: bfoster@redhat.com, mark.rutland@arm.com, alexander.shishkin@linux.intel.com, jolsa@kernel.org, irogers@google.com, adrian.hunter@intel.com, bagasdotme@gmail.com, jserv@ccns.ncku.edu.tw, linux-bcache@vger.kernel.org, linux-kernel@vger.kernel.org, dm-devel@lists.linux.dev, linux-bcachefs@vger.kernel.org, linux-perf-users@vger.kernel.org, Kuan-Wei Chiu Subject: [PATCH v6 16/16] bcachefs: Remove heap-related macros and switch to generic min_heap Date: Fri, 24 May 2024 23:29:58 +0800 Message-Id: <20240524152958.919343-17-visitorckw@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240524152958.919343-1-visitorckw@gmail.com> References: <20240524152958.919343-1-visitorckw@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Drop the heap-related macros from bcachefs and replacing them with the generic min_heap implementation from include/linux. By doing so, code readability is improved by using functions instead of macros. Moreover, the min_heap implementation in include/linux adopts a bottom-up variation compared to the textbook version currently used in bcachefs. This bottom-up variation allows for approximately 50% reduction in the number of comparison operations during heap siftdown, without changing the number of swaps, thus making it more efficient. Link: https://lkml.kernel.org/ioyfizrzq7w7mjrqcadtzsfgpuntowtjdw5pgn4qhvsdp= 4mqqg@nrlek5vmisbu Signed-off-by: Kuan-Wei Chiu Reviewed-by: Ian Rogers Acked-by: Kent Overstreet --- Changes in v6: - Rename the MIN_HEAP() macro to DEFINE_MIN_HEAP(). fs/bcachefs/clock.c | 43 ++++++++++---- fs/bcachefs/clock_types.h | 2 +- fs/bcachefs/ec.c | 76 ++++++++++++++++-------- fs/bcachefs/ec_types.h | 2 +- fs/bcachefs/util.h | 118 +------------------------------------- 5 files changed, 87 insertions(+), 154 deletions(-) diff --git a/fs/bcachefs/clock.c b/fs/bcachefs/clock.c index 363644451106..3ec64fe6a064 100644 --- a/fs/bcachefs/clock.c +++ b/fs/bcachefs/clock.c @@ -6,16 +6,29 @@ #include #include =20 -static inline long io_timer_cmp(io_timer_heap *h, - struct io_timer *l, - struct io_timer *r) +static inline bool io_timer_cmp(const void *l, const void *r, void __alway= s_unused *args) { - return l->expire - r->expire; + struct io_timer **_l =3D (struct io_timer **)l; + struct io_timer **_r =3D (struct io_timer **)r; + + return (*_l)->expire < (*_r)->expire; +} + +static inline void io_timer_swp(void *l, void *r, void __always_unused *ar= gs) +{ + struct io_timer **_l =3D (struct io_timer **)l; + struct io_timer **_r =3D (struct io_timer **)r; + + swap(*_l, *_r); } =20 void bch2_io_timer_add(struct io_clock *clock, struct io_timer *timer) { size_t i; + const struct min_heap_callbacks callbacks =3D { + .less =3D io_timer_cmp, + .swp =3D io_timer_swp, + }; =20 spin_lock(&clock->timer_lock); =20 @@ -26,11 +39,11 @@ void bch2_io_timer_add(struct io_clock *clock, struct i= o_timer *timer) return; } =20 - for (i =3D 0; i < clock->timers.used; i++) + for (i =3D 0; i < clock->timers.nr; i++) if (clock->timers.data[i] =3D=3D timer) goto out; =20 - BUG_ON(!heap_add(&clock->timers, timer, io_timer_cmp, NULL)); + BUG_ON(!min_heap_push(&clock->timers, &timer, &callbacks, NULL)); out: spin_unlock(&clock->timer_lock); } @@ -38,12 +51,16 @@ void bch2_io_timer_add(struct io_clock *clock, struct i= o_timer *timer) void bch2_io_timer_del(struct io_clock *clock, struct io_timer *timer) { size_t i; + const struct min_heap_callbacks callbacks =3D { + .less =3D io_timer_cmp, + .swp =3D io_timer_swp, + }; =20 spin_lock(&clock->timer_lock); =20 - for (i =3D 0; i < clock->timers.used; i++) + for (i =3D 0; i < clock->timers.nr; i++) if (clock->timers.data[i] =3D=3D timer) { - heap_del(&clock->timers, i, io_timer_cmp, NULL); + min_heap_del(&clock->timers, i, &callbacks, NULL); break; } =20 @@ -131,12 +148,16 @@ static struct io_timer *get_expired_timer(struct io_c= lock *clock, unsigned long now) { struct io_timer *ret =3D NULL; + const struct min_heap_callbacks callbacks =3D { + .less =3D io_timer_cmp, + .swp =3D io_timer_swp, + }; =20 spin_lock(&clock->timer_lock); =20 - if (clock->timers.used && + if (clock->timers.nr && time_after_eq(now, clock->timers.data[0]->expire)) - heap_pop(&clock->timers, ret, io_timer_cmp, NULL); + min_heap_pop(&clock->timers, &callbacks, NULL); =20 spin_unlock(&clock->timer_lock); =20 @@ -161,7 +182,7 @@ void bch2_io_timers_to_text(struct printbuf *out, struc= t io_clock *clock) spin_lock(&clock->timer_lock); now =3D atomic64_read(&clock->now); =20 - for (i =3D 0; i < clock->timers.used; i++) + for (i =3D 0; i < clock->timers.nr; i++) prt_printf(out, "%ps:\t%li\n", clock->timers.data[i]->fn, clock->timers.data[i]->expire - now); diff --git a/fs/bcachefs/clock_types.h b/fs/bcachefs/clock_types.h index 5fae0012d808..f2c8a25b7079 100644 --- a/fs/bcachefs/clock_types.h +++ b/fs/bcachefs/clock_types.h @@ -23,7 +23,7 @@ struct io_timer { /* Amount to buffer up on a percpu counter */ #define IO_CLOCK_PCPU_SECTORS 128 =20 -typedef HEAP(struct io_timer *) io_timer_heap; +typedef DEFINE_MIN_HEAP(struct io_timer *, io_timer_heap) io_timer_heap; =20 struct io_clock { atomic64_t now; diff --git a/fs/bcachefs/ec.c b/fs/bcachefs/ec.c index b26dc7424662..797cb389cf3f 100644 --- a/fs/bcachefs/ec.c +++ b/fs/bcachefs/ec.c @@ -896,8 +896,8 @@ static int __ec_stripe_mem_alloc(struct bch_fs *c, size= _t idx, gfp_t gfp) =20 mutex_lock(&c->ec_stripes_heap_lock); if (n.size > h->size) { - memcpy(n.data, h->data, h->used * sizeof(h->data[0])); - n.used =3D h->used; + memcpy(n.data, h->data, h->nr * sizeof(h->data[0])); + n.nr =3D h->nr; swap(*h, n); } mutex_unlock(&c->ec_stripes_heap_lock); @@ -988,7 +988,7 @@ static u64 stripe_idx_to_delete(struct bch_fs *c) =20 lockdep_assert_held(&c->ec_stripes_heap_lock); =20 - if (h->used && + if (h->nr && h->data[0].blocks_nonempty =3D=3D 0 && !bch2_stripe_is_open(c, h->data[0].idx)) return h->data[0].idx; @@ -996,14 +996,6 @@ static u64 stripe_idx_to_delete(struct bch_fs *c) return 0; } =20 -static inline int ec_stripes_heap_cmp(ec_stripes_heap *h, - struct ec_stripe_heap_entry l, - struct ec_stripe_heap_entry r) -{ - return ((l.blocks_nonempty > r.blocks_nonempty) - - (l.blocks_nonempty < r.blocks_nonempty)); -} - static inline void ec_stripes_heap_set_backpointer(ec_stripes_heap *h, size_t i) { @@ -1012,39 +1004,71 @@ static inline void ec_stripes_heap_set_backpointer(= ec_stripes_heap *h, genradix_ptr(&c->stripes, h->data[i].idx)->heap_idx =3D i; } =20 +static inline bool ec_stripes_heap_cmp(const void *l, const void *r, void = __always_unused *args) +{ + struct ec_stripe_heap_entry *_l =3D (struct ec_stripe_heap_entry *)l; + struct ec_stripe_heap_entry *_r =3D (struct ec_stripe_heap_entry *)r; + + return ((_l->blocks_nonempty > _r->blocks_nonempty) < + (_l->blocks_nonempty < _r->blocks_nonempty)); +} + +static inline void ec_stripes_heap_swap(void *l, void *r, void *h) +{ + struct ec_stripe_heap_entry *_l =3D (struct ec_stripe_heap_entry *)l; + struct ec_stripe_heap_entry *_r =3D (struct ec_stripe_heap_entry *)r; + ec_stripes_heap *_h =3D (ec_stripes_heap *)h; + size_t i =3D _l - _h->data; + size_t j =3D _r - _h->data; + + swap(*_l, *_r); + + ec_stripes_heap_set_backpointer(_h, i); + ec_stripes_heap_set_backpointer(_h, j); +} + static void heap_verify_backpointer(struct bch_fs *c, size_t idx) { ec_stripes_heap *h =3D &c->ec_stripes_heap; struct stripe *m =3D genradix_ptr(&c->stripes, idx); =20 - BUG_ON(m->heap_idx >=3D h->used); + BUG_ON(m->heap_idx >=3D h->nr); BUG_ON(h->data[m->heap_idx].idx !=3D idx); } =20 void bch2_stripes_heap_del(struct bch_fs *c, struct stripe *m, size_t idx) { + const struct min_heap_callbacks callbacks =3D { + .less =3D ec_stripes_heap_cmp, + .swp =3D ec_stripes_heap_swap, + }; + mutex_lock(&c->ec_stripes_heap_lock); heap_verify_backpointer(c, idx); =20 - heap_del(&c->ec_stripes_heap, m->heap_idx, - ec_stripes_heap_cmp, - ec_stripes_heap_set_backpointer); + min_heap_del(&c->ec_stripes_heap, m->heap_idx, &callbacks, &c->ec_stripes= _heap); mutex_unlock(&c->ec_stripes_heap_lock); } =20 void bch2_stripes_heap_insert(struct bch_fs *c, struct stripe *m, size_t idx) { + const struct min_heap_callbacks callbacks =3D { + .less =3D ec_stripes_heap_cmp, + .swp =3D ec_stripes_heap_swap, + }; + mutex_lock(&c->ec_stripes_heap_lock); - BUG_ON(heap_full(&c->ec_stripes_heap)); + BUG_ON(min_heap_full(&c->ec_stripes_heap)); =20 - heap_add(&c->ec_stripes_heap, ((struct ec_stripe_heap_entry) { + genradix_ptr(&c->stripes, idx)->heap_idx =3D c->ec_stripes_heap.nr; + min_heap_push(&c->ec_stripes_heap, &((struct ec_stripe_heap_entry) { .idx =3D idx, .blocks_nonempty =3D m->blocks_nonempty, }), - ec_stripes_heap_cmp, - ec_stripes_heap_set_backpointer); + &callbacks, + &c->ec_stripes_heap); =20 heap_verify_backpointer(c, idx); mutex_unlock(&c->ec_stripes_heap_lock); @@ -1053,6 +1077,10 @@ void bch2_stripes_heap_insert(struct bch_fs *c, void bch2_stripes_heap_update(struct bch_fs *c, struct stripe *m, size_t idx) { + const struct min_heap_callbacks callbacks =3D { + .less =3D ec_stripes_heap_cmp, + .swp =3D ec_stripes_heap_swap, + }; ec_stripes_heap *h =3D &c->ec_stripes_heap; bool do_deletes; size_t i; @@ -1063,10 +1091,8 @@ void bch2_stripes_heap_update(struct bch_fs *c, h->data[m->heap_idx].blocks_nonempty =3D m->blocks_nonempty; =20 i =3D m->heap_idx; - heap_sift_up(h, i, ec_stripes_heap_cmp, - ec_stripes_heap_set_backpointer); - heap_sift_down(h, i, ec_stripes_heap_cmp, - ec_stripes_heap_set_backpointer); + min_heap_sift_up(h, i, &callbacks, &c->ec_stripes_heap); + min_heap_sift_down(h, i, &callbacks, &c->ec_stripes_heap); =20 heap_verify_backpointer(c, idx); =20 @@ -1859,7 +1885,7 @@ static s64 get_existing_stripe(struct bch_fs *c, return -1; =20 mutex_lock(&c->ec_stripes_heap_lock); - for (heap_idx =3D 0; heap_idx < h->used; heap_idx++) { + for (heap_idx =3D 0; heap_idx < h->nr; heap_idx++) { /* No blocks worth reusing, stripe will just be deleted: */ if (!h->data[heap_idx].blocks_nonempty) continue; @@ -2190,7 +2216,7 @@ void bch2_stripes_heap_to_text(struct printbuf *out, = struct bch_fs *c) size_t i; =20 mutex_lock(&c->ec_stripes_heap_lock); - for (i =3D 0; i < min_t(size_t, h->used, 50); i++) { + for (i =3D 0; i < min_t(size_t, h->nr, 50); i++) { m =3D genradix_ptr(&c->stripes, h->data[i].idx); =20 prt_printf(out, "%zu %u/%u+%u", h->data[i].idx, diff --git a/fs/bcachefs/ec_types.h b/fs/bcachefs/ec_types.h index 976426da3a12..1df03dccfc72 100644 --- a/fs/bcachefs/ec_types.h +++ b/fs/bcachefs/ec_types.h @@ -36,6 +36,6 @@ struct ec_stripe_heap_entry { unsigned blocks_nonempty; }; =20 -typedef HEAP(struct ec_stripe_heap_entry) ec_stripes_heap; +typedef DEFINE_MIN_HEAP(struct ec_stripe_heap_entry, ec_stripes_heap) ec_s= tripes_heap; =20 #endif /* _BCACHEFS_EC_TYPES_H */ diff --git a/fs/bcachefs/util.h b/fs/bcachefs/util.h index 5d2c470a49ac..d0d99400f986 100644 --- a/fs/bcachefs/util.h +++ b/fs/bcachefs/util.h @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -54,17 +55,9 @@ static inline size_t buf_pages(void *p, size_t len) PAGE_SIZE); } =20 -#define HEAP(type) \ -struct { \ - size_t size, used; \ - type *data; \ -} - -#define DECLARE_HEAP(type, name) HEAP(type) name - #define init_heap(heap, _size, gfp) \ ({ \ - (heap)->used =3D 0; \ + (heap)->nr =3D 0; \ (heap)->size =3D (_size); \ (heap)->data =3D kvmalloc((heap)->size * sizeof((heap)->data[0]),\ (gfp)); \ @@ -76,113 +69,6 @@ do { \ (heap)->data =3D NULL; \ } while (0) =20 -#define heap_set_backpointer(h, i, _fn) \ -do { \ - void (*fn)(typeof(h), size_t) =3D _fn; \ - if (fn) \ - fn(h, i); \ -} while (0) - -#define heap_swap(h, i, j, set_backpointer) \ -do { \ - swap((h)->data[i], (h)->data[j]); \ - heap_set_backpointer(h, i, set_backpointer); \ - heap_set_backpointer(h, j, set_backpointer); \ -} while (0) - -#define heap_peek(h) \ -({ \ - EBUG_ON(!(h)->used); \ - (h)->data[0]; \ -}) - -#define heap_full(h) ((h)->used =3D=3D (h)->size) - -#define heap_sift_down(h, i, cmp, set_backpointer) \ -do { \ - size_t _c, _j =3D i; \ - \ - for (; _j * 2 + 1 < (h)->used; _j =3D _c) { \ - _c =3D _j * 2 + 1; \ - if (_c + 1 < (h)->used && \ - cmp(h, (h)->data[_c], (h)->data[_c + 1]) >=3D 0) \ - _c++; \ - \ - if (cmp(h, (h)->data[_c], (h)->data[_j]) >=3D 0) \ - break; \ - heap_swap(h, _c, _j, set_backpointer); \ - } \ -} while (0) - -#define heap_sift_up(h, i, cmp, set_backpointer) \ -do { \ - while (i) { \ - size_t p =3D (i - 1) / 2; \ - if (cmp(h, (h)->data[i], (h)->data[p]) >=3D 0) \ - break; \ - heap_swap(h, i, p, set_backpointer); \ - i =3D p; \ - } \ -} while (0) - -#define __heap_add(h, d, cmp, set_backpointer) \ -({ \ - size_t _i =3D (h)->used++; \ - (h)->data[_i] =3D d; \ - heap_set_backpointer(h, _i, set_backpointer); \ - \ - heap_sift_up(h, _i, cmp, set_backpointer); \ - _i; \ -}) - -#define heap_add(h, d, cmp, set_backpointer) \ -({ \ - bool _r =3D !heap_full(h); \ - if (_r) \ - __heap_add(h, d, cmp, set_backpointer); \ - _r; \ -}) - -#define heap_add_or_replace(h, new, cmp, set_backpointer) \ -do { \ - if (!heap_add(h, new, cmp, set_backpointer) && \ - cmp(h, new, heap_peek(h)) >=3D 0) { \ - (h)->data[0] =3D new; \ - heap_set_backpointer(h, 0, set_backpointer); \ - heap_sift_down(h, 0, cmp, set_backpointer); \ - } \ -} while (0) - -#define heap_del(h, i, cmp, set_backpointer) \ -do { \ - size_t _i =3D (i); \ - \ - BUG_ON(_i >=3D (h)->used); \ - (h)->used--; \ - if ((_i) < (h)->used) { \ - heap_swap(h, _i, (h)->used, set_backpointer); \ - heap_sift_up(h, _i, cmp, set_backpointer); \ - heap_sift_down(h, _i, cmp, set_backpointer); \ - } \ -} while (0) - -#define heap_pop(h, d, cmp, set_backpointer) \ -({ \ - bool _r =3D (h)->used; \ - if (_r) { \ - (d) =3D (h)->data[0]; \ - heap_del(h, 0, cmp, set_backpointer); \ - } \ - _r; \ -}) - -#define heap_resort(heap, cmp, set_backpointer) \ -do { \ - ssize_t _i; \ - for (_i =3D (ssize_t) (heap)->used / 2 - 1; _i >=3D 0; --_i) \ - heap_sift_down(heap, _i, cmp, set_backpointer); \ -} while (0) - #define ANYSINT_MAX(t) \ ((((t) 1 << (sizeof(t) * 8 - 2)) - (t) 1) * (t) 2 + (t) 1) =20 --=20 2.34.1