From patchwork Thu Jan 21 08:32:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 12035111 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=-20.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, INCLUDES_PULL_REQUEST,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,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 09B2BC433E6 for ; Thu, 21 Jan 2021 08:35:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CB68F2399C for ; Thu, 21 Jan 2021 08:35:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725933AbhAUIe0 (ORCPT ); Thu, 21 Jan 2021 03:34:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60162 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728059AbhAUIdc (ORCPT ); Thu, 21 Jan 2021 03:33:32 -0500 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 704B5C061575 for ; Thu, 21 Jan 2021 00:32:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Type:MIME-Version:Message-ID: Subject:Cc:To:From:Date:Sender:Reply-To:Content-Transfer-Encoding:Content-ID: Content-Description:In-Reply-To:References; bh=tCQyPoxlkt0mcG4IJQ3TV9idT57nElqTrtxIPpTvinM=; b=tp4x2GI4WPuksHoYU/5ymQSsmM tG839XzOj4nrxflSbc8s8Ytzj89Sgbj3bGt3UP47vhOaVuknMsnO0EBA1kfAkz7uj8eWWqcIWtt2r AOwt2gy+iezMoGJvOufJ/m4+kzTeEVULui/lOLSMJyhIfUh8RaRV9IrsRD7JF4DxreLSGEW4vvuUx jyANyk0pH2pyhv6ajHV8NAljSmYI0p/m5BI/9qQ2b22Jghq2p7AQLWzaf20J0Yt3NnCvfFvfilQnL EaUHrQ7a9k2cEDQc5VGsAIGeC7lazK8zqF/qSO8+QxLg+iyRs38qplBO3NjOHgm3os3TWvXrdWGcc AdE4AS+A==; Received: from [2001:4bb8:188:1954:d5b3:2657:287:e45f] (helo=localhost) by casper.infradead.org with esmtpsa (Exim 4.94 #2 (Red Hat Linux)) id 1l2VOV-00Go83-83; Thu, 21 Jan 2021 08:32:44 +0000 Date: Thu, 21 Jan 2021 09:32:42 +0100 From: Christoph Hellwig To: Jens Axboe Cc: Keith Busch , linux-block@vger.kernel.org, Sagi Grimberg , linux-nvme@lists.infradead.org Subject: [GIT PULL] nvme fixes for 5.11 Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org. See http://www.infradead.org/rpr.html Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org The following changes since commit b4f664252f51e119e9403ef84b6e9ff36d119510: Merge tag 'nvme-5.11-2021-01-14' of git://git.infradead.org/nvme into block-5.11 (2021-01-14 15:17:33 -0700) are available in the Git repository at: git://git.infradead.org/nvme.git tags/nvme-5.11-2020-01-21 for you to fetch changes up to fa0732168fa1369dd089e5b06d6158a68229f7b7: nvme-pci: fix error unwind in nvme_map_data (2021-01-20 18:56:33 +0100) ---------------------------------------------------------------- nvme fixes for 5.11: - fix a status code in nvmet (Chaitanya Kulkarni) - avoid double completions in nvme-rdma/nvme-tcp (Chao Leng) - fix the CMB support to cope with NVMe 1.4 controllers (Klaus Jensen) - fix PRINFO handling in the passthrough ioctl (Revanth Rajashekar) - fix a double DMA unmap in nvme-pci ---------------------------------------------------------------- Chaitanya Kulkarni (1): nvmet: set right status on error in id-ns handler Chao Leng (2): nvme-rdma: avoid request double completion for concurrent nvme_rdma_timeout nvme-tcp: avoid request double completion for concurrent nvme_tcp_timeout Christoph Hellwig (2): nvme-pci: refactor nvme_unmap_data nvme-pci: fix error unwind in nvme_map_data Klaus Jensen (1): nvme-pci: allow use of cmb on v1.4 controllers Revanth Rajashekar (1): nvme: check the PRINFO bit before deciding the host buffer length drivers/nvme/host/core.c | 17 +++++- drivers/nvme/host/pci.c | 119 +++++++++++++++++++++++++++------------- drivers/nvme/host/rdma.c | 15 +++-- drivers/nvme/host/tcp.c | 14 +++-- drivers/nvme/target/admin-cmd.c | 8 ++- include/linux/nvme.h | 6 ++ 6 files changed, 129 insertions(+), 50 deletions(-)