From patchwork Fri Oct 28 01:48:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yury Norov X-Patchwork-Id: 12028 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp559795wru; Thu, 27 Oct 2022 18:50:53 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7piOvyIE2n3goxzAu0y4puJYhTmKWlzGEMmWRfKwTEU7kMp2jeIiEy0BJcqXCy7F+pI90y X-Received: by 2002:a17:902:9a07:b0:178:8024:1393 with SMTP id v7-20020a1709029a0700b0017880241393mr52310672plp.128.1666921842492; Thu, 27 Oct 2022 18:50:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666921842; cv=none; d=google.com; s=arc-20160816; b=o0e4cWEqkr0f/0WbuVp8ucxji9z2RD9jlVj8rzeCx+OxJoXumi6z2cR814FNWESfp8 1kbz9AajsiqMRhoIReMmy/uolO7BwF7kI71ubpj95N+IzOuiqAQAQfjycf1APy5XojKp j5loG302pQjtuidyJl6U55mmaxlAAwysX9vpl0ylcy1sJSxyP9zoVC1mFp3O25R9djQO OrjYuqUwp2fNyI3WQxxnV/r4uCleSZ95jfOF9b9H1r8WdI74CN+79AGFCKDj2yy2XMQz w1SMAecNEyU+0i3TNRo5tBnQ0MP8XvTor3irXYKWN8eZFgsONaIcT/gFUuScH7uyrJXl wW4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=B4DUoigKs4i4MiSm7mPBHdj9bSfZn7HJiVErqHP64bE=; b=wC+mv6/VLEEWtUmmqEpFsWKWRG8tHd9Aefc4A2xk8ryeMFeswkeItF6RHNrBfm4B48 CKRYGAl2yDWI/WNhlVDBZKFSwYnf36s7D7r6wPnwZVQZ6bWtJzfFBOWlGhlJIxXO333L e7Se23imGVTxU3sCCj69RM+lN7SreTIYyyeRNExIyzHL5LhzOam59HQNuRmoaPhuzG2a 8LcGswCSlUHORoZ2jaAILCbIQ4U62RcoPGXl0usX4ODDaoxj9nTZyVpAySCGFP+5uByd HWFxWuTYsPiUoPGbPb761suFkEHaO/+f6CTRb+npgi6atMun/rWLlG1d951qE/Ii6KOb J5fQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=UP9smFtq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p39-20020a056a000a2700b00542f9f272ffsi4446924pfh.18.2022.10.27.18.50.29; Thu, 27 Oct 2022 18:50:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=UP9smFtq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235866AbiJ1BtD (ORCPT + 99 others); Thu, 27 Oct 2022 21:49:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49624 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235808AbiJ1Bsp (ORCPT ); Thu, 27 Oct 2022 21:48:45 -0400 Received: from mail-qk1-x735.google.com (mail-qk1-x735.google.com [IPv6:2607:f8b0:4864:20::735]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 90F58AC2B8 for ; Thu, 27 Oct 2022 18:48:44 -0700 (PDT) Received: by mail-qk1-x735.google.com with SMTP id m6so2609112qkm.4 for ; Thu, 27 Oct 2022 18:48:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=B4DUoigKs4i4MiSm7mPBHdj9bSfZn7HJiVErqHP64bE=; b=UP9smFtqIJjIO979pi3gSZOEWo/rG0oI4HF9M0LEHAkvHp0V+9yCj+EFIWT+WIobvN RfXWB5vQJOGlcZIpP5JRkmeKnkUGDAPNU8TE9KKqlYfpywXW7A4opkitijzTa7Dg7Q6l fRRc7iK57T0KY6v/5JyGUtzB0dVtv54gf9vhTNn0BTQkbUo54qO3ozfQxN+Lqe7a0+me P5/7Q/JRXLtmh2jZ3G+pzxKK4D8uQ56ag8AB6iWUh+hWBZljw85ghQF4Hk+QyWmHrOLk +27V0GcsMkSKqYLgMfpF163SYYnLlGY+BNn/bgGUlSWHdWp510X8wk4rVUCqBj7lFfVw 1POQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=B4DUoigKs4i4MiSm7mPBHdj9bSfZn7HJiVErqHP64bE=; b=4Uhoz6VK+QQ+qUV6HKimQY5bBvOWYP3gEz+jV0gznPm3EGEVCEfg+EI6b2mBTqf3Rn oNFU7Tn4JxTTYpLE1EMAJvfIvsW/SOW3rJezMzDZ1VP6OoKfGCt19qQmWiu1GDPSjvJW VXLpRJp5m4kcgHzOwYPj3oSZmYUXCDy9CBFyFFW7mgk4wzrmouP6qu/HKSrCPadeK99D lln80lMGuBbtEk8Qo5Jxa5gO2rp7CuKqhTSMJaNtDaYIpwxx+VFBnxbqreAX6qHpWvRL 7is7No7sUhhKH3WldUZrbazeNzb9R+h9QDeWJ555ERdp7QyFdBnXgtFH7ablfAkFpU8c 55MQ== X-Gm-Message-State: ACrzQf0Kw2nqktin+WX9p4sv20zZraTJYDqtjdmGxWByo1e4OLqpj4iY qXodrFYDEI0gV4prEGtRe48Z4OIVvhw= X-Received: by 2002:a05:620a:2629:b0:6ee:b2cf:aeb5 with SMTP id z41-20020a05620a262900b006eeb2cfaeb5mr36464857qko.62.1666921723522; Thu, 27 Oct 2022 18:48:43 -0700 (PDT) Received: from localhost ([2601:589:4102:4c7c:d8d0:78d7:ad97:2651]) by smtp.gmail.com with ESMTPSA id l13-20020a05620a28cd00b006f8665f483fsm2120991qkp.85.2022.10.27.18.48.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Oct 2022 18:48:43 -0700 (PDT) From: Yury Norov To: linux-kernel@vger.kernel.org, Andy Shevchenko , Rasmus Villemoes , Yury Norov Subject: [PATCH 5/6] bitmap: fix opencoded bitmap_allocate_region() Date: Thu, 27 Oct 2022 18:48:33 -0700 Message-Id: <20221028014834.572819-6-yury.norov@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221028014834.572819-1-yury.norov@gmail.com> References: <20221028014834.572819-1-yury.norov@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747894238072454269?= X-GMAIL-MSGID: =?utf-8?q?1747894238072454269?= bitmap_find_region() opencodes bitmap_allocate_region(). Fix it. Signed-off-by: Yury Norov --- lib/bitmap.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/bitmap.c b/lib/bitmap.c index 389446b6f248..2a85fe16f3fa 100644 --- a/lib/bitmap.c +++ b/lib/bitmap.c @@ -1315,10 +1315,8 @@ int bitmap_find_free_region(unsigned long *bitmap, unsigned int bits, int order) unsigned int pos, end; /* scans bitmap by regions of size order */ for (pos = 0 ; (end = pos + (1U << order)) <= bits; pos = end) { - if (!bitmap_empty_from(bitmap, pos, pos + BIT(order))) - continue; - bitmap_set(bitmap, pos, pos + BIT(order)); - return pos; + if (!bitmap_allocate_region(bitmap, pos, order)) + return pos; } return -ENOMEM; }