From nobody Wed Dec 17 19:37:26 2025 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 08DE142AA5 for ; Sat, 15 Feb 2025 16:56:25 +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=1739638587; cv=none; b=upoSGyz0mUrkb7ysVHu5Ibkts4FNl/6Ee17Lm5DHcN+z69gPfGApca7iArF2XI333lRIdikeFdqjw+BOLu7PGibYc4ZiA4ZYEDlxwUVaVSYn6XDJT582FgcLLQFfAcXUW6K6pcJNWwJoB/JxptuDuDoyfhxoC9zciYLZBraj3DE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739638587; c=relaxed/simple; bh=4GhenkbDKrBeeQpaac7GCOVjDC5507GawgZwHJpzRtI=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=LbY1zT0pmPsFHYqLEVNSQYS/EDPTqvjFEh9ZAvuld/mMKo4NIYnPjJURr0fHJTc/Aqyc9TT1tZFJdwzmSO6SD9flWATC84pNVow/3S777BTgdJN8knt9bTNmuYlznGfAglNBu7DJIMCNzi0YE0xvxNtUOmWbmR4uWSaO1xAFPTg= 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=nMFtdz/l; 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="nMFtdz/l" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-220c8eb195aso63325605ad.0 for ; Sat, 15 Feb 2025 08:56:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739638585; x=1740243385; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=CinEX6MS0HzyKFLg59Ti4ekQYL3c86s5su+UMLdFpAA=; b=nMFtdz/lZfN2cqpMcaXsmvURbjfkMYtc2eKgB4by/ucK5UQThUT8a4ZtZfI9qNqMTM xMUcwop2TNxXmC8jpJhgCb/CmyCyNeU6FPXer2qcH5goLnSaUdI0NrtQEytjXKmFQ4QY Mjg8+JzC8kJ1+qykQOBqZheFHLRoTlKY6/+qe8GX+I3bHWhA+gPg/JPCHadzNcXccUPp uw2cFWRv6XkCE46eso1d4d7KlrxZQYVGRTkSi1J0YKS3gSBI2oSJa3y7pGNlE9MmJ45Z Ai3xxwZcpjE2j45Ov+06tDcofkuf91HKRSBj2vcrAYByp19A8n4Q2WnrCUm/7iWyvk5P gZkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739638585; x=1740243385; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=CinEX6MS0HzyKFLg59Ti4ekQYL3c86s5su+UMLdFpAA=; b=kWrWZK+5Ai/pPbgdoY2p1LZ7j5oYQtHxPm0eB/enrHmi1QqDIVUv7iNJ+fWJeTLdiG W23VYPx9WDW4Yds7TUeG4jmO7BEsN05jAPo/HkpT3LzcWeXoC/pmeqa3UwfbeDSLaJK5 0B7F+Op363Rr6afA0S7fL8PMXnWWlHBbs9XKjWOoRKOITNRZKobDPt1ZRfxfUAlMb2vA VT3jEY1w2GDm7mcovkRNo6/ihZzD5tGYC5DuMWcsBAu3s74FJweOiPHEo87Rdh8Gah+v jgQTbFqSMzGT79kgsfJsIPOrfsylxbu91HdBsZbhbej7XyVZPvRrNHIgRoNP0REBGwRT fduw== X-Forwarded-Encrypted: i=1; AJvYcCV/jFUshJH1Z4Bde1KUa8ZJu0bCtL8PxV5gPeMw04NuYqml/Xstmq/nwpxQpY/5XJyFvHVnxmmPh/h8ot4=@vger.kernel.org X-Gm-Message-State: AOJu0YykzIXiRJ5dK8rWpLUizfIXG6H0X1GK5vE6XFqlxLH4ntOG1TvD YX6Yb6iF0nZjw/EvzKrTWs7z7XacVLcX9/WI+jPfkwGtTOscittn X-Gm-Gg: ASbGncvFLTrC4tTQQiitplE8C+1nMVlT+KVoJHx13wYxjlnjrgrVgTz1yhRjDZQJ68c tyMIepoXKcSmCJECvb1OHgfgdQYiJE5zEYiAc3d8OUZVIDXOwBVsqKkjTJOj07ukVzXHRch/qCn sDWJqGKzwTWAmWW9BjBbWaCMdIh/GP+uIymeZimmC+1EUwxAKRgEGTylQ1H/v4I+MqAs2776MXp 2VN9qMFVp9Dj81wlE0aj+6tdJCbV9MaJviivu/Y00nrOqkMT74PJwsX740d8ooPMw6osrkPuhFC Gl+bM6oMj+sN9tnRI9UnbdeUZ1yAVUynYlPNBSOWjvYzeQ== X-Google-Smtp-Source: AGHT+IH2P4if7COcGYmP4DezxEUNxcJikr03utpzr8xnuT8+KDr/NnQ904DfCePIlL8VCvYAr1nWZw== X-Received: by 2002:a17:903:1d1:b0:220:d272:534d with SMTP id d9443c01a7336-2210405c6b6mr68438755ad.22.1739638585171; Sat, 15 Feb 2025 08:56:25 -0800 (PST) Received: from visitorckw-System-Product-Name.. ([140.113.216.168]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d536b047sm45926115ad.101.2025.02.15.08.56.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Feb 2025 08:56:24 -0800 (PST) From: Kuan-Wei Chiu To: akpm@linux-foundation.org Cc: jserv@ccns.ncku.edu.tw, eleanor15x@gmail.com, linux-kernel@vger.kernel.org, Kuan-Wei Chiu Subject: [PATCH RESEND] lib min_heap: Use size_t for array size and index variables Date: Sun, 16 Feb 2025 00:56:18 +0800 Message-Id: <20250215165618.1757219-1-visitorckw@gmail.com> X-Mailer: git-send-email 2.34.1 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 the int type with size_t for variables representing array sizes and indices in the min-heap implementation. Using size_t aligns with standard practices for size-related variables and avoids potential issues on platforms where int may be insufficient to represent all valid sizes or indices. Signed-off-by: Kuan-Wei Chiu --- include/linux/min_heap.h | 12 ++++++------ lib/min_heap.c | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/linux/min_heap.h b/include/linux/min_heap.h index 1160bed6579e..79ddc0adbf2b 100644 --- a/include/linux/min_heap.h +++ b/include/linux/min_heap.h @@ -218,7 +218,7 @@ static size_t parent(size_t i, unsigned int lsbit, size= _t size) =20 /* Initialize a min-heap. */ static __always_inline -void __min_heap_init_inline(min_heap_char *heap, void *data, int size) +void __min_heap_init_inline(min_heap_char *heap, void *data, size_t size) { heap->nr =3D 0; heap->size =3D size; @@ -254,7 +254,7 @@ bool __min_heap_full_inline(min_heap_char *heap) =20 /* Sift the element at pos down the heap. */ static __always_inline -void __min_heap_sift_down_inline(min_heap_char *heap, int pos, size_t elem= _size, +void __min_heap_sift_down_inline(min_heap_char *heap, size_t pos, size_t e= lem_size, const struct min_heap_callbacks *func, void *args) { const unsigned long lsbit =3D elem_size & -elem_size; @@ -324,7 +324,7 @@ static __always_inline void __min_heapify_all_inline(min_heap_char *heap, size_t elem_size, const struct min_heap_callbacks *func, void *args) { - int i; + ssize_t i; =20 for (i =3D heap->nr / 2 - 1; i >=3D 0; i--) __min_heap_sift_down_inline(heap, i, elem_size, func, args); @@ -379,7 +379,7 @@ bool __min_heap_push_inline(min_heap_char *heap, const = void *element, size_t ele const struct min_heap_callbacks *func, void *args) { void *data =3D heap->data; - int pos; + size_t pos; =20 if (WARN_ONCE(heap->nr >=3D heap->size, "Pushing on a full heap")) return false; @@ -428,10 +428,10 @@ bool __min_heap_del_inline(min_heap_char *heap, size_= t elem_size, size_t idx, __min_heap_del_inline(container_of(&(_heap)->nr, min_heap_char, nr), \ __minheap_obj_size(_heap), _idx, _func, _args) =20 -void __min_heap_init(min_heap_char *heap, void *data, int size); +void __min_heap_init(min_heap_char *heap, void *data, size_t size); void *__min_heap_peek(struct min_heap_char *heap); bool __min_heap_full(min_heap_char *heap); -void __min_heap_sift_down(min_heap_char *heap, int pos, size_t elem_size, +void __min_heap_sift_down(min_heap_char *heap, size_t pos, size_t elem_siz= e, const struct min_heap_callbacks *func, void *args); void __min_heap_sift_up(min_heap_char *heap, size_t elem_size, size_t idx, const struct min_heap_callbacks *func, void *args); diff --git a/lib/min_heap.c b/lib/min_heap.c index 4485372ff3b1..96f01a4c5fb6 100644 --- a/lib/min_heap.c +++ b/lib/min_heap.c @@ -2,7 +2,7 @@ #include #include =20 -void __min_heap_init(min_heap_char *heap, void *data, int size) +void __min_heap_init(min_heap_char *heap, void *data, size_t size) { __min_heap_init_inline(heap, data, size); } @@ -20,7 +20,7 @@ bool __min_heap_full(min_heap_char *heap) } EXPORT_SYMBOL(__min_heap_full); =20 -void __min_heap_sift_down(min_heap_char *heap, int pos, size_t elem_size, +void __min_heap_sift_down(min_heap_char *heap, size_t pos, size_t elem_siz= e, const struct min_heap_callbacks *func, void *args) { __min_heap_sift_down_inline(heap, pos, elem_size, func, args); --=20 2.34.1