From patchwork Thu Jul 20 09:45:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengming Zhou X-Patchwork-Id: 123190 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp3042252vqt; Thu, 20 Jul 2023 04:17:04 -0700 (PDT) X-Google-Smtp-Source: APBJJlHwETN1DeZX0twMmxEEyPGLnEbAvbY2DAKa0DFA+GiA3WEh7D/A0LFpX74pP7Kx7kAZAsFF X-Received: by 2002:a17:906:280e:b0:988:f93:32e8 with SMTP id r14-20020a170906280e00b009880f9332e8mr4557711ejc.26.1689851824271; Thu, 20 Jul 2023 04:17:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689851824; cv=none; d=google.com; s=arc-20160816; b=0nc5X25inNxiTUsdF9yCFpnbJpFK3iDPiiCLwlkFC6tJyaA1xTCqvWzOCLMWQGESk5 3Afo46IMtfcm7jDQGoAW09hIWV/WTG8S+8Cw03kKItAJYBHz5o+mPb0zFItowWfPsvQk 6RNqMIiLIFDhM/c6SwOFCNEL097U/3ABTt51TGCZUuLzpYAs0o8emkUVIV9T9G4hq+E+ Q5xWYRYDohqcOc0Kh2PxZBXNyYh+dQimsvhLJjg38UsDEUj1CYCbx7VduClkHAfMCRt8 hE/p+G0/st2ycxyASZ0d0kik5dACAQxbVILavkA/nTSjxKQiDGfBQgMg/gILXUGoAxPe qs9Q== 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=dQrUdY1vRsj8E+dCm96975wE2JF9r7J+GLmQavXqC6U=; fh=hjJkBnU2szufEu6iYNeHw5+ILtjbq+a6zNGIo+CbvPw=; b=yaA29DB5malJxT6UlP+JpwCwY2ORILKCf5nHqF0VlH4mjiM4YqRSRg0KKiEh+8kTIS MJP21856Hw0qeOLeg3Yx3DRhBTikgnhxyK/Uu59s0pEF5Spd6P0DhATKeOYt1sRgOhEh HzRJv1e2zxKgUIrcmhZEAe9urTtB5XsLsNf15UdQHaa2L/3uDv4rTkd5Qbs9kvkn/sJX J8QuP6pqqMaM095xYdkze5sIujX3nU8hPsyMCLAMrnT7JOShOa/QdDudlm7gpkfCSBQ2 hqBBFWyhiQ0rwHkm4dR71N8nvt8EY0XAVEsZDcMs59nRQ+c7sWGhiUC014gKjEt/lgNJ YR4g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=ppP0xq24; 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 pj27-20020a170906d79b00b00992acfe04b8si554685ejb.150.2023.07.20.04.16.39; Thu, 20 Jul 2023 04:17:04 -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=ppP0xq24; 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 S230319AbjGTJsn (ORCPT + 99 others); Thu, 20 Jul 2023 05:48:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47886 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231386AbjGTJsK (ORCPT ); Thu, 20 Jul 2023 05:48:10 -0400 Received: from out-2.mta0.migadu.com (out-2.mta0.migadu.com [91.218.175.2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8FF702704 for ; Thu, 20 Jul 2023 02:47:16 -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=1689846435; 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=dQrUdY1vRsj8E+dCm96975wE2JF9r7J+GLmQavXqC6U=; b=ppP0xq24ptj/OlMY3SPOuHL6Ff4dQYJc12lo4pwlHFUru/0kT+yUO+nGANDCOXMijpY0zh 0xRV/YP9illwyEGWdRzcnR+C2a2oqd4/o3nAXfqCCcJ3QCVAM4J4lj3lf7TdGBwhgX25Kc aqsmNNgQe9Mnd4K/gYhs9jp73e9/KfE= From: chengming.zhou@linux.dev To: axboe@kernel.dk, osandov@fb.com, ming.lei@redhat.com, kbusch@kernel.org, krisman@suse.de Cc: linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, zhouchengming@bytedance.com Subject: [PATCH 1/6] sbitmap: fix hint wrap in the failure case Date: Thu, 20 Jul 2023 17:45:50 +0800 Message-ID: <20230720094555.1397621-2-chengming.zhou@linux.dev> In-Reply-To: <20230720094555.1397621-1-chengming.zhou@linux.dev> References: <20230720094555.1397621-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=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: INBOX X-GMAIL-THRID: 1771938066399285971 X-GMAIL-MSGID: 1771938066399285971 From: Chengming Zhou ``` hint = nr + 1; if (hint >= depth - 1) hint = 0; ``` Now we wrap the hint to 0 in the failure case, but: 1. hint == depth - 1, is actually an available offset hint, which we shouldn't wrap hint to 0. 2. In the strict round_robin non-wrap case, we shouldn't wrap at all. ``` wrap = wrap && hint; ``` We only need to check wrap based on the original hint ( > 0), don't need to recheck the new hint which maybe updated in the failure case. Also delete the mismatched comments by the way. Signed-off-by: Chengming Zhou --- lib/sbitmap.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/sbitmap.c b/lib/sbitmap.c index eff4e42c425a..5ed6c2adf58e 100644 --- a/lib/sbitmap.c +++ b/lib/sbitmap.c @@ -144,12 +144,7 @@ static int __sbitmap_get_word(unsigned long *word, unsigned long depth, while (1) { nr = find_next_zero_bit(word, depth, hint); if (unlikely(nr >= depth)) { - /* - * We started with an offset, and we didn't reset the - * offset to 0 in a failure case, so start from 0 to - * exhaust the map. - */ - if (hint && wrap) { + if (wrap) { hint = 0; continue; } @@ -160,8 +155,13 @@ static int __sbitmap_get_word(unsigned long *word, unsigned long depth, break; hint = nr + 1; - if (hint >= depth - 1) - hint = 0; + if (hint >= depth) { + if (wrap) { + hint = 0; + continue; + } + return -1; + } } return nr; From patchwork Thu Jul 20 09:45:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengming Zhou X-Patchwork-Id: 123172 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp3023318vqt; Thu, 20 Jul 2023 03:38:41 -0700 (PDT) X-Google-Smtp-Source: APBJJlFjphFQCJKlBAbHLU6gNU2fLsX6Mm2AWAG9nP4M3NE7ISW4+15WVIE+sPq7cKNZ/y20p4D6 X-Received: by 2002:a05:6402:1394:b0:51a:42b2:cb83 with SMTP id b20-20020a056402139400b0051a42b2cb83mr3544191edv.42.1689849520763; Thu, 20 Jul 2023 03:38:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689849520; cv=none; d=google.com; s=arc-20160816; b=PjJ+rZJvrGdHLVFuOK2ManUFl3SmK6z+3h7lll0mYkdgk10IB332R+J9ErO2XTBa3+ zYbFoy+Odld5JJhCVIfP94nRwJ/pJ4XcBnojCVIctZnLKyDdlwxavVARExQKuFA6FRAC wuxG/5ri4NjlEL/2pbuakGWHyU8ZTUBVHSR4AekDuCuncEGXVgOXT6RXMyAglJVAhRo8 lzm84Z9rjD+clYgaKp1b17m1c43Napb7kawpDMCAb1GHWg9csnV5S7rLxr3EODMank1K M1CE/H3Z5AMyXI0VIyN/ALvOhW71iSTLb07hE/AmRX4lQJ4f3RwiZORblZi1kxiVS5sD Nxzg== 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=HexLk5YdZ9UMqQVRKs36MeqJ3bE8mocAttG9oHtUF6A=; fh=hjJkBnU2szufEu6iYNeHw5+ILtjbq+a6zNGIo+CbvPw=; b=hvadqSH1NX1ZRaIFBgVZ+EmcpYqNEn/fOcD1gsawenvHa1L2/VIVxCKIapTFdnVSBk h7hCD3mL+HYh5gZgMAK8gYNcWHjmUYx+x+Bt2vgMb0bR1FvTBrNNHHUY13aDMvBu77ky mhDlgL6HBRivdi5ayJ8ihejP77u5AkVVOo6hfTlqbl2Up0yYWZ8eXL7ck/MZr2idCoxh O/fqsGOkWIw/dv841mH9JNqa9Z+HCVP2ErZeonygrUHrJ7A2XnoUS7EBdrVtBVfs6//W llUbsGMnvxYjES5TYysTg4XxG+p9yqW/4V9ASS0TvygIJEmFsk0DL82hVBy8gu8QTtmt kN5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=T3g0daIq; 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 s23-20020aa7c557000000b00518c6e070f8si580430edr.663.2023.07.20.03.38.17; Thu, 20 Jul 2023 03:38:40 -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=T3g0daIq; 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 S230463AbjGTJs4 (ORCPT + 99 others); Thu, 20 Jul 2023 05:48:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47894 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231404AbjGTJsL (ORCPT ); Thu, 20 Jul 2023 05:48:11 -0400 Received: from out-33.mta0.migadu.com (out-33.mta0.migadu.com [IPv6:2001:41d0:1004:224b::21]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 974AB2708 for ; Thu, 20 Jul 2023 02:47:21 -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=1689846440; 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=HexLk5YdZ9UMqQVRKs36MeqJ3bE8mocAttG9oHtUF6A=; b=T3g0daIqsxUtbedfWKPmCc61Qc12FtWKResFJpeO2mr/aRXdYhFQp9Pq27ndDZNyrYc5Kt 7uDJsxRP4E45zPxPxh7vmCqiZoRPQfuQmeTGRkOu8Atn66cRWwHReZ+iWGrbu+ify0SdMJ eCiiqpd8AYC3WMEkSJGYMsndmZ5Jq5E= From: chengming.zhou@linux.dev To: axboe@kernel.dk, osandov@fb.com, ming.lei@redhat.com, kbusch@kernel.org, krisman@suse.de Cc: linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, zhouchengming@bytedance.com Subject: [PATCH 2/6] sbitmap: fix round-robin non-wrap find with hint > 0 Date: Thu, 20 Jul 2023 17:45:51 +0800 Message-ID: <20230720094555.1397621-3-chengming.zhou@linux.dev> In-Reply-To: <20230720094555.1397621-1-chengming.zhou@linux.dev> References: <20230720094555.1397621-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: 1771935651278251666 X-GMAIL-MSGID: 1771935651278251666 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. 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 5ed6c2adf58e..ccb96d1f92ba 100644 --- a/lib/sbitmap.c +++ b/lib/sbitmap.c @@ -192,10 +192,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), From patchwork Thu Jul 20 09:45:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengming Zhou X-Patchwork-Id: 123169 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp3021355vqt; Thu, 20 Jul 2023 03:33:58 -0700 (PDT) X-Google-Smtp-Source: APBJJlF9bmYKqasDSndsvx0VhvJKvVkpDw6nBUUajO4HpzOH5+xjRUWdN8Bn1xK0BkTqJV3IXH1U X-Received: by 2002:a17:907:7f13:b0:98e:738c:6d39 with SMTP id qf19-20020a1709077f1300b0098e738c6d39mr4834804ejc.36.1689849237988; Thu, 20 Jul 2023 03:33:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689849237; cv=none; d=google.com; s=arc-20160816; b=Uci+8Z+nBnLlo2s+g6lkJYU7vt3GTHLFYwFbcdFBHBpj0GWgqi7N4tYJRxar1wqm5L aK98b16AMconAmMmVys5Jqj0BGDX6ND6UOkhf0XsF5Rdy2HkUVOQuVBPgDeu/UEJdvtV E8WfvyeKyLa0N8eEqWI/Jy6FUUd2VZmP+G9QaBn1PYftpi+isreqCXLXTJWN2xlq9+CJ MD4NjMPxSJ2thhr3KWrdXty2uMteJ1ovSfABqqTHZPqVjlbOLKfvJsE++FxG9Fek88ms AFGIKnAaMZLZvcORCArI/nesmlrRcDpg+l6ryMAaPvZdY0CK8iYT7UFAvbcs7XHsNSYV pwiQ== 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=TQ3vuI5C6djnpQbCi1PW59Gj+FCebISZRVuxTvWKvqo=; fh=hjJkBnU2szufEu6iYNeHw5+ILtjbq+a6zNGIo+CbvPw=; b=RQ+mEIM441/DadtZahwgxea6jWV+xSZ3coM49aODmt1h8vAyOUkXD8S6T1ZHjAodV/ NteRteT5ykL7+zWtYv/dgGZ/vlDt+Ln5XfVqEktJHUk2QFlHHS6d1byT6EYGgcJNkh8W kGvA1f+kHXneJRFay7BHSq6oo/7MhJAzPCsXT/5/CsXFbwdDooh8zjRk1bwqeRAIfflw XvT06FArWY/SESlX7FoBWrV/7kxW4PcjAvYuyOA1cMP1B3sNRivu3537dotMetCFtM7P FMXrnvBgt5W2eUVoPNAkuBzS/0vNAgFuuitldPEMa8SvbKF/Ggy7k10HYC8D8ZQ7uF/P sTmQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=w4MmY0D5; 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 m21-20020a170906849500b009938248d370si522712ejx.2.2023.07.20.03.33.22; Thu, 20 Jul 2023 03:33:57 -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=w4MmY0D5; 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 S231220AbjGTJtT (ORCPT + 99 others); Thu, 20 Jul 2023 05:49:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46596 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231483AbjGTJsT (ORCPT ); Thu, 20 Jul 2023 05:48:19 -0400 Received: from out-48.mta0.migadu.com (out-48.mta0.migadu.com [IPv6:2001:41d0:1004:224b::30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 12DA110A for ; Thu, 20 Jul 2023 02:47:27 -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=1689846446; 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=TQ3vuI5C6djnpQbCi1PW59Gj+FCebISZRVuxTvWKvqo=; b=w4MmY0D51B5mbGeKCwtzsoKhqXXNdLV/Jh+Z8f4ocFu4r2lgNM2FMx5joP6MZg61eMRcPe SWTBP0I8vkvNLPEK871eybgV69GeQS2Ltb1S/JfKkNAgDSRsA3dseXHhNnlHdXo/ewd8zK JY+lUtfuC2q3a1WZ9PWsuyHaW+deVy0= From: chengming.zhou@linux.dev To: axboe@kernel.dk, osandov@fb.com, ming.lei@redhat.com, kbusch@kernel.org, krisman@suse.de Cc: linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, zhouchengming@bytedance.com Subject: [PATCH 3/6] sbitmap: don't loop twice in find_next_zero_bit() Date: Thu, 20 Jul 2023 17:45:52 +0800 Message-ID: <20230720094555.1397621-4-chengming.zhou@linux.dev> In-Reply-To: <20230720094555.1397621-1-chengming.zhou@linux.dev> References: <20230720094555.1397621-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,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: 1771935354495395668 X-GMAIL-MSGID: 1771935354495395668 From: Chengming Zhou __sbitmap_get_shallow() try to allocate a free bit with a limited depth, which always wrap when finding a free bit in the word, even in the round-robin case. So it seems we don't need strict round-robin here. This way will loop twice in find_next_zero_bit() in the word, no point in looping twice in find_next_zero_bit() if we don't want strict round-robin for this case. Signed-off-by: Chengming Zhou --- lib/sbitmap.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/sbitmap.c b/lib/sbitmap.c index ccb96d1f92ba..0f3943bd3940 100644 --- a/lib/sbitmap.c +++ b/lib/sbitmap.c @@ -268,7 +268,9 @@ static int __sbitmap_get_shallow(struct sbitmap *sb, unsigned int index; index = SB_NR_TO_INDEX(sb, alloc_hint); - alloc_hint = SB_NR_TO_BIT(sb, alloc_hint); + + /* No point in looping twice in find_next_zero_bit() for this case. */ + alloc_hint = 0; return sbitmap_find_bit(sb, shallow_depth, index, alloc_hint, true); } From patchwork Thu Jul 20 09:45:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengming Zhou X-Patchwork-Id: 123174 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp3024188vqt; Thu, 20 Jul 2023 03:41:01 -0700 (PDT) X-Google-Smtp-Source: APBJJlGcHiriHRp8WHN7QsoL+GoP1rF2iuxysfMZNfNNEeG0rBhF7x3GkRzc1AT6a1TqIwuFLEjF X-Received: by 2002:a05:6512:551:b0:4fd:d6cb:1d86 with SMTP id h17-20020a056512055100b004fdd6cb1d86mr1533772lfl.44.1689849660884; Thu, 20 Jul 2023 03:41:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689849660; cv=none; d=google.com; s=arc-20160816; b=JK8gNXdA4Coz5oW+8d+DmXwtU8j7ygVamQvj73VF3dS8tFlDmGcPNjQpoqojHodl52 ixP9bAk6yABfrtocnzyV+pG7lqxn/Lsgax2VLBvQK/1xhiKxHT6kX5IRztzAYGOvqyWq VAwfmn/D19gy5HCLZer4o++Hv3gfcXvwGa366HIxQPDHp/B4kEIxjp03zpmf1ULScbma jM7sOfUXYWy+Xqr3sI6fxIUO4EeGCtVR0yBnuBD1kOUeM6CXjLIYxTh2JevoxDgwa62z dbGVECxL7rMmNFzVe7o1IR+yIBEtdQk6UEpvtb2COP79owOKCvtX73olU5IC4Sh4x2ze naCQ== 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=CHTcss6l/Dml/Uch+o0A/n+25yQoOIqj7dE4TlbyHH4=; fh=hjJkBnU2szufEu6iYNeHw5+ILtjbq+a6zNGIo+CbvPw=; b=OTZjAZoqLMrjrcHrIBKOcBdtBp0Spc4YYAxseW31oazrezje5Ps9iiqB9F9bUouWF4 klL1chLCaBFC4rdnBpQe4tavIMlwPdLeJjAHXgAoY15cnU3zCKNrkXB/pAw1no8nXLVf x6f23547djl5AQtdCymzVm2uTzfrWVixGjV2NslzdRhCjYqd2rmkWg9gnkmQiZfIzTcM qVgKIXn2tp0jDK+rT5JnVQhx74yVLuSNJAX07IiBIneoa1+vW5HwR6bYp2E+y/tha3ay oF2Qlv60g9vbgvv4fiQuEYclVZ+FiYo9iXyKuO8fShSc2g+S86tS8rp1eclS17xgwUHs W69Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=Ai++OZMU; 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 z3-20020a170906814300b0099279b2cdddsi460394ejw.833.2023.07.20.03.40.36; Thu, 20 Jul 2023 03:41:00 -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=Ai++OZMU; 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 S231271AbjGTJtd (ORCPT + 99 others); Thu, 20 Jul 2023 05:49:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46932 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229652AbjGTJs2 (ORCPT ); Thu, 20 Jul 2023 05:48:28 -0400 Received: from out-18.mta0.migadu.com (out-18.mta0.migadu.com [IPv6:2001:41d0:1004:224b::12]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 678DB26A5 for ; Thu, 20 Jul 2023 02:47:32 -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=1689846450; 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=CHTcss6l/Dml/Uch+o0A/n+25yQoOIqj7dE4TlbyHH4=; b=Ai++OZMUjHmw2983yCNBjVkPFxFeR1arX5zXXbaGjA90hfi5mvTPK+xbJURrXi/u+0CWWN RkZhb6KGm+bKwEOt2ud4UlHdP4VWFqqslwKhjxgk4nP6y8kd6taike6pQ5cLKPz4EMMIpE 7N58wZ4pmp7tHfkumvcPMa3P5e/aYD4= From: chengming.zhou@linux.dev To: axboe@kernel.dk, osandov@fb.com, ming.lei@redhat.com, kbusch@kernel.org, krisman@suse.de Cc: linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, zhouchengming@bytedance.com Subject: [PATCH 4/6] sbitmap: remove offset wrap logic when finding bit in word Date: Thu, 20 Jul 2023 17:45:53 +0800 Message-ID: <20230720094555.1397621-5-chengming.zhou@linux.dev> In-Reply-To: <20230720094555.1397621-1-chengming.zhou@linux.dev> References: <20230720094555.1397621-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=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: INBOX X-GMAIL-THRID: 1771935797788008491 X-GMAIL-MSGID: 1771935797788008491 From: Chengming Zhou We actually don't need the offset hint wrap logic in word: 1. Strict round-robin mode: just search from that offset hint, we will recheck that word at last if offset hint > 0. 2. No round-robin mode: we use offset hint == 0, so don't need to wrap offset hint too. We remove offset wrap logic and simplify the code. Signed-off-by: Chengming Zhou --- lib/sbitmap.c | 36 ++++++++++-------------------------- 1 file changed, 10 insertions(+), 26 deletions(-) diff --git a/lib/sbitmap.c b/lib/sbitmap.c index 0f3943bd3940..50bdf3a31947 100644 --- a/lib/sbitmap.c +++ b/lib/sbitmap.c @@ -134,34 +134,21 @@ void sbitmap_resize(struct sbitmap *sb, unsigned int depth) EXPORT_SYMBOL_GPL(sbitmap_resize); static int __sbitmap_get_word(unsigned long *word, unsigned long depth, - unsigned int hint, bool wrap) + unsigned int hint) { int nr; - /* don't wrap if starting from 0 */ - wrap = wrap && hint; - while (1) { nr = find_next_zero_bit(word, depth, hint); - if (unlikely(nr >= depth)) { - if (wrap) { - hint = 0; - continue; - } + if (unlikely(nr >= depth)) return -1; - } if (!test_and_set_bit_lock(nr, word)) break; hint = nr + 1; - if (hint >= depth) { - if (wrap) { - hint = 0; - continue; - } + if (hint >= depth) return -1; - } } return nr; @@ -169,14 +156,13 @@ static int __sbitmap_get_word(unsigned long *word, unsigned long depth, static int sbitmap_find_bit_in_word(struct sbitmap_word *map, unsigned int depth, - unsigned int alloc_hint, - bool wrap) + unsigned int alloc_hint) { int nr; do { nr = __sbitmap_get_word(&map->word, depth, - alloc_hint, wrap); + alloc_hint); if (nr != -1) break; if (!sbitmap_deferred_clear(map)) @@ -189,8 +175,7 @@ static int sbitmap_find_bit_in_word(struct sbitmap_word *map, static int sbitmap_find_bit(struct sbitmap *sb, unsigned int depth, unsigned int index, - unsigned int alloc_hint, - bool wrap) + unsigned int alloc_hint) { unsigned int map_nr = sb->map_nr; unsigned int i; @@ -200,7 +185,7 @@ static int sbitmap_find_bit(struct sbitmap *sb, * 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) + if (alloc_hint) map_nr += 1; for (i = 0; i < map_nr; i++) { @@ -208,7 +193,7 @@ static int sbitmap_find_bit(struct sbitmap *sb, min_t(unsigned int, __map_depth(sb, index), depth), - alloc_hint, wrap); + alloc_hint); if (nr != -1) { nr += index << sb->shift; @@ -240,8 +225,7 @@ static int __sbitmap_get(struct sbitmap *sb, unsigned int alloc_hint) else alloc_hint = 0; - return sbitmap_find_bit(sb, UINT_MAX, index, alloc_hint, - !sb->round_robin); + return sbitmap_find_bit(sb, UINT_MAX, index, alloc_hint); } int sbitmap_get(struct sbitmap *sb) @@ -272,7 +256,7 @@ static int __sbitmap_get_shallow(struct sbitmap *sb, /* No point in looping twice in find_next_zero_bit() for this case. */ alloc_hint = 0; - return sbitmap_find_bit(sb, shallow_depth, index, alloc_hint, true); + return sbitmap_find_bit(sb, shallow_depth, index, alloc_hint); } int sbitmap_get_shallow(struct sbitmap *sb, unsigned long shallow_depth) From patchwork Thu Jul 20 09:45:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengming Zhou X-Patchwork-Id: 123156 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp3004581vqt; Thu, 20 Jul 2023 02:58:33 -0700 (PDT) X-Google-Smtp-Source: APBJJlE2cxzo0237HoK+KCgR5TLDMwpZrNBNkqvey0hTEr2MLwMdIizMNq+iegx0yse5d85d3AEr X-Received: by 2002:a17:906:5345:b0:99b:484b:21b4 with SMTP id j5-20020a170906534500b0099b484b21b4mr3193669ejo.8.1689847112955; Thu, 20 Jul 2023 02:58:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689847112; cv=none; d=google.com; s=arc-20160816; b=hACn6cCLqAUZy2n7uAKTLShEk+DE3UN0J0dh+UR0XMHZyaqLfwbx9ch8/lu/SjI6Cr aMIEI1x/FlnBy1YMYVimgw/Jm76iyEKzBylhPhqJxDpNeIEbvJd9KaaLEerpfjK1p+VM 2ml7HeNoD666E+6TA8NhoaWjuqBU7nyD3IS5BJ/Ck4mn7VKbGfxGaoRvOCOwdJiwvDM7 xDFFzASLTHERz9Uv0/DMxLDqTLOWla52PxmcA98zkIT4nY/tS13bj8HCWSw6uBkuxZVc RWUrfPPGuPqLpJ65bdmua+Z5U+7pCyvstM3JQUk46EKHOU7JfXT/M9yHDk8pEgvwhsIy ya+Q== 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=p34J6xnRb86eKyDcpXgSq81rjV9gO+WCulIJcSmybAc=; fh=hjJkBnU2szufEu6iYNeHw5+ILtjbq+a6zNGIo+CbvPw=; b=wiVvnHkPRTe+f1NgrwNGNu906GUgpkTvyiz6kLp/t0hyzVOL4BZXkQAay1tMid3QWL pMbRXujynxAmCoO2C0pUGduyq+VbttKLTKzTAMHShWEnBd2uuOJrVXMnDqCf7FvCblyU GT19iUXijzQB0zaSNiuGiN9fhXNxq5NtMTQdKvcu01B8e97cJg2A4Kbd/DhaeAFf4RNw AxF/FJwBt01TdCe7YNwIBkVn0+nV2KZocLS/STFft6SrG+4ZpJvRl/bSFfhg5gPWwkgi NJIgnxe2sAumqTU4a+547X2Qi0AMo+13Qr00GYUjkuoblQ+CRG4ZxnFTnnG3c8fzZk6C LLxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=FO6tJlnK; 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 bs10-20020a170906d1ca00b0097650856f55si460989ejb.695.2023.07.20.02.58.08; Thu, 20 Jul 2023 02:58:32 -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=FO6tJlnK; 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 S231285AbjGTJtl (ORCPT + 99 others); Thu, 20 Jul 2023 05:49:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46466 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229879AbjGTJsf (ORCPT ); Thu, 20 Jul 2023 05:48:35 -0400 Received: from out-42.mta0.migadu.com (out-42.mta0.migadu.com [91.218.175.42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 844623AA8 for ; Thu, 20 Jul 2023 02:47:36 -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=1689846454; 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=p34J6xnRb86eKyDcpXgSq81rjV9gO+WCulIJcSmybAc=; b=FO6tJlnKG0PcTyIP5O724vhJaUPzs5PqLkd247BAIxAFGdYM4v7WurTFDGaN1YoOreq4c4 b/h8BL7Yc08WxbDl3yG4Uw0l/8qSIJEuH5EsaTErtlXjMS1BEQPE+uV6BtlyiezOPVg7ob IdnA189BksTiUPxZouFvEL2EiJX56tI= From: chengming.zhou@linux.dev To: axboe@kernel.dk, osandov@fb.com, ming.lei@redhat.com, kbusch@kernel.org, krisman@suse.de Cc: linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, zhouchengming@bytedance.com Subject: [PATCH 5/6] sbitmap: wake_index doesn't need to be atomic_t Date: Thu, 20 Jul 2023 17:45:54 +0800 Message-ID: <20230720094555.1397621-6-chengming.zhou@linux.dev> In-Reply-To: <20230720094555.1397621-1-chengming.zhou@linux.dev> References: <20230720094555.1397621-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,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE 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: INBOX X-GMAIL-THRID: 1771933126222274824 X-GMAIL-MSGID: 1771933126222274824 From: Chengming Zhou We use wake_index to remember from which to wake up next time, which doesn't need to be atomic_t since we only read it once before wakeups, and write it once after wakeups. Signed-off-by: Chengming Zhou --- include/linux/sbitmap.h | 2 +- lib/sbitmap.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/linux/sbitmap.h b/include/linux/sbitmap.h index d662cf136021..bdbe478ba4dc 100644 --- a/include/linux/sbitmap.h +++ b/include/linux/sbitmap.h @@ -116,7 +116,7 @@ struct sbitmap_queue { /** * @wake_index: Next wait queue in @ws to wake up. */ - atomic_t wake_index; + unsigned int wake_index; /** * @ws: Wait queues. diff --git a/lib/sbitmap.c b/lib/sbitmap.c index 50bdf3a31947..6778ab3fc6a5 100644 --- a/lib/sbitmap.c +++ b/lib/sbitmap.c @@ -419,7 +419,7 @@ int sbitmap_queue_init_node(struct sbitmap_queue *sbq, unsigned int depth, sbq->min_shallow_depth = UINT_MAX; sbq->wake_batch = sbq_calc_wake_batch(sbq, depth); - atomic_set(&sbq->wake_index, 0); + sbq->wake_index = 0; atomic_set(&sbq->ws_active, 0); atomic_set(&sbq->completion_cnt, 0); atomic_set(&sbq->wakeup_cnt, 0); @@ -549,7 +549,7 @@ static void __sbitmap_queue_wake_up(struct sbitmap_queue *sbq, int nr) if (!atomic_read(&sbq->ws_active)) return; - wake_index = atomic_read(&sbq->wake_index); + wake_index = READ_ONCE(sbq->wake_index); for (i = 0; i < SBQ_WAIT_QUEUES; i++) { struct sbq_wait_state *ws = &sbq->ws[wake_index]; @@ -570,8 +570,8 @@ static void __sbitmap_queue_wake_up(struct sbitmap_queue *sbq, int nr) break; } - if (wake_index != atomic_read(&sbq->wake_index)) - atomic_set(&sbq->wake_index, wake_index); + if (wake_index != READ_ONCE(sbq->wake_index)) + WRITE_ONCE(sbq->wake_index, wake_index); } void sbitmap_queue_wake_up(struct sbitmap_queue *sbq, int nr) @@ -672,7 +672,7 @@ void sbitmap_queue_wake_all(struct sbitmap_queue *sbq) * sbitmap_queue_wake_up(). */ smp_mb(); - wake_index = atomic_read(&sbq->wake_index); + wake_index = READ_ONCE(sbq->wake_index); for (i = 0; i < SBQ_WAIT_QUEUES; i++) { struct sbq_wait_state *ws = &sbq->ws[wake_index]; @@ -702,7 +702,7 @@ void sbitmap_queue_show(struct sbitmap_queue *sbq, struct seq_file *m) seq_puts(m, "}\n"); seq_printf(m, "wake_batch=%u\n", sbq->wake_batch); - seq_printf(m, "wake_index=%d\n", atomic_read(&sbq->wake_index)); + seq_printf(m, "wake_index=%d\n", READ_ONCE(sbq->wake_index)); seq_printf(m, "ws_active=%d\n", atomic_read(&sbq->ws_active)); seq_puts(m, "ws={\n"); From patchwork Thu Jul 20 09:45:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengming Zhou X-Patchwork-Id: 123170 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp3022007vqt; Thu, 20 Jul 2023 03:35:29 -0700 (PDT) X-Google-Smtp-Source: APBJJlHg4xdY5FQUU4/X61bcb6nzrovddG68vJ9v2qT0y/LAOALzn+4pXj/neE0p9TTiPbb/sffF X-Received: by 2002:a17:906:151:b0:998:de72:4c89 with SMTP id 17-20020a170906015100b00998de724c89mr2135383ejh.50.1689849329627; Thu, 20 Jul 2023 03:35:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689849329; cv=none; d=google.com; s=arc-20160816; b=F+Xf+VMGlj8LDhsD2JIhXBFjnP+jsvy0J6O2cKM0UssxHT4p8AfCJgmX8oWROYMdHD erjvX+uyPX23uOprkVxg/G3JjP/kEYG5QZmUHmJ0qKi4MCLeRKv53i5UyeQ8Thty5B9N ez6ABxDP4JB02UBXPk7q6ITAmIZFZ3yASax3SCvU3n30f6YF9nFk4WaX5iktWGXOnQxK r5pjbMIVBbB151Ldbk4bha39B/tz5HjnjtdLxwGieSMydvWLiTJOPiAcW4xKjpEJn4Yk hqX0JDa7YR2+ZbSBwTyPfQADOsMLiOavlzyzZzkUqLstigsHX6AfxGoPcZ8HBrM+pDcz 8xLw== 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=iYyPqspkOuXVMavHO7B8mxFBAqzpe8Xduz/Ay3699EE=; fh=hjJkBnU2szufEu6iYNeHw5+ILtjbq+a6zNGIo+CbvPw=; b=Yztyb9bwBKuGvfNd67XiUoxtaWRpVijJ5Oa+JPB0iK2EsXFwHO2X30U1hGpwtyw2xz 6u7Pbm7rUC3+vklPb6DRU/YMVX2Mar60XtA3dxoTmT+VxEdEc7HxK+KMQeA9bF6KPd9j UYoAj2LOLewQzmZutkNq8NoJNPuG6iQhycswC0XpUsuSnhzfHuGkvmq2118JxvzqN9FG wBlKAqxz3QHZat7Cm9kTb466bjDLdVEY6J1hC3OdDELKAL/82iVUaJsRK0Su3sFOAqnB 4KLmNnMfI5DoZI1vrtm8XEWPuJgzJVcGXAB60gXZSRfpybt+IdNt/m58UVHeIFvejtGJ tk1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=pw5sQb18; 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 kk27-20020a170907767b00b00988839e5435si467419ejc.522.2023.07.20.03.35.05; Thu, 20 Jul 2023 03:35:29 -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=pw5sQb18; 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 S229763AbjGTJtx (ORCPT + 99 others); Thu, 20 Jul 2023 05:49:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47800 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229653AbjGTJt1 (ORCPT ); Thu, 20 Jul 2023 05:49:27 -0400 Received: from out-34.mta0.migadu.com (out-34.mta0.migadu.com [91.218.175.34]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C83E1189 for ; Thu, 20 Jul 2023 02:47:42 -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=1689846460; 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=iYyPqspkOuXVMavHO7B8mxFBAqzpe8Xduz/Ay3699EE=; b=pw5sQb18kA//kymlNb+qvXIDo6jCV6+mmT0zU6VFQozPJNN8PoBdLacoMJrd/1FqdpJvcW VwuVolXq85zUUtFfX40ZQSiEGTsPAgEbohducF49YxBq9Q/Wf59Odv9Bl0BlUS6IqohIJQ /iml5vko4ls+yXcePH2pF7w/oW2Of3U= From: chengming.zhou@linux.dev To: axboe@kernel.dk, osandov@fb.com, ming.lei@redhat.com, kbusch@kernel.org, krisman@suse.de Cc: linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, zhouchengming@bytedance.com Subject: [PATCH 6/6] sbitmap: check ws_active before check waitqueues Date: Thu, 20 Jul 2023 17:45:55 +0800 Message-ID: <20230720094555.1397621-7-chengming.zhou@linux.dev> In-Reply-To: <20230720094555.1397621-1-chengming.zhou@linux.dev> References: <20230720094555.1397621-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=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: INBOX X-GMAIL-THRID: 1771935450582240987 X-GMAIL-MSGID: 1771935450582240987 From: Chengming Zhou When !ws_active, we don't need to check waitqueues at all. So add this check in sbitmap_queue_wake_all(), like we do in sbitmap_queue_wake_up(). Signed-off-by: Chengming Zhou --- lib/sbitmap.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/sbitmap.c b/lib/sbitmap.c index 6778ab3fc6a5..38c265e4ef9d 100644 --- a/lib/sbitmap.c +++ b/lib/sbitmap.c @@ -672,6 +672,10 @@ void sbitmap_queue_wake_all(struct sbitmap_queue *sbq) * sbitmap_queue_wake_up(). */ smp_mb(); + + if (!atomic_read(&sbq->ws_active)) + return; + wake_index = READ_ONCE(sbq->wake_index); for (i = 0; i < SBQ_WAIT_QUEUES; i++) { struct sbq_wait_state *ws = &sbq->ws[wake_index];