From patchwork Wed Oct 7 17:00:32 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Dryomov X-Patchwork-Id: 7346111 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D32F3BEEA4 for ; Wed, 7 Oct 2015 15:20:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 08ADC2037E for ; Wed, 7 Oct 2015 15:20:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 26FE02012D for ; Wed, 7 Oct 2015 15:20:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753872AbbJGPUm (ORCPT ); Wed, 7 Oct 2015 11:20:42 -0400 Received: from mail-wi0-f172.google.com ([209.85.212.172]:36075 "EHLO mail-wi0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753527AbbJGPUl (ORCPT ); Wed, 7 Oct 2015 11:20:41 -0400 Received: by wicgb1 with SMTP id gb1so216394375wic.1 for ; Wed, 07 Oct 2015 08:20:40 -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=QXP7dBFFdP5cOW+9ydGrNZ8XvF3gguZVnOZTn0lRGMY=; b=MaGFyzGlATjfs2IhOwLZdqvKFhqa9cVSnQVOW+nlZUSTQNLP6maL8tjvGgf1KiqMNw 9c8G96RZ6N1mXLCY846XuoaJ3feQf3k8RAMrF6f2TGtA5S4TrAFUEeWv69KPCiQEGsE2 iStbkpq2jHuA8dZX6LJn+rH2HxAPfRnsZX/y48hYLemKtooHpaM724duZOCSUWb579kg RWlamM4Vak2yowZ5zvgJ3gP08lKIbh7taWCHWhZ4jaAkpbC+B7nc9LL3rmTUJLq7SqTa ueXoxifuJJW7q/zZG/7EnTRNTEp00R3k2dQ75GJ8tZH6+QoQzOoQBGrntvBq5YHRXqDE lHOw== X-Received: by 10.180.182.116 with SMTP id ed20mr24564255wic.19.1444231240482; Wed, 07 Oct 2015 08:20:40 -0700 (PDT) Received: from orange.localdomain (nat-pool-brq-u.redhat.com. [213.175.37.12]) by smtp.gmail.com with ESMTPSA id hx4sm39884510wjb.31.2015.10.07.08.20.39 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Oct 2015 08:20:39 -0700 (PDT) From: Ilya Dryomov To: ceph-devel@vger.kernel.org Subject: [PATCH] rbd: set max_sectors explicitly Date: Wed, 7 Oct 2015 19:00:32 +0200 Message-Id: <1444237232-9574-1-git-send-email-idryomov@gmail.com> X-Mailer: git-send-email 2.4.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=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, 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 Commit 30e2bc08b2bb ("Revert "block: remove artifical max_hw_sectors cap"") restored a clamp on max_sectors. It's now 2560 sectors instead of 1024, but it's not good enough: we set max_hw_sectors to rbd object size because we don't want object sized I/Os to be split, and the default object size is 4M. So, set max_sectors to max_hw_sectors in rbd at queue init time. Signed-off-by: Ilya Dryomov --- drivers/block/rbd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 05072464d25e..04e69b4df664 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -3760,6 +3760,7 @@ static int rbd_init_disk(struct rbd_device *rbd_dev) /* set io sizes to object size */ segment_size = rbd_obj_bytes(&rbd_dev->header); blk_queue_max_hw_sectors(q, segment_size / SECTOR_SIZE); + q->limits.max_sectors = queue_max_hw_sectors(q); blk_queue_max_segments(q, segment_size / SECTOR_SIZE); blk_queue_max_segment_size(q, segment_size); blk_queue_io_min(q, segment_size);