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 58042C77B7A for ; Tue, 30 May 2023 15:49:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DDA9890000B; Tue, 30 May 2023 11:49:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D623A900005; Tue, 30 May 2023 11:49:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B16FC90000B; Tue, 30 May 2023 11:49:57 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 9E0DC900005 for ; Tue, 30 May 2023 11:49:57 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 7EFD5ADB7C for ; Tue, 30 May 2023 15:49:57 +0000 (UTC) X-FDA: 80847357234.05.9913200 Received: from mail-qk1-f179.google.com (mail-qk1-f179.google.com [209.85.222.179]) by imf19.hostedemail.com (Postfix) with ESMTP id A9B061A000F for ; Tue, 30 May 2023 15:49:55 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=kernel.org (policy=none); spf=pass (imf19.hostedemail.com: domain of msnitzer@redhat.com designates 209.85.222.179 as permitted sender) smtp.mailfrom=msnitzer@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1685461795; 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: in-reply-to:in-reply-to:references:references; bh=ef9UXKlo6HOEzGKOWoRQOx3X1Mv/S3dqqbfR/aqcj1E=; b=dH4NZl5VN2sCwZDBpGqhmvO5nFFj3+WGjRGWOhH0uZT/PjQWpUxWueeQpQ0t3graK9myRu JNTazx1Zt3Qfmv7HEhVD1xkB9ZvYcG4SoOOxzNq2S90y0v2PoMDSLnPp1Snvbz8z3tR1Ak VtPea5BbCk7MXqAfcz89Pl7Y7N52u7w= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=kernel.org (policy=none); spf=pass (imf19.hostedemail.com: domain of msnitzer@redhat.com designates 209.85.222.179 as permitted sender) smtp.mailfrom=msnitzer@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1685461795; a=rsa-sha256; cv=none; b=tONtHkrTKuRki/uEZATHKxd955ki2C7Cpb+XQ3pXabVF1umCP8+swEwFInShD0wlTizZSI I2JxQtS8ilZkBwUPkJjwfDtQbLjow7N3dKWSUMOiWI9uVr56wteV1ZGIeyVrYerceGRx0C 7ol51MfuqHDr0AVod9Q5FtKUcKy5rSY= Received: by mail-qk1-f179.google.com with SMTP id af79cd13be357-75affb4d0f9so262026285a.2 for ; Tue, 30 May 2023 08:49:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685461795; x=1688053795; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=ef9UXKlo6HOEzGKOWoRQOx3X1Mv/S3dqqbfR/aqcj1E=; b=Vf7Am4RMtekJUqT4WsW3J+Srmn+O6WJvFRDB9F8dzRUkS/8jX9RinWfgvFF0Yq11mW /EbNqruF9JxguQKZSLofCXFrmR+hJP6PYNUoRsws3BxNwdtHCry6kGcvC6fPfUNEqU1Z lfNq/Q3x2now+79tcw6fGzfDwg+pxP6pMSggYuBfCC/AEXA8TbaEkJ1+/r8cHFkuabSt WTvIyLCWgBXIW4QctfKmVlx/vWiAO2M6xx8gjorIKul5sOMf6rKpdMYDpxAvcyKIqz7V JZqRXWN66+Y0OtR8xkcKRdxO0wOnxONFfd+tdA8sw9R1oHI7quxOHiLCWMOQl6a4MkX9 J6yA== X-Gm-Message-State: AC+VfDxdHmioWS5Vm/s+1lLzbLxnq6CRgYUDwL0/I7rX4sTrW8V+oxcV kRkLKv4jzJvzDumV48kf/V/P X-Google-Smtp-Source: ACHHUZ7pliMoFycu95ZOXiwcTabY+u351+caH9+LwJwAEUbICb4vYuE61O+IVefjdSw8mai/KPkDog== X-Received: by 2002:a05:620a:8084:b0:75c:c99d:e416 with SMTP id ef4-20020a05620a808400b0075cc99de416mr2289656qkb.49.1685461794842; Tue, 30 May 2023 08:49:54 -0700 (PDT) Received: from localhost (pool-68-160-166-30.bstnma.fios.verizon.net. [68.160.166.30]) by smtp.gmail.com with ESMTPSA id a23-20020a05620a16d700b0075b053ab66bsm4135656qkn.50.2023.05.30.08.49.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 May 2023 08:49:54 -0700 (PDT) Date: Tue, 30 May 2023 11:49:53 -0400 From: Mike Snitzer To: Mikulas Patocka Cc: Johannes Thumshirn , "axboe @ kernel . dk" , shaggy@kernel.org, damien.lemoal@wdc.com, cluster-devel@redhat.com, kch@nvidia.com, agruenba@redhat.com, linux-mm@kvack.org, Damien Le Moal , jfs-discussion@lists.sourceforge.net, willy@infradead.org, ming.lei@redhat.com, linux-block@vger.kernel.org, song@kernel.org, dm-devel@redhat.com, rpeterso@redhat.com, linux-fsdevel@vger.kernel.org, linux-raid@vger.kernel.org, hch@lst.de Subject: Re: [PATCH v5 16/20] dm-crypt: check if adding pages to clone bio fails Message-ID: References: <20230502101934.24901-1-johannes.thumshirn@wdc.com> <20230502101934.24901-17-johannes.thumshirn@wdc.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspam-User: X-Stat-Signature: amu74mubckfn6phr9o163s1p3jek5m8p X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: A9B061A000F X-HE-Tag: 1685461795-970689 X-HE-Meta: U2FsdGVkX1/q/xfjqKE7RSyyhRWJWWuXEF4so4KpZnZQ97MI2PgeOrHLK+3aMIsMmq3ftxsx32kBMcqRZfxTyVThzpBpHDgJ7Bauwo2bPI5xBWJ8iZBK+wurooYIVcs3mxeBpSxRP25ftebPHki38UIfYo5bJs2UxvQ9j3/bCy1Ocss8wRRFKiZX/m2qma/GiF4wKNdsLrA+1USLCEugL11+lICoUpGDhgqFHW9grrLFfInaCBRCd6YMRD/mYBqgu1jDXQ+iaaO8SReb7oQYd1tms7ghSc2NKD1EMcCjeS0TYTJmu3fuCOuHW7fI/yoVoiRvRXBhf5xlbTq3vCcy76f5TPqIdVsJaeHm/EetLyeKybOP7ijjZSN3GlIPzuBOowVl+arqF/xb9h5Fnold1GgYZmYkvSrJyYIbxzXoaddZ0iW1RmHYWSGT2PrYRaMPMy33mjVHYdeBG0BuGJ1zq+k5Ylim4pFmFjO56frOeBUiKqXHUp2UFnvocRW/t1lvcrr2tBIem8WxbkL8BvzSPV/X81NNm7S+3k4ZcgdBL2YIS9uVjnE+JHSFZxQBdT4WSNdFceXRh1rMuO2cmNoe2+UYKqnx6X/TthrBQoNIzeWmr83NMZaBGgqpXTLPzoHmwTO6DTF+in8Nn6pIeOqFH5HcORhKefz1m9jGMtYD+cxT4+IGspKMyWKP6GXn3E8AeeH6Uw3OKsYj2B+4JmXVWoyC/xZaS3GSNPuUtu/9HMX3g7/ssJjTuN5J+Ktj8CR/CBQXYjkn61iYCI6BplMkv+55JXOQBe+77kDpSl6IUnGHvnxA1AurdN/d+TlTpMGB7+tmXvR22R8Mo13xYnGz2UOwNtZ4WNmBpvwN06YvNiH1R+na17pZ80cdotwdmRlliU6w8lEqZySoKnFrFUQn01tW77jRrLorsfQxnPQeFmPR7TPTWfm+sMQVX4z1JJ4XgcaFa8XAfIRymx7qvGe +YecEW7s g5qbNCBBKHn9nvlY+kzMqL0Wzat4Od+H6gbThAa5ekpyLL0fmEYSADwO0IkrIJDen8C6lWwopq9EhjPQkWP4pvJCNK3h5vBHTJN0oEgbW+NiGWo3qy+07/B99M/o32TpFOk6chz356wiLClTCVHpzSDqu2iVuV9e1ROZLr/xFWCOsnQBtgTw2WVGqa3J9VE1AP6el29/aljQn9NI5O2up+4wD1yqF/bqB3O1YciZ12VI2aP1Wm9iaF06d6KijIIltnOaSF/chV6PLqQerrXDi9TbTYcN8Rvvzhi48uLUKp+GWtdAKNWU2cavq7ZJs6gTaOKqhkMWNUNHjsXtvJIwn83nXK4HHkuCTrp3iY+TeDOL2BE0FDH/u0waF11Jw8y/w9AIZyw143rK//KJQeCZo4Xl6W0lb+fF7b9pIXvbwtw4cHvANBiqMpNz+36YZfx1b9gwBKq6AwwodPL1G+b4NF7ysX6RiH8CRGqt/aAvNVABCK/FBviHFXCXhaLqXdwmBKsZMdFzYImDTco06oHH6JBaJpfOsEC9F+9G68ojsjKc2b5M= 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: On Tue, May 30 2023 at 11:13P -0400, Mikulas Patocka wrote: > > > On Tue, 2 May 2023, Johannes Thumshirn wrote: > > > Check if adding pages to clone bio fails and if it does retry with > > reclaim. This mirrors the behaviour of page allocation in > > crypt_alloc_buffer(). > > > > This way we can mark bio_add_pages as __must_check. > > > > Reviewed-by: Damien Le Moal > > Signed-off-by: Johannes Thumshirn > > --- > > drivers/md/dm-crypt.c | 9 ++++++++- > > 1 file changed, 8 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c > > index 8b47b913ee83..b234dc089cee 100644 > > --- a/drivers/md/dm-crypt.c > > +++ b/drivers/md/dm-crypt.c > > @@ -1693,7 +1693,14 @@ static struct bio *crypt_alloc_buffer(struct dm_crypt_io *io, unsigned int size) > > > > len = (remaining_size > PAGE_SIZE) ? PAGE_SIZE : remaining_size; > > > > - bio_add_page(clone, page, len, 0); > > + if (!bio_add_page(clone, page, len, 0)) { > > + mempool_free(page, &cc->page_pool); > > + crypt_free_buffer_pages(cc, clone); > > + bio_put(clone); > > + gfp_mask |= __GFP_DIRECT_RECLAIM; > > + goto retry; > > + > > + } > > > > remaining_size -= len; > > } > > Hi > > I nack this. This just adds code that can't ever be executed. > > dm-crypt already allocates enough entries in the vector (see "unsigned int > nr_iovecs = (size + PAGE_SIZE - 1) >> PAGE_SHIFT;"), so bio_add_page can't > fail. > > If you want to add __must_check to bio_add_page, you should change the > dm-crypt code to: > if (!bio_add_page(clone, page, len, 0)) { > WARN(1, "this can't happen"); > return NULL; > } > and not write recovery code for a can't-happen case. Thanks for the review Mikulas. But the proper way forward, in the context of this patchset, is to simply change bio_add_page() to __bio_add_page() Subject becomes: "dm crypt: use __bio_add_page to add single page to clone bio" And header can explain that "crypt_alloc_buffer() already allocates enough entries in the clone bio's vector, so bio_add_page can't fail". Mike