From patchwork Thu Jul 27 15:20:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengming Zhou X-Patchwork-Id: 127042 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a985:0:b0:3e4:2afc:c1 with SMTP id t5csp1206066vqo; Thu, 27 Jul 2023 09:09:11 -0700 (PDT) X-Google-Smtp-Source: APBJJlFIGreBfWNjNSxLV7Gu2V8VVF3UaBUc9W2rQeaWZ7ww7Q9WOS1+nvWgJclWxP9E8rklXRB9 X-Received: by 2002:a17:90b:378d:b0:267:6fd0:bd31 with SMTP id mz13-20020a17090b378d00b002676fd0bd31mr3881457pjb.7.1690474150866; Thu, 27 Jul 2023 09:09:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690474150; cv=none; d=google.com; s=arc-20160816; b=P+lTKvOF9uaAiXYwECOBdbjK8C7fwndffeP4gvAWG2utEwFjqF829M0qwmptV0zdP1 dlHTH9D9vkC3lg5dGcy9u785Sag0oeGOoAyVF+BUOmgS93tOud4GGyKquENNAhXYe2Ef 59mzc7mqoJ3t+3TomLG9UAetb/R9gF9uogU1uefc7xduCqBlJvNKG+t6o83YaDmRNvJW L6AHzt6gt3U1FbmgeyirhlKHq+YdaSOtDHrKDd47nimres0e4LLs9beo58pk6V/wTtup QwX9GadABkBgfnWxT134eh9BO/vPBlKiopyQHENZ9kZ9kKyPh35ulPdhnsIZ3qbBuVUe BIVQ== 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:cc:to:from :dkim-signature; bh=/sKpoCtxUkYnH2WqkRrOBZ45YFGekx6TcrM1LcTi34Y=; fh=CVBJz1nv1DiM00KSAFXpoDdrembP9EJZsKRDNKymLtw=; b=XNi7zbDxqOu+SkgUGMMc2cp1FTq5kQ9nLx5BuH4JGaupcgIXEsifKF8gOjNVHiSas/ g+2Av5dxhISS8lmRmNAA6pyu0G/U8W68S6S06fuueP47uleFoV9r0qrC836avDBmU9mO 7yqb+Bjl6yqN7uxREhqClumcwlbxH+2lGv24TSenJ3OIun2O1wkqNPdg0Q/xd1ivBNMG PiPOKILNlW4ygDkmc1UpCTMEran4EEy28KSQEHlwRP9lo5yaeTn+VsmlNqQhQiROWeLa o3cF5+8kEvxmmyP05UzkMu3xgQA1/Vq8E9c8AoAjadbNxpi9WMPhWP4EtwWgwzmDiSUR Qq8A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=GoAulQGy; 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=NONE dis=NONE) header.from=linux.dev Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id my18-20020a17090b4c9200b0026815fe629esi3214984pjb.70.2023.07.27.09.08.56; Thu, 27 Jul 2023 09:09:10 -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=@linux.dev header.s=key1 header.b=GoAulQGy; 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=NONE dis=NONE) header.from=linux.dev Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234570AbjG0PVt (ORCPT + 99 others); Thu, 27 Jul 2023 11:21:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35534 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233672AbjG0PVr (ORCPT ); Thu, 27 Jul 2023 11:21:47 -0400 Received: from out-94.mta0.migadu.com (out-94.mta0.migadu.com [91.218.175.94]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D83F62D57 for ; Thu, 27 Jul 2023 08:21:41 -0700 (PDT) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1690471299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/sKpoCtxUkYnH2WqkRrOBZ45YFGekx6TcrM1LcTi34Y=; b=GoAulQGyGJtzXSa5IKoRcjIs0s8QPP3zFwnYNiNs+kPVJnExsYqEOYEtlR8fhSpj47xKUw YJMSo28qz6Ff2+WhW4F2MDPA7X0bZeGdSFiNNk7xJAPXm25ysAo4/ta6xcQFVsJP/ROKoX B4SM3TA0HMPPk371Wjn8U3jkybITGKc= From: chengming.zhou@linux.dev To: axboe@kernel.dk, osandov@fb.com, ming.lei@redhat.com, kbusch@kernel.org, krisman@suse.de Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, zhouchengming@bytedance.com Subject: [PATCH v2 2/3] sbitmap: fix strict round-robin non-wrap with hint > 0 Date: Thu, 27 Jul 2023 23:20:19 +0800 Message-ID: <20230727152020.3633009-2-chengming.zhou@linux.dev> In-Reply-To: <20230727152020.3633009-1-chengming.zhou@linux.dev> References: <20230727152020.3633009-1-chengming.zhou@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable 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: INBOX X-GMAIL-THRID: 1772590623183005075 X-GMAIL-MSGID: 1772590623183005075 From: Chengming Zhou If we have alloc_hint > 0 and don't wrap, we need to recheck sb->map[index] with hint == 0 to exhaust the map. For example: we have 8 words to search, index == 4, hint > 0 In sb->map[4] word, we only search [hint, 63] bits in the first word search. Then we search left 7 words, the sb->map[4] [0, hint-1] bits aren't searched. This patch fix it by searching 9 words in this case, so we will search sb->map[4] the second time at last with hint == 0. Signed-off-by: Chengming Zhou --- lib/sbitmap.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/sbitmap.c b/lib/sbitmap.c index ac4027884765..6e098a46be26 100644 --- a/lib/sbitmap.c +++ b/lib/sbitmap.c @@ -199,10 +199,18 @@ static int sbitmap_find_bit(struct sbitmap *sb, unsigned int alloc_hint, bool wrap) { + unsigned int map_nr = sb->map_nr; unsigned int i; int nr = -1; - for (i = 0; i < sb->map_nr; i++) { + /* + * If we have alloc_hint > 0 and don't wrap, we need to + * recheck sb->map[index] with hint == 0 to exhaust the map. + */ + if (alloc_hint && !wrap) + map_nr += 1; + + for (i = 0; i < map_nr; i++) { nr = sbitmap_find_bit_in_word(&sb->map[index], min_t(unsigned int, __map_depth(sb, index),