linux-kernel - [PATCH] brd: decrease the number of allocated pages which discarded

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20241128170056565nPKSz2vsP8K8X2uk2iaDG@zte.com.cn>
Date: Thu, 28 Nov 2024 17:00:56 +0800 (CST)
From: <long.yunjian@....com.cn>
To: <axboe@...nel.dk>
Cc: <kbusch@...nel.org>, <linux-block@...r.kernel.org>,
        <linux-kernel@...r.kernel.org>, <mou.yi@....com.cn>,
        <zhang.xianwei8@....com.cn>, <cai.qu@....com.cn>,
        <xu.lifeng1@....com.cn>, <jiang.xuexin@....com.cn>,
        <jiang.yong5@....com.cn>
Subject: [PATCH] brd: decrease the number of allocated pages which discarded

From: Zhang Xianwei <zhang.xianwei8@....com.cn>
The number of allocated pages which discarded will not decrease.
Fix it.

Fixes: 9ead7efc6f3f ("brd: implement discard support")

Signed-off-by: Zhang Xianwei <zhang.xianwei8@....com.cn>
---
 drivers/block/brd.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/block/brd.c b/drivers/block/brd.c
index 5a95671d8151..292f127cae0a 100644
--- a/drivers/block/brd.c
+++ b/drivers/block/brd.c
@@ -231,8 +231,10 @@ static void brd_do_discard(struct brd_device *brd, sector_t sector, u32 size)
 	xa_lock(&brd->brd_pages);
 	while (size >= PAGE_SIZE && aligned_sector < rd_size * 2) {
 		page = __xa_erase(&brd->brd_pages, aligned_sector >> PAGE_SECTORS_SHIFT);
-		if (page)
+		if (page) {
 			__free_page(page);
+			brd->brd_nr_pages--;
+		}
 		aligned_sector += PAGE_SECTORS;
 		size -= PAGE_SIZE;
 	}
-- 
2.27.0