From patchwork Mon Oct 15 20:08:56 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kent Overstreet X-Patchwork-Id: 1595771 Return-Path: X-Original-To: patchwork-dm-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by patchwork2.kernel.org (Postfix) with ESMTP id 14DE4DFB34 for ; Mon, 15 Oct 2012 20:14:06 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q9FKBJXv006857; Mon, 15 Oct 2012 16:11:19 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q9FKAPWQ027031 for ; Mon, 15 Oct 2012 16:10:25 -0400 Received: from mx1.redhat.com (ext-mx14.extmail.prod.ext.phx2.redhat.com [10.5.110.19]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q9FKAKRE004812 for ; Mon, 15 Oct 2012 16:10:20 -0400 Received: from mail-pa0-f46.google.com (mail-pa0-f46.google.com [209.85.220.46]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q9FK9qeb013584 for ; Mon, 15 Oct 2012 16:10:19 -0400 Received: by mail-pa0-f46.google.com with SMTP id hz1so5214261pad.33 for ; Mon, 15 Oct 2012 13:10:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=a8H1an0EZ2J48vWlXDQ93ljPdMDxz+q4/fQHUj7MApc=; b=gLXrLJP04e/Z9C1NWkLHuXzuslgyGQBDA9650Ix/R1iKH3UDwoV2XYn8W6QIgxsSpL 9skP7sW/69HCwrdMtRRiluumS+rI1ugNenJJEx3UyiwK73e/x/66toPrVN9IJ9T9cp/o CPgpGYY76RSKwbFBHPL25IaJj5xPuhZXARHuc+G0J1mjA+WIsj4M451NTWM30ww0Moiz AyKIfyfk2eQ3RaooIGeelWpnTIAIDp3phX/xHLAsdpc8WOGBTGojh2IEVc8dNwrLoORN 6jlG/UtKJstMQxlJl3ntAGtfoxIhbwBg8pLwGqAs2v9bZyp0OQ1O+S54pO2wTQ1lHT0/ R2hQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=a8H1an0EZ2J48vWlXDQ93ljPdMDxz+q4/fQHUj7MApc=; b=Gi00DDbfDThuC4GB7+/HSzCBFAa+AZX7kMCPBZhedGeXaNLTcSrr7T1IbWZK5/zNDf wMxDl5CC7WBuyHIUM2DZsUEQOlY6sInnKNR+0L7cD2Qr6T3BYLHS/9LXSG/fpnNP4D/6 0Hk3S8LSdsBr8fwl+WNVWrMAU61NVOifiZc0qCUKo8ZyzsoCyGr5XmOgmPPmnK2BuSlY c5g1oMoay8/dUfcunXZhdHYrGZyHmpFNIKSwYCl3zpDX3qFr7PNDsmn2IGsxdQsSNGl9 JbmyQi+WyQ0xijSnSj9MtGHOJBNe8VfNJTffK8UTmK3yvlVLwQyT8ujnMBoEuzC9e1bR 2jPg== Received: by 10.68.230.234 with SMTP id tb10mr40239152pbc.71.1350331819693; Mon, 15 Oct 2012 13:10:19 -0700 (PDT) Received: from formenos.mtv.corp.google.com (formenos.mtv.corp.google.com [172.18.110.66]) by mx.google.com with ESMTPS id k9sm3021703paz.22.2012.10.15.13.10.17 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 15 Oct 2012 13:10:18 -0700 (PDT) From: Kent Overstreet To: linux-bcache@vger.kernel.org, linux-kernel@vger.kernel.org, dm-devel@redhat.com Date: Mon, 15 Oct 2012 13:08:56 -0700 Message-Id: <1350331769-14856-23-git-send-email-koverstreet@google.com> In-Reply-To: <1350331769-14856-1-git-send-email-koverstreet@google.com> References: <1350331769-14856-1-git-send-email-koverstreet@google.com> X-Gm-Message-State: ALoCoQmK/rjwbaPvCu5pD8waTB3x404nMBXWBGqdC29omRdvlAR7dRk/x2qAO3z7DsQE+E1QDY7JZlSYB0KIX9QUrbXwIQ1o+W+DdF7zhLp3c4QnUP853+/lFJbXKzrdRhbmioDd2exLka0ye1tqrJQSO0GilYPUD90U/YiedUWS2K/8RQ7b0kw0k19+/IfM5hCD0CVHtcK8 X-RedHat-Spam-Score: -3.072 (BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_LOW, RP_MATCHES_RCVD, SPF_PASS) X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Scanned-By: MIMEDefang 2.68 on 10.5.110.19 X-loop: dm-devel@redhat.com Cc: tj@kernel.org, axboe@kernel.dk, Kent Overstreet , vgoyal@redhat.com Subject: [dm-devel] [PATCH v4 22/24] block: Add an explicit bio flag for bios that own their bvec X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk Reply-To: device-mapper development List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com This is for the new bio splitting code. When we split a bio, if the split occured on a bvec boundry we reuse the bvec for the new bio. But that means bio_free() can't free it, hence the explicit flag. Signed-off-by: Kent Overstreet CC: Jens Axboe Acked-by: Tejun Heo --- fs/bio.c | 4 +++- include/linux/bio.h | 5 ----- include/linux/blk_types.h | 1 + 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/fs/bio.c b/fs/bio.c index b3dceff..5dc8441 100644 --- a/fs/bio.c +++ b/fs/bio.c @@ -250,7 +250,7 @@ static void bio_free(struct bio *bio) __bio_free(bio); if (bs) { - if (bio_has_allocated_vec(bio)) + if (bio_flagged(bio, BIO_OWNS_VEC)) bvec_free(bs->bvec_pool, bio->bi_io_vec, BIO_POOL_IDX(bio)); /* @@ -449,6 +449,8 @@ struct bio *bio_alloc_bioset(gfp_t gfp_mask, int nr_iovecs, struct bio_set *bs) if (unlikely(!bvl)) goto err_free; + + bio->bi_flags |= 1 << BIO_OWNS_VEC; } else if (nr_iovecs) { bvl = bio->bi_inline_vecs; } diff --git a/include/linux/bio.h b/include/linux/bio.h index 8c02317..79f16a6 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -85,11 +85,6 @@ static inline void *bio_data(struct bio *bio) return NULL; } -static inline int bio_has_allocated_vec(struct bio *bio) -{ - return bio->bi_io_vec && bio->bi_io_vec != bio->bi_inline_vecs; -} - /* * will die */ diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h index c178d25..538289f 100644 --- a/include/linux/blk_types.h +++ b/include/linux/blk_types.h @@ -117,6 +117,7 @@ struct bio { * BIO_POOL_IDX() */ #define BIO_RESET_BITS 12 +#define BIO_OWNS_VEC 12 /* bio_free() should free bvec */ #define bio_flagged(bio, flag) ((bio)->bi_flags & (1 << (flag)))