From patchwork Fri Feb 26 15:40:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 8438771 Return-Path: X-Original-To: patchwork-linux-block@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 27D00C0553 for ; Fri, 26 Feb 2016 15:42:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 489D9203B1 for ; Fri, 26 Feb 2016 15:42:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5058720392 for ; Fri, 26 Feb 2016 15:42:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933539AbcBZPlb (ORCPT ); Fri, 26 Feb 2016 10:41:31 -0500 Received: from mail-pa0-f66.google.com ([209.85.220.66]:35802 "EHLO mail-pa0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933521AbcBZPl2 (ORCPT ); Fri, 26 Feb 2016 10:41:28 -0500 Received: by mail-pa0-f66.google.com with SMTP id fl4so4644735pad.2; Fri, 26 Feb 2016 07:41:27 -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=zgs0VYzyxkhuCTZkSobpxXGftQ5vYBByLb3RC0qNxJY=; b=ZihszKio3cmqN+hQwfY034cuq81dkd9oRj0NLVEzYKkpjl0oSiSm73GPGqa72DrOom arRyR14kqcZxouZJsDjs0WniU8lt+vhPcPz9uhhl4S3haWNcScyR9VQqbeLkesGg7pxX 7trhz1R6iUe4yTXAoeAECU9yfH49n5oQM0rrcTsr0FlJlgbJfrs1wBQ3Z4z3pt9d52hO ouqUqP+1Nm6GGe5UqlUuxvc8ebGpME2KuuLkARvRwD+xJ72kkzal/zAK4TIdNhZbfZH5 LN6KjOtIkvat1MMf7GcGUP5b2VXKFIYmQA3Vb1VBYbM7kXBsGC+hRjT3C1M0WUkexizW UF/g== X-Gm-Message-State: AD7BkJKRUZjq3G1Yw2xLUoDpvbL9dP5ZYknZPOJAwYDU/D8VHAaO59MvkS6AnOz8AxKZFA== X-Received: by 10.67.7.1 with SMTP id cy1mr2944207pad.123.1456501287498; Fri, 26 Feb 2016 07:41:27 -0800 (PST) Received: from localhost ([45.35.47.131]) by smtp.gmail.com with ESMTPSA id h66sm20226405pfd.91.2016.02.26.07.41.26 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Fri, 26 Feb 2016 07:41:26 -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 v2 2/4] block: check virt boundary in bio_will_gap() Date: Fri, 26 Feb 2016 23:40:51 +0800 Message-Id: <1456501253-7269-3-git-send-email-ming.lei@canonical.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1456501253-7269-1-git-send-email-ming.lei@canonical.com> References: <1456501253-7269-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. Reviewed-by: Sagi Grimberg Reviewed-by: Christoph Hellwig Signed-off-by: Ming Lei --- include/linux/blkdev.h | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 4571ef1..cd06a41 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,18 +1388,17 @@ 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], - next->bi_io_vec[0].bv_offset); + return __bvec_gap_to_prev(q, &prev->bi_io_vec[prev->bi_vcnt - 1], + next->bi_io_vec[0].bv_offset); } static inline bool req_gap_back_merge(struct request *req, struct bio *bio)