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 53F6EC77B7A for ; Tue, 30 May 2023 15:14:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 951FB900003; Tue, 30 May 2023 11:14:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9011F900002; Tue, 30 May 2023 11:14:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7C951900003; Tue, 30 May 2023 11:14:34 -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 6E1DE900002 for ; Tue, 30 May 2023 11:14:34 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 4434F1C7016 for ; Tue, 30 May 2023 15:14:34 +0000 (UTC) X-FDA: 80847268068.02.91B2750 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf26.hostedemail.com (Postfix) with ESMTP id C6AA014012E for ; Tue, 30 May 2023 15:13:45 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=G6hEFDgE; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf26.hostedemail.com: domain of mpatocka@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=mpatocka@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1685459625; 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:dkim-signature; bh=vye8gB1vOKUzz58ckJ8yXN12XsS7VmnNhEIxChnaCeU=; b=rdELT0A3NurCtHkb2WGDega3M9a0qadHA9qDO0amo8Cx1puw7j3esZ3jh36aCAmTWFMt8r +OczWrd8DoGX8dAJHab/9WI4+Afv9r6mwsQ1ebOKF2xvKNnLhiN9yRP104jX8OwlQNCd8i Bln3oVuaS28kDw4CzT8H3RBQy3zboPY= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=G6hEFDgE; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf26.hostedemail.com: domain of mpatocka@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=mpatocka@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1685459625; a=rsa-sha256; cv=none; b=emCt3kbrX8++DT05mRiL1l8s19I0NaqknqsC5jf9MjXGz1dbhTo4Ei69uX9MHKwTStGny3 c09c2h4OZa4JjgJt5PoXXKQcAOfwnHGsq+eSEFjTBesWF/dzlAfvwJ3W/sXseTsoEbXzyh pUSYFxwLxHE0N/dQcAAzu+rrk4Od7Ac= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685459625; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=vye8gB1vOKUzz58ckJ8yXN12XsS7VmnNhEIxChnaCeU=; b=G6hEFDgEQ4cfyxajqtazPnr7+2QJi4lLdfA1n48Gkimr3zyZetAWzVurUxcPDM+1hDndyO noJr56j95XPxY/ohZ4O2RUCUnbrfzHfYOfICaIGpXC9GgUZNTIpl+TqoWpK9z7hJYOQaKz uJuQWyBpY4pCcXjsE7fEKg5eCYvyRKQ= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-5-hmEFKwvqOZWLGW87qowi1w-1; Tue, 30 May 2023 11:13:40 -0400 X-MC-Unique: hmEFKwvqOZWLGW87qowi1w-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BB27785A5BA; Tue, 30 May 2023 15:13:39 +0000 (UTC) Received: from file01.intranet.prod.int.rdu2.redhat.com (file01.intranet.prod.int.rdu2.redhat.com [10.11.5.7]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8A93F140EBB8; Tue, 30 May 2023 15:13:39 +0000 (UTC) Received: from file01.intranet.prod.int.rdu2.redhat.com (localhost [127.0.0.1]) by file01.intranet.prod.int.rdu2.redhat.com (8.14.4/8.14.4) with ESMTP id 34UFDdMG006630; Tue, 30 May 2023 11:13:39 -0400 Received: from localhost (mpatocka@localhost) by file01.intranet.prod.int.rdu2.redhat.com (8.14.4/8.14.4/Submit) with ESMTP id 34UFDc58006626; Tue, 30 May 2023 11:13:38 -0400 X-Authentication-Warning: file01.intranet.prod.int.rdu2.redhat.com: mpatocka owned process doing -bs Date: Tue, 30 May 2023 11:13:38 -0400 (EDT) From: Mikulas Patocka X-X-Sender: mpatocka@file01.intranet.prod.int.rdu2.redhat.com To: Johannes Thumshirn cc: "axboe @ kernel . dk" , linux-block@vger.kernel.org, damien.lemoal@wdc.com, kch@nvidia.com, agruenba@redhat.com, shaggy@kernel.org, song@kernel.org, Damien Le Moal , snitzer@kernel.org, jfs-discussion@lists.sourceforge.net, willy@infradead.org, ming.lei@redhat.com, cluster-devel@redhat.com, linux-mm@kvack.org, dm-devel@redhat.com, linux-fsdevel@vger.kernel.org, linux-raid@vger.kernel.org, hch@lst.de, rpeterso@redhat.com Subject: Re: [dm-devel] [PATCH v5 16/20] dm-crypt: check if adding pages to clone bio fails In-Reply-To: <20230502101934.24901-17-johannes.thumshirn@wdc.com> Message-ID: References: <20230502101934.24901-1-johannes.thumshirn@wdc.com> <20230502101934.24901-17-johannes.thumshirn@wdc.com> User-Agent: Alpine 2.21 (LRH 202 2017-01-01) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-Rspamd-Queue-Id: C6AA014012E X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: rkk7bokdkogp55f5qkzkgfgcaokqppxi X-HE-Tag: 1685459625-509951 X-HE-Meta: U2FsdGVkX1/zz6NQGfmAfulgq4elr/68eNLPupYEAhmkk4FGgGckU8Gb1yDaIjvRk+9WR6bfup485C8IsWWmayKrSg59BP0B6WnUDuIfXWScEieK9cRZNRI2lnFSJ7oockFJc8JFlxD2Lpqkl1s2xEnVs6iv9ZQ3MgArL9e+GAqCF3hRTnfUtmo02DoOxi+V5nWg74oTCBw5Rw5PFfo4OEO07Uw5iXnsc4HiEKLrOe+Gj5Mv+/ApBmhLDfsFitNKtY+k0CKYBnJPdI8CWEcIOebmxckFdATZaR0p+5Gyim7bCUbk7rP1cDGzt/9nI1qT2AuXyCQgzabyVpIfgVku2NhjjwdR4y1yxjAIY/K+tOZR6fSO5uxdF16wkpFyZ68XvddF8+wcL0Xsuz/2NRfjEmDXZkQJqa++wSC9VtHA/wH5mv5Ov5hGW5p4Gt4jxkwK8PCZ8/y3xzt/56+aHyCI2XpicgwblaasBV/1cxhqh4gM1+GD1KApUE2HVvR4NvcBlrz7QocSWpc9JoAeAp57NATKtU/cV42GY/uNYJx4j0aFTRSPljpYt8DgMmEL5BIngs2yti33qFcFSXT9nBzGAJ/iKhcvsYvKI9Q5MlvhIEToecSYPvMulzHjwgnVtmBmZoeN8k9POwVcRVycQtVg2SC6AaQiwTQZDKwjdOARQuGICfYM+OXhhyXQALCOcdSd7NKxyx6ZEnnXP/qmMflz9jBHxUCy78m4ns5ncPEtXujfdMs/JYU71NYColnwXdwkicnHVsgXyP/wfSdCtKDOpW65CYZlxU/fndc0Pz6VbWJ8R3iiwZJs1AcMrzFof7Fh2AsFd/0ikDt9v4MYae1MmO26TsehgnqXoO+FCUGXYcZLdOYOdoWPcMg0r8hp5KB0BuY8mY+yw8fhG7IKfujNUn1J3V5Wg2isRv2kIPT0bGN9BcEyWBWDCMaszcNDpR441rjDCnxNo1MMIFmvAGT sshb+AwY SIUx9TpidGvhTU96XoEmpQIrAGULiEY5PvvY3VnKCUYrWZwsdGLRoTLrIHViaZLIADwjOLwM3tuzUdpqOZ/YeFl+jdBnnwNQRBSl+lJLDYdAjMruL6bkMKH+vBrN7jL7ykGe4dbhixIHAnbdLlwMXZCV9ITYasNQMEKxQm2FXxPzS1mSfJJB7TQ+KfsZwxfkvmPmbEVMRB9TC/1sErEleaDEuLwAPeXbNmSiIY7+5rxPn+qzwEjSgWghn3w== 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, 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. Mikulas