From patchwork Mon Jan 21 08:18:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 10773279 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 1E89814E5 for ; Mon, 21 Jan 2019 08:22:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 111BC29EE6 for ; Mon, 21 Jan 2019 08:22:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 04E4F29EEB; Mon, 21 Jan 2019 08:22:08 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A9BF929EE6 for ; Mon, 21 Jan 2019 08:22:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D9E658E0035; Mon, 21 Jan 2019 03:22:06 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id D74B58E0025; Mon, 21 Jan 2019 03:22:06 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C8B028E0035; Mon, 21 Jan 2019 03:22:06 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) by kanga.kvack.org (Postfix) with ESMTP id 9BD138E0025 for ; Mon, 21 Jan 2019 03:22:06 -0500 (EST) Received: by mail-qt1-f198.google.com with SMTP id w18so19972266qts.8 for ; Mon, 21 Jan 2019 00:22:06 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references; bh=PWPZT416UnDtHnTkAwGJ+1F+/W8cOEKYDjH6aqPOvFQ=; b=svXDJgJrVVAzLmhQK7UF+D8SIiE2fhugU7X0Vx9fw/cD2PpDzxnzewAYV0gYoJhHya IlDT+PnLLbMUJYfKb1hxK60BvSUHEEbYZjjsA72AIH0fVH2c1wam8rllceupgyKedDy+ Qe6KWS+ExvkiaxIROdxCJ+j8nxKan0rYIrj+HuoZIXhN15GTCQ94P4xF8cCnSZy7xsKB LPhND7btfdCOdpCDIBYtWhiV7r8AFW1AKZsuHbeNZ3jcyBbClT8dq94YILc471X56Tck V4yaihgzd7vPwuhN35Hx4kxgaGbD8YQboGvmc66p0W1E4ocb4p87wzGc2Xw5w0jjEXWf q5xQ== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of ming.lei@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=ming.lei@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com X-Gm-Message-State: AJcUukc5Ct0xIERVWOpIk66c1RI2Yr1qC2AAi8XiJZ1o3NAqQmSpAStS KZ1SDbTrgBL6nfYop9PPcK/fQhCRg8T+QEHFu4PR3bB2p0pQjzcFJ4JizvQgYxPjn96sli0OLXz YDjfFjSwgXp0B30h6ZYP3ns/mmZTSbJIGNM6XVlQJQ3Y+LbNB1PWVtLav6rpTj4IFXQ== X-Received: by 2002:ac8:27c8:: with SMTP id x8mr25344128qtx.352.1548058926413; Mon, 21 Jan 2019 00:22:06 -0800 (PST) X-Google-Smtp-Source: ALg8bN7asFr7mZZsVGXydhaIoB5AgdZ+eb/RNxtKFGRNiPM5sX44+r4Y0PdYWgUUpvHgtr2Ld3k2 X-Received: by 2002:ac8:27c8:: with SMTP id x8mr25344103qtx.352.1548058925897; Mon, 21 Jan 2019 00:22:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548058925; cv=none; d=google.com; s=arc-20160816; b=e9WDHi+h+yvJqe7JmAni9OtryDPJvmomVOS7s6WE6V5JPd8xnpd6n+KbcVhCeioWy3 o+EMTNyIjQLgmfPA15iX4NgE83WuDxzAMWAXGzIHZPni5bXgJAxxafv53xxe2ZEzBG4x tlQ+GfcFMlBnUG93KgCHbAxixrOJPxH3tPBX6jjqsLVfRqIUh1JmtemVhy/xH7gEcoL6 fl/QbiuRD8rQk6OCKg0BqWd1mnh0iA4BxeRc3jSGTvK6jWXmxTV8+jVnOh/RN5+kO5Gt qBPAZLGN0lDqU55+8rvUDZkGfvl1cz8zrQDW3SSdYGHE0GJJODj58CUMX5Kqu4edZjuj wEeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from; bh=PWPZT416UnDtHnTkAwGJ+1F+/W8cOEKYDjH6aqPOvFQ=; b=kVsZjUpaiwl497TNhT9/Omj0LRZMP2xGOtgKF4NVNzuPJwnGk4ZyHT/n7RE8ru4RFu TILjREdcSjytbMflM7PkN8+UAw1sbc9IKSw6EBvuEcTl+mk+lcVxKnAu3HvIVCbpa8xN JmTlbgprw+gKwbb1JOaIIMRzj5g4Y3GMgQulno9x7Rd6wOI03eUdHMaGIcfx7kq3TkVl XJyNz+NaWm6Gsb9yUn6T09/bw71Q4ZNHz5DGZbfM0TRQ1yKzoPk9YXQQyedv4hkAlqov SJDJaJEmp9v7q2JNRHvB92U5wzU0HLfbb0ZKFUS6SZewranqWVyLqinQHcpqIwH1E1jt 2bHQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ming.lei@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=ming.lei@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from mx1.redhat.com (mx1.redhat.com. [209.132.183.28]) by mx.google.com with ESMTPS id l5si2046436qtr.32.2019.01.21.00.22.05 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Jan 2019 00:22:05 -0800 (PST) Received-SPF: pass (google.com: domain of ming.lei@redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ming.lei@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=ming.lei@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9B63583F51; Mon, 21 Jan 2019 08:22:04 +0000 (UTC) Received: from localhost (ovpn-8-22.pek2.redhat.com [10.72.8.22]) by smtp.corp.redhat.com (Postfix) with ESMTP id 84AA56013B; Mon, 21 Jan 2019 08:21:50 +0000 (UTC) From: Ming Lei To: Jens Axboe Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Theodore Ts'o , Omar Sandoval , Sagi Grimberg , Dave Chinner , Kent Overstreet , Mike Snitzer , dm-devel@redhat.com, Alexander Viro , linux-fsdevel@vger.kernel.org, linux-raid@vger.kernel.org, David Sterba , linux-btrfs@vger.kernel.org, "Darrick J . Wong" , linux-xfs@vger.kernel.org, Gao Xiang , Christoph Hellwig , linux-ext4@vger.kernel.org, Coly Li , linux-bcache@vger.kernel.org, Boaz Harrosh , Bob Peterson , cluster-devel@redhat.com, Ming Lei Subject: [PATCH V14 15/18] block: always define BIO_MAX_PAGES as 256 Date: Mon, 21 Jan 2019 16:18:02 +0800 Message-Id: <20190121081805.32727-16-ming.lei@redhat.com> In-Reply-To: <20190121081805.32727-1-ming.lei@redhat.com> References: <20190121081805.32727-1-ming.lei@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Mon, 21 Jan 2019 08:22:05 +0000 (UTC) X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP Now multi-page bvec can cover CONFIG_THP_SWAP, so we don't need to increase BIO_MAX_PAGES for it. CONFIG_THP_SWAP needs to split one THP into normal pages and adds them all to one bio. With multipage-bvec, it just takes one bvec to hold them all. Reviewed-by: Omar Sandoval Reviewed-by: Christoph Hellwig Signed-off-by: Ming Lei --- include/linux/bio.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/include/linux/bio.h b/include/linux/bio.h index af288f6e8ab0..1d279a6ae737 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -34,15 +34,7 @@ #define BIO_BUG_ON #endif -#ifdef CONFIG_THP_SWAP -#if HPAGE_PMD_NR > 256 -#define BIO_MAX_PAGES HPAGE_PMD_NR -#else #define BIO_MAX_PAGES 256 -#endif -#else -#define BIO_MAX_PAGES 256 -#endif #define bio_prio(bio) (bio)->bi_ioprio #define bio_set_prio(bio, prio) ((bio)->bi_ioprio = prio)