Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Sanjay R Mehta <sanju.mehta@amd.com>
To:     jdmason@kudzu.us, dave.jiang@intel.com, allenbh@gmail.com,
        arindam.nath@amd.com, logang@deltatee.com, Shyam-sundar.S-k@amd.com
Cc:     linux-ntb@googlegroups.com, linux-kernel@vger.kernel.org,
        Sanjay R Mehta <sanju.mehta@amd.com>
Subject: [PATCH v3 5/5] ntb_perf: avoid false dma unmap of destination address
Date:   Tue,  5 May 2020 23:21:52 -0500
Message-Id: <1588738912-24827-6-git-send-email-sanju.mehta@amd.com>
In-Reply-To: <1588738912-24827-1-git-send-email-sanju.mehta@amd.com>
References: <1588738912-24827-1-git-send-email-sanju.mehta@amd.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from sanjuamdntb2.amd.com (165.204.156.251) by MA1PR01CA0127.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:35::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.2979.26 via Frontend Transport; Wed, 6 May 2020 04:22:56 +0000
X-Mailer: git-send-email 2.7.4
X-Originating-IP: [165.204.156.251]
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-HT: Tenant
X-MS-Office365-Filtering-Correlation-Id: dc385fb0-cefc-46ef-76f6-08d7f17528d3
X-MS-TrafficTypeDiagnostic: DM6PR12MB4092:|DM6PR12MB4092:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <DM6PR12MB4092AD5754DBAD0F49A72853E5A40@DM6PR12MB4092.namprd12.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:4502;
X-Forefront-PRVS: 03950F25EC
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: iwyqhVv19j54pC/wpzHNj5c/k48YVWjQ5QRJcXZ/ZNkRlUnBcNPckmMWk8f/tC9OsiGWtNiKCjew52xCBfkPbVyM3cjGcDpHplALc3Qan88A+aqWmqmGxDXhZL4TTKSY2v+f45MxUakz7b+NAl431Jqju6VGUW0cfxP3w1UIJASDJ8ow7RXb+L8M8YBJuvA8e6OURJqLrqURe6IqghwfFvt8pr+62bX2RPPBGcOCaXWrhJBoC6qN6BLCpT9UDPvJssYSyMXIMSjmiQTb4tAwW0SZvYt5swdp5eNdXt1Yi5N739r63sWbuyj1ixo1OT2DoalayjlfDXMwM6kxtdvoJYkEFjUoyCqihrJp4ACfpL5k234vht7VOCbFRceok0W1n2Dsp3lmiZkbBAxKkvgr4OASxhUwWtf0IWOqdJl8LR36vLKSkvkgPyYOPcbnOC/ME5M10BQgatvdjV6kkQN5hIpfjxNyNCVHT6Is0t4dXL8S2945Goi8+lrxro40/IprrspzV2XsMQYYBVMZmdoo2A==
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR12MB3420.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(366004)(396003)(136003)(39860400002)(376002)(346002)(33430700001)(4326008)(33440700001)(956004)(2616005)(478600001)(5660300002)(2906002)(8936002)(36756003)(316002)(6636002)(66556008)(66476007)(6486002)(7696005)(66946007)(52116002)(26005)(8676002)(86362001)(6666004)(16526019)(186003);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData: UyTYFEcgM7h3/E3QwKJXnlJrxW0O4h3QPdkB5itxNj4dmMgxqguOGNvzBVDe9v7NO8D9PCdRQ1EA+vBvGIr4YuuFYmxC4LkvE8oLsROPrYp3och31iyO+sSDXbIyC7Z8RE9j7kIsJ/6zjc7Gj9QACrtXCGEspgJ2jf88Vs9DRzEtcBXtloyV4o7r0nUXv1zxybfv01cC7WvvNV9sfjeHh+upnhp/memKX/a6zAPgAf2sdOEO/myJebxhzbGlRmjVlI03Bil4gaV7hbdvn/GbDpIyjO6bQWnjDn6b41X6p42Ol8hPGbEpw2r42qEjBhzPiaMKy0GnhnPwYpLj71jepsdmCtqBYsGi5GTh2a16y0K/XV0IMF3cY+EfstE8JKt7/ZZ2/3n6/fltiYjACixkxlQbS49ESbB4JLOA7D3dXSmrmb60FKMEl52kxehK21rL2PdCXrmEeDkRpffWVYkiJCHXQ9rjFAA6abbA05WFpEkR49KMLpaaL8XBM4pGhNrMwGXCX2ifV+nA3VlvO9UlqbWI5KIjgU/ioTvjRTi/ajgXUnxeKDUgd7a5ab2ZmDa2C6I9wlukD1Zfnk9dz+lOi7AFHdpZrQ4t5cje7zjATta6Cra81hF34hvr2KjJtkvcNZgr46x15IltOoz72QJ6ZkbQxqJ/d3ddLIWtsS0khyydC9SMt1RudJ92bu/3+Aakqp5HdykNRVM214gp2x5HmTmcDSDfAwpGAa48oh8psHQoA41NfTe5KMVm+zzlK68y5iWIjVgYGGg5rIA00se7Y3ZL2V4o5UvI3jje8e5QIYQUn9+4LDOKqUXuBaIFDTVb
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: dc385fb0-cefc-46ef-76f6-08d7f17528d3
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 May 2020 04:22:59.6158
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: S1GbMMbePl/ste9PTewMqCBf2OzrwX8F9SlE5KsnsX4KnSMYoYWhKRB4N8ua4gq9IsIOStIRgTOUpErb9pcgUw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4092
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

The DMA map and unmap of destination address is already being
done in perf_init_test() and perf_clear_test() functions.
Hence avoiding it by making necessary changes in perf_copy_chunk()
function.

Signed-off-by: Sanjay R Mehta <sanju.mehta@amd.com>
Signed-off-by: Arindam Nath <arindam.nath@amd.com>
---
 drivers/ntb/test/ntb_perf.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/drivers/ntb/test/ntb_perf.c b/drivers/ntb/test/ntb_perf.c
index dbcfdaa..95a0853 100644
--- a/drivers/ntb/test/ntb_perf.c
+++ b/drivers/ntb/test/ntb_perf.c
@@ -804,7 +804,7 @@ static int perf_copy_chunk(struct perf_thread *pthr,
 	dst_vaddr = dst;
 	dst_dma_addr = peer->dma_dst_addr + (dst_vaddr - vbase);
 
-	unmap = dmaengine_get_unmap_data(dma_dev, 2, GFP_NOWAIT);
+	unmap = dmaengine_get_unmap_data(dma_dev, 1, GFP_NOWAIT);
 	if (!unmap)
 		return -ENOMEM;
 
@@ -817,15 +817,8 @@ static int perf_copy_chunk(struct perf_thread *pthr,
 	}
 	unmap->to_cnt = 1;
 
-	unmap->addr[1] = dst_dma_addr;
-	if (dma_mapping_error(dma_dev, unmap->addr[1])) {
-		ret = -EIO;
-		goto err_free_resource;
-	}
-	unmap->from_cnt = 1;
-
 	do {
-		tx = dmaengine_prep_dma_memcpy(pthr->dma_chan, unmap->addr[1],
+		tx = dmaengine_prep_dma_memcpy(pthr->dma_chan, dst_dma_addr,
 			unmap->addr[0], len, DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
 		if (!tx)
 			msleep(DMA_MDELAY);
-- 
2.7.4