From nobody Mon Feb 9 13:01:23 2026 Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) (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 020212C1A7; Tue, 19 Mar 2024 18:00:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710871221; cv=none; b=NMvpt2lRSuOnY8n3ptsUxZLkA8x1xh82g+TvpzcGA8QS3wMRB3XdEw2eyZTn6d5Fgjmro/am91jfWQrh2FdyVfyIO6EWIM7AzVx0PvljGylTJBmu3cS0BbDJ4gb42Y31b/4PbaIt2lT85hGq+hLm9YU0zp4RZcufQjtff3TnFFI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710871221; c=relaxed/simple; bh=Uxy4FXDyNLzaAJy4CxHQi0yIvgpDLivSSBXdnPwCwuQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=NRUwUjP5ABfB+HccxlCNDaQT48jK9OQ/7u+Z40PXkJcFHIvlPrDEVTpUXzYC0IENWy9pD96RmWmDAMeR/SONJzxTQ9zbCgdydOMqZJ6cIZR/HUpnJDbWINgZBIZCDxCjYkEe1i8reE1AXfOThUtW+DmUnJKR3fSc0mul7jrfr5g= 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=EYWJHooN; arc=none smtp.client-ip=209.85.210.173 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="EYWJHooN" Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-6e73f67adcdso378663b3a.0; Tue, 19 Mar 2024 11:00:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710871219; x=1711476019; 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=pHaHpy3VMSxU4FhivVA5zrQI0a35rqqHjlYe3D324Dw=; b=EYWJHooNZXMeR7RrgWHWlvrPzkaWUPkLtrUoSOnYM8OC3xboeT9OtMvCgxZMAJWiEn M4NIAFtA59C4t11QKhMP4TcxN9DLIJ5ml4V2ktJyBEwqrVELuoGi5cyvfAYWDJbsLT8W oLhlFlxO/obQIndJNZszLf/T1panGoeTPrWcPP11MIR/eDq3LfaMaWHRpAeW0Z22eRHg 17q5BYeXjP4z8CpOr7ttWT7Pofa0C8Xr0/aCaGFQpr9Kx17BfIXoO8vlnWy/Oyf1pNH8 aSyirklQBKKdgDzJQmfcFeGewyW5TcFRLrjjTY48b+Mb+tYae7EXKtztRxxfFX64pkG8 K0vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710871219; x=1711476019; 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=pHaHpy3VMSxU4FhivVA5zrQI0a35rqqHjlYe3D324Dw=; b=akNnWvaykbp4gkE4Wj+AYqOLP9kJDavsNNoeThxNVd+E9HjfbmiBmDCerOK6cQbhZL arZt3Yr2Blxk8EOLjhQahvYVceLCmhM3ZrNa4MJ27yjUJywgq2/7Mqy9J9GQnfvX49C1 plbkcxpro+l+h9SDKdLN/6FDTN2dxHg6qoteVDT0PShbZYWN8OiOwoglff6UmQgZGSBE BgmeYiDJKOHc27wfy50+o/Fg9OITSAKmwtBJjphwZXAIakY2FkgGr0kV8NhTjQT3Ruju wzAslPtY4STAMm+9JuD6fiFw1ZoU2kYILsxbk2qLaKYgg54S7E8wMHVlyvbEjS+7WYwY btGg== X-Forwarded-Encrypted: i=1; AJvYcCWgQ9xIW01zi4S+mfaTwXkq4hs7833Ya8mmOJeUOAM060AOOzTJW9cG2jECwOQ4zlhVxR5K8aAhdc8lDSUfFniMMciepRYkFaS9DkkgDDhcnPFryUM4d8cX8q8huoSSGr9LjZe092hjK4ph3wBvbOrZ2Y1Icnq5OpIX5LW+kKMLiOeFVar2Z4SX09exZB276OdnjF3UzkM7PuIcH2kgQgdMTGeusjytSUGFADcP X-Gm-Message-State: AOJu0YxBvYqv1qHRMGIUbT5L1FHilXwXP8/Ucm3kC4OS2LbynkKsiqA/ 0I5gornKRYH+saREV04FH5PRPd/AA0Gvh3U6OAQ+/WZ77B8eatf2 X-Google-Smtp-Source: AGHT+IEhvdpXvwvqRRV0hHJ9/OeRmetDSphgKPoBonzn3eX0p5BLYq7lCrwYVR2oGhatifQimhK+0w== X-Received: by 2002:a05:6a20:72a9:b0:1a1:1a07:b0b3 with SMTP id o41-20020a056a2072a900b001a11a07b0b3mr17181784pzk.5.1710871219281; Tue, 19 Mar 2024 11:00:19 -0700 (PDT) Received: from visitorckw-System-Product-Name.. ([140.113.216.168]) by smtp.gmail.com with ESMTPSA id u16-20020a17090341d000b001dd3bee3cd6sm5531359ple.219.2024.03.19.11.00.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Mar 2024 11:00:18 -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, jserv@ccns.ncku.edu.tw, linux-bcache@vger.kernel.org, dm-devel@lists.linux.dev, linux-bcachefs@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Kuan-Wei Chiu Subject: [PATCH 01/13] perf/core: Fix several typos Date: Wed, 20 Mar 2024 01:59:53 +0800 Message-Id: <20240319180005.246930-2-visitorckw@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240319180005.246930-1-visitorckw@gmail.com> References: <20240319180005.246930-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 --- 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 724e6d7e128f..10ac2db83f14 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 Mon Feb 9 13:01:23 2026 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) (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 D66F02E62B; Tue, 19 Mar 2024 18:00:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710871226; cv=none; b=ccZduOeQzvpJAiCGHgVnP1JhnDRU85uhQcO1o4D+TCP1LMlLszZOFZ9Fub7ED8obJOndoyx660hWPfMuHjULEbZuYXl92BHDL1aevAuWnvfzIZHVgsHzz/OT45JaQoaSRbq02tr44i4lwgngNw4QdEpjOxEW13XBc1XTGZMrc/I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710871226; c=relaxed/simple; bh=fgS7YoHkqd6Gk9OHy+FkIeSgxsebxOkghiQdONm8t5g=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Jl2rs1jlTDkcZQKKQKrETP5awPokZqd3LlEq3ELZPyjkPlzu/yCodADoEHo6IW69UYuCMttg6WEHz7Iv2P5jo4hrgSuIK/kBk7FvJc15vuGGz3qjPDnJNlJiRkYtifsKCwkmzmCLI+XH7hUDewleU5jsKUhQzC146gphFb5GXpc= 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=OdbdK5Ba; arc=none smtp.client-ip=209.85.214.169 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="OdbdK5Ba" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-1dee6672526so5305025ad.1; Tue, 19 Mar 2024 11:00:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710871224; x=1711476024; 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=MhM32UpnGJPnLVyVQuYFJmPAIet94tyo1EZagEt6PY4=; b=OdbdK5Batpoz4NqNLwAmr1pS4IZfQB8j49HZVvcxfr1EnAaeODWR8CtDeL7ATqh7/l IwTcAStY2138KQtjWtoak7vHSt5oaSBVLya+aTUKZwhYLlbPHku701oGgn+twVAZnOm5 hSfovGd7MPfNCApaKeTEcXqs8CndjU3kH2SvB7I9jN4gParZK23Bw7O6m65sWs6M00xe k67J5qJ+7mHm8EAJcpJrzd6nePn1MVYT+Gp/stgqSAMbtpfV0iYzGc27PUvm7ZXRs8Nr 6gVmPDWY2aXYbCaOM98sbFOEKEqexEHU3rQe+fjrOKU77xOa7Njg2FjVaTsAmpMkAcFB 9pjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710871224; x=1711476024; 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=MhM32UpnGJPnLVyVQuYFJmPAIet94tyo1EZagEt6PY4=; b=ehfJBes7pvQ1R2wrPa3+M/YXMj3FFX69h5lftbLVBh7Bm+4FOSsdu/rzrwDDFdOe0k u7VRs3x0ZiiN83S0R8LJG2QyHx6eJLlELiX2PfGgvuIc6L6Eh/ZnpYAy1QEnTrp/rV2W k8lkzWckOImOZaWmDZoLctVwJU1KNrGisWdWcuOpgFzJQ18oZONF9VbtHTBjk8ZRMutw SdsojEA4qDpcH74YK87rUULDX73wqN6L7MKRfKkzr+1hWEwDwKUFhxEehcRsOY5LQC8s OEDxdsZ6oZ+sKw0bJAOGyqytwxUWIngGXrbHTZW6QVXGALTiB6G88Qjd6/pe0pewi4aC Ke0g== X-Forwarded-Encrypted: i=1; AJvYcCXxare8wC1/K0B6XgLucw+3C+e+O+p8VzAYBFRzk6mYYhGmnhMbt5SuBjLOfF7JrqePnG0l6Gp3SoLnEd9tlujZTwsTTBc4ZqcSxZ1uWnU4HyRGdE2ywgW8Wdc1qMP/YJ4oiJchHlLYLBBL4BIiA6+OgEJvD+kCnzqOsKdnXoVl+Zw67XBPcQ9ILi3qmevadiHhoLz8FZzAqSSXvu0u42K/q2hzdRYNjg/8qjfx X-Gm-Message-State: AOJu0Yxkgd0N+NsZjGCFBOb9ipNlI7ZbBasSpGdkxjPl72AFRu/kWjgE AOayYUgNVZ+xhfaGXIpEZchP0cfNhyO9PD2yNb9POz28VlyNREE3 X-Google-Smtp-Source: AGHT+IH2KN8j2I6RFIqMV16DYXyC+c50lnC7pdEn/IN/+1SE4kATVcjPSy+d91Y1ECfUYLZTXBbVKQ== X-Received: by 2002:a17:903:24f:b0:1dd:7d66:bfc0 with SMTP id j15-20020a170903024f00b001dd7d66bfc0mr16665032plh.4.1710871223988; Tue, 19 Mar 2024 11:00:23 -0700 (PDT) Received: from visitorckw-System-Product-Name.. ([140.113.216.168]) by smtp.gmail.com with ESMTPSA id u16-20020a17090341d000b001dd3bee3cd6sm5531359ple.219.2024.03.19.11.00.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Mar 2024 11:00:23 -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, jserv@ccns.ncku.edu.tw, linux-bcache@vger.kernel.org, dm-devel@lists.linux.dev, linux-bcachefs@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Kuan-Wei Chiu Subject: [PATCH 02/13] bcache: Fix typo Date: Wed, 20 Mar 2024 01:59:54 +0800 Message-Id: <20240319180005.246930-3-visitorckw@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240319180005.246930-1-visitorckw@gmail.com> References: <20240319180005.246930-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 --- 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 Mon Feb 9 13:01:23 2026 Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) (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 4451C37719; Tue, 19 Mar 2024 18:00:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710871230; cv=none; b=X5fMvkmneX+fnkfzjmHX+Vx0cKm/aPkPA7VnICImPOdt+73J03p8kRVQ6Ev/cekLtwzz1Y7Yy8/liemPPkZBeECHINGi6tm5jFI76NlDVKePx28+590AC2wW2pd1glAKUAz2ptZkChmodJ0sNtNdoZTNXtoHeBfbV95+AFSBQjI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710871230; c=relaxed/simple; bh=LuMWxrm74Ksk4iutH9RtN0QFCEVnpht0zuIdBSGgoFI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ZnWKYFcwvFEmGBica0iJAMhAhBYOjhAr8YC7GdwZn20iy4AbknRbZBQSq3vfNtKyY9QltlgyoIM+TqqUfvja2mIMnypQHje/UTD37bgfCZrRe+ldycC8sB9Dyb5tKRXNL+A37rOJNkPH4jRDUrnmnBqUjqDQuY6kwQh6B/HrqoU= 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=aBbZCe9h; arc=none smtp.client-ip=209.85.215.172 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="aBbZCe9h" Received: by mail-pg1-f172.google.com with SMTP id 41be03b00d2f7-58962bf3f89so598972a12.0; Tue, 19 Mar 2024 11:00:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710871229; x=1711476029; 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=rP9XXgpmCWqpAAlyRPQQqYMsXW7o57+TdtdVf+VR+ZM=; b=aBbZCe9hN+HoF5p1Hih1RIrJ9bnZ8ilq6+tJeZSW23QPRewfabewwD6eToIusTktmO gGIg7sT8MT5WTGiu2ggPTMr9VTpTaTw8ohczVYynNLwYit2+NngagjWQVZKKXqkBvVdL DWckC3YYM9ZTe3nk+mPWYF0kTq4lrtQwWPVG2RRV/kQmfYGtyeuVa4wv/QhINPJMcX8Q t6Anxvidvu4mcx4TQ/P2IZgNFBxQ0/C1fH97FBebir6c0SqHHqqvlE/ySxKlr83f9DFL jzyrxD/Ioi4k8HPejHrsz3kbEcJRWG8IH4WfQo12CmvevNK/M41i6hS0wnfun39kXs5B 5fOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710871229; x=1711476029; 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=rP9XXgpmCWqpAAlyRPQQqYMsXW7o57+TdtdVf+VR+ZM=; b=pQypvCDAmoVo3fpQj0oDwMLdCiRfS7eqGXhvXTH4TkYSN9aZysz4DFswF2uxkGts+u fK4516VHOvtGHNPIG6NKUK9RoJZv8a3Ib2/TMlvcFuSlUnD+SDKsu+LPetCBtZoNidHR d0ReCzA0JcBJ1bpkxVkb/oFEJVF8KTFlu+0hX8asZSBvx7mD9dV39plNxCpmXRtGvPSE GdxucmoCA/56ZU+xlb3AIcnBjyc1bVxD3kLxD0EVnt7+f4LgR/IyEz9LSt7+/qc+xpvc reoKLk/ekw5a6bIrPp5XPk3bPyNUAtA0ynoAfgV5QC5eLL8D8kVhbJDKpAkblqaEkQE6 wU/g== X-Forwarded-Encrypted: i=1; AJvYcCWF/HMM+55wUL/y6zxADutNYUPvoO+LZbAZ3t0jjckgM27ZMhRtsEdkaXomaxa4Afo54Z0gVfNnWJSW4rCyoXB8fMBS5lmCVXRmD2gxfwVtcKbOMWDMHpZyEYUFeJaC3ZApGjM0KNijCiWqozRsUjwWDGB/IfrQATusaSd+eSPGKQz+bopNvCacrBbhD2d8SFPlKtxnNrYcBfWRrf537KhzkZipcgUwg1M8u/Im X-Gm-Message-State: AOJu0Yw9OEZIb8fyOstgbFkAeQzqQ3kh7wXPYQ+QFy9/r44iG1vN+oYI Jbp/isD/7DZPnZUY0h3r+ANNCFd7D1gvqeL42y6z/hqNqEo6Ki41 X-Google-Smtp-Source: AGHT+IF2whbQ9aCeS6gfzji2YFu/DVbEgj2n4mByZSc6EsUXDmYi9IvKNiXNRkgK5ItMhYIsEOJuCg== X-Received: by 2002:a05:6a21:a584:b0:1a3:673b:627d with SMTP id gd4-20020a056a21a58400b001a3673b627dmr3461387pzc.1.1710871228645; Tue, 19 Mar 2024 11:00:28 -0700 (PDT) Received: from visitorckw-System-Product-Name.. ([140.113.216.168]) by smtp.gmail.com with ESMTPSA id u16-20020a17090341d000b001dd3bee3cd6sm5531359ple.219.2024.03.19.11.00.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Mar 2024 11:00:28 -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, jserv@ccns.ncku.edu.tw, linux-bcache@vger.kernel.org, dm-devel@lists.linux.dev, linux-bcachefs@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Kuan-Wei Chiu Subject: [PATCH 03/13] bcachefs: Fix typo Date: Wed, 20 Mar 2024 01:59:55 +0800 Message-Id: <20240319180005.246930-4-visitorckw@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240319180005.246930-1-visitorckw@gmail.com> References: <20240319180005.246930-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 --- 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 216fadf16928..f5a16ad65424 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 Mon Feb 9 13:01:23 2026 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) (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 3633239ADD; Tue, 19 Mar 2024 18:00:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710871236; cv=none; b=XJt6mSLcEmSxN+xLxwSDstnBpNW9fmj4RIVNmddv0t0Zv4kVbCMCbQ5vpY5amDnYj8Yvda3+Y9gSOfKsL5wCa4DYioCm5iOEpZ1yuIlyZlZ1Z4Z6dXsiApIY6BBRAyhFAHPZOFnl2Ir+UxpAgNXY+St+vrsBGx0LdUfXAhVaxDs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710871236; c=relaxed/simple; bh=s2Q5vr+aHoYjMQO6KbI3HIvQIWdhukGbM3wlY9M5nlE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=VXXI4WOwL0J+lBEo+AL5Ddf2FXxGeaZ0kVu/YHs091jdLRUnSE6pMbnY8SVJGLEdBcd93AvFlo+j3626mpwdN8ZUB0ZESZFU+XSYbtpXbunehTalUFzdUQYAIJmuld9+z3JmqsKyTK+g7lSHB9msgIgm/5XwE7FWAEQf6yxNPCY= 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=DKh3Y3Ld; arc=none smtp.client-ip=209.85.214.169 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="DKh3Y3Ld" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-1dee5daedf6so7812155ad.0; Tue, 19 Mar 2024 11:00:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710871233; x=1711476033; 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=ZSHgB4hxEBBauRhrZ0U2W96MMg0YSyGg21fcRCxp7JA=; b=DKh3Y3Ld1aSZM8GHkBEfq38fc68hxYlUvKdXOH8cZEOt1cBFWnFj9yeNi+yS1vcXx/ iFSmWBs2bboA8jF74BjQpUBwEkh4LGH4541nzpsLWqdCWC2b3czESOoFIcMLDqjEAAgc gR+i8K9k7uzad2Nj72gQM4eCVlMwloNoaRrOW0M7/qgjZaPgtqehINT8G7EhkxOvsY2G GE+XxuH58yw0zIflcBncoCLFLJ2XcSZIus50U6wpFFth7PBuLd2GPJUSee76D+xlvobO ojTcOw54lTPT//JGPgOWWrDZ7ENyaK05JR9ItVnZVo3D1TDtncoa+ppU3V+SeAMoym8X ZKvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710871233; x=1711476033; 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=ZSHgB4hxEBBauRhrZ0U2W96MMg0YSyGg21fcRCxp7JA=; b=lBvRLVzXYj6e8HhU9EnTgmXiKoDMwx/kUSQ99qw8ul0PykWfCbrj9pIh+cbnCqyDuI JdDcP+dBIFg79WVvyG9ANEtstEdgUp6S7RI9m03Ot/XFbnUeCanErexNXhFKDMYbTer4 BnN6OrJghUeXotmTEdCVd6Fp2CS2WZhDoRkKGD0sv7Rn33uwEZRWlVRdVzdy1p5ZARJz N1PqKaQW/1Jj7nslHLTj72bq31aUtxncBfaWFWiu2n8Ir0BDHW3eFePEJVPYJYnLyjRC jk9dlY7WugoE1Ghr2+IWGWQKf1xcVAe+R4zgClOwWd3LIFBv6eu6saojYiRyi0SquU1c 1OKw== X-Forwarded-Encrypted: i=1; AJvYcCXq25GcZeZSw+F/GUHdT4lWESlMkPtl+aY+sDvH5xiN5td4zse5CX/vuyRpiVZm3rc6Qbpzp6eY8KxrUPIYixLXjpPmm3ddFicQ1HISgTqga/DboS/r23HeAVZcpUc7fK+JWkTfGB42M2AdeUEeEvCo6cxLVywx1XgOlXaKwrTKtXj1B1NyeoG4kI/MY2S4/2B+S+oZzpkIQp2JQ8CailLNl/hcsTiQfiSWSptw X-Gm-Message-State: AOJu0Yw0VExw0Hda1AKaNcHM5LXNQ8o0iK4IHh+bWGbhbs2TsCnPble2 YkmIo+0qTWhW5aQuum+kWVNaJctHYSEB3IKKbjHKjgl2FBhhb6w4 X-Google-Smtp-Source: AGHT+IEM2vqp17cv7/ApeHdeADTQWUGpvkUov3R7GqnNyMEAuNTapMbUNLNoh+xGg6VYplg2wGgfuQ== X-Received: by 2002:a17:902:c411:b0:1dd:dab5:ce0d with SMTP id k17-20020a170902c41100b001dddab5ce0dmr3149956plk.2.1710871233261; Tue, 19 Mar 2024 11:00:33 -0700 (PDT) Received: from visitorckw-System-Product-Name.. ([140.113.216.168]) by smtp.gmail.com with ESMTPSA id u16-20020a17090341d000b001dd3bee3cd6sm5531359ple.219.2024.03.19.11.00.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Mar 2024 11:00:32 -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, jserv@ccns.ncku.edu.tw, linux-bcache@vger.kernel.org, dm-devel@lists.linux.dev, linux-bcachefs@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Kuan-Wei Chiu Subject: [PATCH 04/13] lib min_heap: Add type safe interface Date: Wed, 20 Mar 2024 01:59:56 +0800 Message-Id: <20240319180005.246930-5-visitorckw@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240319180005.246930-1-visitorckw@gmail.com> References: <20240319180005.246930-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" Introduce a type-safe interface for min_heap by adding small macro wrappers around functions and using a 0-size array to store type information. This enables the use of __minheap_cast and __minheap_obj_size macros for type casting and obtaining element size. The implementation draws inspiration from generic-radix-tree.h, eliminating the need to pass element size in min_heap_callbacks. Link: https://lkml.kernel.org/ioyfizrzq7w7mjrqcadtzsfgpuntowtjdw5pgn4qhvsdp= 4mqqg@nrlek5vmisbu Signed-off-by: Kuan-Wei Chiu Reviewed-by: Ian Rogers --- drivers/md/dm-vdo/repair.c | 21 +++++----- drivers/md/dm-vdo/slab-depot.c | 13 +++--- include/linux/min_heap.h | 75 +++++++++++++++++++++++----------- kernel/events/core.c | 35 ++++++++-------- lib/test_min_heap.c | 49 +++++++++++----------- 5 files changed, 107 insertions(+), 86 deletions(-) diff --git a/drivers/md/dm-vdo/repair.c b/drivers/md/dm-vdo/repair.c index defc9359f10e..7663fa2098f4 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 +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,25 +165,24 @@ 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) + if (heap->heap.nr =3D=3D 0) return NULL; =20 /* * Swap the next heap element with the last one on the heap, popping it o= ff the heap, * restore the heap invariant, and return a pointer to the popped element. */ - last =3D &repair->entries[--heap->nr]; - swap_mappings(heap->data, last); + last =3D &repair->entries[--heap->heap.nr]; + swap_mappings(heap->heap.data, last); min_heapify(heap, 0, &repair_min_heap); return last; } @@ -1117,11 +1118,9 @@ 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) { - .data =3D repair->entries, - .nr =3D repair->block_map_entry_count, - .size =3D repair->block_map_entry_count, - }; + repair->replay_heap.heap.data =3D repair->entries; + repair->replay_heap.heap.nr =3D repair->block_map_entry_count; + repair->replay_heap.heap.size =3D repair->block_map_entry_count; min_heapify_all(&repair->replay_heap, &repair_min_heap); =20 vdo_log_info("Replaying %zu recovery entries into block map", diff --git a/drivers/md/dm-vdo/slab-depot.c b/drivers/md/dm-vdo/slab-depot.c index 46e4721e5b4f..3309480170c3 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; + MIN_HEAP(struct slab_status *, heap) heap; int result; struct slab_status *slab_statuses; struct slab_depot *depot =3D allocator->depot; @@ -3521,14 +3520,12 @@ static int __must_check vdo_prepare_slabs_for_alloc= ation(struct block_allocator return result; =20 /* Sort the slabs by cleanliness, then by emptiness hint. */ - heap =3D (struct min_heap) { - .data =3D slab_statuses, - .nr =3D allocator->slab_count, - .size =3D allocator->slab_count, - }; + heap.heap.data =3D slab_statuses; + heap.heap.nr =3D allocator->slab_count; + heap.heap.size =3D allocator->slab_count; min_heapify_all(&heap, &slab_status_min_heap); =20 - while (heap.nr > 0) { + while (heap.heap.nr > 0) { bool high_priority; struct vdo_slab *slab; struct slab_journal *journal; diff --git a/include/linux/min_heap.h b/include/linux/min_heap.h index d52daf45861b..c3635a7fdb88 100644 --- a/include/linux/min_heap.h +++ b/include/linux/min_heap.h @@ -7,45 +7,59 @@ #include =20 /** - * struct min_heap - Data structure to hold a min-heap. + * struct __min_heap - Data structure to hold a min-heap. * @data: Start of array holding the heap elements. * @nr: Number of elements currently in the heap. * @size: Maximum number of elements that can be held in current storage. */ -struct min_heap { +struct __min_heap { void *data; int nr; int size; }; =20 +/* + * We use a 0 size array to stash the type we're storing without taking any + * space at runtime - then the various accessor macros can use typeof() to= get + * to it for casts/sizeof - we also force the alignment so that storing a = type + * with a ridiculous alignment doesn't blow up the alignment or size of the + * min_heap. + */ +#define MIN_HEAP(_type, _name) \ +struct _name { \ + struct __min_heap heap; \ + _type type[0] __aligned(1); \ +} + +#define __minheap_cast(_heap) (typeof((_heap)->type[0]) *) +#define __minheap_obj_size(_heap) sizeof((_heap)->type[0]) + /** * 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(struct __min_heap *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 +68,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(&(_heap)->heap, _pos, __minheap_obj_size(_heap), _func) + /* Floyd's approach to heapification that is O(nr). */ static __always_inline -void min_heapify_all(struct min_heap *heap, +void __min_heapify_all(struct __min_heap *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(&(_heap)->heap, __minheap_obj_size(_heap), _func) + /* Remove minimum element from the heap, O(log2(nr)). */ static __always_inline -void min_heap_pop(struct min_heap *heap, +void __min_heap_pop(struct __min_heap *heap, size_t elem_size, const struct min_heap_callbacks *func) { void *data =3D heap->data; @@ -88,27 +108,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(&(_heap)->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(struct __min_heap *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(&(_heap)->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(struct __min_heap *heap, const void *element, size_t = elem_size, const struct min_heap_callbacks *func) { void *data =3D heap->data; @@ -120,17 +146,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(&(_heap)->heap, _element, __minheap_obj_size(_heap), _fun= c) + #endif /* _LINUX_MIN_HEAP_H */ diff --git a/kernel/events/core.c b/kernel/events/core.c index 10ac2db83f14..065dfaa8b009 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -3698,19 +3698,20 @@ static void swap_ptr(void *l, void *r) swap(*lp, *rp); } =20 +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; + struct perf_event **itrs =3D heap->heap.data; =20 if (event) { - itrs[heap->nr] =3D event; - heap->nr++; + itrs[heap->heap.nr] =3D event; + heap->heap.nr++; } } =20 @@ -3738,7 +3739,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 @@ -3747,11 +3748,9 @@ static noinline int visit_groups_merge(struct perf_e= vent_context *ctx, =20 if (!ctx->task) { cpuctx =3D this_cpu_ptr(&perf_cpu_context); - event_heap =3D (struct min_heap){ - .data =3D cpuctx->heap, - .nr =3D 0, - .size =3D cpuctx->heap_size, - }; + event_heap.heap.data =3D cpuctx->heap; + event_heap.heap.nr =3D 0; + event_heap.heap.size =3D cpuctx->heap_size; =20 lockdep_assert_held(&cpuctx->ctx.lock); =20 @@ -3760,15 +3759,13 @@ static noinline int visit_groups_merge(struct perf_= event_context *ctx, css =3D &cpuctx->cgrp->css; #endif } else { - event_heap =3D (struct min_heap){ - .data =3D itrs, - .nr =3D 0, - .size =3D ARRAY_SIZE(itrs), - }; + event_heap.heap.data =3D itrs; + event_heap.heap.nr =3D 0; + event_heap.heap.size =3D ARRAY_SIZE(itrs); /* Events not within a CPU context may be on any CPU. */ __heap_add(&event_heap, perf_event_groups_first(groups, -1, pmu, NULL)); } - evt =3D event_heap.data; + evt =3D event_heap.heap.data; =20 __heap_add(&event_heap, perf_event_groups_first(groups, cpu, pmu, NULL)); =20 @@ -3777,14 +3774,14 @@ static noinline int visit_groups_merge(struct perf_= event_context *ctx, __heap_add(&event_heap, perf_event_groups_first(groups, cpu, pmu, css->c= group)); #endif =20 - if (event_heap.nr) { + if (event_heap.heap.nr) { __link_epc((*evt)->pmu_ctx); perf_assert_pmu_disabled((*evt)->pmu_ctx->pmu); } =20 min_heapify_all(&event_heap, &perf_min_heap); =20 - while (event_heap.nr) { + while (event_heap.heap.nr) { ret =3D func(*evt, data); if (ret) return ret; diff --git a/lib/test_min_heap.c b/lib/test_min_heap.c index 7b01b4387cfb..af2e446034d8 100644 --- a/lib/test_min_heap.c +++ b/lib/test_min_heap.c @@ -11,6 +11,8 @@ #include #include =20 +MIN_HEAP(int, min_heap_test); + static __init bool less_than(const void *lhs, const void *rhs) { return *(int *)lhs < *(int *)rhs; @@ -30,16 +32,16 @@ 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; + int *values =3D heap->heap.data; int err =3D 0; int last; =20 last =3D values[0]; min_heap_pop(heap, funcs); - while (heap->nr > 0) { + while (heap->heap.nr > 0) { if (min_heap) { if (last > values[0]) { pr_err("error: expected %d <=3D %d\n", last, @@ -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 { - .data =3D values, - .nr =3D ARRAY_SIZE(values), - .size =3D ARRAY_SIZE(values), - }; + struct min_heap_test heap; + + heap.heap.data =3D values; + heap.heap.nr =3D ARRAY_SIZE(values); + heap.heap.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, }; @@ -81,8 +82,8 @@ static __init int test_heapify_all(bool min_heap) =20 =20 /* Test with randomly generated values. */ - heap.nr =3D ARRAY_SIZE(values); - for (i =3D 0; i < heap.nr; i++) + heap.heap.nr =3D ARRAY_SIZE(values); + for (i =3D 0; i < heap.heap.nr; i++) values[i] =3D get_random_u32(); =20 min_heapify_all(&heap, &funcs); @@ -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 { - .data =3D values, - .nr =3D 0, - .size =3D ARRAY_SIZE(values), - }; + struct min_heap_test heap; + + heap.heap.data =3D values; + heap.heap.nr =3D 0; + heap.heap.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, }; @@ -115,7 +115,7 @@ static __init int test_heap_push(bool min_heap) err =3D pop_verify_heap(min_heap, &heap, &funcs); =20 /* Test with randomly generated values. */ - while (heap.nr < heap.size) { + while (heap.heap.nr < heap.heap.size) { temp =3D get_random_u32(); min_heap_push(&heap, &temp, &funcs); } @@ -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 { - .data =3D values, - .nr =3D 0, - .size =3D ARRAY_SIZE(values), - }; + struct min_heap_test heap; + + heap.heap.data =3D values; + heap.heap.nr =3D 0; + heap.heap.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, }; @@ -152,7 +151,7 @@ static __init int test_heap_pop_push(bool min_heap) =20 err =3D pop_verify_heap(min_heap, &heap, &funcs); =20 - heap.nr =3D 0; + heap.heap.nr =3D 0; for (i =3D 0; i < ARRAY_SIZE(data); i++) min_heap_push(&heap, &temp, &funcs); =20 --=20 2.34.1 From nobody Mon Feb 9 13:01:23 2026 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.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 9ACE339FCF; Tue, 19 Mar 2024 18:00:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710871240; cv=none; b=hSRTQ766a5VWttQ9f+ri27GoPDfUpZG8IBuSDDUI7E/A44jDuP9CdcFnpV6al+IhbnjlUQH4vs55T0uLNf+GM18sn2DM0zziG7CYGC/ULeuje41VURggShI7YB71K7637i2sICjwSwKcMEKct/FsgGzlk6V6jbW0c5ys7NVxhqQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710871240; c=relaxed/simple; bh=1kcI5O448ZoSUJqM7Fwo+CLjTMdYaBqUzIGDOV4I8Wc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=S3hXn+8w0FUKlfsAPr/cyLYhyTSS9qdU+QpRDWdu/3+JnSoYpRgXVvcPbhJcBeEHr0Irly4HDQ3yINfGxnJXM2jrnN4ubBgYBBoo79uFPl4q8LoxA4T8M3G+gUJz8/Ug+uihODZ6YHRkXm2sen/u3Q8Lz84x5CJ+b9aaY+waYL8= 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=HEMm69y7; arc=none smtp.client-ip=209.85.214.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="HEMm69y7" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-1dd8ee2441dso10459715ad.1; Tue, 19 Mar 2024 11:00:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710871238; x=1711476038; 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=wIY+iLTtXDqlHadPKUvUaL+ptK+GK0/HaTJmss4inJc=; b=HEMm69y7i6ACz6UE7aL6mGPM0xbrV/BwlkH60HlqnsFv6r5ZWNAeldoJCMrGtaw2I1 4QPo+91OgKbtNrgtQ1lmg6r2IpWutWGxrMvRE9WW1QNhM8JJKtoijYkU195N+alCEIDf RTaDlpTUJGAyHmjdbJ544iS2ZCsa2sZi2DtRQViTeYBWJZTu8U7/RwpHPgP1E1XgJVFe MiCC4vuy4HVha1+OL3Lx+qI+t4qQ7/4x3CQXDr/RIUWviSbarjzfalBw3ksJq4NQK7n4 YYH1Uqeh5FrIByg8u/xHO0SwL9KRG1M91bfg41c1GcljEVWSZq1tJ/F9mN0Y5EyZakxl 32zQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710871238; x=1711476038; 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=wIY+iLTtXDqlHadPKUvUaL+ptK+GK0/HaTJmss4inJc=; b=Q5cDe4ekN4stQezggHtQm7EQgGowvfy/4HXuW0LtfCxODUbz0xYophAIS/BuSGU/oN dbM9SFFoSeOo9RFXUEBxBtve3/xZt0znwrzrhJ3/siOzBOC5Ft21aVLQX/eZBHvT+zie HBQvqoaG/upOr1Gvj/1A5928yE4AaiMTVuPwM3S6xFQRpWncnoNj0lUaA0dYddNpXfpO 9MRUUzS3U1G55xFWVUQsO2i98/qZHBSgm6Ws8TSKuLJj/nbNla+M/1nhjjWG8qiDkKxa pwQBxHGurkv4IzGZQkW49voF9Z1PDhpb9GlYwTCQyCUXbldGaO//POvvDohbPjlYJMkO Jo3A== X-Forwarded-Encrypted: i=1; AJvYcCVkzQrl6dPUMdL7WU3zRxd9ZEYwRYnGaiD645nA7X79UG6Id17f1WLvS9AWahl2X3AqHqRQnYHiA7aEkkEMfw5mhyWO4sUhWNAdUAqsVPoVoUzM287NpHfnSesiCH7CLnyJhrC++eCBb3DcPwY8xZ4CNuUac5YmbXAh0CAB8FkmTtf8UGgbOR7eSYQZaxNRA7ouJUDPL2q7sCGplGJ6VzbndOC4n9NzhmpX7R+q X-Gm-Message-State: AOJu0YxaHl1fdAYDR9EqG+4RAOsAcvlwD2DXvMPdpvliTYhqfpO+KtU0 OL1U4u9iYSN0YYeY5ZsLZTqqQsYZEn/qTJcJ3fUWhKgaEBlCTlPR X-Google-Smtp-Source: AGHT+IEmG62jJmsoaRkrpL1XhfpAvR+sBzrjaRo0zakUg8127IT9z6Y2bZCHFDgurpvJ46NmFObQhQ== X-Received: by 2002:a17:902:f547:b0:1dc:c28e:2236 with SMTP id h7-20020a170902f54700b001dcc28e2236mr3253079plf.2.1710871237779; Tue, 19 Mar 2024 11:00:37 -0700 (PDT) Received: from visitorckw-System-Product-Name.. ([140.113.216.168]) by smtp.gmail.com with ESMTPSA id u16-20020a17090341d000b001dd3bee3cd6sm5531359ple.219.2024.03.19.11.00.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Mar 2024 11:00:37 -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, jserv@ccns.ncku.edu.tw, linux-bcache@vger.kernel.org, dm-devel@lists.linux.dev, linux-bcachefs@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Kuan-Wei Chiu Subject: [PATCH 05/13] lib min_heap: Add min_heap_init() Date: Wed, 20 Mar 2024 01:59:57 +0800 Message-Id: <20240319180005.246930-6-visitorckw@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240319180005.246930-1-visitorckw@gmail.com> References: <20240319180005.246930-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 --- include/linux/min_heap.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/linux/min_heap.h b/include/linux/min_heap.h index c3635a7fdb88..ed462f194b88 100644 --- a/include/linux/min_heap.h +++ b/include/linux/min_heap.h @@ -44,6 +44,18 @@ struct min_heap_callbacks { void (*swp)(void *lhs, void *rhs); }; =20 +/* Initialize a min-heap. */ +static __always_inline +void __min_heap_init(struct __min_heap *heap, void *data, int size) +{ + heap->data =3D data; + heap->nr =3D 0; + heap->size =3D size; +} + +#define min_heap_init(_heap, _data, _size) \ + __min_heap_init(&(_heap)->heap, _data, _size) + /* Sift the element at pos down the heap. */ static __always_inline void __min_heapify(struct __min_heap *heap, int pos, size_t elem_size, --=20 2.34.1 From nobody Mon Feb 9 13:01:23 2026 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (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 E48DE3B289; Tue, 19 Mar 2024 18:00:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710871245; cv=none; b=YcqQtMJ8C3tRaMlcqbtw+PdcPLxE2vkc0NjN8bkX6r9qiiMkuSnhyhY51rh9bgQon5DiMgIlCNdIuBBeUqb2rgu2aPNtdQuuKb0Mt3+v0LOSrlCmRGERm/a7S+JBTP4hAiIwc5N3aD+fsERuYYCLk49iGKQM6mEHxF1E0UGDlv8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710871245; c=relaxed/simple; bh=n8NPWU7TPG0FYu6/1N5UcgjqvR4CgLcQsDnsmf28uBE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=PFIW95ca6RebwYJ9D1G67XKTaB56JU2apdQRMjWxnhAiA10ovuCr+NJFDMJOLb1MQY2CwJh8KTxUq8kXsUZy27XyMhvRAr1/Ap/oms1iCCOkmWhuz8gHwkorztkymvaaKNinTcGW9fvLMCHMgU1ZLkHLoWP64CXPF1rlYMFkf9I= 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=TY3jwtse; arc=none smtp.client-ip=209.85.214.176 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="TY3jwtse" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-1def81ee762so8052735ad.0; Tue, 19 Mar 2024 11:00:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710871242; x=1711476042; 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=WFeAQpAK4aUBu/1PW+JMtASIBT0c/sUzFzsKvR09WTg=; b=TY3jwtseA353mYpDXImFu+7lKZmRF3o0JDxLHsHPAcM7MjWwgYcYfHj1NwyD1kSt1r Pi+M5CUiLoU/aX2C+j6/HJa0EccyFFVatxfruNlE4R5Q9hTATaU9EozWutG1DKB+hGck dFM1ThTgXxiWpk8BGBFUPx4lx9b7j5t9B22WHx+SuDidBwz3BobaQMcTfSOAfraT8jtF ul4xqBSt/ru13jRlwxyxZ5hVLJjkf4vHHqxrP41GyWuWcMCwNcrGY7QERL0ThU6SX/Zj G0utV4GF0WvVht3XZtbdkRLsPNJ5XrXlNESczRDS3pGeuvi2FqIJMVrFUvZosWBhV1ca xL+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710871242; x=1711476042; 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=WFeAQpAK4aUBu/1PW+JMtASIBT0c/sUzFzsKvR09WTg=; b=kgWsjDQzex3/zd9Y9eu9VSgKKX5AC2wPUhmh1bQBC5IBcw0Vp+dGStPNIq+KNTIT/s l27JmFqDYxJNGiSYVQQJDmeXJvxtk9ELUzEKMncm6NL5olXJyZi0J7QdMSdWm0U3ytwt DbFIhQCB4PTa3ZK1XUbbMDw9hch3KonHXqozZKNNYoBz++KjSEf4XGlZK8aFUsNC53mv AzdQBQRSAcyRbihQYAeb/+9Qwr6q7yBNut3i/AvxdxJQN5LYhSGGw9vGJw376h82gDXu aZF3C/h+Vme1LJScGLKcGlhF+2uFo+QV5xZtF4UPj5VMRIoMsy6InvUQoWbnRb+lRK3M 1Lpg== X-Forwarded-Encrypted: i=1; AJvYcCXOvCoELgOqcKTXEFqQki9GajwKK6xB8+jTTWc7OaRPJKWlXHTT4zjPqGvFQ17mYrbALGWem6xTZit7ivUmlxT6b1HNxR4yn5xMN7ayRGMQkb+za7i851fgGIyaE1xAILIxrh2KcY5UO9/EE+SpHYD8p+j1VXoT/4pbZ9lB7TnUsise4doMI8CI4D0DkSq8FhscV00wxDHKjiNT6FvbjkTH8tjFm6PDMsmw+Eh7 X-Gm-Message-State: AOJu0Yx5hw3dQaxDGHX9oqIASYvkWB2K2kz+j8ustGJVitkHffEocPKj HsvQyvvrJNJ2wwgj4Cps5fNHcQZPHQTuVFBMbLpqZvt/OlJZB5zE X-Google-Smtp-Source: AGHT+IFB+h3UiEYM4uOMtZyHElq0Cc/LqfYFRVzSSDBHrYR9QcIjIvtermmErDaKNfSoK+egpfDDig== X-Received: by 2002:a17:902:d4d1:b0:1dd:6f1a:2106 with SMTP id o17-20020a170902d4d100b001dd6f1a2106mr3338647plg.0.1710871242213; Tue, 19 Mar 2024 11:00:42 -0700 (PDT) Received: from visitorckw-System-Product-Name.. ([140.113.216.168]) by smtp.gmail.com with ESMTPSA id u16-20020a17090341d000b001dd3bee3cd6sm5531359ple.219.2024.03.19.11.00.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Mar 2024 11:00: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, jserv@ccns.ncku.edu.tw, linux-bcache@vger.kernel.org, dm-devel@lists.linux.dev, linux-bcachefs@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Kuan-Wei Chiu Subject: [PATCH 06/13] lib min_heap: Add min_heap_peek() Date: Wed, 20 Mar 2024 01:59:58 +0800 Message-Id: <20240319180005.246930-7-visitorckw@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240319180005.246930-1-visitorckw@gmail.com> References: <20240319180005.246930-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 ed462f194b88..7c1fd1ddc71a 100644 --- a/include/linux/min_heap.h +++ b/include/linux/min_heap.h @@ -56,6 +56,16 @@ void __min_heap_init(struct __min_heap *heap, void *data= , int size) #define min_heap_init(_heap, _data, _size) \ __min_heap_init(&(_heap)->heap, _data, _size) =20 +/* Get the minimum element from the heap. */ +static __always_inline +void *__min_heap_peek(struct __min_heap *heap) +{ + return heap->nr ? heap->data : NULL; +} + +#define min_heap_peek(_heap) \ + (__minheap_cast(_heap) __min_heap_peek(&(_heap)->heap)) + /* Sift the element at pos down the heap. */ static __always_inline void __min_heapify(struct __min_heap *heap, int pos, size_t elem_size, --=20 2.34.1 From nobody Mon Feb 9 13:01:23 2026 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) (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 AAD1939FFD; Tue, 19 Mar 2024 18:00:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710871249; cv=none; b=JAD52OIB7g16zuoghMM1F7Xvje2r3E+PGfmaaIl69y/s2+m5sqTWb7g0Utm+bvoBCH/Mg2A1Ye/1GX4YTu6K/qRu5EqkpxMX0Amr2PSXxfat7TaR3/dFVoOEm//5BtXnog5qpL6YIOdLwmxSNWA+a6qhI3HECYtD3qnYx0lb/kY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710871249; c=relaxed/simple; bh=yTJX4YtdwgEulmGVYBrgLkPT5pZIiK7xGcI0Hsz9HoI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=RR5dONb+P4Oer2uX2wYT8MG8dpv51X9Vya7iO5747c2VVbiHYA0VfLZMczp8JrtbpNefUhEAWnT+s30sRmquvURuGDmTVH0cr56CM2uROclt+M3kuYxxqs4DXvvB2zzDqKguMtLbz9Iy50Fq9VBuIk3dc+/2eHBe+etIUIQ8gTc= 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=MTUPKdR5; arc=none smtp.client-ip=209.85.214.177 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="MTUPKdR5" Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-1dee5daedf6so7812795ad.0; Tue, 19 Mar 2024 11:00:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710871247; x=1711476047; 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=0us8+h8cbtOm/cTnK778odLRaJj/mu367/JnBXEvBM0=; b=MTUPKdR5l67aQ4OWCvb/S2oHxjatZ0NIuhM+qsq0au1WmY1OeizWffNV7z64dQ6kjE rm0RUIATfIZm/vKT9/zEtkdIY+czkevuARrlF6lwksTIcrnasG/NDXBrH80+kZFYGk1z 864TwglifgaVEKnr1skAF7pjst3/KV9nDujj1q14HkQw8mwBcA7s21CgjJ3qfjaP+OYQ GbWQV7hfjp8e2AAOqLnhTADLfA0wlePpbhEYxO3Rx+Y2oWaT1TgQVKItJqyxqvlcQSMj R7EpJh+n1TF7srjaDJmlDb3dCtfQhxxgHTAUAaUjCRsjFq2YoxQRPnuUVkKiae8CfvOK AvIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710871247; x=1711476047; 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=0us8+h8cbtOm/cTnK778odLRaJj/mu367/JnBXEvBM0=; b=RZIyrUkHQY2YdyvkI/7sXNqzr5GjEr8NMuQZERttKQ+vvxxc27B19CZO/TblqFBfAo SRHQw8ls//PHfu2TXL12pLEXQ0hoBqPX5aBhk5F3UGop1goKcI4NdGZD9+PhUmYPjJJO c7Pyg5HObFoOUKYSOnlIKEE2Jip5eWVfouYHBUAji1qSdLQlLjWUiBOKh4/c4HP82as8 dCutrRhbzKx+oOVFQZ/9JPpXygsSim6le7sHJXrWaoMnJ+0DsbQwAcQDMJ3yEb6kKeWy 4fjRBszBPd7qlnBoaVXbST9zjuHogg7jNLo1Zl/g9HCx9NUdGUFf88gqUodncfzggq9B b4aw== X-Forwarded-Encrypted: i=1; AJvYcCWMlc+mq17NA4/w/4uUqFwPMxBa5ofsBx9oVLfwLUURIKqosVbcw3zzDCFMc7TKowLspJJeNP97veXb7p16jNXgPcdpjp1faxSLHyhSFREQfkPkmGfrH6EOD5dNaM79ffLLi2dDgwqIfJedup97LlJ7YfIYlpnFZ1Xq4vi4JIdG8va2nHsMvedr/zuO4NrMIXhWE483qcRigeyjyWS+c+W5Y5gOzJo2aLJwAJmW X-Gm-Message-State: AOJu0Yy0atW1Wp9B32RddRBw44jTsEysWqRcIoOzFLZsv5VKbMQfkQTs unpBtFrmnOEf3PKfHxyGzTgIjGZeqNlUZozCnG2aTFeYFYXmzmbM X-Google-Smtp-Source: AGHT+IFaDQPKXrZW+fS7R5CytoBAvc38atn+/rwr+gJqsg0kfZROW3rrwE051quXouo0EjA3EYSr5A== X-Received: by 2002:a17:902:d4c6:b0:1dd:e128:16b1 with SMTP id o6-20020a170902d4c600b001dde12816b1mr3109208plg.6.1710871247072; Tue, 19 Mar 2024 11:00:47 -0700 (PDT) Received: from visitorckw-System-Product-Name.. ([140.113.216.168]) by smtp.gmail.com with ESMTPSA id u16-20020a17090341d000b001dd3bee3cd6sm5531359ple.219.2024.03.19.11.00.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Mar 2024 11:00:46 -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, jserv@ccns.ncku.edu.tw, linux-bcache@vger.kernel.org, dm-devel@lists.linux.dev, linux-bcachefs@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Kuan-Wei Chiu Subject: [PATCH 07/13] lib min_heap: Add min_heap_full() Date: Wed, 20 Mar 2024 01:59:59 +0800 Message-Id: <20240319180005.246930-8-visitorckw@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240319180005.246930-1-visitorckw@gmail.com> References: <20240319180005.246930-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 7c1fd1ddc71a..b1d874f4d536 100644 --- a/include/linux/min_heap.h +++ b/include/linux/min_heap.h @@ -66,6 +66,16 @@ void *__min_heap_peek(struct __min_heap *heap) #define min_heap_peek(_heap) \ (__minheap_cast(_heap) __min_heap_peek(&(_heap)->heap)) =20 +/* Check if the heap is full. */ +static __always_inline +bool __min_heap_full(struct __min_heap *heap) +{ + return heap->nr =3D=3D heap->size; +} + +#define min_heap_full(_heap) \ + __min_heap_full(&(_heap)->heap) + /* Sift the element at pos down the heap. */ static __always_inline void __min_heapify(struct __min_heap *heap, int pos, size_t elem_size, --=20 2.34.1 From nobody Mon Feb 9 13:01:23 2026 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (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 9D1975A0F4; Tue, 19 Mar 2024 18:00:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710871254; cv=none; b=moI6RXm6i58mea+BCwhspvgMMAG6jdbZFozG4LWhKKHOuoCIZyQi8dPJz1gtpzNRjp8R1XRtUJS1sJIcz04koduZRidhoL9kbnu+nkUaF03tNL7ZbRUJqVmXQc0u37DeJUGEkMGVZlI4ZhQLmYn1wSwXM+CJIm5G4mrlVUQpASw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710871254; c=relaxed/simple; bh=XQiaXeAP655awWvdMEU6lHJjsFcSwUpEIdTJv8iFyaU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=U6Sq7ZEFfXidIGd9gZldyLIhMWjrmEz09u0wrLGTm4ldz4PO1sl4Ys25nbc5FSVXgYs+1xPUkyg/ywbaTsySgclG8gUuKWvoCxB1WVzR6u8qgy7wL084jhADiAk3XS8VlliJ4iP/cAfSw/iSX+qNT4/1j+rAuoZiwkP6Yulb0Vc= 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=TuCcvp57; arc=none smtp.client-ip=209.85.214.181 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="TuCcvp57" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-1dcc0d163a1so4144815ad.0; Tue, 19 Mar 2024 11:00:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710871252; x=1711476052; 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=GpCspBwq6Ds2VE6+eSB9SlRfMb3a62jgZfPXRMMvlaA=; b=TuCcvp57GFoYtCkrwh3Oe+uGN2sGHQ8+hfJdBwhnR66O//UlNDrX93hvNuof/573L+ p1yaINCafBQMQNr4fqveXhJpZYyYSBZxlHRi1/PWsWvDZ+YnAjTaVifT7iMe9zzt8Bar jT7oHepcXE4fYsv0pKnFs4kN/nKHf3CwgSc3p4/6AqTwVAjLA+ZPJOQw7MmauTTn4BZl sQ/LLtw4mmJI/bxQ4R8UPTLk9JL5deVMW/J53jjmUXRzsCUBIbuGNVEhQbRZq/uP4xbw juBDLLhL0l6d1YCXj5BqwirvaJkN/Gshsk6KNpDfkf4xCNaqIzmFU8sNzc5f9whGD2mO mGmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710871252; x=1711476052; 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=GpCspBwq6Ds2VE6+eSB9SlRfMb3a62jgZfPXRMMvlaA=; b=rRD/BcbTKDkJ/joa52UIQm2HbypaSFJi34rHbor+2yMwPnHx8dUJteuGe6Mp2d62Gm qdiH92sHCo/2ukH32srQLa3N3l5JuX+85x17LHZ5mxgP4baYxt2xHhOsjskLKM+XxmIy /1TGxN+aRlttdnv+nbXEgzPOAxq/l7wBsXIGT58+pKGyGL9Dz1NVCj6oqzcTuFrqMYeE b0vJLEIACOmFtjr2v1bIVUcxIXw9WLXCv+974oODHy0lbDvOS6LGdwQyLl9smVEKtsyr ktp1AA71WxkFLB/EROqzixKaAFJ3DaFvghggpdPebltaz6SPE31iKiHiKXktuPKNr94B WI1A== X-Forwarded-Encrypted: i=1; AJvYcCXHWYJzFYg3s2xAA/nMqYCKpNwtxQTThICw7uHWzxLrgVJpsXZnpyM0maYXcD0uVuF+is5YWaUq4nR0PouILZWsDRvd2LOxtto2zF9WTR6oQ254nMDKHBr3uloIPwuWpXJPU9bGWSCA2jbdze0uR7/eN92miwkQGgQkHBdSb3trigmFuWNCDYWBvHAZhVOQSPKNikqo4ZSKzYgBd5otwKH1ZxyXnRo6D60qWqxf X-Gm-Message-State: AOJu0YwIZAw8Vwrb2LTfvZvZ+cgmrcfNFgZLJbP7xTQgs8f0NV++F7uj 7oMg61f8Duo3uGU5YvmJxmNUgSNRAqn+aMe/QuAbji37Thiag1MZ X-Google-Smtp-Source: AGHT+IEaSz42u2pySeZHdIUBOVj6rANsZ4rJFeS5FMZkGS66KtmBl1rHHPIWejKsqEPDnfUX9vywtg== X-Received: by 2002:a17:903:24f:b0:1dd:7d66:bfc0 with SMTP id j15-20020a170903024f00b001dd7d66bfc0mr16666936plh.4.1710871251739; Tue, 19 Mar 2024 11:00:51 -0700 (PDT) Received: from visitorckw-System-Product-Name.. ([140.113.216.168]) by smtp.gmail.com with ESMTPSA id u16-20020a17090341d000b001dd3bee3cd6sm5531359ple.219.2024.03.19.11.00.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Mar 2024 11:00:51 -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, jserv@ccns.ncku.edu.tw, linux-bcache@vger.kernel.org, dm-devel@lists.linux.dev, linux-bcachefs@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Kuan-Wei Chiu Subject: [PATCH 08/13] lib min_heap: Add args for min_heap_callbacks Date: Wed, 20 Mar 2024 02:00:00 +0800 Message-Id: <20240319180005.246930-9-visitorckw@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240319180005.246930-1-visitorckw@gmail.com> References: <20240319180005.246930-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 --- drivers/md/dm-vdo/repair.c | 10 +++---- drivers/md/dm-vdo/slab-depot.c | 8 +++--- include/linux/min_heap.h | 51 +++++++++++++++++----------------- kernel/events/core.c | 10 +++---- lib/test_min_heap.c | 26 ++++++++--------- 5 files changed, 53 insertions(+), 52 deletions(-) diff --git a/drivers/md/dm-vdo/repair.c b/drivers/md/dm-vdo/repair.c index 7663fa2098f4..528fa100b410 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 *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 *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->heap.nr]; - swap_mappings(heap->heap.data, last); - min_heapify(heap, 0, &repair_min_heap); + swap_mappings(heap->heap.data, last, NULL); + min_heapify(heap, 0, &repair_min_heap, NULL); return last; } =20 @@ -1121,7 +1121,7 @@ static void recover_block_map(struct vdo_completion *= completion) repair->replay_heap.heap.data =3D repair->entries; repair->replay_heap.heap.nr =3D repair->block_map_entry_count; repair->replay_heap.heap.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 3309480170c3..b8c41d7ccde0 100644 --- a/drivers/md/dm-vdo/slab-depot.c +++ b/drivers/md/dm-vdo/slab-depot.c @@ -3288,7 +3288,7 @@ 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 *args) { const struct slab_status *info1 =3D item1; const struct slab_status *info2 =3D item2; @@ -3300,7 +3300,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 *args) { struct slab_status *info1 =3D item1; struct slab_status *info2 =3D item2; @@ -3523,7 +3523,7 @@ static int __must_check vdo_prepare_slabs_for_allocat= ion(struct block_allocator heap.heap.data =3D slab_statuses; heap.heap.nr =3D allocator->slab_count; heap.heap.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.heap.nr > 0) { bool high_priority; @@ -3531,7 +3531,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 b1d874f4d536..97d8ba5c32e6 100644 --- a/include/linux/min_heap.h +++ b/include/linux/min_heap.h @@ -40,8 +40,8 @@ struct _name { \ * @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. */ @@ -79,7 +79,7 @@ bool __min_heap_full(struct __min_heap *heap) /* Sift the element at pos down the heap. */ static __always_inline void __min_heapify(struct __min_heap *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; @@ -92,7 +92,7 @@ void __min_heapify(struct __min_heap *heap, int pos, size= _t elem_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. */ @@ -100,38 +100,38 @@ void __min_heapify(struct __min_heap *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(&(_heap)->heap, _pos, __minheap_obj_size(_heap), _func) +#define min_heapify(_heap, _pos, _func, _args) \ + __min_heapify(&(_heap)->heap, _pos, __minheap_obj_size(_heap), _func, _ar= gs) =20 /* Floyd's approach to heapification that is O(nr). */ static __always_inline void __min_heapify_all(struct __min_heap *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(&(_heap)->heap, __minheap_obj_size(_heap), _func) +#define min_heapify_all(_heap, _func, _args) \ + __min_heapify_all(&(_heap)->heap, __minheap_obj_size(_heap), _func, _args) =20 /* Remove minimum element from the heap, O(log2(nr)). */ static __always_inline void __min_heap_pop(struct __min_heap *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 @@ -141,11 +141,11 @@ void __min_heap_pop(struct __min_heap *heap, size_t e= lem_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(&(_heap)->heap, __minheap_obj_size(_heap), _func) +#define min_heap_pop(_heap, _func, _args) \ + __min_heap_pop(&(_heap)->heap, __minheap_obj_size(_heap), _func, _args) =20 /* * Remove the minimum element and then push the given element. The @@ -155,19 +155,20 @@ void __min_heap_pop(struct __min_heap *heap, size_t e= lem_size, static __always_inline void __min_heap_pop_push(struct __min_heap *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(&(_heap)->heap, _element, __minheap_obj_size(_heap), = _func) +#define min_heap_pop_push(_heap, _element, _func, _args) \ + __min_heap_pop_push(&(_heap)->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(struct __min_heap *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; @@ -185,13 +186,13 @@ void __min_heap_push(struct __min_heap *heap, const v= oid *element, size_t elem_s 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(&(_heap)->heap, _element, __minheap_obj_size(_heap), _fun= c) +#define min_heap_push(_heap, _element, _func, _args) \ + __min_heap_push(&(_heap)->heap, _element, __minheap_obj_size(_heap), _fun= c, _args) =20 #endif /* _LINUX_MIN_HEAP_H */ diff --git a/kernel/events/core.c b/kernel/events/core.c index 065dfaa8b009..f2a9044058ee 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -3683,7 +3683,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 *args) { const struct perf_event *le =3D *(const struct perf_event **)l; const struct perf_event *re =3D *(const struct perf_event **)r; @@ -3691,7 +3691,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 *args) { void **lp =3D l, **rp =3D r; =20 @@ -3779,7 +3779,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.heap.nr) { ret =3D func(*evt, data); @@ -3788,9 +3788,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 af2e446034d8..b8859d17a19c 100644 --- a/lib/test_min_heap.c +++ b/lib/test_min_heap.c @@ -13,17 +13,17 @@ =20 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 *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 *ar= gs) { 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 *argsss) { 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->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.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.heap.nr < heap.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.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 Mon Feb 9 13:01:23 2026 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (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 2BF90208D0; Tue, 19 Mar 2024 18:00:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710871258; cv=none; b=eEo3BAA7ndSW7MhBPhEjWi/QIpfjPANHTSenYfnW1sfleRIVbxElrUxWTbbs1J7IZj6IGAF8Ah8niQo6sCjwXp4N1vWb5BpGU3opFJs9KwX6FBXKJdeLv8Men0WxnWZS5mSP+6qqw9K1dt55LDRpQ8R2hBMG7pUpx6EsCDA8H4k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710871258; c=relaxed/simple; bh=B6aRAqV6zp5QyTg3WPpruzaUQrG1xvKUJStbcNeX4Hc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=QdsT3l86t28mc2g5FycbpWll6aEUONdcTfUhLScZj4JFMMMtXTo5kSRSuoIzJshopPbzC7W+BUmGspyuFOOcc0NG8YJEU/QhV2SY/F13CFr+xlWBbtT71tpobPX+TYKn9mhxJnCAbaGlKpeBxT638iSpY0vYu0YN8JCPSrDik9I= 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=WOsHWhXu; arc=none smtp.client-ip=209.85.214.176 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="WOsHWhXu" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-1dd3c6c8dbbso3191895ad.1; Tue, 19 Mar 2024 11:00:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710871256; x=1711476056; 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=vXm1fu9C4vX46h0sj29/lTEeornZUsKUb3fjEsz6jiw=; b=WOsHWhXukUbB0mi5ivzNGywXZqHcyMWjU3zQDYYMHiQsVQCzgwg9vFpuChxVBc9wTL 9FkNGGaszolwQmd9HooDYcLY+iRHq8hpqEz/Rrsjtl8iu9o5djlykw8+F2SGkzjqcxXX PpIAIwF7VjvyF70cbz08m6J7wfIj2tgcuNDJh5oLqO3uJ6CEpFwMlWrWiuyEK6JxuvFD g70iUYcvhirdy5XChbtI5JCrWmy9Qgae3sLvFzwCEBgW/NWQAWUNbJncJ7GbviYoOWuQ A7o97R78snbOifAt7QbZjpfsTf6U7ZWsaGKBMvcrcipJvJs8ohmUpcI4/aKbvPBMAQ/A xT6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710871256; x=1711476056; 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=vXm1fu9C4vX46h0sj29/lTEeornZUsKUb3fjEsz6jiw=; b=Kp3LP64uCrSroVH68fg0aiUSzHxvGeuuMQH9E43ffWHaTzXeXV2Lg06hkPAbrqhr5u vayZAJpTe874cZwAL+WDhL6ga3Zw77wJxnG0C/B5z46NGK31X1QBfHIQ7rrb+zNZm5tD v0YuIHKT+LaWOBZc0hM0omJZLAThfybvAalYwxitcf4N59cfCtCbliQjHI+FjwdFamvo sHX0xrgBQ1RnD/OTmLkMJXdYXHpZyeFa+tBqZeXuvWNbT56k5Ndv5jEyTr2qPuH72wGZ f5nx7acZSyeUv0SG5/h6BgWx0wqRNLSrBXR+ECN3yu89wg8culPQU/vcRqtndtyaZRAB xTKA== X-Forwarded-Encrypted: i=1; AJvYcCU7IUXfMGZSprtc1JBJkwK7votJYqvuEZjy0wheFN3KeOUeC4dVNFe0gX3Y44UMc2vye+m5a/4TYRLdbzjofrj+i4fnZsjAD29YNetiQK2lGiTWznqjdMxtMH7nxV8U0vSJle0XLht2UlakbZ9/d1fh4gUnzGRPK3VuTUMFDSpAR1WKACyqhkPZexEaDAY2LhEmJDVO6FnmSIuAFdRwAXv2abwJcWQ1OeOyh045 X-Gm-Message-State: AOJu0Yz1w+fmAZsKIn7X4PQtljamYMBYj9qYv+3ztPL7UVqwyaDndU0E WJm0rLBLmuBcl3qyodMUCPnawLaMAGQBtHwG1OwJT0oGoqX+zaJ1 X-Google-Smtp-Source: AGHT+IHz2e9HCL5b8g4rCYp5kejors7FezHFbQ8oKlKDPjYAYoLpn1/27z4UODGEQE8Y/aKdKY5Jfw== X-Received: by 2002:a17:902:e84a:b0:1dd:b883:3398 with SMTP id t10-20020a170902e84a00b001ddb8833398mr3095419plg.4.1710871256326; Tue, 19 Mar 2024 11:00:56 -0700 (PDT) Received: from visitorckw-System-Product-Name.. ([140.113.216.168]) by smtp.gmail.com with ESMTPSA id u16-20020a17090341d000b001dd3bee3cd6sm5531359ple.219.2024.03.19.11.00.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Mar 2024 11:00: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, jserv@ccns.ncku.edu.tw, linux-bcache@vger.kernel.org, dm-devel@lists.linux.dev, linux-bcachefs@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Kuan-Wei Chiu Subject: [PATCH 09/13] lib min_heap: Update min_heap_push() and min_heap_pop() to return bool values Date: Wed, 20 Mar 2024 02:00:01 +0800 Message-Id: <20240319180005.246930-10-visitorckw@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240319180005.246930-1-visitorckw@gmail.com> References: <20240319180005.246930-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 97d8ba5c32e6..154ac2102114 100644 --- a/include/linux/min_heap.h +++ b/include/linux/min_heap.h @@ -130,18 +130,20 @@ void __min_heapify_all(struct __min_heap *heap, size_= t elem_size, =20 /* Remove minimum element from the heap, O(log2(nr)). */ static __always_inline -void __min_heap_pop(struct __min_heap *heap, size_t elem_size, +bool __min_heap_pop(struct __min_heap *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) \ @@ -167,7 +169,7 @@ void __min_heap_pop_push(struct __min_heap *heap, =20 /* Push an element on to the heap, O(log2(nr)). */ static __always_inline -void __min_heap_push(struct __min_heap *heap, const void *element, size_t = elem_size, +bool __min_heap_push(struct __min_heap *heap, const void *element, size_t = elem_size, const struct min_heap_callbacks *func, void *args) { void *data =3D heap->data; @@ -175,7 +177,7 @@ void __min_heap_push(struct __min_heap *heap, const voi= d *element, size_t elem_s 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; @@ -190,6 +192,8 @@ void __min_heap_push(struct __min_heap *heap, const voi= d *element, size_t elem_s break; func->swp(parent, child, args); } + + return true; } =20 #define min_heap_push(_heap, _element, _func, _args) \ --=20 2.34.1 From nobody Mon Feb 9 13:01:23 2026 Received: from mail-pg1-f181.google.com (mail-pg1-f181.google.com [209.85.215.181]) (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 AAABD5FBB0; Tue, 19 Mar 2024 18:01:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710871264; cv=none; b=n7xSP8rPSDa/PPwmcvO3aAwz1POwU1sFsy4fuCVfxW3be1NHhMxK0Wz0j7vb5oZiwmJSE5nE5CZLpwB6OdHeVzvDKOcQcBIvn8R/3q7TMKusqcmR0YTtKrfxAhfiejoynsVZjfxv8JmEHq2YM3x9+p/lYKF0YZLMoOE6ybMxYPo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710871264; c=relaxed/simple; bh=SzanTHe8fdFsJ1zQGSsmKZgt9X9060jgJj3kTq+QswU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=sq4CI97UKO926t5OchKtpwpEOckT5nBCh1bE25jWFSyR9AIeUNvPzq8r4E60yqzjTZi/XhUbsefywpdQuzpZOC5J01Zkps1DOWTMjroyFdJfToyASpHnBVaqL6nQ+sxL5m2R3fEeFrVKNuVDOB5j0X8eMGd1F0poAx/RSYBWUJw= 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=RHUc0mcV; arc=none smtp.client-ip=209.85.215.181 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="RHUc0mcV" Received: by mail-pg1-f181.google.com with SMTP id 41be03b00d2f7-55b5a37acb6so972953a12.0; Tue, 19 Mar 2024 11:01:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710871262; x=1711476062; 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=gkwrjYgr25pJtFwXmJg3BLDTHaaMD3X5YVpDc57d3mA=; b=RHUc0mcV81U5q6169gSnzjpPTY36EHTb9yotyv5fUZyZpGQ94hf2mVZoQTyxJns0+S 1+CZ+HyMfDbZy0InMuvBeJ4RLrMVO+lol1ZkbbyngE6EykyyqIPQV4cfxfEKTBTXAg1I LoMV6FY8RC2UY3oWp4gml9ElBAYGsGvb2LIuKUc8heddgmaLMqo7PnS/AGHHNgJgozt0 oEIC1WmvL22bM1xWj2KIY6n8RnpgH/+HjapnI8J7mtin2+OI0X2p68UE150ncArX4K7o OSet1L2hUaX9AQ7RSs/8WO2FluoSPCHaSa0XY4XK1BPlObk9GfOHI043ZYxwLafGKbrX 4SNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710871262; x=1711476062; 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=gkwrjYgr25pJtFwXmJg3BLDTHaaMD3X5YVpDc57d3mA=; b=kj/6/hOYsgOkdNkGLVUGpxPywj515/iOuJwxrZg+YM/RcKpFQfddAMB3IXF+vdIqJG IxCsVbW2VALx/orrWg4zorTSN8+4wB8H45GSEn67C5YwprjTRpXAGz6OofgOfq2ljRhu SNyuokfbNdSLj7NK4FMcF8jpMO0BavkvmwP/A+SZTQeUWL5+dbrRl82q6aZyC3iy5A02 x11/+kQSwuK6HddkNPWZL75CYnLfVtgrm4zUPfi58DVcIqmvpIq2GY2jHPk3IKsPYWhp bv+DLyPbenfY/K155aHCoJSdZyfY81oWPf3bu1fJeaYypMWMQMRhCQBkSJDlgnYvg+Wh UW7g== X-Forwarded-Encrypted: i=1; AJvYcCWPS9pHiRPuXnOWdxz5qwxcWCLiSgI4uCD9B4wyr9yxp/3Mjbuwo8FKfIAPxqsQSb1Kp0Fa/MON/DoGK70/oSEJQnm4EHqAvE82+/0hABxffNY9ZSPxvgj++nrNzVPYPL3f8zQLb3gaMhelUjoZmzIWG84YafEuS3q9aPLgkxe5ygHx+l+9C+fkorhhKEuZ9Jz8TB6U9olZ0YmdvZaMUv+1sX8HLXo0avvemuIN X-Gm-Message-State: AOJu0Yy3T4dSk0I/NCh26WZB+N+I9o4JkduiW66aU+E0tsBXI1nDDGf2 qdsIrTimxXT/lORcgLavjK4+m3qWgjzLbE4r6fTA/sOaI8+SzXQD X-Google-Smtp-Source: AGHT+IEQoC3G2d7Vh94gAFRltAWkbPmppCp4u9RKwbHK3LEGrzFm0t6A8thqcrG44aQaQjyjuh+ssg== X-Received: by 2002:a17:903:244e:b0:1dd:7350:29f6 with SMTP id l14-20020a170903244e00b001dd735029f6mr3130430pls.3.1710871261193; Tue, 19 Mar 2024 11:01:01 -0700 (PDT) Received: from visitorckw-System-Product-Name.. ([140.113.216.168]) by smtp.gmail.com with ESMTPSA id u16-20020a17090341d000b001dd3bee3cd6sm5531359ple.219.2024.03.19.11.00.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Mar 2024 11:01:00 -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, jserv@ccns.ncku.edu.tw, linux-bcache@vger.kernel.org, dm-devel@lists.linux.dev, linux-bcachefs@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Kuan-Wei Chiu Subject: [PATCH 10/13] bcache: Remove heap-related macros and switch to generic min_heap Date: Wed, 20 Mar 2024 02:00:02 +0800 Message-Id: <20240319180005.246930-11-visitorckw@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240319180005.246930-1-visitorckw@gmail.com> References: <20240319180005.246930-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 replaces them with the generic min_heap implementation from include/linux. This change improves code readability by using functions instead of macros. Link: https://lkml.kernel.org/ioyfizrzq7w7mjrqcadtzsfgpuntowtjdw5pgn4qhvsdp= 4mqqg@nrlek5vmisbu Signed-off-by: Kuan-Wei Chiu --- drivers/md/bcache/alloc.c | 66 +++++++++++++++++++++-------- drivers/md/bcache/bcache.h | 2 +- drivers/md/bcache/bset.c | 73 ++++++++++++++++++++++---------- drivers/md/bcache/bset.h | 38 ++++++++++------- drivers/md/bcache/btree.c | 27 +++++++++++- drivers/md/bcache/extents.c | 44 ++++++++++++-------- drivers/md/bcache/movinggc.c | 40 +++++++++++++----- drivers/md/bcache/super.c | 16 +++++++ drivers/md/bcache/sysfs.c | 3 ++ drivers/md/bcache/util.h | 81 +----------------------------------- 10 files changed, 224 insertions(+), 166 deletions(-) diff --git a/drivers/md/bcache/alloc.c b/drivers/md/bcache/alloc.c index ce13c272c387..e0459826788e 100644 --- a/drivers/md/bcache/alloc.c +++ b/drivers/md/bcache/alloc.c @@ -166,40 +166,70 @@ 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 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 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 bucket_prio(ca, lhs) > bucket_prio(ca, rhs); +} + +static inline bool 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 bucket_prio(ca, lhs) < bucket_prio(ca, rhs); +} + +static inline void bucket_swap(void *l, void *r, void *args) +{ + struct bucket *lhs =3D l, *rhs =3D r; =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)) + 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 bucket_max_cmp, + .swp =3D bucket_swap, + }; + const struct min_heap_callbacks bucket_min_cmp_callback =3D { + .less =3D bucket_min_cmp, + .swp =3D bucket_swap, + }; =20 - ca->heap.used =3D 0; + ca->heap.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))) { - ca->heap.data[0] =3D b; - heap_sift(&ca->heap, 0, bucket_max_cmp); + if (!min_heap_full(&ca->heap)) + min_heap_push(&ca->heap, b, &bucket_max_cmp_callback, ca); + else if (!bucket_max_cmp(b, min_heap_peek(&ca->heap), ca)) { + *min_heap_peek(&ca->heap) =3D b; + min_heapify(&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)) { + b =3D *min_heap_peek(&ca->heap); + if (!min_heap_pop(&ca->heap, &bucket_min_cmp_callback, ca)) { /* * We don't want to be calling invalidate_buckets() * multiple times when it can't do anything diff --git a/drivers/md/bcache/bcache.h b/drivers/md/bcache/bcache.h index 4e6afa89921f..97b0a1768ba7 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); + MIN_HEAP(struct bucket *, 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 2bba4d6aaaa2..04187f800c78 100644 --- a/drivers/md/bcache/bset.c +++ b/drivers/md/bcache/bset.c @@ -56,7 +56,9 @@ int __bch_count_data(struct btree_keys *b) unsigned int ret =3D 0; struct btree_iter iter; struct bkey *k; + struct btree_iter_set data[MAX_BSETS]; =20 + iter.heap.heap.data =3D data; if (b->ops->is_extents) for_each_key(b, k, &iter) ret +=3D KEY_SIZE(k); @@ -69,6 +71,9 @@ void __bch_check_keys(struct btree_keys *b, const char *f= mt, ...) struct bkey *k, *p =3D NULL; struct btree_iter iter; const char *err; + struct btree_iter_set data[MAX_BSETS]; + + iter.heap.heap.data =3D data; =20 for_each_key(b, k, &iter) { if (b->ops->is_extents) { @@ -110,9 +115,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 min_heap_peek(&iter->heap)->k, *next =3D bkey_next(k); =20 - if (next < iter->data->end && + if (next < min_heap_peek(&iter->heap)->end && bkey_cmp(k, iter->b->ops->is_extents ? &START_KEY(next) : next) > 0) { bch_dump_bucket(iter->b); @@ -882,6 +887,9 @@ unsigned int bch_btree_insert_key(struct btree_keys *b,= struct bkey *k, struct btree_iter iter; struct bkey preceding_key_on_stack =3D ZERO_KEY; struct bkey *preceding_key_p =3D &preceding_key_on_stack; + struct btree_iter_set data[MAX_BSETS]; + + iter.heap.heap.data =3D data; =20 BUG_ON(b->ops->is_extents && !KEY_SIZE(k)); =20 @@ -1077,27 +1085,34 @@ 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 (btree_iter_cmp_fn)(const void *, const void *, void *); =20 -static inline bool btree_iter_cmp(struct btree_iter_set l, - struct btree_iter_set r) +static inline bool btree_iter_cmp(const void *l, const void *r, void *args) { - return bkey_cmp(l.k, r.k) > 0; + 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_end(struct btree_iter *iter) { - return !iter->used; + return !iter->heap.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 btree_iter_cmp, + .swp =3D 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_init(struct btree_keys *b, @@ -1107,8 +1122,8 @@ static struct bkey *__bch_btree_iter_init(struct btre= e_keys *b, { struct bkey *ret =3D NULL; =20 - iter->size =3D ARRAY_SIZE(iter->data); - iter->used =3D 0; + iter->heap.heap.size =3D MAX_BSETS; + iter->heap.heap.nr =3D 0; =20 #ifdef CONFIG_BCACHE_DEBUG iter->b =3D b; @@ -1134,22 +1149,28 @@ static inline struct bkey *__bch_btree_iter_next(st= ruct btree_iter *iter, { struct btree_iter_set b __maybe_unused; struct bkey *ret =3D NULL; + const struct min_heap_callbacks callbacks =3D { + .less =3D cmp, + .swp =3D 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 min_heap_peek(&iter->heap)->k; + min_heap_peek(&iter->heap)->k =3D bkey_next(min_heap_peek(&iter->heap)->= k); =20 - if (iter->data->k > iter->data->end) { + if (min_heap_peek(&iter->heap)->k > min_heap_peek(&iter->heap)->end) { WARN_ONCE(1, "bset was corrupt!\n"); - iter->data->k =3D iter->data->end; + min_heap_peek(&iter->heap)->k =3D min_heap_peek(&iter->heap)->end; } =20 - if (iter->data->k =3D=3D iter->data->end) - heap_pop(iter, b, cmp); + if (min_heap_peek(&iter->heap)->k =3D=3D min_heap_peek(&iter->heap)->end= ) { + b =3D *min_heap_peek(&iter->heap); + min_heap_pop(&iter->heap, &callbacks, NULL); + } else - heap_sift(iter, 0, cmp); + min_heapify(&iter->heap, 0, &callbacks, NULL); } =20 return ret; @@ -1195,16 +1216,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 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) @@ -1295,7 +1318,9 @@ void bch_btree_sort_partial(struct btree_keys *b, uns= igned int start, size_t order =3D b->page_order, keys =3D 0; struct btree_iter iter; int oldsize =3D bch_count_data(b); + struct btree_iter_set data[MAX_BSETS]; =20 + iter.heap.heap.data =3D data; __bch_btree_iter_init(b, &iter, NULL, &b->set[start]); =20 if (start) { @@ -1324,7 +1349,9 @@ void bch_btree_sort_into(struct btree_keys *b, struct= btree_keys *new, { uint64_t start_time =3D local_clock(); struct btree_iter iter; + struct btree_iter_set data[MAX_BSETS]; =20 + iter.heap.heap.data =3D data; bch_btree_iter_init(b, &iter, NULL); =20 btree_mergesort(b, new->set->data, &iter, false, true); diff --git a/drivers/md/bcache/bset.h b/drivers/md/bcache/bset.h index d795c84246b0..c764127937df 100644 --- a/drivers/md/bcache/bset.h +++ b/drivers/md/bcache/bset.h @@ -152,6 +152,19 @@ struct btree_iter; struct btree_iter_set; struct bkey_float; =20 +/* Btree key iteration */ + +struct btree_iter_set { + struct bkey *k, *end; +}; + +struct btree_iter { +#ifdef CONFIG_BCACHE_DEBUG + struct btree_keys *b; +#endif + MIN_HEAP(struct btree_iter_set, btree_iter_heap) heap; +}; + #define MAX_BSETS 4U =20 struct bset_tree { @@ -187,8 +200,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, @@ -258,6 +272,14 @@ static inline unsigned int bset_sector_offset(struct b= tree_keys *b, return bset_byte_offset(b, i) >> 9; } =20 +static inline void btree_iter_swap(void *iter1, void *iter2, void *args) +{ + struct btree_iter_set *_iter1 =3D iter1; + struct btree_iter_set *_iter2 =3D iter2; + + swap(*_iter1, *_iter2); +} + #define __set_bytes(i, k) (sizeof(*(i)) + (k) * sizeof(uint64_t)) #define set_bytes(i) __set_bytes(i, i->keys) =20 @@ -312,18 +334,6 @@ enum { BTREE_INSERT_STATUS_FRONT_MERGE, }; =20 -/* Btree key iteration */ - -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[MAX_BSETS]; -}; - typedef bool (*ptr_filter_fn)(struct btree_keys *b, const struct bkey *k); =20 struct bkey *bch_btree_iter_next(struct btree_iter *iter); diff --git a/drivers/md/bcache/btree.c b/drivers/md/bcache/btree.c index 196cdacce38f..e7333a8c4819 100644 --- a/drivers/md/bcache/btree.c +++ b/drivers/md/bcache/btree.c @@ -157,8 +157,8 @@ void bch_btree_node_read_done(struct btree *b) * 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.heap.size =3D b->c->cache->sb.bucket_size / b->c->cache->sb.bl= ock_size; + iter->heap.heap.nr =3D 0; =20 #ifdef CONFIG_BCACHE_DEBUG iter->b =3D &b->keys; @@ -1311,6 +1311,9 @@ static bool btree_gc_mark_node(struct btree *b, struc= t gc_stat *gc) struct bkey *k; struct btree_iter iter; struct bset_tree *t; + struct btree_iter_set data[MAX_BSETS]; + + iter.heap.heap.data =3D data; =20 gc->nodes++; =20 @@ -1572,6 +1575,9 @@ static unsigned int btree_gc_count_keys(struct btree = *b) struct bkey *k; struct btree_iter iter; unsigned int ret =3D 0; + struct btree_iter_set data[MAX_BSETS]; + + iter.heap.heap.data =3D data; =20 for_each_key_filter(&b->keys, k, &iter, bch_ptr_bad) ret +=3D bkey_u64s(k); @@ -1614,6 +1620,9 @@ static int btree_gc_recurse(struct btree *b, struct b= tree_op *op, struct btree_iter iter; struct gc_merge_info r[GC_MERGE_NODES]; struct gc_merge_info *i, *last =3D r + ARRAY_SIZE(r) - 1; + struct btree_iter_set data[MAX_BSETS]; + + iter.heap.heap.data =3D data; =20 bch_btree_iter_init(&b->keys, &iter, &b->c->gc_done); =20 @@ -1912,6 +1921,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 iter; + struct btree_iter_set data[MAX_BSETS]; + + iter.heap.heap.data =3D data; =20 for_each_key_filter(&b->keys, k, &iter, bch_ptr_invalid) bch_initial_mark_key(b->c, b->level, k); @@ -1953,7 +1965,9 @@ static int bch_btree_check_thread(void *arg) struct btree_iter iter; struct bkey *k, *p; int cur_idx, prev_idx, skip_nr; + struct btree_iter_set data[MAX_BSETS]; =20 + iter.heap.heap.data =3D data; k =3D p =3D NULL; cur_idx =3D prev_idx =3D 0; ret =3D 0; @@ -2053,6 +2067,9 @@ int bch_btree_check(struct cache_set *c) struct bkey *k =3D NULL; struct btree_iter iter; struct btree_check_state check_state; + struct btree_iter_set data[MAX_BSETS]; + + iter.heap.heap.data =3D data; =20 /* check and mark root node keys */ for_each_key_filter(&c->root->keys, k, &iter, bch_ptr_invalid) @@ -2548,6 +2565,9 @@ static int bch_btree_map_nodes_recurse(struct btree *= b, struct btree_op *op, if (b->level) { struct bkey *k; struct btree_iter iter; + struct btree_iter_set data[MAX_BSETS]; + + iter.heap.heap.data =3D data; =20 bch_btree_iter_init(&b->keys, &iter, from); =20 @@ -2581,6 +2601,9 @@ int bch_btree_map_keys_recurse(struct btree *b, struc= t btree_op *op, int ret =3D MAP_CONTINUE; struct bkey *k; struct btree_iter iter; + struct btree_iter_set data[MAX_BSETS]; + + iter.heap.heap.data =3D data; =20 bch_btree_iter_init(&b->keys, &iter, from); =20 diff --git a/drivers/md/bcache/extents.c b/drivers/md/bcache/extents.c index d626ffcbecb9..ee6057558d4b 100644 --- a/drivers/md/bcache/extents.c +++ b/drivers/md/bcache/extents.c @@ -32,16 +32,19 @@ 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]; + if (i->k =3D=3D i->end) { + struct btree_iter_set *data =3D iter->heap.heap.data; + *i =3D data[--iter->heap.heap.nr]; + } } =20 -static bool bch_key_sort_cmp(struct btree_iter_set l, - struct btree_iter_set r) +static bool 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) @@ -255,22 +258,29 @@ 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 bch_extent_sort_cmp(const void *l, const void *r, void *args) { - int64_t c =3D bkey_cmp(&START_KEY(l.k), &START_KEY(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(&START_KEY(_l->k), &START_KEY(_r->k)); =20 - return c ? c > 0 : l.k < r.k; + return !(c ? c > 0 : _l->k < _r->k); } =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; + const struct min_heap_callbacks callbacks =3D { + .less =3D bch_extent_sort_cmp, + .swp =3D btree_iter_swap, + }; + + while (iter->heap.heap.nr > 1) { + struct btree_iter_set *top =3D min_heap_peek(&iter->heap), *i =3D top + = 1; =20 - if (iter->used > 2 && - bch_extent_sort_cmp(i[0], i[1])) + if (iter->heap.heap.nr > 2 && + !bch_extent_sort_cmp(&i[0], &i[1], NULL)) i++; =20 if (bkey_cmp(top->k, &START_KEY(i->k)) <=3D 0) @@ -278,7 +288,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_heapify(&iter->heap, i - top, &callbacks, NULL); continue; } =20 @@ -288,7 +298,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_heapify(&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 +308,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_heapify(&iter->heap, 0, &callbacks, NULL); =20 return tmp; } else { diff --git a/drivers/md/bcache/movinggc.c b/drivers/md/bcache/movinggc.c index ebd500bdf0b2..9f8aaf0845dc 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 bucket_cmp(const void *l, const void *r, void *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 bucket_swap(void *l, void *r, void *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)) ? 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 bucket_cmp, + .swp =3D 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.heap.nr =3D 0; =20 for_each_bucket(b, ca) { if (GC_MARK(b) =3D=3D GC_MARK_METADATA || @@ -218,25 +233,28 @@ 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 (!bucket_cmp(b, min_heap_peek(&ca->heap), NULL)) { 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_peek(&ca->heap) =3D b; + min_heapify(&ca->heap, 0, &callbacks, NULL); } } =20 while (sectors_to_move > reserve_sectors) { - heap_pop(&ca->heap, b, bucket_cmp); + b =3D *min_heap_peek(&ca->heap); + 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 ((b =3D *min_heap_peek(&ca->heap))) { + 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 330bcd9ea4a9..1c6aeeff2cc3 100644 --- a/drivers/md/bcache/super.c +++ b/drivers/md/bcache/super.c @@ -2193,6 +2193,22 @@ static const char *register_cache_set(struct cache *= ca) return err; } =20 +static inline bool init_heap(struct heap *heap, size_t size, gfp_t gfp) +{ + size_t bytes =3D size * sizeof(struct bucket *); + void *data =3D kvmalloc(bytes, (gfp) & GFP_KERNEL); + + min_heap_init(heap, data, size); + + return data; +} + +static inline void free_heap(struct heap *heap) +{ + kvfree(heap->heap.data); + heap->heap.data =3D NULL; +} + /* Cache device */ =20 /* When ca->kobj released */ diff --git a/drivers/md/bcache/sysfs.c b/drivers/md/bcache/sysfs.c index 6956beb55326..eac2039c2cad 100644 --- a/drivers/md/bcache/sysfs.c +++ b/drivers/md/bcache/sysfs.c @@ -661,6 +661,9 @@ static unsigned int bch_root_usage(struct cache_set *c) struct bkey *k; struct btree *b; struct btree_iter iter; + struct btree_iter_set data[MAX_BSETS]; + + iter.heap.heap.data =3D data; =20 goto lock_root; =20 diff --git a/drivers/md/bcache/util.h b/drivers/md/bcache/util.h index f61ab1bada6c..fa928d1d327a 100644 --- a/drivers/md/bcache/util.h +++ b/drivers/md/bcache/util.h @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include @@ -30,86 +31,6 @@ 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)->size =3D (_size); \ - _bytes =3D (heap)->size * sizeof(*(heap)->data); \ - (heap)->data =3D kvmalloc(_bytes, (gfp) & GFP_KERNEL); \ - (heap)->data; \ -}) - -#define free_heap(heap) \ -do { \ - kvfree((heap)->data); \ - (heap)->data =3D NULL; \ -} while (0) - -#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; \ --=20 2.34.1 From nobody Mon Feb 9 13:01:23 2026 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (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 C2D285FBA8; Tue, 19 Mar 2024 18:01:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710871268; cv=none; b=KLu3gNQTG24cy8Mh3GpwYSSD1FeJ0rZjpLU7hLm9BX3pJWeftpWSOzxIyjMSgJayZqaurxvMLNrqqv1lfTxF0mC7b1K/C+37w7cRUKecIm8JQAu39E1/uFOGzeoktZ2nhR1N8GDlHzCNTw3Scx6C6m9CNUg3VpLdmIpFUU3S1pc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710871268; c=relaxed/simple; bh=DaiE46aVxWHt/auXpAOLOuGHx89UIZWSzrLRvoly4ig=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=tkc+HF6oD2OYfrAxd4j26QLOHdlWXpK4xCk+ybt2VJvf+FaODEFrMIeO9EiGUz5e6nqvoyOZqZFLbUVxd2EHwHZP3I5SuReC/EqFaQ0tKgLtTyHAKo2Aa1Ra2WL9jIKm1O/I2xnsdgKNERyeZeivBW1mWf+KYVO7biA16iYwoOU= 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=Vm5+tbWb; arc=none smtp.client-ip=209.85.214.176 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="Vm5+tbWb" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-1dee6672526so5309275ad.1; Tue, 19 Mar 2024 11:01:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710871266; x=1711476066; 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=JIhnZ2ZNiWUepm6TjWG9gskFjBN2pbtB8loOlyqrj3U=; b=Vm5+tbWbVIQ4W71mvXYphVzNIWVtixlWtrO0kOwFGDncmn8Wd92DvmvTr1aF5LHV0N i1oL8qXAsitgCyZgesDT6Hp5Jte8uRVUTPnHcZTxBAaJKqz0ymD7MN3X9kOjQGEBiJ2d 3Vu3StrUXSQWaZkg/7trhBVrbT6Fdp6hueWCnA4a3fgfzmUi7nKTviAbVMNMvZG1SFGK xC2ZE/LrrMiRABeOxC8kWnOlU9ibwXHVlTBLXWm6gRCBzASDXkW5lxXLo9Xw/E5c6m3U UhPLuZu5mNHxLMsjpYWiIXZOeGktj4OydNT+7kW7y580/KMHyt1m6wJnjdKiEF9+wBRb dQWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710871266; x=1711476066; 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=JIhnZ2ZNiWUepm6TjWG9gskFjBN2pbtB8loOlyqrj3U=; b=BvNzRKr7JgTzVdMTFzx65rt5OSmL+/VP/MWSBwE8UWTL/9I9JZTKb18qXsdL4EaUnb UJuxwk84HxlYYxvScbdXkDVTRjgL6RRaBHN93dzSPdeM+8O/yyEGpl+6ciEXoaew9U7f lzJrtCwx4iIaeq0bDAiSDnvbeQpibW2gGc5EiPovPiLz8QE/p4+5Aj3rK3GLzsLk73Hm w6mVNaTdLs3rGqdKMIUSb//hEPS9KqKtvx1g3ONb04lpVfNxnXTuvbJ/os9nw4ZHuVNz Lmwrz9UiyqXLkeTx5QLAGIMF4oAB6slus3IUN3xJgQTJ7cOkRqjodoDzq+mpVMY/ZdBU 99LA== X-Forwarded-Encrypted: i=1; AJvYcCWc0rUxn4N7KjNobZloTRm8T8PN1mwPMK9kNvAPX66tznMmosBWszfAp9vYuQuzsoW32s5rVNRGG1paIP/6kgEik8fai7mm4qoiGwengJnvbVcmZLK1LnlcsYJmcH4Q+Q+O2tjQH3m7FrRvhVwqZPFaHrwLck8ZgMZhLIhmcHRAUCjLQ7b1iIIStdKWXKCp2+q4HbeAOntODS1KN6w2WyVbcaXOubn7nz7xPE2+ X-Gm-Message-State: AOJu0Yw0HMUMiaFL5Nxyn3mAnd9xPmbilnc4tyS1xB8NFllk3Qnicf3X N/LiGSBGAQPav2TmHia3IPqLSrny3YNy9EzpMYnN5vmvjWU56xID X-Google-Smtp-Source: AGHT+IG0Z0ZjYaV7oFCEX12jN1Clo3Wx+9dfnihvM1D8PQqVB+cVf/xolig1GQ3Nnap/p/L4r1uyiw== X-Received: by 2002:a17:902:ce91:b0:1dc:df03:ad86 with SMTP id f17-20020a170902ce9100b001dcdf03ad86mr17605167plg.2.1710871266314; Tue, 19 Mar 2024 11:01:06 -0700 (PDT) Received: from visitorckw-System-Product-Name.. ([140.113.216.168]) by smtp.gmail.com with ESMTPSA id u16-20020a17090341d000b001dd3bee3cd6sm5531359ple.219.2024.03.19.11.01.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Mar 2024 11:01:05 -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, jserv@ccns.ncku.edu.tw, linux-bcache@vger.kernel.org, dm-devel@lists.linux.dev, linux-bcachefs@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Kuan-Wei Chiu Subject: [PATCH 11/13] lib min_heap: Add min_heap_del() Date: Wed, 20 Mar 2024 02:00:03 +0800 Message-Id: <20240319180005.246930-12-visitorckw@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240319180005.246930-1-visitorckw@gmail.com> References: <20240319180005.246930-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 154ac2102114..ce085137fce7 100644 --- a/include/linux/min_heap.h +++ b/include/linux/min_heap.h @@ -199,4 +199,28 @@ bool __min_heap_push(struct __min_heap *heap, const vo= id *element, size_t elem_s #define min_heap_push(_heap, _element, _func, _args) \ __min_heap_push(&(_heap)->heap, _element, __minheap_obj_size(_heap), _fun= c, _args) =20 +/* Remove ith element from the heap, O(log2(nr)). */ +static __always_inline +bool __min_heap_del(struct __min_heap *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; + memcpy(data, data + (heap->nr * elem_size), elem_size); + __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(&(_heap)->heap, __minheap_obj_size(_heap), _idx, _func, _a= rgs) + #endif /* _LINUX_MIN_HEAP_H */ --=20 2.34.1 From nobody Mon Feb 9 13:01:23 2026 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) (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 193385FF0C; Tue, 19 Mar 2024 18:01:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710871273; cv=none; b=uvbfiXWQXkG7ljnZd+R9QHT3n3nfU9pVW+HKKQtoeQIEeO57WRcXRJovHl8DnG/md8EoKDuvOtUrShidFtCsvSIwSJeWitrIR85SO0uEpCioNqdTK29CbSA8DJBzpiCsASKpGV5aCYGMR5XCO2cHj38M4oDHwfjdg67BnNU7Uh8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710871273; c=relaxed/simple; bh=zN440LBYznGYuwtfOCQ791ERSZb6vpOQUzA6Ge0oSZQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=dvdeeHvf06WXDKkmEszRcr75Sh9zc8nNSmdjdZAxnOwqVLt06Hx2abJn0CHzTG+DexcOMR2XYv9eVUCBTnPMxcEEyhlLS8uoQCjx2D6bPacWGz0DDklMHaF7KkfdgHApwl6RrL2bzITAiwUevtZmhbzUuz/DT59/DdINA0IBwkw= 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=T0BZ5/DP; arc=none smtp.client-ip=209.85.214.180 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="T0BZ5/DP" Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-1def81ee762so8054205ad.0; Tue, 19 Mar 2024 11:01:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710871271; x=1711476071; 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=EpLdHE6T1HFPzXRXZUEmHqfSXSlfR4maqjXPuXkrLoU=; b=T0BZ5/DPV51IZc+InZPeOzUyhrZu5sH4Audvl0rVoJQ4jfG2z+F5s4FfjRhLmofB+t Nk2ApwBRy1eG69PAWUSVfyJdWp2Gal2dsZFkwD81T+LysrRa9CcllJNwM48C2lSHNYl1 F3BBqzCWQDt6jRX7Vk7+uQNJzrS5c1mwpf/yukqUOhJDF5zuwRo6iludjwfY1Wn7DSbk GxEoMS8ao9+KIPv9R8r7mH3ivj19IWWiI77K3OmSO9/OjpuagS9+SzfXUy161ESoNaBZ mFexFvrbBXlshRG21pef94HbcyEK3kxUu7f7JnEpDK2nt0lMjvrlG0ne8A3faykft+1J NtaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710871271; x=1711476071; 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=EpLdHE6T1HFPzXRXZUEmHqfSXSlfR4maqjXPuXkrLoU=; b=oc4/9goF1Gbtb1nLoot5EsD16QzxT1nofXEjuegIZmVPp7OTCTsQzwHPeshaS2c4RM m+sU/1I5cgQEnwUFxsl8tDcbLN3LQ2anOeq/7W5o34e4fAqX2rNpgy+KLhjmaXZQqnAn PY9erin6+gi4sE+FISpmkS9SfR3+pC0yevpyhvsiSN3wyIRZobM7ZBY1INUM9nPTcGYm jtNksfdMr4J/JtTyPtFHoYcSfia8Hn/n40aaqOMpHeuWQrO1aB7nBDzaM+oFC3u0WYwR mAxRKao6woRVb6MVGUATEXVTg1C46Lg5H3KFIDSSBknU7RexVuNwDsvDnADjY7c1WknS Fezg== X-Forwarded-Encrypted: i=1; AJvYcCWIUOrBm3r/boydDo3mm78qjQSgempEudYnMNNucugbSjmgvXOHvCmHLZ3X6Qeyhv/QFugtyN9oL9v+Btzsq2tQyLDrme/sXOQWY5OwScilYU4akZBwwjKMywSwAtz9CMmo+sTi3Nddj+RueTURYHbKDtoTrjSZAVoaz9oENEVI4/IOy7IoNak3pa4PE4YWDzTfBG80Y00Wic0hnEHmIjnwYzxJPWr78/j+jorg X-Gm-Message-State: AOJu0YzRrlr+mD2ZenRRF4hZovC6bXnjTGMTlj0LX1IKQUDnWSht588K Uq0GwjE82jgIdJQIZZfVQzN6KZKZquHtdxor3DWSYhr5Gp/ZMPvC X-Google-Smtp-Source: AGHT+IGw1tSDvoLNGEGY0M0BpGhYAxmYXXUZM6IM61Eb1OllvzIJtHYB3YwGJRIcRAUGbxId1L1ZfA== X-Received: by 2002:a17:902:ec8e:b0:1db:ce31:96b1 with SMTP id x14-20020a170902ec8e00b001dbce3196b1mr3201058plg.6.1710871270937; Tue, 19 Mar 2024 11:01:10 -0700 (PDT) Received: from visitorckw-System-Product-Name.. ([140.113.216.168]) by smtp.gmail.com with ESMTPSA id u16-20020a17090341d000b001dd3bee3cd6sm5531359ple.219.2024.03.19.11.01.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Mar 2024 11:01:10 -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, jserv@ccns.ncku.edu.tw, linux-bcache@vger.kernel.org, dm-devel@lists.linux.dev, linux-bcachefs@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Kuan-Wei Chiu Subject: [PATCH 12/13] lib min_heap: Add min_heap_sift_up() Date: Wed, 20 Mar 2024 02:00:04 +0800 Message-Id: <20240319180005.246930-13-visitorckw@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240319180005.246930-1-visitorckw@gmail.com> References: <20240319180005.246930-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 --- 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 ce085137fce7..586965977104 100644 --- a/include/linux/min_heap.h +++ b/include/linux/min_heap.h @@ -199,6 +199,26 @@ bool __min_heap_push(struct __min_heap *heap, const vo= id *element, size_t elem_s #define min_heap_push(_heap, _element, _func, _args) \ __min_heap_push(&(_heap)->heap, _element, __minheap_obj_size(_heap), _fun= c, _args) =20 +/* Sift up ith element from the heap, O(log2(nr)). */ +static __always_inline +void __min_heap_sift_up(struct __min_heap *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(&(_heap)->heap, __minheap_obj_size(_heap), _idx, _func= , _args) + /* Remove ith element from the heap, O(log2(nr)). */ static __always_inline bool __min_heap_del(struct __min_heap *heap, size_t elem_size, size_t idx, --=20 2.34.1 From nobody Mon Feb 9 13:01:23 2026 Received: from mail-pg1-f181.google.com (mail-pg1-f181.google.com [209.85.215.181]) (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 00A62604C6; Tue, 19 Mar 2024 18:01:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710871278; cv=none; b=jMaM/sy/hRgBwnaFtgMcs2psjoJx5w5o5PvMWVmVA68iYqBDKO6sTKB2N923SChs4Q2JjAuQTZBrXes0iYkxg41JLc3TKtOefdpIOzev5Bzz906BP8DwnbQIrYQ4Qyb2CGn2/wHq3QEcTX43dOHEXCWMjb/RWUle4JDk4ztyShE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710871278; c=relaxed/simple; bh=+yEiZ43RB1kHULxTTuB/64NK5y0o51aXqEIqAtlaiH4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=uSXUJkM/WL6eIWBYCgaF7Qv5Xpb9xKBTUP81BfpZOISrMxLiV5Hf/mFRXGP7TTYSYopZpi6+4CkF1WBdgVu1s/b4g4sdJAfBFABv5FDfTcm+tasi67vu3HxIa7/4bBgX4kTKQwZDrjA4SK3rWjxiVE6vwa3VUnUCX2J9Xc8BIIs= 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=i30JLY0f; arc=none smtp.client-ip=209.85.215.181 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="i30JLY0f" Received: by mail-pg1-f181.google.com with SMTP id 41be03b00d2f7-5cfcf509fbdso831062a12.1; Tue, 19 Mar 2024 11:01:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710871276; x=1711476076; 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=hU4FK6Bj2mTXqR3yAD+6lLX+CSXCbIHfMQPQKJ2HSxw=; b=i30JLY0fMi+tIwqkxU6vnPXrDEkaGgn9cbEHx3HufEcHoxzpdVIvRWH6VJJSIou1aT li9eVxDTTZjrK5TgYHUxgCaEa92m5a1W9eFRHjP12VEml7cBhOqRl7/S523DsZiDYcoM BqMqWkJnn7T0O2f1Ox7FzFIZ/WF1LZ96VIRlRtxl9xwhCuh0bg0zqFhsJ0IFBgkH4Qss NhaK5M7vyWbTkVYgYr3sP5SN8Z0ymu8qUcCi9Xvu0Lz0f+ecUm4RwfzmgcxVAb/n+5iy JvM5lqo8RirRJZkX3ItZRsN7Rn0wbo+H4uFVTCvvZgB4CKEpb12OYqL9Yu4msYHv5POG +ekw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710871276; x=1711476076; 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=hU4FK6Bj2mTXqR3yAD+6lLX+CSXCbIHfMQPQKJ2HSxw=; b=ZIaiAEE61Z4RlwZVJou62yt4zjdh4wJA58BDspfDQuJUpQgJVY2mmkkzUZ9FKONbt7 t+0NJ6T3EKmuseXwkQn8n8uq0kfm+l7oxUNGabjAc/9c4ISVsT4opQY4GVQCXODJGJRB 8ptoJU0s010ignlX2DHerSRXLohE8hkzRBHlexzy8+ep+Q3OYVS+k3cTl1RFs2aJs57/ dTrpwj1N3luUHOPLJf7qimN2AGpYoe8a+g3wcKHvOHAFUIAG+cRVDoYi9YxAvgw0zTxx laNRQ2AnhXbGUZ+2TBvuWdIddwxPrA7QDnu4f3s6X2oezF2hMBC/jOENkG+BgYH4rp3z F1lg== X-Forwarded-Encrypted: i=1; AJvYcCUrgVNhiV2Drqn/6BtS1jEMCRYLdy6Bmx1EaUFUdHGRXJOZiDj7nwK5GPv1cKCp5DDGIWe1c/Bu410TIvsHAKQZ4X+oxDG7Au5ojJR2g+INKxD7uVRy3bHiikS6EXphG/aaXRFVMoOAmg3HDGpxQLmExu+Wca1KUTTnY20EVGjhLA6Pw2Zzlt3V4gwy9mM6k7qAYCD7EkNgTZBok0l7QUnJ9ql20N4ZAc0W7ENf X-Gm-Message-State: AOJu0Yzh/l5cfT9ipdgJuifb2pt27PgTZ95MyiHJrcrhQYjZhpt9jVTe 0who3fmbwzT9G0h0mbm3CvZ1iPxkH6bm/J/d2uptPrkNf0tl4uEB X-Google-Smtp-Source: AGHT+IF5MYW1/my3A16x1xiJ2X9onBhMDXT1Q1JNKBukA3ROQE+f0XhQUeEXgXWNWSqq/75VhaWycw== X-Received: by 2002:a17:903:244e:b0:1dd:7350:29f6 with SMTP id l14-20020a170903244e00b001dd735029f6mr3131478pls.3.1710871275782; Tue, 19 Mar 2024 11:01:15 -0700 (PDT) Received: from visitorckw-System-Product-Name.. ([140.113.216.168]) by smtp.gmail.com with ESMTPSA id u16-20020a17090341d000b001dd3bee3cd6sm5531359ple.219.2024.03.19.11.01.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Mar 2024 11:01:15 -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, jserv@ccns.ncku.edu.tw, linux-bcache@vger.kernel.org, dm-devel@lists.linux.dev, linux-bcachefs@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Kuan-Wei Chiu Subject: [PATCH 13/13] bcachefs: Remove heap-related macros and switch to generic min_heap Date: Wed, 20 Mar 2024 02:00:05 +0800 Message-Id: <20240319180005.246930-14-visitorckw@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240319180005.246930-1-visitorckw@gmail.com> References: <20240319180005.246930-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 replaces them with the generic min_heap implementation from include/linux. This change improves code readability by using functions instead of macros. Link: https://lkml.kernel.org/ioyfizrzq7w7mjrqcadtzsfgpuntowtjdw5pgn4qhvsdp= 4mqqg@nrlek5vmisbu Signed-off-by: Kuan-Wei Chiu --- fs/bcachefs/clock.c | 53 +++++++++++----- fs/bcachefs/clock_types.h | 2 +- fs/bcachefs/ec.c | 99 ++++++++++++++++++----------- fs/bcachefs/ec_types.h | 2 +- fs/bcachefs/util.h | 127 +++----------------------------------- 5 files changed, 109 insertions(+), 174 deletions(-) diff --git a/fs/bcachefs/clock.c b/fs/bcachefs/clock.c index 363644451106..7a7d13f7a629 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 *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 >=3D _r->expire; +} + +static inline void io_timer_swp(void *l, void *r, void *args) +{ + 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++) - if (clock->timers.data[i] =3D=3D timer) + for (i =3D 0; i < clock->timers.heap.nr; i++) + if (min_heap_peek(&clock->timers)[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++) - if (clock->timers.data[i] =3D=3D timer) { - heap_del(&clock->timers, i, io_timer_cmp, NULL); + for (i =3D 0; i < clock->timers.heap.nr; i++) + if (min_heap_peek(&clock->timers)[i] =3D=3D timer) { + min_heap_pop(&clock->timers, &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 && - time_after_eq(now, clock->timers.data[0]->expire)) - heap_pop(&clock->timers, ret, io_timer_cmp, NULL); + if (clock->timers.heap.nr && + time_after_eq(now, min_heap_peek(&clock->timers)[0]->expire)) + min_heap_pop(&clock->timers, &callbacks, NULL); =20 spin_unlock(&clock->timer_lock); =20 @@ -161,10 +182,10 @@ void bch2_io_timers_to_text(struct printbuf *out, str= uct 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.heap.nr; i++) prt_printf(out, "%ps:\t%li\n", - clock->timers.data[i]->fn, - clock->timers.data[i]->expire - now); + min_heap_peek(&clock->timers)[i]->fn, + min_heap_peek(&clock->timers)[i]->expire - now); spin_unlock(&clock->timer_lock); --out->atomic; } diff --git a/fs/bcachefs/clock_types.h b/fs/bcachefs/clock_types.h index 5fae0012d808..b02b24b9d74f 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 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 b98e2c2b8bf0..7b6a31237503 100644 --- a/fs/bcachefs/ec.c +++ b/fs/bcachefs/ec.c @@ -860,14 +860,14 @@ static int __ec_stripe_mem_alloc(struct bch_fs *c, si= ze_t idx, gfp_t gfp) { ec_stripes_heap n, *h =3D &c->ec_stripes_heap; =20 - if (idx >=3D h->size) { + if (idx >=3D h->heap.size) { if (!init_heap(&n, max(1024UL, roundup_pow_of_two(idx + 1)), gfp)) return -BCH_ERR_ENOMEM_ec_stripe_mem_alloc; =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; + if (n.heap.size > h->heap.size) { + memcpy(min_heap_peek(&n), min_heap_peek(h), h->heap.nr * sizeof(*min_he= ap_peek(h))); + n.heap.nr =3D h->heap.nr; swap(*h, n); } mutex_unlock(&c->ec_stripes_heap_lock); @@ -958,20 +958,21 @@ static u64 stripe_idx_to_delete(struct bch_fs *c) =20 lockdep_assert_held(&c->ec_stripes_heap_lock); =20 - if (h->used && - h->data[0].blocks_nonempty =3D=3D 0 && - !bch2_stripe_is_open(c, h->data[0].idx)) - return h->data[0].idx; + if (h->heap.nr && + min_heap_peek(h)->blocks_nonempty =3D=3D 0 && + !bch2_stripe_is_open(c, min_heap_peek(h)->idx)) + return min_heap_peek(h)->idx; =20 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) +static inline bool ec_stripes_heap_cmp(const void *l, const void *r, void = *args) { - return ((l.blocks_nonempty > r.blocks_nonempty) - - (l.blocks_nonempty < r.blocks_nonempty)); + 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) >=3D + (_l->blocks_nonempty < _r->blocks_nonempty)); } =20 static inline void ec_stripes_heap_set_backpointer(ec_stripes_heap *h, @@ -979,7 +980,21 @@ static inline void ec_stripes_heap_set_backpointer(ec_= stripes_heap *h, { struct bch_fs *c =3D container_of(h, struct bch_fs, ec_stripes_heap); =20 - genradix_ptr(&c->stripes, h->data[i].idx)->heap_idx =3D i; + genradix_ptr(&c->stripes, min_heap_peek(h)[i].idx)->heap_idx =3D i; +} + +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 - min_heap_peek(_h); + size_t j =3D _r - min_heap_peek(_h); + + ec_stripes_heap_set_backpointer(_h, i); + ec_stripes_heap_set_backpointer(_h, j); + + swap(*_l, *_r); } =20 static void heap_verify_backpointer(struct bch_fs *c, size_t idx) @@ -987,34 +1002,43 @@ 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(h->data[m->heap_idx].idx !=3D idx); + BUG_ON(m->heap_idx >=3D h->heap.nr); + BUG_ON(min_heap_peek(h)[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.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); @@ -1026,17 +1050,20 @@ void bch2_stripes_heap_update(struct bch_fs *c, ec_stripes_heap *h =3D &c->ec_stripes_heap; bool do_deletes; size_t i; + const struct min_heap_callbacks callbacks =3D { + .less =3D ec_stripes_heap_cmp, + .swp =3D ec_stripes_heap_swap, + }; =20 mutex_lock(&c->ec_stripes_heap_lock); heap_verify_backpointer(c, idx); =20 - h->data[m->heap_idx].blocks_nonempty =3D m->blocks_nonempty; + min_heap_peek(h)[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_heapify(h, i, &callbacks, &c->ec_stripes_heap); =20 heap_verify_backpointer(c, idx); =20 @@ -1828,12 +1855,12 @@ 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->heap.nr; heap_idx++) { /* No blocks worth reusing, stripe will just be deleted: */ - if (!h->data[heap_idx].blocks_nonempty) + if (!min_heap_peek(h)[heap_idx].blocks_nonempty) continue; =20 - stripe_idx =3D h->data[heap_idx].idx; + stripe_idx =3D min_heap_peek(h)[heap_idx].idx; =20 m =3D genradix_ptr(&c->stripes, stripe_idx); =20 @@ -2159,14 +2186,14 @@ 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++) { - m =3D genradix_ptr(&c->stripes, h->data[i].idx); + for (i =3D 0; i < min_t(size_t, h->heap.nr, 50); i++) { + m =3D genradix_ptr(&c->stripes, min_heap_peek(h)[i].idx); =20 - prt_printf(out, "%zu %u/%u+%u", h->data[i].idx, - h->data[i].blocks_nonempty, + prt_printf(out, "%zu %u/%u+%u", min_heap_peek(h)[i].idx, + min_heap_peek(h)[i].blocks_nonempty, m->nr_blocks - m->nr_redundant, m->nr_redundant); - if (bch2_stripe_is_open(c, h->data[i].idx)) + if (bch2_stripe_is_open(c, min_heap_peek(h)[i].idx)) prt_str(out, " open"); prt_newline(out); } diff --git a/fs/bcachefs/ec_types.h b/fs/bcachefs/ec_types.h index 976426da3a12..2ed67431a81c 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 MIN_HEAP(struct ec_stripe_heap_entry, ec_stripes_heap) ec_stripes_= heap; =20 #endif /* _BCACHEFS_EC_TYPES_H */ diff --git a/fs/bcachefs/util.h b/fs/bcachefs/util.h index 7ffbddb80400..c599dc5276ac 100644 --- a/fs/bcachefs/util.h +++ b/fs/bcachefs/util.h @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -54,134 +55,20 @@ 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)->size =3D (_size); \ - (heap)->data =3D kvmalloc((heap)->size * sizeof((heap)->data[0]),\ - (gfp)); \ -}) - -#define free_heap(heap) \ -do { \ - kvfree((heap)->data); \ - (heap)->data =3D NULL; \ -} while (0) - -#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; \ + void *data =3D kvmalloc(_size * sizeof(*min_heap_peek(heap)), (gfp));\ + min_heap_init(heap, data, _size); \ + min_heap_peek(heap); \ }) =20 -#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) =20 -#define heap_del(h, i, cmp, set_backpointer) \ +#define free_heap(_heap) \ 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); \ - } \ + kvfree((_heap)->heap.data); \ + (_heap)->heap.data =3D NULL; \ } while (0) =20 -#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) =20 #define ANYSINT_MAX(t) \ ((((t) 1 << (sizeof(t) * 8 - 2)) - (t) 1) * (t) 2 + (t) 1) --=20 2.34.1