From patchwork Tue Sep 11 00:22:35 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kent Overstreet X-Patchwork-Id: 1434611 Return-Path: X-Original-To: patchwork-dm-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) by patchwork2.kernel.org (Postfix) with ESMTP id 0AC87DF28C for ; Tue, 11 Sep 2012 00:37:01 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q8B0YOuu018039; Mon, 10 Sep 2012 20:34:24 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q8B0NHHq009884 for ; Mon, 10 Sep 2012 20:23:17 -0400 Received: from mx1.redhat.com (ext-mx14.extmail.prod.ext.phx2.redhat.com [10.5.110.19]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q8B0NBTH007611 for ; Mon, 10 Sep 2012 20:23:12 -0400 Received: from mail-pz0-f46.google.com (mail-pz0-f46.google.com [209.85.210.46]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q8B0N329003172 for ; Mon, 10 Sep 2012 20:23:11 -0400 Received: by mail-pz0-f46.google.com with SMTP id y13so1608316dad.33 for ; Mon, 10 Sep 2012 17:23:11 -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=SLv2DZEO/hcyD9ywEKdWprBAHEHDbj/1Og4sHripSQo=; b=XMaUPgGxdXMJtZvvOTBFVjyqdXeV7XGkqZNccFoZkW1gvFt7NvJeLiKQudyqAqjOPn AOjYXYGjMgC9HdK0eZ4DmpbuCi3mqkl02XTtMI4NRT5bXMGRC8yIN/RmX+zEyNx5+Voe HEEyNsoTDQ8JTsAOEFkVHdhqDis0xXojaR8WPh2+k7ABTXWWzFfWnakAZ9oQblzZ1GA0 LQeKZRB5eWlrvpdmu9n2YjJuG6Ae/tL2YQxYcNUAtRQcQKIgoSdJFLK/rB/A8cEybzvT 8J33NprsyfE5QiTk2fJW1Kjvg4fMjH1XATUqGR+wOJsdUR3YZK2zYR+a1+aZDyywC7Av 0Wsg== 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=SLv2DZEO/hcyD9ywEKdWprBAHEHDbj/1Og4sHripSQo=; b=dUHizZl0NYvJezWjp+IlM1lNbgT22SCq4BuE1NL0eldGqZ0f4m8gTRBbSHc026W/jf bsjqQoCRJgpqPlEKDGU097xTXF6lgfATIwrlBq7IEG0u4yf2AEgZzPOd4zui2LjtsXGC cYnZFvM6OvOCk9haL2ehRkcNwMlfp+fe5AiE6G6fuZyhFNoOckKGrj4SpQr5SImXJtwu uUP+ek3x9F8HXGR8PJqQyCa3JcInqrAlpJnIqY4+9w58v3q4CfqD/v8zFhO/D2BhfL7x pwR+R8Nliean9yB+jloj9ligjP+rgaQSjINplasgg1XSHtgW6coYA6mfAUZLK1EQDvxv /K1g== Received: by 10.68.201.198 with SMTP id kc6mr8350003pbc.122.1347322991191; Mon, 10 Sep 2012 17:23:11 -0700 (PDT) Received: by 10.68.201.198 with SMTP id kc6mr8349990pbc.122.1347322991098; Mon, 10 Sep 2012 17:23:11 -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 pj8sm8883986pbb.60.2012.09.10.17.23.09 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 10 Sep 2012 17:23:10 -0700 (PDT) From: Kent Overstreet To: linux-bcache@vger.kernel.org, linux-kernel@vger.kernel.org, dm-devel@redhat.com Date: Mon, 10 Sep 2012 17:22:35 -0700 Message-Id: <1347322957-25260-25-git-send-email-koverstreet@google.com> In-Reply-To: <1347322957-25260-1-git-send-email-koverstreet@google.com> References: <1347322957-25260-1-git-send-email-koverstreet@google.com> X-Gm-Message-State: ALoCoQnn+C5ICLeKBASgCKtNMeP8V5CJqWnQkTpJ5pKnRd5DOwN8HP8VGLY7o4WtNABnTgFIcqTBviSggtdQXhFy363pSHk2nNa574RP4oLHvNPcleYQTITCyCl3OHLxg7gXepmWB6LJMP76Z180DnnfOw6BqFtPkAxQb97XWcplARTPAw5COGF7sQs6PAvnr0iMzoQwdvTM X-RedHat-Spam-Score: -3.075 (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.25 X-Scanned-By: MIMEDefang 2.68 on 10.5.110.19 X-loop: dm-devel@redhat.com Cc: axboe@kernel.dk, tj@kernel.org, Kent Overstreet Subject: [dm-devel] [PATCH v2 24/26] 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 65e6eac..5e91e36 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(bs, 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 bd45154..edd66f3 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 3eefbb2..e9375cf 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)))