From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 32FAEC433E0 for ; Tue, 11 Aug 2020 23:44:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0E91E20774 for ; Tue, 11 Aug 2020 23:44:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="PMcM5hpM" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726271AbgHKXor (ORCPT ); Tue, 11 Aug 2020 19:44:47 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:35692 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726143AbgHKXor (ORCPT ); Tue, 11 Aug 2020 19:44:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597189485; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=iSZ7hXIKVw5juca/gpGvNrqZSRoFpSzwLtaovrF/TJA=; b=PMcM5hpMazZe+k0T26DrSgmjQ+XPxUL6KDFZY4PInmHUwsmPR+8ThXwVyHb9ra2Po/ie/B 1X6FiF2K2F4XAyUrBRkVrot+LRw+r+1Gu3wVNxDjxVThk52DvD1wTE991b+NDMS0IwVeeO q9yBKm9UPSij11uIKYjpPuokz3c/dqg= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-105-YtFmfcZHOpOIp0q5a3W0iw-1; Tue, 11 Aug 2020 19:44:41 -0400 X-MC-Unique: YtFmfcZHOpOIp0q5a3W0iw-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C423F1083; Tue, 11 Aug 2020 23:44:40 +0000 (UTC) Received: from localhost (ovpn-13-156.pek2.redhat.com [10.72.13.156]) by smtp.corp.redhat.com (Postfix) with ESMTP id 487F78BB06; Tue, 11 Aug 2020 23:44:36 +0000 (UTC) From: Ming Lei To: Jens Axboe Cc: linux-block@vger.kernel.org, Ming Lei , Christoph Hellwig , Stefano Garzarella Subject: [PATCH V2 1/3] block: respect queue limit of max discard segment Date: Wed, 12 Aug 2020 07:44:18 +0800 Message-Id: <20200811234420.2297137-2-ming.lei@redhat.com> In-Reply-To: <20200811234420.2297137-1-ming.lei@redhat.com> References: <20200811234420.2297137-1-ming.lei@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org When queue_max_discard_segments(q) is 1, blk_discard_mergable() will return false for discard request, then normal request merge is applied. However, only queue_max_segments() is checked, so max discard segment limit isn't respected. Check max discard segment limit in the request merge code for fixing the issue. Discard request failure of virtio_blk is fixed. Signed-off-by: Ming Lei Fixes: 69840466086d ("block: fix the DISCARD request merge") Cc: Christoph Hellwig Cc: Stefano Garzarella --- block/blk-merge.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/block/blk-merge.c b/block/blk-merge.c index 5196dc145270..d18fb88ca8bd 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c @@ -533,10 +533,16 @@ int __blk_rq_map_sg(struct request_queue *q, struct request *rq, } EXPORT_SYMBOL(__blk_rq_map_sg); +static inline unsigned int blk_rq_get_max_segments(struct request *rq) +{ + return req_op(rq) == REQ_OP_DISCARD ? + queue_max_discard_segments(rq->q) : queue_max_segments(rq->q); +} + static inline int ll_new_hw_segment(struct request *req, struct bio *bio, unsigned int nr_phys_segs) { - if (req->nr_phys_segments + nr_phys_segs > queue_max_segments(req->q)) + if (req->nr_phys_segments + nr_phys_segs > blk_rq_get_max_segments(req)) goto no_merge; if (blk_integrity_merge_bio(req->q, req, bio) == false) @@ -624,7 +630,7 @@ static int ll_merge_requests_fn(struct request_queue *q, struct request *req, return 0; total_phys_segments = req->nr_phys_segments + next->nr_phys_segments; - if (total_phys_segments > queue_max_segments(q)) + if (total_phys_segments > blk_rq_get_max_segments(req)) return 0; if (blk_integrity_merge_rq(q, req, next) == false) -- 2.25.2