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=-9.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,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 0B8A0C12002 for ; Fri, 16 Jul 2021 09:33:50 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BB0B1613ED for ; Fri, 16 Jul 2021 09:33:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BB0B1613ED Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=NOvQIqvhBStmr4QuNeQGlhHzHI9OrCvl3oIeHy6b2tc=; b=ifNjSiGQrtOou3 gaErSCtSgW9reOJi5g0S2VkZ0KXJvDhrsePAt8q1eCsMfeoPDQFGsGz0JkdeosVqsW1rx0xzb3sqU CsI/dJRCKNmGZJWimydFYKRrtQsWrZckQtBdYxTPwi+Wa6ixoi+Wxlzzf5MNsrvlrOoFy4Is+DNBg eaK16DzEOHwOIMT5UAJADODbtLpVa36nte3Y/R7DIA73YZukdaNNLNUFZ6ORtdCaxO+4QMKGwiqQ0 azco0dOK+MRl0cNjNwfNqk6W+wQSLkpf+rpxhICfOxp6pSY0jrLuB9WrR5NB5VqUu1YW6b6hXPIgh 9pQftBa2MZ5PDDv/DWqA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1m4KDq-003vz0-M8; Fri, 16 Jul 2021 09:33:30 +0000 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1m4KDm-003vwZ-Uq for linux-nvme@lists.infradead.org; Fri, 16 Jul 2021 09:33:29 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626428004; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=m08xqBA+uGZoSfDv0tyerS1nF0XIak+eyqoZwC+cyQU=; b=fs+uiCL+FgX9B4Y7CzNcyliC87vtZtwMV4adJC3RD6CV7gFLE38p+4ZAqBQhxtxmL3O6Oi E5OrOTQabtzve7ABKXGhJA6iTjDHtndUoQBwwmKWsvTjnQMIjeQNslBEsgi0PHRQrxLdSN kTVURCL7orejL2/YPVRswQQmp4YtVsY= 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-561-RuIirQ95PvymlHJa_zgO6g-1; Fri, 16 Jul 2021 05:33:23 -0400 X-MC-Unique: RuIirQ95PvymlHJa_zgO6g-1 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 362F5CC621; Fri, 16 Jul 2021 09:33:21 +0000 (UTC) Received: from T590 (ovpn-13-146.pek2.redhat.com [10.72.13.146]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E5136604CD; Fri, 16 Jul 2021 09:33:10 +0000 (UTC) Date: Fri, 16 Jul 2021 17:33:05 +0800 From: Ming Lei To: Oleksandr Natalenko Cc: linux-kernel@vger.kernel.org, Jens Axboe , Christoph Hellwig , Sagi Grimberg , linux-nvme@lists.infradead.org, David Jeffery , Laurence Oberman , Paolo Valente , Jan Kara , Sasha Levin , Greg Kroah-Hartman , Keith Busch Subject: Re: New warning in nvme_setup_discard Message-ID: References: <4729812.CpyZKHjjVO@natalenko.name> <81322754.HEIg0oD171@natalenko.name> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <81322754.HEIg0oD171@natalenko.name> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210716_023327_158598_6DA515E6 X-CRM114-Status: GOOD ( 22.32 ) X-BeenThere: linux-nvme@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "Linux-nvme" Errors-To: linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org T24gRnJpLCBKdWwgMTYsIDIwMjEgYXQgMDc6NTM6MjhBTSArMDIwMCwgT2xla3NhbmRyIE5hdGFs ZW5rbyB3cm90ZToKPiBIZWxsby4KPiAKPiBPbiBww6F0ZWsgMTYuIMSNZXJ2ZW5jZSAyMDIxIDQ6 MTY6MTggQ0VTVCBNaW5nIExlaSB3cm90ZToKPiA+ID4gIDg1MCAgICAgaWYgKFdBUk5fT05fT05D RShuICE9IHNlZ21lbnRzKSkgewo+ID4gCj4gPiBXaGF0IGlzICduJyBhbmQgJ3NlZ21lbnRzJz8K PiAKPiBTbywgSSB1c2VkIHRoaXMgY2hhbmdlIHRvIGNoZWNrIHRoYXQ6Cj4gCj4gYGBgCj4gZGlm ZiAtLWdpdCBhL2RyaXZlcnMvbnZtZS9ob3N0L2NvcmUuYyBiL2RyaXZlcnMvbnZtZS9ob3N0L2Nv cmUuYwo+IGluZGV4IDY2OTczYmI1NjMwNS4uMGE2NGYyZjc3ZGFmIDEwMDY0NAo+IC0tLSBhL2Ry aXZlcnMvbnZtZS9ob3N0L2NvcmUuYwo+ICsrKyBiL2RyaXZlcnMvbnZtZS9ob3N0L2NvcmUuYwo+ IEBAIC04NDcsNyArODQ3LDggQEAgc3RhdGljIGJsa19zdGF0dXNfdCBudm1lX3NldHVwX2Rpc2Nh cmQoc3RydWN0IG52bWVfbnMgKm5zLCAKPiBzdHJ1Y3QgcmVxdWVzdCAqcmVxLAo+ICAJCW4rKzsK PiAgCX0KPiAgCj4gLQlpZiAoV0FSTl9PTl9PTkNFKG4gIT0gc2VnbWVudHMpKSB7Cj4gKwlpZiAo dW5saWtlbHkobiAhPSBzZWdtZW50cykpIHsKPiArCQlwcl93YXJuKCJudm1lX3NldHVwX2Rpc2Nh cmQ6IG4gIT0gc2VnbWVudHMgKCV1ICE9ICV1KVxuIiwgbiwgCj4gc2VnbWVudHMpOwo+ICAJCWlm ICh2aXJ0X3RvX3BhZ2UocmFuZ2UpID09IG5zLT5jdHJsLT5kaXNjYXJkX3BhZ2UpCj4gIAkJCWNs ZWFyX2JpdF91bmxvY2soMCwgJm5zLT5jdHJsLT5kaXNjYXJkX3BhZ2VfYnVzeSk7Cj4gIAkJZWxz ZQo+IAo+IGBgYAo+IAo+IGFuZCB0aGUgcmVzdWx0IGlzOgo+IAo+IGBgYAo+IG52bWVfc2V0dXBf ZGlzY2FyZDogbiAhPSBzZWdtZW50cyAoMyAhPSAyKQo+IG52bWVfc2V0dXBfZGlzY2FyZDogbiAh PSBzZWdtZW50cyAoMTIgIT0gMTEpCj4gYGBgCgpDYW4geW91IHRlc3QgdGhlIGZvbGxvd2luZyBw YXRjaD8KCmRpZmYgLS1naXQgYS9ibG9jay9iZnEtaW9zY2hlZC5jIGIvYmxvY2svYmZxLWlvc2No ZWQuYwppbmRleCA3Mjc5NTU5MTg1NjMuLjY3M2E2MzRlYWRkOSAxMDA2NDQKLS0tIGEvYmxvY2sv YmZxLWlvc2NoZWQuYworKysgYi9ibG9jay9iZnEtaW9zY2hlZC5jCkBAIC0yMzYxLDYgKzIzNjEs OSBAQCBzdGF0aWMgaW50IGJmcV9yZXF1ZXN0X21lcmdlKHN0cnVjdCByZXF1ZXN0X3F1ZXVlICpx LCBzdHJ1Y3QgcmVxdWVzdCAqKnJlcSwKIAlfX3JxID0gYmZxX2ZpbmRfcnFfZm1lcmdlKGJmcWQs IGJpbywgcSk7CiAJaWYgKF9fcnEgJiYgZWx2X2Jpb19tZXJnZV9vayhfX3JxLCBiaW8pKSB7CiAJ CSpyZXEgPSBfX3JxOworCisJCWlmIChibGtfZGlzY2FyZF9tZXJnYWJsZShfX3JxKSkKKwkJCXJl dHVybiBFTEVWQVRPUl9ESVNDQVJEX01FUkdFOwogCQlyZXR1cm4gRUxFVkFUT1JfRlJPTlRfTUVS R0U7CiAJfQogCmRpZmYgLS1naXQgYS9ibG9jay9ibGstbWVyZ2UuYyBiL2Jsb2NrL2Jsay1tZXJn ZS5jCmluZGV4IGExMWIzYjUzNzE3ZS4uZjg3MDdmZjdlMmZjIDEwMDY0NAotLS0gYS9ibG9jay9i bGstbWVyZ2UuYworKysgYi9ibG9jay9ibGstbWVyZ2UuYwpAQCAtNzA1LDIyICs3MDUsNiBAQCBz dGF0aWMgdm9pZCBibGtfYWNjb3VudF9pb19tZXJnZV9yZXF1ZXN0KHN0cnVjdCByZXF1ZXN0ICpy ZXEpCiAJfQogfQogCi0vKgotICogVHdvIGNhc2VzIG9mIGhhbmRsaW5nIERJU0NBUkQgbWVyZ2U6 Ci0gKiBJZiBtYXhfZGlzY2FyZF9zZWdtZW50cyA+IDEsIHRoZSBkcml2ZXIgdGFrZXMgZXZlcnkg YmlvCi0gKiBhcyBhIHJhbmdlIGFuZCBzZW5kIHRoZW0gdG8gY29udHJvbGxlciB0b2dldGhlci4g VGhlIHJhbmdlcwotICogbmVlZG4ndCB0byBiZSBjb250aWd1b3VzLgotICogT3RoZXJ3aXNlLCB0 aGUgYmlvcy9yZXF1ZXN0cyB3aWxsIGJlIGhhbmRsZWQgYXMgc2FtZSBhcwotICogb3RoZXJzIHdo aWNoIHNob3VsZCBiZSBjb250aWd1b3VzLgotICovCi1zdGF0aWMgaW5saW5lIGJvb2wgYmxrX2Rp c2NhcmRfbWVyZ2FibGUoc3RydWN0IHJlcXVlc3QgKnJlcSkKLXsKLQlpZiAocmVxX29wKHJlcSkg PT0gUkVRX09QX0RJU0NBUkQgJiYKLQkgICAgcXVldWVfbWF4X2Rpc2NhcmRfc2VnbWVudHMocmVx LT5xKSA+IDEpCi0JCXJldHVybiB0cnVlOwotCXJldHVybiBmYWxzZTsKLX0KLQogc3RhdGljIGVu dW0gZWx2X21lcmdlIGJsa190cnlfcmVxX21lcmdlKHN0cnVjdCByZXF1ZXN0ICpyZXEsCiAJCQkJ CXN0cnVjdCByZXF1ZXN0ICpuZXh0KQogewpkaWZmIC0tZ2l0IGEvYmxvY2svZWxldmF0b3IuYyBi L2Jsb2NrL2VsZXZhdG9yLmMKaW5kZXggNTJhZGExNGNmZTQ1Li5hNWZlMjYxNWVjMGYgMTAwNjQ0 Ci0tLSBhL2Jsb2NrL2VsZXZhdG9yLmMKKysrIGIvYmxvY2svZWxldmF0b3IuYwpAQCAtMzM2LDYg KzMzNiw5IEBAIGVudW0gZWx2X21lcmdlIGVsdl9tZXJnZShzdHJ1Y3QgcmVxdWVzdF9xdWV1ZSAq cSwgc3RydWN0IHJlcXVlc3QgKipyZXEsCiAJX19ycSA9IGVsdl9ycWhhc2hfZmluZChxLCBiaW8t PmJpX2l0ZXIuYmlfc2VjdG9yKTsKIAlpZiAoX19ycSAmJiBlbHZfYmlvX21lcmdlX29rKF9fcnEs IGJpbykpIHsKIAkJKnJlcSA9IF9fcnE7CisKKwkJaWYgKGJsa19kaXNjYXJkX21lcmdhYmxlKF9f cnEpKQorCQkJcmV0dXJuIEVMRVZBVE9SX0RJU0NBUkRfTUVSR0U7CiAJCXJldHVybiBFTEVWQVRP Ul9CQUNLX01FUkdFOwogCX0KIApkaWZmIC0tZ2l0IGEvYmxvY2svbXEtZGVhZGxpbmUtbWFpbi5j IGIvYmxvY2svbXEtZGVhZGxpbmUtbWFpbi5jCmluZGV4IDZmNjEyZTZkYzgyYi4uMjk0YmUwYzBk YjY1IDEwMDY0NAotLS0gYS9ibG9jay9tcS1kZWFkbGluZS1tYWluLmMKKysrIGIvYmxvY2svbXEt ZGVhZGxpbmUtbWFpbi5jCkBAIC02NzcsNiArNjc3LDggQEAgc3RhdGljIGludCBkZF9yZXF1ZXN0 X21lcmdlKHN0cnVjdCByZXF1ZXN0X3F1ZXVlICpxLCBzdHJ1Y3QgcmVxdWVzdCAqKnJxLAogCiAJ CWlmIChlbHZfYmlvX21lcmdlX29rKF9fcnEsIGJpbykpIHsKIAkJCSpycSA9IF9fcnE7CisJCQlp ZiAoYmxrX2Rpc2NhcmRfbWVyZ2FibGUoX19ycSkpCisJCQkJcmV0dXJuIEVMRVZBVE9SX0RJU0NB UkRfTUVSR0U7CiAJCQlyZXR1cm4gRUxFVkFUT1JfRlJPTlRfTUVSR0U7CiAJCX0KIAl9CmRpZmYg LS1naXQgYS9pbmNsdWRlL2xpbnV4L2Jsa2Rldi5oIGIvaW5jbHVkZS9saW51eC9ibGtkZXYuaApp bmRleCAzMTc3MTgxYzQzMjYuLjg3ZjAwMjkyZmQ3YSAxMDA2NDQKLS0tIGEvaW5jbHVkZS9saW51 eC9ibGtkZXYuaAorKysgYi9pbmNsdWRlL2xpbnV4L2Jsa2Rldi5oCkBAIC0xNTIxLDYgKzE1MjEs MjIgQEAgc3RhdGljIGlubGluZSBpbnQgcXVldWVfbGltaXRfZGlzY2FyZF9hbGlnbm1lbnQoc3Ry dWN0IHF1ZXVlX2xpbWl0cyAqbGltLCBzZWN0b3IKIAlyZXR1cm4gb2Zmc2V0IDw8IFNFQ1RPUl9T SElGVDsKIH0KIAorLyoKKyAqIFR3byBjYXNlcyBvZiBoYW5kbGluZyBESVNDQVJEIG1lcmdlOgor ICogSWYgbWF4X2Rpc2NhcmRfc2VnbWVudHMgPiAxLCB0aGUgZHJpdmVyIHRha2VzIGV2ZXJ5IGJp bworICogYXMgYSByYW5nZSBhbmQgc2VuZCB0aGVtIHRvIGNvbnRyb2xsZXIgdG9nZXRoZXIuIFRo ZSByYW5nZXMKKyAqIG5lZWRuJ3QgdG8gYmUgY29udGlndW91cy4KKyAqIE90aGVyd2lzZSwgdGhl IGJpb3MvcmVxdWVzdHMgd2lsbCBiZSBoYW5kbGVkIGFzIHNhbWUgYXMKKyAqIG90aGVycyB3aGlj aCBzaG91bGQgYmUgY29udGlndW91cy4KKyAqLworc3RhdGljIGlubGluZSBib29sIGJsa19kaXNj YXJkX21lcmdhYmxlKHN0cnVjdCByZXF1ZXN0ICpyZXEpCit7CisJaWYgKHJlcV9vcChyZXEpID09 IFJFUV9PUF9ESVNDQVJEICYmCisJICAgIHF1ZXVlX21heF9kaXNjYXJkX3NlZ21lbnRzKHJlcS0+ cSkgPiAxKQorCQlyZXR1cm4gdHJ1ZTsKKwlyZXR1cm4gZmFsc2U7Cit9CisKIHN0YXRpYyBpbmxp bmUgaW50IGJkZXZfZGlzY2FyZF9hbGlnbm1lbnQoc3RydWN0IGJsb2NrX2RldmljZSAqYmRldikK IHsKIAlzdHJ1Y3QgcmVxdWVzdF9xdWV1ZSAqcSA9IGJkZXZfZ2V0X3F1ZXVlKGJkZXYpOwoKVGhh bmtzLApNaW5nCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KTGludXgtbnZtZSBtYWlsaW5nIGxpc3QKTGludXgtbnZtZUBsaXN0cy5pbmZyYWRlYWQub3Jn Cmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4vbGlzdGluZm8vbGludXgtbnZtZQo= 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=-11.5 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,SPF_HELO_NONE,SPF_PASS 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 E7AF8C07E95 for ; Fri, 16 Jul 2021 09:33:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D218F613EE for ; Fri, 16 Jul 2021 09:33:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233883AbhGPJgU (ORCPT ); Fri, 16 Jul 2021 05:36:20 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:30069 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232617AbhGPJgT (ORCPT ); Fri, 16 Jul 2021 05:36:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626428004; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=m08xqBA+uGZoSfDv0tyerS1nF0XIak+eyqoZwC+cyQU=; b=fs+uiCL+FgX9B4Y7CzNcyliC87vtZtwMV4adJC3RD6CV7gFLE38p+4ZAqBQhxtxmL3O6Oi E5OrOTQabtzve7ABKXGhJA6iTjDHtndUoQBwwmKWsvTjnQMIjeQNslBEsgi0PHRQrxLdSN kTVURCL7orejL2/YPVRswQQmp4YtVsY= 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-561-RuIirQ95PvymlHJa_zgO6g-1; Fri, 16 Jul 2021 05:33:23 -0400 X-MC-Unique: RuIirQ95PvymlHJa_zgO6g-1 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 362F5CC621; Fri, 16 Jul 2021 09:33:21 +0000 (UTC) Received: from T590 (ovpn-13-146.pek2.redhat.com [10.72.13.146]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E5136604CD; Fri, 16 Jul 2021 09:33:10 +0000 (UTC) Date: Fri, 16 Jul 2021 17:33:05 +0800 From: Ming Lei To: Oleksandr Natalenko Cc: linux-kernel@vger.kernel.org, Jens Axboe , Christoph Hellwig , Sagi Grimberg , linux-nvme@lists.infradead.org, David Jeffery , Laurence Oberman , Paolo Valente , Jan Kara , Sasha Levin , Greg Kroah-Hartman , Keith Busch Subject: Re: New warning in nvme_setup_discard Message-ID: References: <4729812.CpyZKHjjVO@natalenko.name> <81322754.HEIg0oD171@natalenko.name> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <81322754.HEIg0oD171@natalenko.name> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Jul 16, 2021 at 07:53:28AM +0200, Oleksandr Natalenko wrote: > Hello. > > On pátek 16. července 2021 4:16:18 CEST Ming Lei wrote: > > > 850 if (WARN_ON_ONCE(n != segments)) { > > > > What is 'n' and 'segments'? > > So, I used this change to check that: > > ``` > diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c > index 66973bb56305..0a64f2f77daf 100644 > --- a/drivers/nvme/host/core.c > +++ b/drivers/nvme/host/core.c > @@ -847,7 +847,8 @@ static blk_status_t nvme_setup_discard(struct nvme_ns *ns, > struct request *req, > n++; > } > > - if (WARN_ON_ONCE(n != segments)) { > + if (unlikely(n != segments)) { > + pr_warn("nvme_setup_discard: n != segments (%u != %u)\n", n, > segments); > if (virt_to_page(range) == ns->ctrl->discard_page) > clear_bit_unlock(0, &ns->ctrl->discard_page_busy); > else > > ``` > > and the result is: > > ``` > nvme_setup_discard: n != segments (3 != 2) > nvme_setup_discard: n != segments (12 != 11) > ``` Can you test the following patch? diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 727955918563..673a634eadd9 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -2361,6 +2361,9 @@ static int bfq_request_merge(struct request_queue *q, struct request **req, __rq = bfq_find_rq_fmerge(bfqd, bio, q); if (__rq && elv_bio_merge_ok(__rq, bio)) { *req = __rq; + + if (blk_discard_mergable(__rq)) + return ELEVATOR_DISCARD_MERGE; return ELEVATOR_FRONT_MERGE; } diff --git a/block/blk-merge.c b/block/blk-merge.c index a11b3b53717e..f8707ff7e2fc 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c @@ -705,22 +705,6 @@ static void blk_account_io_merge_request(struct request *req) } } -/* - * Two cases of handling DISCARD merge: - * If max_discard_segments > 1, the driver takes every bio - * as a range and send them to controller together. The ranges - * needn't to be contiguous. - * Otherwise, the bios/requests will be handled as same as - * others which should be contiguous. - */ -static inline bool blk_discard_mergable(struct request *req) -{ - if (req_op(req) == REQ_OP_DISCARD && - queue_max_discard_segments(req->q) > 1) - return true; - return false; -} - static enum elv_merge blk_try_req_merge(struct request *req, struct request *next) { diff --git a/block/elevator.c b/block/elevator.c index 52ada14cfe45..a5fe2615ec0f 100644 --- a/block/elevator.c +++ b/block/elevator.c @@ -336,6 +336,9 @@ enum elv_merge elv_merge(struct request_queue *q, struct request **req, __rq = elv_rqhash_find(q, bio->bi_iter.bi_sector); if (__rq && elv_bio_merge_ok(__rq, bio)) { *req = __rq; + + if (blk_discard_mergable(__rq)) + return ELEVATOR_DISCARD_MERGE; return ELEVATOR_BACK_MERGE; } diff --git a/block/mq-deadline-main.c b/block/mq-deadline-main.c index 6f612e6dc82b..294be0c0db65 100644 --- a/block/mq-deadline-main.c +++ b/block/mq-deadline-main.c @@ -677,6 +677,8 @@ static int dd_request_merge(struct request_queue *q, struct request **rq, if (elv_bio_merge_ok(__rq, bio)) { *rq = __rq; + if (blk_discard_mergable(__rq)) + return ELEVATOR_DISCARD_MERGE; return ELEVATOR_FRONT_MERGE; } } diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 3177181c4326..87f00292fd7a 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -1521,6 +1521,22 @@ static inline int queue_limit_discard_alignment(struct queue_limits *lim, sector return offset << SECTOR_SHIFT; } +/* + * Two cases of handling DISCARD merge: + * If max_discard_segments > 1, the driver takes every bio + * as a range and send them to controller together. The ranges + * needn't to be contiguous. + * Otherwise, the bios/requests will be handled as same as + * others which should be contiguous. + */ +static inline bool blk_discard_mergable(struct request *req) +{ + if (req_op(req) == REQ_OP_DISCARD && + queue_max_discard_segments(req->q) > 1) + return true; + return false; +} + static inline int bdev_discard_alignment(struct block_device *bdev) { struct request_queue *q = bdev_get_queue(bdev); Thanks, Ming