From patchwork Sat Dec 14 03:03:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerry X-Patchwork-Id: 13922020 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 62B27E7717F for ; Sat, 14 Dec 2024 03:03:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E04056B0085; Fri, 13 Dec 2024 22:03:57 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DB4486B008A; Fri, 13 Dec 2024 22:03:57 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C7B536B008C; Fri, 13 Dec 2024 22:03:57 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id AA80A6B0085 for ; Fri, 13 Dec 2024 22:03:57 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 2E04544844 for ; Sat, 14 Dec 2024 03:03:57 +0000 (UTC) X-FDA: 82892069106.07.5F57E94 Received: from m16.mail.163.com (m16.mail.163.com [220.197.31.5]) by imf03.hostedemail.com (Postfix) with ESMTP id 5E9DF20008 for ; Sat, 14 Dec 2024 03:03:41 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=163.com header.s=s110527 header.b=gFFNM8G5; dmarc=pass (policy=none) header.from=163.com; spf=pass (imf03.hostedemail.com: domain of jerrydeng079@163.com designates 220.197.31.5 as permitted sender) smtp.mailfrom=jerrydeng079@163.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1734145423; a=rsa-sha256; cv=none; b=PkVqVPnyXiGirlTi/bnuaUXWpXNIr1SVbPhzG0iAA4bBisYpu3ZwEbbnek6TIlh/S+aNQg mwoJ37fu/mC0D6nQ0TG4s/r5X46OhF8IUSnV4Pko08G7oV8yMAHqiRI+P2d9O24fmB9hyp tN7WYyUaSswsjxs02SGnXhBctIQr1HI= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=163.com header.s=s110527 header.b=gFFNM8G5; dmarc=pass (policy=none) header.from=163.com; spf=pass (imf03.hostedemail.com: domain of jerrydeng079@163.com designates 220.197.31.5 as permitted sender) smtp.mailfrom=jerrydeng079@163.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1734145423; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=R1Zia9Fz2QARQl8fEmYHofwn16afpQH0+MPKYwrH0LA=; b=s0Io9tCm1Fv0AGpFkpSj/sFCL4Z9do70mid9uGXCYE3fjeSa6eGzcAdUhMrvUrE9WDyarw wnJP3cgtQa95MGs8nNm/LxBaa3lSzkT6qCSoK0Yke+dhyDrkQs+UbrHQT4ymZqBbwdXqSG L5Xiu+JF2QBmbQkgk/5y/T/eKaNKpHg= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=R1Zia 9Fz2QARQl8fEmYHofwn16afpQH0+MPKYwrH0LA=; b=gFFNM8G5HXgSrPIxO8nNB iY+ljVY0HReH2tatNPzvKUBAvan/zWLXFVS360onsO5r4mRCZc25MV7fYpRz0q+K 9c01T+n34zUXqQwkdQSnZQAKqtoArYE2ZRkq2nRZCtevqXASbYPVqmo+K08Wmjy8 f++sfifIhwpk3eOB/McOK0= Received: from Jerry-PC.. (unknown [36.27.96.116]) by gzsmtp3 (Coremail) with SMTP id PigvCgDXy66Q9VxnpMc9Fg--.7304S2; Sat, 14 Dec 2024 11:03:50 +0800 (CST) From: Jerry To: jerrydeng079@163.com Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, Jerry Subject: Date: Sat, 14 Dec 2024 11:03:28 +0800 Message-ID: <20241214030341.4264-1-jerrydeng079@163.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 X-CM-TRANSID: PigvCgDXy66Q9VxnpMc9Fg--.7304S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxXrW7uw15Zr4DXF48Kr4kWFg_yoW7JF1xpF Wayw1FyrW8JF17WrZ3AayUZF4a93yIkFW7Ary7Ga9IyrsxKF1jkFyavFy0yr1IkrZ8GrWa vr45trW7Gr48Cr7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07U7gAcUUUUU= X-Originating-IP: [36.27.96.116] X-CM-SenderInfo: xmhu25pghqwiixz6il2tof0z/1tbiNh+122dc5sTkEgAAso X-Rspam-User: X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 5E9DF20008 X-Stat-Signature: hd4s814wzhq8ng5zp5adrui9ag8x8qr7 X-HE-Tag: 1734145421-265155 X-HE-Meta: U2FsdGVkX190A+5Y6SOy6aVTytpg0gmxMtlx0jpgsTOQBdm7j0TFplD9ac7rK9C4M5uMTxZinkdSnxki2K5QwfMp90UMC2iggyagJS4mijv+O75EtRrGArrGfzLuKPteHVyz+zMKJ/t9IUCV+4ksjZDayKWMJ5Uz388hYWy/oiHbjJA6iiiDP20glpLDJSF2iowtwe2Srn7W7PuzIAuKKU9eC03w1KqEEtLYReWUA3mLObbwsqPbUTuUo25FpFdLmMjcL1c0HRzwDToPD0PwiL7oelZ1IG2IpYx+jNawU6asshcU+udk2ixIHO0/l5Yvm+G8tz88fxxvIJVvMDWdjwjvBuxEVxapV8U582C/uyHkvndmFrTJUE7Pxv5pb6YwWRijQ7i+e3xiVDhoP2uyTlRNhTI66CZuINyVMC9+uxPf633iAGUzNZgyn9S+Bl/WGDoibZGWhhFqtDELjOFywbIBJf59phIIrawhBU04pn+OEOivO03WJ/dW9TRCUZ+xOe+Ux1ZfD3hLaN/517YR9q5ujI+qoDxjJXijDjjVJQpzcAdGdxYp7Oc5OQA9WUBzK5yi+ybKK8e8Vg6zV/gW3o4g5VWGKPFFI3BPvD0Ll1r2ialqVWnTtlfR5l1kuFXmbJAaD4u9eSbatzQPui4MJsY/PxEpKKmOhImV3ovRdTdBVagOVZDc0SD7Lw8Qr+q3r/ZWK/JhsXoXdLyhiugIG+a2n+Ym/VnLLsE7Z4QNbCv72M3BbsbyObOqnVmeDo9U0wIkZbp+q0byOyF8MaXuakPuydlVPjlzIyrBH9q5Yen5UfGN8M6kp2vB8SIYUW0Dtpk6gVm+yyLmnVdAfzgP+5qCK53rtfwwvcpyFdIWXzmLgOSGYGeGxggtHkYIzs4p3NcYqJDwN3SJJ5kuLh8ESmgnFamIcU0nYPQWUPXch3Un3kvEvTt4Ex/eyDU2K7dN8u4j5+/2P3Iltj1SEzO MIoe3nQD R0CTgY0l1tmy0uxQ0SHV1JTJUfKQA2bQbSCEhT2OTt1J6U1QV7cIEVMkAv29mrmbElQ04zOyzo0d2ydtIld4F/97ByOF/PmhfT3nBlcWuxE8pFp0NQHeypJsFkVc+hpIvYPr5w/ROhec1vG7ojmmt/i6a5wvZQZHroe+u1FzMFxYW4SS6vvcO5tw8KOHSniEtEgqQVzoTW1A0t+HRTXiLGmY2SDu3FdLEwXNAMKJxhs/cnw0wGGs5o7Sn4qRG4dol1YXSQBGyzhSAvEl0jGbCXx7xciZvT+ST6K08Rsp62DJkemOWyRTzFXRyBUmKOeDZxDfkrKYQg3TWGTc5SZKsCs1Egug1aRVuB2DEfg7TV0IfrBxZP9XPuierbtFUadRYyZuejDDJ7nhSgQOtUpjMgGlk2WATtM1CktsahXGopxNZyx2S+VnCFXsK+0jyb/Sv5RajKSB6aC5VzV8IO8loPlnTHVBWGnb1QgG0Gq9Zr2z1J8FvUmeqK5F9RA== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Signed-off-by: Jerry --- mm/backing-dev.c | 1 + mm/filemap.c | 6 ++++- mm/page-writeback.c | 61 +++++++++++++++++++++++++++++++++++++++++---- 3 files changed, 62 insertions(+), 6 deletions(-) diff --git a/mm/backing-dev.c b/mm/backing-dev.c index dd08ab928..0b86bd980 100755 --- a/mm/backing-dev.c +++ b/mm/backing-dev.c @@ -878,6 +878,7 @@ void bdi_unregister(struct backing_dev_info *bdi) /* make sure nobody finds us on the bdi_list anymore */ bdi_remove_from_list(bdi); wb_shutdown(&bdi->wb); + wake_up(&(bdi->wb_waitq)); cgwb_bdi_unregister(bdi); /* diff --git a/mm/filemap.c b/mm/filemap.c index 3b0d8c6dd..3282840f0 100755 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -3300,6 +3300,7 @@ ssize_t generic_perform_write(struct file *file, long status = 0; ssize_t written = 0; unsigned int flags = 0; + errseq_t err = 0; do { struct page *page; @@ -3368,8 +3369,11 @@ ssize_t generic_perform_write(struct file *file, } pos += copied; written += copied; - balance_dirty_pages_ratelimited(mapping); + err = errseq_check(&mapping->wb_err, 0); + if (err) + return err; + } while (iov_iter_count(i)); return written ? written : status; diff --git a/mm/page-writeback.c b/mm/page-writeback.c index b2c916474..e013a6d01 100755 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -146,6 +146,16 @@ struct dirty_throttle_control { unsigned long pos_ratio; }; + + +struct bdi_wq_callback_entry { + + struct task_struct *tsk; + struct wait_queue_entry wq_entry; + int bdi_unregister; +}; + + /* * Length of period for aging writeout fractions of bdis. This is an * arbitrarily chosen number. The longer the period, the slower fractions will @@ -1567,6 +1577,22 @@ static inline void wb_dirty_limits(struct dirty_throttle_control *dtc) } } + +static int wake_up_bdi_waitq(wait_queue_entry_t *wait, unsigned mode, + int sync, void *key) +{ + + struct bdi_wq_callback_entry *bwce = + container_of(wait, struct bdi_wq_callback_entry, wq_entry); + + bwce->bdi_unregister = 1; + if(bwce->tsk) + wake_up_process(bwce->tsk); + + return 0; +} + + /* * balance_dirty_pages() must be called by processes which are generating dirty * data. It looks at the number of dirty pages in the machine and will force @@ -1574,7 +1600,7 @@ static inline void wb_dirty_limits(struct dirty_throttle_control *dtc) * If we're over `background_thresh' then the writeback threads are woken to * perform some writeout. */ -static void balance_dirty_pages(struct bdi_writeback *wb, +static int balance_dirty_pages(struct bdi_writeback *wb, unsigned long pages_dirtied) { struct dirty_throttle_control gdtc_stor = { GDTC_INIT(wb) }; @@ -1595,6 +1621,16 @@ static void balance_dirty_pages(struct bdi_writeback *wb, struct backing_dev_info *bdi = wb->bdi; bool strictlimit = bdi->capabilities & BDI_CAP_STRICTLIMIT; unsigned long start_time = jiffies; + struct bdi_wq_callback_entry bwce= {NULL}; + int ret = 0; + + + if (!test_bit(WB_registered, &wb->state)) + return -EIO; + + init_waitqueue_func_entry(&(bwce.wq_entry), wake_up_bdi_waitq); + bwce.tsk = current; + add_wait_queue(&(bdi->wb_waitq), &(bwce.wq_entry)); for (;;) { unsigned long now = jiffies; @@ -1816,6 +1852,12 @@ static void balance_dirty_pages(struct bdi_writeback *wb, wb->dirty_sleep = now; io_schedule_timeout(pause); + /* bid is unregister NULL, all bdi memory is illegal */ + if (bwce.bdi_unregister){ + ret = -EIO; + break; + } + current->dirty_paused_when = now + pause; current->nr_dirtied = 0; current->nr_dirtied_pause = nr_dirtied_pause; @@ -1843,12 +1885,15 @@ static void balance_dirty_pages(struct bdi_writeback *wb, if (fatal_signal_pending(current)) break; } + + if (0 == bwce.bdi_unregister) + remove_wait_queue(&(bdi->wb_waitq), &(bwce.wq_entry)); if (!dirty_exceeded && wb->dirty_exceeded) wb->dirty_exceeded = 0; if (writeback_in_progress(wb)) - return; + return ret; /* * In laptop mode, we wait until hitting the higher threshold before @@ -1859,10 +1904,12 @@ static void balance_dirty_pages(struct bdi_writeback *wb, * background_thresh, to keep the amount of dirty memory low. */ if (laptop_mode) - return; + return ret; if (nr_reclaimable > gdtc->bg_thresh) wb_start_background_writeback(wb); + + return ret; } static DEFINE_PER_CPU(int, bdp_ratelimits); @@ -1944,8 +1991,12 @@ void balance_dirty_pages_ratelimited(struct address_space *mapping) } preempt_enable(); - if (unlikely(current->nr_dirtied >= ratelimit)) - balance_dirty_pages(wb, current->nr_dirtied); + if (unlikely(current->nr_dirtied >= ratelimit)) { + + if( 0 > balance_dirty_pages(wb, current->nr_dirtied)) + errseq_set(&(mapping->wb_err), -EIO); + + } wb_put(wb); }