From patchwork Tue Jun 30 19:19:02 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Dryomov X-Patchwork-Id: 6698071 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 86E689F1C1 for ; Tue, 30 Jun 2015 19:19:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A14F420513 for ; Tue, 30 Jun 2015 19:19:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8E3EA2050E for ; Tue, 30 Jun 2015 19:19:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751527AbbF3TT1 (ORCPT ); Tue, 30 Jun 2015 15:19:27 -0400 Received: from mail-la0-f48.google.com ([209.85.215.48]:33324 "EHLO mail-la0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751889AbbF3TT0 (ORCPT ); Tue, 30 Jun 2015 15:19:26 -0400 Received: by laar3 with SMTP id r3so26258650laa.0 for ; Tue, 30 Jun 2015 12:19:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=2tcmNQ03dPPSKyvRpQusmbH8RCozX0ewV/tMZTGbwmc=; b=H8KDw4JwbX1ZLNNaVmrP6J5ESoR1O+W+V2naWF3DidR8+scrQ2dFa5UswzMepkGjYH 5MH0zTQ75xcLbRHJC5pTI+utXy/xCVEU1+t0F4D4HKrwFf9kIuhyCqnQW1Ed7aBsvdaQ PmSHYs5jT4GfU2bWAiwUNVEmro5GDtt2kJpnlxuu4ykfwv3686nJNB2QpVptCga35Cum r8ctJxmL2Q45O/zaNJ1lDtf74LLYYhXEnSRmDXmsPv+iFnCT9IiQSNJjQJQhQ2OcVlmQ +pgkLsf4pywOgP2QOYS5eVG7aH2ysXHBDXVFQJzGyDbclJewm3NFTTSdtegfRAyaH/87 Q8MA== X-Received: by 10.152.25.227 with SMTP id f3mr20705139lag.67.1435691964822; Tue, 30 Jun 2015 12:19:24 -0700 (PDT) Received: from localhost.localdomain ([109.110.66.238]) by mx.google.com with ESMTPSA id aj4sm11857096lbd.5.2015.06.30.12.19.23 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 30 Jun 2015 12:19:23 -0700 (PDT) From: Ilya Dryomov To: ceph-devel@vger.kernel.org Subject: [PATCH] rbd: use GFP_NOIO in rbd_obj_request_create() Date: Tue, 30 Jun 2015 22:19:02 +0300 Message-Id: <1435691942-41015-1-git-send-email-idryomov@gmail.com> X-Mailer: git-send-email 1.9.3 Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP rbd_obj_request_create() is called on the main I/O path, so we need to use GFP_NOIO to make sure allocation doesn't blow back on us. Not all callers need this, but I'm still hardcoding the flag inside rather than making it a parameter because a) this is going to stable, and b) those callers shouldn't really use rbd_obj_request_create() and will be fixed in the future. More memory allocation fixes will follow. Cc: stable@vger.kernel.org # 3.10+ Signed-off-by: Ilya Dryomov Reviewed-by: Alex Elder --- drivers/block/rbd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index b316ee48a30b..d94529d5c8e9 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -2022,11 +2022,11 @@ static struct rbd_obj_request *rbd_obj_request_create(const char *object_name, rbd_assert(obj_request_type_valid(type)); size = strlen(object_name) + 1; - name = kmalloc(size, GFP_KERNEL); + name = kmalloc(size, GFP_NOIO); if (!name) return NULL; - obj_request = kmem_cache_zalloc(rbd_obj_request_cache, GFP_KERNEL); + obj_request = kmem_cache_zalloc(rbd_obj_request_cache, GFP_NOIO); if (!obj_request) { kfree(name); return NULL;