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=-17.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 9432DC433E0 for ; Sun, 7 Feb 2021 16:04:03 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 59AA764DF6 for ; Sun, 7 Feb 2021 16:04:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 59AA764DF6 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de 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=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=4F/dWIdWqyTrtne6EBydFmfvcr6Q66foCsxloKGw+1Y=; b=fs7ADNeeoT8mVbbZKk4flwiyL jG9qkgu1kiApGYJD2i1dM2BBV0YB48PzcegUTavXc2sZ1gZZRS2C7zcmMGGAW62agnQiLwY3CC05U 7HIUQ791lcfY8lLsI/rnockRykf1HVK4FSel9mFYhDHB/O81GLLrZ0Hn3S1RoXduBLKhj1DweaZx8 WiaEhbCw9gkOax7zJFao8GBTUblCzEuak5PAwYjvCssaj9H/L4kUs8RvDfXHdj8UgLc2hJM8psOwT pFWJq2Ck2e/V7r359Yp8Y/lCpyt0gk7u7wYCcxO37+G1o3zuq8/wO5H3IazrsgO5bedZS5rEw3JHO bB0ezDCwg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l8mXV-0004ra-WE; Sun, 07 Feb 2021 16:03:58 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l8mXS-0004pz-BC for linux-nvme@merlin.infradead.org; Sun, 07 Feb 2021 16:03:54 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=F24Liqgf8qiF463t7oAeygk27So981Fko2Wbpc6bT9g=; b=pnnqZpwoJ6QCs7bs7Tx4x3pas9 JbwBXQWGNDkycE+dS6c+jkh9yaXRc8JYObbH2HRv6/UcaP2GHabkSJvL0sjXKl8JxAo2mOmYqm19a Sj0G1SfYq2GEeOiWvaklju2MvGwHJS0l4+mpnAkoYdEs3hsyX5lCyONYs7tnuDjckJJBPLGfz1Rfk IjtyAfL+h536s8gp2758mJIX4OpOuPhKQjTghX2mJVEJEyGPOHApBSugxp+Q6ua8iPHHn0R2NsAoR Z+hXHuHBFitIsgCdt2LJej9R9E/0bGqFc0OZFSxj/H8aHDK+ifFzY0TiDEosv7fm/X3gOgutzekxe zos02m+A==; Received: from [2001:4bb8:184:7d04:4590:5583:6cb7:77c7] (helo=localhost) by casper.infradead.org with esmtpsa (Exim 4.94 #2 (Red Hat Linux)) id 1l8mXP-004tOt-Qy; Sun, 07 Feb 2021 16:03:52 +0000 From: Christoph Hellwig To: jxgao@google.com, gregkh@linuxfoundation.org Subject: [PATCH 7/9] swiotlb: don't modify orig_addr in swiotlb_tbl_sync_single Date: Sun, 7 Feb 2021 17:03:25 +0100 Message-Id: <20210207160327.2955490-8-hch@lst.de> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210207160327.2955490-1-hch@lst.de> References: <20210207160327.2955490-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org. See http://www.infradead.org/rpr.html X-BeenThere: linux-nvme@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: saravanak@google.com, konrad.wilk@oracle.com, marcorr@google.com, linux-nvme@lists.infradead.org, kbusch@kernel.org, iommu@lists.linux-foundation.org, erdemaktas@google.com, robin.murphy@arm.com, m.szyprowski@samsung.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-nvme" Errors-To: linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org swiotlb_tbl_map_single currently nevers sets a tlb_addr that is not aligned to the tlb bucket size. But we're going to add such a case soon, for which this adjustment would be bogus. Signed-off-by: Christoph Hellwig --- kernel/dma/swiotlb.c | 1 - 1 file changed, 1 deletion(-) diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c index 381c24ef1ac1d0..8eb84c337fe90c 100644 --- a/kernel/dma/swiotlb.c +++ b/kernel/dma/swiotlb.c @@ -660,7 +660,6 @@ void swiotlb_tbl_sync_single(struct device *hwdev, phys_addr_t tlb_addr, if (orig_addr == INVALID_PHYS_ADDR) return; - orig_addr += (unsigned long)tlb_addr & (IO_TLB_SIZE - 1); switch (target) { case SYNC_FOR_CPU: -- 2.29.2 _______________________________________________ Linux-nvme mailing list Linux-nvme@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-nvme