From mboxrd@z Thu Jan 1 00:00:00 1970 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 34134C48BF6 for ; Thu, 29 Feb 2024 18:08:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6818D6B0082; Thu, 29 Feb 2024 13:08:19 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 630EE6B0089; Thu, 29 Feb 2024 13:08:19 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4F94D6B0088; Thu, 29 Feb 2024 13:08:19 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 408626B0095 for ; Thu, 29 Feb 2024 13:08:19 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id E6BB4140439 for ; Thu, 29 Feb 2024 18:08:18 +0000 (UTC) X-FDA: 81845625876.03.F250665 Received: from mail.cybernetics.com (mail.cybernetics.com [72.215.153.18]) by imf17.hostedemail.com (Postfix) with ESMTP id 96B7D4002F for ; Thu, 29 Feb 2024 18:08:16 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=cybernetics.com header.s=mail header.b=EHNEAJpH; spf=pass (imf17.hostedemail.com: domain of "btv1==78916a1268e==tonyb@cybernetics.com" designates 72.215.153.18 as permitted sender) smtp.mailfrom="btv1==78916a1268e==tonyb@cybernetics.com"; dmarc=pass (policy=none) header.from=cybernetics.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1709230096; 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-type: content-transfer-encoding:content-transfer-encoding:in-reply-to: references:dkim-signature; bh=GyTYh7rZxyuaZxAK4E6INt0hy/oXnF2VsS983Qgm9WI=; b=VKhuHkMv8dU5Qr/1Ci7pVuPgFJ7gQMwGZCeEx7iDJTTUj3azmD3D8YrZv7j5KYgqKgTemy VMnlHA1fDh3jipwSqZyexHqrP81ayKIGf1fw9sWRt2ZP8g3Paj6GrZpBFz+kEEOzwtGTWm RQDgUCweKJ1+3vh9Njoa2WP2NVwFaG4= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1709230096; a=rsa-sha256; cv=none; b=M67feUipEO9da88oNi1CgnG8xNG3hFDbIc+FVnJC424+T0qPJQ2Kp5HVjxQk5VSIT8Y+vI cOiFQcZn8W9k0G1Md0Ks3OEAMQ54XweQF32uxjnA8sCNf+8UfToY0mveKIdjh5wCVkOYOP SbMnD6Y1ve03A5hHCapSLDUml2O7IRo= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=cybernetics.com header.s=mail header.b=EHNEAJpH; spf=pass (imf17.hostedemail.com: domain of "btv1==78916a1268e==tonyb@cybernetics.com" designates 72.215.153.18 as permitted sender) smtp.mailfrom="btv1==78916a1268e==tonyb@cybernetics.com"; dmarc=pass (policy=none) header.from=cybernetics.com X-ASG-Debug-ID: 1709230070-1cf4391a1c4fcf0002-v9ZeMO Received: from cybernetics.com ([10.10.4.126]) by mail.cybernetics.com with ESMTP id OKH4L5BwQIJxnplq; Thu, 29 Feb 2024 13:08:13 -0500 (EST) X-Barracuda-Envelope-From: tonyb@cybernetics.com X-Barracuda-RBL-Trusted-Forwarder: 10.10.4.126 X-ASG-Whitelist: Client DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=cybernetics.com; s=mail; bh=GyTYh7rZxyuaZxAK4E6INt0hy/oXnF2VsS983Qgm9WI=; h=Content-Transfer-Encoding:Content-Type:Subject:From:Cc:To:Content-Language: MIME-Version:Date:Message-ID; b=EHNEAJpH9NO6DGJeblalbgxMQVo9ZjLHP5lNuDo0CY5z+ 3qRP6j8BSOQ1clNEfFa8V1xd1wyAxTkw7gIdJuf4r5DcXWB08/uQ/7qeVuc70mLwffJnHoNaXO4ro 5M6b7FYErqw/nqlHndEyRgwppLhJ5Aw8n43zpvTRnqCKTu0iA= Received: from [10.157.2.224] (HELO [192.168.200.1]) by cybernetics.com (CommuniGate Pro SMTP 7.1.1) with ESMTPS id 13108803; Thu, 29 Feb 2024 13:08:10 -0500 Message-ID: <86e592a9-98d4-4cff-a646-0c0084328356@cybernetics.com> X-Barracuda-RBL-Trusted-Forwarder: 10.157.2.224 Date: Thu, 29 Feb 2024 13:08:09 -0500 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: Jens Axboe Cc: "Matthew Wilcox (Oracle)" , Andrew Morton , "Kirill A . Shutemov" , Hugh Dickins , Hannes Reinecke , Keith Busch , linux-mm , linux-block@vger.kernel.org, linux-fsdevel , "linux-kernel@vger.kernel.org" From: Tony Battersby Subject: [PATCH] block: Fix page refcounts for unaligned buffers in __bio_release_pages() Content-Type: text/plain; charset=UTF-8 X-ASG-Orig-Subj: [PATCH] block: Fix page refcounts for unaligned buffers in __bio_release_pages() Content-Transfer-Encoding: 7bit X-Barracuda-Connect: UNKNOWN[10.10.4.126] X-Barracuda-Start-Time: 1709230093 X-Barracuda-URL: https://10.10.4.122:443/cgi-mod/mark.cgi X-Barracuda-BRTS-Status: 1 X-Virus-Scanned: by bsmtpd at cybernetics.com X-Barracuda-Scan-Msg-Size: 1347 X-Stat-Signature: qfiip3t936erfqohpfw1kqyy1z7hw6am X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 96B7D4002F X-Rspam-User: X-HE-Tag: 1709230096-48129 X-HE-Meta: U2FsdGVkX19iPTWrwrtA2YWV6bdV0BiN0rVf1U02IwCh/8BGeg8z02KjZya/1ER7ZIkSDXAKCcACLN5nGUvSQJShmIw8lT6eymF/9CnfvkVjLHMyyXuc5Xo4gyH9/+GRDWeLJX6sBEBXmWSlZsg6MMP3LQSQFrCBac+XQUzgh7yjxlwQ3I+AwLCUYavitON8Hg9HkDtzyml8mwohg57zPjtqG2AseLvrI1XS+MX4MIyB7VFkgZ0CxVvt/2Vw/Gf5ilkuQP/H4raOAFhBwoRitcJ8IrXNdztGajMloGRD6luexWrwiX/LEeFrnQcMAMQauEGyuZ46REJzK8Ti8+16s9mtlWMRFETLDkczCa4iZhF69EJul8rs4nz98sHoRQvTh46niyQmspWF6YiyfuCGTgwq51TU1oCFokZdg35+rxeENjlybht6ZC9Cmi2Q8F67R9ZRURZKodFdzKfKHlm5/QfM46YQ5aAJ6aIjHaI0LyKe0UJ9ESx8jcG5Fy+MQEaWHBPqk0LJzaMWAbUbqPFobFrwLjMpzzfC3w15g/3qrfgL0heevTjFc4iOL1al+6QdffzCaLg6CjL4He6RBIBDYu/+6cswXn6BftJtET6Ne5U+I16W9luRa2NzPP75/+IvsbTGw2sQx0kqzT02l46CPE6b8iMD6/Z3ffEU53kkzWbxciy5UPjjVrfCrAjuxNAkKarc1AHUpZnNX0GByWsmQlZOkmZ/HRmx+E3DaUgPWVtCpedTuuwcueS9SI/Cyy04EiKA5btKzyQBef8ctBxz6qfgct2LsWOJSoUlNyoIFfLUdVfE3jgFeHLMb7urizFmsj8JPvsuTJ3orzVrKr30QjS1eZ9WclDwYlGA2JTN5rdwkftN4b9sEqAmzqFu7F3A5ftKuE1my5qfBldDOIVBxPER2r0adeDUU1Z8sxy+/RJqPKt0OyM8Ot6Q7j/Elri66I/rdAu3jfnPAdJ5H2e U84nb7Mt cEDN2zqF/igvzFtjsHjDN7qJ2A97+42FHTX5s/rM++2Dpw43zWO344QGholv/SjwcYkHHNbjH5Rl690gtZH07WBokPuT3bao7W/Zn4ELE7jJXoJ1N/wn3JDjhTfFrnSjwmbRSZf2IRuJXgGXeZITH+pmtz9iGxYdGtUZBkIxf94I+aEGwR0yem+zwp8h4v/OkIWFPv+3wpLy4hjq55QNOanthwVJwkA0SgsafPAzUZjgZYIUZHSmfFBRm1s9YWEeM9mX314HyLiK33IzWXfqD4xRgM39NSYxfYZqJrmjAUMLQV+hfZa+ltRyu8BlU1ywo1N3u8NFIF9xGS3fWipFB2LPFJBmK+/BPOAiuuNjI7w5s70+J4Len4T9/nyr/6iYBbSzpEe4Rkwu4do4y/SK1aGgiLhpSNYGDtOeechyZw0GlOPPEFb8Tr0QQS5LJ17n5m71eTjACofc7gtum3sll7o4AyyMvscxsrrfywRUAkL98Apb0y4Mc6iI25ilC29CKMy2YkpCZqiyoJpdE2vImmyxZYFSJ+Iw94X8n7WdlGW9QaAOK/QzXjGGl7Jxpv9M8r6uW0gYktPELF6G0eS0NHp3L4oOUVo+b5qOoIGD3u8ewpEc= 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: Fix an incorrect number of pages being released for buffers that do not start at the beginning of a page. Fixes: 1b151e2435fc ("block: Remove special-casing of compound pages") Cc: stable@vger.kernel.org Signed-off-by: Tony Battersby --- Tested with 6.1.79. The 6.1 backport can just use folio_put_refs(fi.folio, nr_pages) instead of do {...} while. block/bio.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/block/bio.c b/block/bio.c index b9642a41f286..b52b56067e79 100644 --- a/block/bio.c +++ b/block/bio.c @@ -1152,7 +1152,7 @@ void __bio_release_pages(struct bio *bio, bool mark_dirty) bio_for_each_folio_all(fi, bio) { struct page *page; - size_t done = 0; + size_t nr_pages; if (mark_dirty) { folio_lock(fi.folio); @@ -1160,10 +1160,11 @@ void __bio_release_pages(struct bio *bio, bool mark_dirty) folio_unlock(fi.folio); } page = folio_page(fi.folio, fi.offset / PAGE_SIZE); + nr_pages = (fi.offset + fi.length - 1) / PAGE_SIZE - + fi.offset / PAGE_SIZE + 1; do { bio_release_page(bio, page++); - done += PAGE_SIZE; - } while (done < fi.length); + } while (--nr_pages != 0); } } EXPORT_SYMBOL_GPL(__bio_release_pages); base-commit: d206a76d7d2726f3b096037f2079ce0bd3ba329b -- 2.25.1