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.1 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,URIBL_BLOCKED, 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 78B92C433DB for ; Thu, 4 Feb 2021 19:31:17 +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 1099564E8C for ; Thu, 4 Feb 2021 19:31:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1099564E8C 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=xHkYsmrF194Sy0i0BiD7+8MbLYyJEMMAT8EiIDAQdWU=; b=J4bXzxg0r5Hz8C/RVCnfVM2en kwNP+DjGhLWMf0yDsBfte3O+KMlWvz9APA10SyErAm3vtX5WpVC6/2KK7n1wu9zZUTJhgxGB275L4 PoljOkiqXhBYrYW6O5TjK8GvaWah9Zk+Fo/viP+xULQ1RWITQnzNSYKkHnfprBMre7la0a498GYkz A15snIGApRbPZopqsIYynSX/aU7pdHEDbsyAqvd7xEztm4YExgiMkKbddZdQUS68a4dDwFCxj+OGU 7wbyI82xKdX1AVyJ29gykizpziTsAVGgcJp+dL28x/fjzLJs9psGICbC85rlRExY/+kVgSrcdmLVu 50HOIngPQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l7kLM-0008CT-MZ; Thu, 04 Feb 2021 19:31:08 +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 1l7kL8-00086A-Pc for linux-nvme@merlin.infradead.org; Thu, 04 Feb 2021 19:30: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=DxaRDKf7HluJFpLbNHgF0rL3eIOI92nWEAIlQODnQYU=; b=SDRHtqwATWNLDinMfquTc/cYVG 83BJkhFN+82vUcjXxw3huP58Nn/tgk4XqLWCOmnKwXwjX3znQvHVl/ozxAlE9QFcfvcravtEZO5Ey quElTSy8JfgbTmVKcG6gXtlgaN/K7aAORyEbHRi+SM8otwS+4a14RhNvf5+6QB63TOvNUUPXbddTm Wdb62Tjut7/29dyvVs7FEDm1DDLOLJQiDvKG0g5jwq4iQjZA2QE/DRx/Xs9ToXL4/4QiMQ3OM2ZEm bWpHegKujvO+xw5xD1Venvs4NYVDlGl/HUQQWHdwwccxuPLweM9VO+F95EJCN7puvsmwXlaB7EcgW g0yFTWJQ==; Received: from [2001:4bb8:184:7d04:e998:f47:b9fb:7611] (helo=localhost) by casper.infradead.org with esmtpsa (Exim 4.94 #2 (Red Hat Linux)) id 1l7kL5-001Jim-Lh; Thu, 04 Feb 2021 19:30:52 +0000 From: Christoph Hellwig To: jxgao@google.com, gregkh@linuxfoundation.org Subject: [PATCH 6/8] swiotlb: don't modify orig_addr in swiotlb_tbl_sync_single Date: Thu, 4 Feb 2021 20:30:33 +0100 Message-Id: <20210204193035.2606838-7-hch@lst.de> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210204193035.2606838-1-hch@lst.de> References: <20210204193035.2606838-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 e78615e3be2906..6a2439826a1ba4 100644 --- a/kernel/dma/swiotlb.c +++ b/kernel/dma/swiotlb.c @@ -658,7 +658,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 & ((1 << IO_TLB_SHIFT) - 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