From patchwork Fri Feb 19 03:20:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 8355841 Return-Path: X-Original-To: patchwork-linux-block@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 D20DF9F372 for ; Fri, 19 Feb 2016 03:21:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EA857203EC for ; Fri, 19 Feb 2016 03:21:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 12459203E6 for ; Fri, 19 Feb 2016 03:21:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1422797AbcBSDVO (ORCPT ); Thu, 18 Feb 2016 22:21:14 -0500 Received: from mail-pa0-f50.google.com ([209.85.220.50]:35625 "EHLO mail-pa0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1422649AbcBSDVN (ORCPT ); Thu, 18 Feb 2016 22:21:13 -0500 Received: by mail-pa0-f50.google.com with SMTP id ho8so43412450pac.2; Thu, 18 Feb 2016 19:21:13 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=2HdK2HGhCEMSeQTMPlGEjaIqh+0J9fYQTUWyEcPvDDg=; b=mkrGxPJnjm6oE6aTEjSDy1oPJg2CeV0jIBqcepitmHs+zAizU6pDo/9oKejR7PXUBI BXFlwK7p1M34tPlwsD6ZpbDXDS3e3x9h4H5OeaY/lY4wxwMhtgL0zUebt3xuIfIgOPvl tOA5bFMWebrd5LhZFyO8hCKCQQ5/sfPqadzH9XAkUn7XM0EXNrGC+dn5A4R05Md4jIxl GG+0nv1bCl5Pmss3c1yTCJt1xupcNYGgUS2BeoSg4SwTXPDBfZ5uX8Wkzs7BzFI82nHM 3jQAQvWyQjNKxz2cJZK91wN7twA5hSYPE++vQ/X6KxLuJbu34xqmZFVoXllW9eVlnDhr dW9Q== X-Gm-Message-State: AG10YOSvaZmn+roEv3gkSOeLBgw/cAxqRHruGQGmi1PZbGWf4m5XA/kQDw5q4mrT88ElcA== X-Received: by 10.66.136.231 with SMTP id qd7mr15070727pab.51.1455852073382; Thu, 18 Feb 2016 19:21:13 -0800 (PST) Received: from localhost ([116.251.208.106]) by smtp.gmail.com with ESMTPSA id d65sm13454397pfb.74.2016.02.18.19.20.40 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Thu, 18 Feb 2016 19:21:12 -0800 (PST) From: Ming Lei To: Jens Axboe , linux-kernel@vger.kernel.org Cc: linux-block@vger.kernel.org, Christoph Hellwig , Sagi Grimberg , Kent Overstreet , Keith Busch , Elliott Robert , Ming Lei Subject: [PATCH v1 2/4] block: check virt boundary in bio_will_gap() Date: Fri, 19 Feb 2016 11:20:20 +0800 Message-Id: <1455852022-14188-3-git-send-email-ming.lei@canonical.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1455852022-14188-1-git-send-email-ming.lei@canonical.com> References: <1455852022-14188-1-git-send-email-ming.lei@canonical.com> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 In the following patch, the way for figuring out the last bvec will be changed with a bit cost introduced, so return immediately if the queue doesn't have virt boundary limit. Actually most of devices have not this limit. Cc: Sagi Grimberg Cc: Christoph Hellwig Signed-off-by: Ming Lei Reviewed-by: Sagi Grimberg Reviewed-by: Christoph Hellwig --- include/linux/blkdev.h | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 4571ef1..5023401 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -1372,6 +1372,13 @@ static inline void put_dev_sector(Sector p) page_cache_release(p.v); } +static inline bool __bvec_gap_to_prev(struct request_queue *q, + struct bio_vec *bprv, unsigned int offset) +{ + return offset || + ((bprv->bv_offset + bprv->bv_len) & queue_virt_boundary(q)); +} + /* * Check if adding a bio_vec after bprv with offset would create a gap in * the SG list. Most drivers don't care about this, but some do. @@ -1381,14 +1388,13 @@ static inline bool bvec_gap_to_prev(struct request_queue *q, { if (!queue_virt_boundary(q)) return false; - return offset || - ((bprv->bv_offset + bprv->bv_len) & queue_virt_boundary(q)); + return __bvec_gap_to_prev(q, bprv, offset); } static inline bool bio_will_gap(struct request_queue *q, struct bio *prev, struct bio *next) { - if (!bio_has_data(prev)) + if (!bio_has_data(prev) || !queue_virt_boundary(q)) return false; return bvec_gap_to_prev(q, &prev->bi_io_vec[prev->bi_vcnt - 1],