From patchwork Wed Sep 6 10:50:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?UTF-8?q?Javier=20Gonz=C3=A1lez?= X-Patchwork-Id: 9940413 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 88A01602CC for ; Wed, 6 Sep 2017 10:57:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7C65928556 for ; Wed, 6 Sep 2017 10:57:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7137D28BA1; Wed, 6 Sep 2017 10:57:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2CFED28556 for ; Wed, 6 Sep 2017 10:57:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753680AbdIFK52 (ORCPT ); Wed, 6 Sep 2017 06:57:28 -0400 Received: from mail-wm0-f51.google.com ([74.125.82.51]:38507 "EHLO mail-wm0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753268AbdIFKwl (ORCPT ); Wed, 6 Sep 2017 06:52:41 -0400 Received: by mail-wm0-f51.google.com with SMTP id 187so29402962wmn.1 for ; Wed, 06 Sep 2017 03:52:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lightnvm-io.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aZzR2Va+1Efpndv8yPZF3i/GbRDAFSlVR+VZ4XvXVuI=; b=RqoCPZTSSkmi5IMHAHuceKPcmGjW4dzB/bPRTAfKM+PnR5DYc1sKdF69l2sTgZp0sX sRgGJBzJ7YZtX8yQDJNY3o9Yad2P9JlBthGWvAKBUyWqHnTkP2P/YDb63FzZt2ch3L3s 2dSWIKJZ0PQgd14673JRPqWPSXgCVpgpoF43c8BC+nDQk0zfd5tFE9kRTeI76IZ3oai4 h3RfSidpwaJ0LbVqrqg2yzfurc8spDzXYhcnDAqK7B7AtiC1/B+zyl093ydLRu4OKbwK XsxoJLrfmLivFogr7Y3v7mCQyzRLJGezaVxrHzWOZpMGobloNfhW0zOhRK+t/BT91L4n 3SZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aZzR2Va+1Efpndv8yPZF3i/GbRDAFSlVR+VZ4XvXVuI=; b=nG+I0DC/jdDwaBZu7Q3lt30sNYWYxQU/TPQ+afUKUftytxfZVK7nYpDEkD2YlzVEKe KbGHJ6tAMxf0o0tw+YEKzKZWr/zH4I2l8lIXSY3iBb+MYoPH9P6ewh46vj7wpbgjDqc/ 3uYytTaZMWfVcmWs3NAyFKdXSyb0ld2cIYweOZkpPMiEk8fDUvPZGHfccbucfY4FHqcc M+AYiegVhSzw6zeDV8LWFBXOPwdNeOiPA6gC1MU1R1CSgVjwlqOlySDn3sZ38sndNxrS fFaxDZ1YtKw7poxobcbpAl4xkL+RYZeCU9YnKUMOWhIJSbzvUQYL8xb3KAyzvGoXC8KN JKig== X-Gm-Message-State: AHPjjUhGoYfDhFi1pAIG5rOq/8/mpagYBnI5eYhsPRxvYddug9fu1Eni wRJMOxVNeTcAenBE7M8= X-Google-Smtp-Source: ADKCNb6e0MPkIMiUTvBuwgJlhYQwXSN/G97DLkBSpsqkJg4viaX04xMgctko1EXvd2neyA+8m2EBmw== X-Received: by 10.80.177.78 with SMTP id l14mr5875912edd.9.1504695159763; Wed, 06 Sep 2017 03:52:39 -0700 (PDT) Received: from uHalley.cnexlabs.com (6164211-cl69.boa.fiberby.dk. [193.106.164.211]) by smtp.gmail.com with ESMTPSA id b8sm1044007edi.46.2017.09.06.03.52.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 06 Sep 2017 03:52:39 -0700 (PDT) From: "=?UTF-8?q?Javier=20Gonz=C3=A1lez?=" X-Google-Original-From: =?UTF-8?q?Javier=20Gonz=C3=A1lez?= To: mb@lightnvm.io, axboe@fb.com Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Javier=20Gonz=C3=A1lez?= , =?UTF-8?q?Matias=20Bj=C3=B8rling?= Subject: [PATCH 04/18] lightnvm: pblk: check for failed mempool alloc. Date: Wed, 6 Sep 2017 12:50:57 +0200 Message-Id: <1504695071-25928-5-git-send-email-javier@cnexlabs.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1504695071-25928-1-git-send-email-javier@cnexlabs.com> References: <1504695071-25928-1-git-send-email-javier@cnexlabs.com> MIME-Version: 1.0 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Check for failed mempool allocations and act accordingly. Signed-off-by: Javier González Signed-off-by: Matias Bjørling --- drivers/lightnvm/pblk-core.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/lightnvm/pblk-core.c b/drivers/lightnvm/pblk-core.c index e3997abdf740..11a684162a5d 100644 --- a/drivers/lightnvm/pblk-core.c +++ b/drivers/lightnvm/pblk-core.c @@ -165,6 +165,8 @@ struct nvm_rq *pblk_alloc_rqd(struct pblk *pblk, int rw) } rqd = mempool_alloc(pool, GFP_KERNEL); + if (!rqd) + return NULL; memset(rqd, 0, rq_size); return rqd; @@ -1478,6 +1480,8 @@ int pblk_blk_erase_async(struct pblk *pblk, struct ppa_addr ppa) int err; rqd = mempool_alloc(pblk->g_rq_pool, GFP_KERNEL); + if (!rqd) + return -ENOMEM; memset(rqd, 0, pblk_g_rq_size); pblk_setup_e_rq(pblk, rqd, ppa);