From patchwork Fri Sep 11 12:54:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 264086 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B455BC43461 for ; Fri, 11 Sep 2020 14:31:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6570F222B8 for ; Fri, 11 Sep 2020 14:31:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599834674; bh=WlNBCEI9KTfKCFK7pdkqnVaUt/mbl+s3RN+6DE4iLdg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Anl2u8ppZz+H0LoyCXl+EYYDbKpLdm5XWlIqeodlImwSLE5R4Rh00z4yErK7wQkGh clF5R961b6U40hJQ3lWDnTciyttz3PVgk2dBcDGvL9rtry75VZJlT2OdGOL3sV/BIe S/18A0AQWVhL8CSGfChX6r9hqPyj81spAu55zYug= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725839AbgIKObC (ORCPT ); Fri, 11 Sep 2020 10:31:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:56014 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726146AbgIKNMA (ORCPT ); Fri, 11 Sep 2020 09:12:00 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id CA7BD22460; Fri, 11 Sep 2020 13:00:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599829238; bh=WlNBCEI9KTfKCFK7pdkqnVaUt/mbl+s3RN+6DE4iLdg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=g5sr7gU0aGC8V/8M9yjmTEtD+0jQnC2RO6kVk3SNlSErxT/g/J/zODx+NnvdN/Hsp GcYQmrhoVosdYrnTTPeYkwWj+3F0O6RORtgoZPe4kboXOBzO+HLs+ygWmT6S36bfHp QEgRhf6bhvwDDb3D26fDTkFZSnwQ639OXtZzW8gQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, OGAWA Hirofumi , Christoph Hellwig , Jens Axboe , Sasha Levin Subject: [PATCH 4.19 2/8] block: ensure bdi->io_pages is always initialized Date: Fri, 11 Sep 2020 14:54:49 +0200 Message-Id: <20200911125421.818030368@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200911125421.695645838@linuxfoundation.org> References: <20200911125421.695645838@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jens Axboe [ Upstream commit de1b0ee490eafdf65fac9eef9925391a8369f2dc ] If a driver leaves the limit settings as the defaults, then we don't initialize bdi->io_pages. This means that file systems may need to work around bdi->io_pages == 0, which is somewhat messy. Initialize the default value just like we do for ->ra_pages. Cc: stable@vger.kernel.org Fixes: 9491ae4aade6 ("mm: don't cap request size based on read-ahead setting") Reported-by: OGAWA Hirofumi Reviewed-by: Christoph Hellwig Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- block/blk-core.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/block/blk-core.c b/block/blk-core.c index ea33d6abdcfc9..ce3710404544c 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -1036,6 +1036,8 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id, q->backing_dev_info->ra_pages = (VM_MAX_READAHEAD * 1024) / PAGE_SIZE; + q->backing_dev_info->io_pages = + (VM_MAX_READAHEAD * 1024) / PAGE_SIZE; q->backing_dev_info->capabilities = BDI_CAP_CGROUP_WRITEBACK; q->backing_dev_info->name = "block"; q->node = node_id;