From patchwork Thu Mar 21 12:30:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Thumshirn X-Patchwork-Id: 10863425 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 4FF3A17E0 for ; Thu, 21 Mar 2019 12:30:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3E8462A14C for ; Thu, 21 Mar 2019 12:30:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3352C2A150; Thu, 21 Mar 2019 12:30:54 +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 D507D2A146 for ; Thu, 21 Mar 2019 12:30:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728057AbfCUMaw (ORCPT ); Thu, 21 Mar 2019 08:30:52 -0400 Received: from mx2.suse.de ([195.135.220.15]:50212 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727874AbfCUMaw (ORCPT ); Thu, 21 Mar 2019 08:30:52 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id E3E0AACD4; Thu, 21 Mar 2019 12:30:50 +0000 (UTC) From: Johannes Thumshirn To: Jens Axboe Cc: Hannes Reinecke , Bart Van Assche , Christoph Hellwig , Jan Kara , Linux Block Layer Mailinglist , Linux FSDEVEL Mailinglist , Johannes Thumshirn Subject: [PATCH 1/2] block: bio: ensure newly added bio flags don't override BVEC_POOL_IDX Date: Thu, 21 Mar 2019 13:30:44 +0100 Message-Id: <20190321123045.32396-2-jthumshirn@suse.de> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20190321123045.32396-1-jthumshirn@suse.de> References: <20190321123045.32396-1-jthumshirn@suse.de> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP With the introduction of BIO_ALLOCED we've used up all available bits in bio::bi_flags. Make sure no-one adds a new one and thus overrides the BVEC_POOL_IDX Signed-off-by: Johannes Thumshirn --- block/bio.c | 8 ++++++++ include/linux/blk_types.h | 31 +++++++++++++++++-------------- 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/block/bio.c b/block/bio.c index 4db1008309ed..8c689aed46a0 100644 --- a/block/bio.c +++ b/block/bio.c @@ -2126,12 +2126,20 @@ static void __init biovec_init_slabs(void) } } +static inline void bio_flag_buildtime_check(void) +{ + BUILD_BUG_ON(BIO_FLAG_LAST > BVEC_POOL_OFFSET); +} + static int __init init_bio(void) { bio_slab_max = 2; bio_slab_nr = 0; bio_slabs = kcalloc(bio_slab_max, sizeof(struct bio_slab), GFP_KERNEL); + + bio_flag_buildtime_check(); + if (!bio_slabs) panic("bio: can't allocate bios\n"); diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h index d66bf5f32610..0273bad71a96 100644 --- a/include/linux/blk_types.h +++ b/include/linux/blk_types.h @@ -215,20 +215,23 @@ struct bio { /* * bio flags */ -#define BIO_SEG_VALID 1 /* bi_phys_segments valid */ -#define BIO_CLONED 2 /* doesn't own data */ -#define BIO_BOUNCED 3 /* bio is a bounce bio */ -#define BIO_USER_MAPPED 4 /* contains user pages */ -#define BIO_NULL_MAPPED 5 /* contains invalid user pages */ -#define BIO_QUIET 6 /* Make BIO Quiet */ -#define BIO_CHAIN 7 /* chained bio, ->bi_remaining in effect */ -#define BIO_REFFED 8 /* bio has elevated ->bi_cnt */ -#define BIO_THROTTLED 9 /* This bio has already been subjected to - * throttling rules. Don't do it again. */ -#define BIO_TRACE_COMPLETION 10 /* bio_endio() should trace the final completion - * of this bio. */ -#define BIO_QUEUE_ENTERED 11 /* can use blk_queue_enter_live() */ -#define BIO_TRACKED 12 /* set if bio goes through the rq_qos path */ +enum { + BIO_SEG_VALID = 1, /* bi_phys_segments valid */ + BIO_CLONED = 2, /* doesn't own data */ + BIO_BOUNCED = 3, /* bio is a bounce bio */ + BIO_USER_MAPPED = 4, /* contains user pages */ + BIO_NULL_MAPPED = 5, /* contains invalid user pages */ + BIO_QUIET = 6, /* Make BIO Quiet */ + BIO_CHAIN = 7, /* chained bio, ->bi_remaining in effect */ + BIO_REFFED = 8, /* bio has elevated ->bi_cnt */ + BIO_THROTTLED = 9, /* This bio has already been subjected to + * throttling rules. Don't do it again. */ + BIO_TRACE_COMPLETION = 10, /* bio_endio() should trace the final completion + * of this bio. */ + BIO_QUEUE_ENTERED = 11, /* can use blk_queue_enter_live() */ + BIO_TRACKED = 12, /* set if bio goes through the rq_qos path */ + BIO_FLAG_LAST +}; /* See BVEC_POOL_OFFSET below before adding new flags */