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 D910AC7EE2F for ; Wed, 31 May 2023 11:38:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4518C6B0074; Wed, 31 May 2023 07:38:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 400E36B0075; Wed, 31 May 2023 07:38:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 22D068E0001; Wed, 31 May 2023 07:38:14 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 14FD36B0074 for ; Wed, 31 May 2023 07:38:14 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id D3DC9402EC for ; Wed, 31 May 2023 11:38:13 +0000 (UTC) X-FDA: 80850351666.17.BBD1E52 Received: from esa3.hgst.iphmx.com (esa3.hgst.iphmx.com [216.71.153.141]) by imf02.hostedemail.com (Postfix) with ESMTP id B2B6D80016 for ; Wed, 31 May 2023 11:38:11 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=wdc.com header.s=dkim.wdc.com header.b=ndssroBU; spf=pass (imf02.hostedemail.com: domain of "prvs=508ef2a02=johannes.thumshirn@wdc.com" designates 216.71.153.141 as permitted sender) smtp.mailfrom="prvs=508ef2a02=johannes.thumshirn@wdc.com"; dmarc=pass (policy=quarantine) header.from=wdc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1685533092; a=rsa-sha256; cv=none; b=5O94RN8FHKRv7//xjbmENfk8ffh0efHFMPd7xolXesGjf46Cij3Jmy6ca22xV09jbjHWzu 7UvO67i8aqoNM6oa9fSZgRRd2lkg3qViWLCg9v14K7Y5I95baC3+EysLyPNiecZuQz+H7U 4AE1Ih2roAOMp6ilDfQJqiRwHnn5FSw= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=wdc.com header.s=dkim.wdc.com header.b=ndssroBU; spf=pass (imf02.hostedemail.com: domain of "prvs=508ef2a02=johannes.thumshirn@wdc.com" designates 216.71.153.141 as permitted sender) smtp.mailfrom="prvs=508ef2a02=johannes.thumshirn@wdc.com"; dmarc=pass (policy=quarantine) header.from=wdc.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1685533092; 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=JFwZOevzZPaYPPGYr1w21C+cJT0TV2LMpZApShUn0g8=; b=O+EyM1Xm8ftCA+LZL3v7QNXHVoM9LQaTtCkY78fukwKp6n51+eeRP7H/9jPJs48TN5XP4N 3NfZoKuhNIAB6cB4zRYbEUyoaTWx5vnnDxDgYb4cFmXxXrFeDebVPEX2Z38JOLT8AHRwMq se7kQIFFofV5Md8n0BO1TpFsO119hVk= DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1685533091; x=1717069091; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=QmZzem9nS4IdX+YpMPH6/hkU8Q8851NfFydLySYg+TQ=; b=ndssroBUa3yVsBN6Cj0w41r/5zZ19BFUf73cEug0EH/myVoADJu56G/8 Svutgd647rjqlCbMrIBQ4+Aps485lnceYMlaw6t/Gp75gwA6gqzVH9Dgj dSuqE8a8aP0Gq32umqmyodvwT2CcIOrZGdUn6EGXdODDPXelEUdd9G+i9 42VAvlXCR32txY0F15QQ619+prhpj5H2ArpGuzsk4WgcFSqva5TiwcN1m WlyjktnpSy/CNffoZ5pHDEpO4tbh56qn9tvRPhcq84h92j57Zodi6bNxE kS4Odxu8E0IZwlmD9Cqdss3loSVne3QMZvrft+LvKaPvEIga+mCRLFMvt w==; X-IronPort-AV: E=Sophos;i="6.00,207,1681142400"; d="scan'208";a="237001286" Received: from h199-255-45-14.hgst.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 31 May 2023 19:38:10 +0800 IronPort-SDR: /JA52vGdKIbXF/iLS+BFv2b2m209gR9DlLmHfTpgpo2dQomzN8Hi2mZ7NQd07vBYv6rnT9JSit 8vZyETByhl3GM0BSKIn02O2N6pVDeP09KnBR6bc9VD/PUB3mtW2AJREA58kK08jksQX1ZDEmdU VDCQXYKEOuf5sGKpsF+rweFbScHJFQVp2ec5Oa3hXPTOr7rVFitIzBEx/vBQvlkvkz5ghYzKtG xaZCMcA+WKcSMmMANVPQ/LoIHDXLDD0THEN4wQ2GoH+Okto0hE6QXeJGd5NYy8+SGnGcVtgna4 Hog= Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 31 May 2023 03:53:02 -0700 IronPort-SDR: elnARq94Fzfs9J/SRdQfPNSX2Mj47szsB+03GiXquQ2ST3HVuP3adJmqVxYOTx4q+O3Ar0gSDG obKu1tjEmPaDp0Baw6hhej1TiKvLCydrnnSOivc5pAoD/cOgpqCNYnEP6/Mqd74RpC+Wx0vSBH GI3+WyE4fAK6iQr0axj5aoe3KHl8hMhJY0SalgRpsyxXvDMZmnHERLU4aQaTJg2RMSrIbWgvpC 3iHVAQtCOiND+WXOqNqjAwGt4qQsXSe/P0EYzlIb2M+HDt/lrHj4VzKNRsn7VyLQUoD32UrxG5 92Y= WDCIronportException: Internal Received: from unknown (HELO redsun91.ssa.fujisawa.hgst.com) ([10.149.66.6]) by uls-op-cesaip02.wdc.com with ESMTP; 31 May 2023 04:38:07 -0700 From: Johannes Thumshirn To: Jens Axboe Cc: Christoph Hellwig , Hannes Reinecke , Chaitanya Kulkarni , Damien Le Moal , Ming Lei , linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, dm-devel@redhat.com, Song Liu , linux-raid@vger.kernel.org, Mike Snitzer , Matthew Wilcox , Dave Kleikamp , jfs-discussion@lists.sourceforge.net, cluster-devel@redhat.com, Bob Peterson , Andreas Gruenbacher , Mikulas Patocka , gouha7@uniontech.com, Johannes Thumshirn , Damien Le Moal Subject: [PATCH v6 01/20] swap: use __bio_add_page to add page to bio Date: Wed, 31 May 2023 04:37:43 -0700 Message-ID: <64f8ac179cc54aa316c75aaadd71e107ba12917d.1685461490.git.johannes.thumshirn@wdc.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: B2B6D80016 X-Stat-Signature: nhifkww6itykqynojefmagjxukh4ebtx X-Rspam-User: X-HE-Tag: 1685533091-915595 X-HE-Meta: U2FsdGVkX18tnH4pYHnbPBaSMggvu045cN5bkjsGHL5Im60hbKSsBKtdecbEgVGmj7GQiDIC+M9jtZyas782iYVSSqO3hltmzaFwSABdMa3ztIrX6K+QW5Rvn+g5Uq+p4VREXS9PH37TTaglYinHhG9+KaHmc3Lo5+x58izW5QH5ZOEOxfmzzFGUmZ0JvF8omqHFFqgSJBxqR1x9gFM0B1VzFn7mvJaNvQuI2k93ZPyK0fQJRqxoXnQp3stIvddbvOjxHPhO4Y/mwomz617CAYIxyWTguTsgn+IEAqX2mmta2WDNZpTz+VElgqVHG+dZjSk3FJEmI3Mhk8LG8ApkELi/iBTJjLR0CDzQZU7kUv5x5vI4sbEYtnA7xAC3U90hm+RBJGJHhscXpFYlqTuBMvP36aX9Z55v25kCwM0BXNUMpsD6pfKnPqqrnp+DFKUi4B/0aSOYTeo8gL1EE2j/skN5CgEvRKb7Dw3sGsOUwtj7xvDbCPBoPpRrHyCrQ/mQKvTl5bYydzw6WS3ABO/33Ia9TCrYoM6lcORievltQQhEavbQfOOvbq0wLD7494FaFUcOi4Pv+c94phQ4Mm7ukI5CJ0NJ7n5e9BE+aM+EdKNWUy5Y2rBkAEWBqEadAlQ8pvsPPiTiDK4ekt4Sy+2+PgN7/5qU+EKTgLiOSiR09i2tGmaNhxHA9eyBbCkFiA7gGSLhgrYlF5x7SEFh4QQT22LnF/rrCFku2WrMnBsSFseuaXJovqt4kyBxIaBkCZ/TEc/qifSTg7Sc+2J4k4iCw3oqJoLzJbVsVCMkKcFj27Copuu2v47fAVxBHZl089QwRsyn/BKTNJ1mm3kTW8jLj4iEaD7gyutZuKuH5ZRdD2wB/p+scHUITdk8A634YFty44yI56YWSVK+5S5nYVF+CU3xJ0VpyduMljVbb86z6jq4FKGDVQXYJe2V5LngEyu28n1T83adY0UcoI4S98P COMQf67j 5s14+sUeihqi5oigpppqHCLQof1nKKfaMNlwndVCpUqNgDCAWWOQAOXGmJe2VNDEnM4p6NrRBcsi5MGfWHMDRLX5OVaAVi0paaVByZM5lf29GCRPJe5kzaohS1UC8VdLbhj3nBAC2mjV7afwuukcdxuNzZezUtEYYLHWNR8b3LP/T2u2c+FqFHGEuB9Fll1fVz5A+pQiasvdE4sOqEQBeh0RcxcyWXzA69eHrjD/PkMHgh7INXydZRTprB7qhep+I20kDRqAPqdznFA6BYvh4ft8unaazaS0/j2Kgp+A+hnEkYVYCspZyRMd1n+1PWGZcD2CLYR3uRzkdyygE8IduYTHI4n14eIHXYkFu4HuB2DNnbgi8n3aM+u13tMXXQylhzvjpngdYoddLScNnfkbkHgRsUA== 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: Message-ID: <20230531113743.66XO7wn3AEeD0e1EnNjbhdsVmbywD_pUHMAQgrf42u8@z> The swap code only adds a single page to a newly created bio. So use __bio_add_page() to add the page which is guaranteed to succeed in this case. This brings us closer to marking bio_add_page() as __must_check. Reviewed-by: Damien Le Moal Signed-off-by: Johannes Thumshirn --- mm/page_io.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mm/page_io.c b/mm/page_io.c index 87b682d18850..684cd3c7b59b 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -338,7 +338,7 @@ static void swap_writepage_bdev_sync(struct page *page, bio_init(&bio, sis->bdev, &bv, 1, REQ_OP_WRITE | REQ_SWAP | wbc_to_write_flags(wbc)); bio.bi_iter.bi_sector = swap_page_sector(page); - bio_add_page(&bio, page, thp_size(page), 0); + __bio_add_page(&bio, page, thp_size(page), 0); bio_associate_blkg_from_page(&bio, page); count_swpout_vm_event(page); @@ -360,7 +360,7 @@ static void swap_writepage_bdev_async(struct page *page, GFP_NOIO); bio->bi_iter.bi_sector = swap_page_sector(page); bio->bi_end_io = end_swap_bio_write; - bio_add_page(bio, page, thp_size(page), 0); + __bio_add_page(bio, page, thp_size(page), 0); bio_associate_blkg_from_page(bio, page); count_swpout_vm_event(page); @@ -468,7 +468,7 @@ static void swap_readpage_bdev_sync(struct page *page, bio_init(&bio, sis->bdev, &bv, 1, REQ_OP_READ); bio.bi_iter.bi_sector = swap_page_sector(page); - bio_add_page(&bio, page, thp_size(page), 0); + __bio_add_page(&bio, page, thp_size(page), 0); /* * Keep this task valid during swap readpage because the oom killer may * attempt to access it in the page fault retry time check. @@ -488,7 +488,7 @@ static void swap_readpage_bdev_async(struct page *page, bio = bio_alloc(sis->bdev, 1, REQ_OP_READ, GFP_KERNEL); bio->bi_iter.bi_sector = swap_page_sector(page); bio->bi_end_io = end_swap_bio_read; - bio_add_page(bio, page, thp_size(page), 0); + __bio_add_page(bio, page, thp_size(page), 0); count_vm_event(PSWPIN); submit_bio(bio); } -- 2.40.1