From patchwork Thu Jun 20 16:12:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Logan Gunthorpe X-Patchwork-Id: 11007281 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9DC3914DB for ; Thu, 20 Jun 2019 16:14:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 91DE428756 for ; Thu, 20 Jun 2019 16:14:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 85D8128759; Thu, 20 Jun 2019 16:14:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3BEF728765 for ; Thu, 20 Jun 2019 16:14:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732201AbfFTQM7 (ORCPT ); Thu, 20 Jun 2019 12:12:59 -0400 Received: from ale.deltatee.com ([207.54.116.67]:59476 "EHLO ale.deltatee.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732170AbfFTQM6 (ORCPT ); Thu, 20 Jun 2019 12:12:58 -0400 Received: from cgy1-donard.priv.deltatee.com ([172.16.1.31]) by ale.deltatee.com with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1hdzg6-00046P-68; Thu, 20 Jun 2019 10:12:57 -0600 Received: from gunthorp by cgy1-donard.priv.deltatee.com with local (Exim 4.89) (envelope-from ) id 1hdzg4-0005wH-If; Thu, 20 Jun 2019 10:12:44 -0600 From: Logan Gunthorpe To: linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, linux-nvme@lists.infradead.org, linux-pci@vger.kernel.org, linux-rdma@vger.kernel.org Cc: Jens Axboe , Christoph Hellwig , Bjorn Helgaas , Dan Williams , Sagi Grimberg , Keith Busch , Jason Gunthorpe , Stephen Bates , Logan Gunthorpe Date: Thu, 20 Jun 2019 10:12:20 -0600 Message-Id: <20190620161240.22738-9-logang@deltatee.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190620161240.22738-1-logang@deltatee.com> References: <20190620161240.22738-1-logang@deltatee.com> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 172.16.1.31 X-SA-Exim-Rcpt-To: linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, linux-pci@vger.kernel.org, linux-rdma@vger.kernel.org, axboe@kernel.dk, hch@lst.de, bhelgaas@google.com, dan.j.williams@intel.com, sagi@grimberg.me, kbusch@kernel.org, jgg@ziepe.ca, sbates@raithlin.com, logang@deltatee.com X-SA-Exim-Mail-From: gunthorp@deltatee.com Subject: [RFC PATCH 08/28] block: Introduce dmavec_phys_mergeable() X-SA-Exim-Version: 4.2.1 (built Tue, 02 Aug 2016 21:08:31 +0000) X-SA-Exim-Scanned: Yes (on ale.deltatee.com) Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Introduce a new helper which is an analog of biovec_phys_mergeable() for dma-direct vectors. This also provides a common helper vec_phys_mergeable() for use in code that's general to both bio_vecs and dma_vecs. Signed-off-by: Logan Gunthorpe --- block/blk.h | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/block/blk.h b/block/blk.h index 7814aa207153..4142383eed7a 100644 --- a/block/blk.h +++ b/block/blk.h @@ -66,20 +66,36 @@ static inline void blk_queue_enter_live(struct request_queue *q) percpu_ref_get(&q->q_usage_counter); } +static inline bool vec_phys_mergeable(struct request_queue *q, + unsigned long addr1, unsigned int len1, + unsigned long addr2, unsigned int len2) +{ + unsigned long mask = queue_segment_boundary(q); + + if (addr1 + len1 != addr2) + return false; + if ((addr1 | mask) != ((addr2 + len2 - 1) | mask)) + return false; + return true; +} + static inline bool biovec_phys_mergeable(struct request_queue *q, struct bio_vec *vec1, struct bio_vec *vec2) { - unsigned long mask = queue_segment_boundary(q); phys_addr_t addr1 = page_to_phys(vec1->bv_page) + vec1->bv_offset; phys_addr_t addr2 = page_to_phys(vec2->bv_page) + vec2->bv_offset; - if (addr1 + vec1->bv_len != addr2) - return false; if (xen_domain() && !xen_biovec_phys_mergeable(vec1, vec2->bv_page)) return false; - if ((addr1 | mask) != ((addr2 + vec2->bv_len - 1) | mask)) - return false; - return true; + + return vec_phys_mergeable(q, addr1, vec1->bv_len, addr2, vec2->bv_len); +} + +static inline bool dmavec_phys_mergeable(struct request_queue *q, + struct dma_vec *vec1, struct dma_vec *vec2) +{ + return vec_phys_mergeable(q, vec1->dv_addr, vec1->dv_len, + vec2->dv_addr, vec2->dv_len); } static inline bool __bvec_gap_to_prev(struct request_queue *q,