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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 94F81C433E0 for ; Thu, 18 Jun 2020 01:55:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 71F1420885 for ; Thu, 18 Jun 2020 01:55:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592445346; bh=V2vg7eN6p7rfgpqhFbM5P7WBzxfDE41m63zy0/15p8M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=seTgL25jLcnm4S3uBHxloZyB/fX2dTw2FoXCK63FBrwv2jXu8XW314I9MAmGzu+Kf AIA3oFddELmBc/hL8i2PqOf7h8ucd8/3TcMTKcjWokVIgw4kTkGhtcOnZlmQn9MKb7 Ot+5j3qbZV5apIt3uxcyFce+f9jcyE4DK7h55nuc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731628AbgFRBzp (ORCPT ); Wed, 17 Jun 2020 21:55:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:60960 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730784AbgFRBZk (ORCPT ); Wed, 17 Jun 2020 21:25:40 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0939C20776; Thu, 18 Jun 2020 01:25:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592443539; bh=V2vg7eN6p7rfgpqhFbM5P7WBzxfDE41m63zy0/15p8M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IQZyZdsrLbIJx4ty/etx2Ru/glHCOH0KWOFSifwqdqqt8OpFeL5Yk/Cfj31cVwECS RtHgXGbSe4CXQIqhfHY4vYzBmVkMpP58OQYVj0Qcl/dvcofhxRh+WRarm170RAoq3y 28b9oCTknSkY3/+3PqrglYlpdh2zDhvYaUl7tNT8= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Logan Gunthorpe , Allen Hubbe , Alexander Fomichev , Jon Mason , Sasha Levin , linux-ntb@googlegroups.com Subject: [PATCH AUTOSEL 4.19 157/172] NTB: perf: Don't require one more memory window than number of peers Date: Wed, 17 Jun 2020 21:22:03 -0400 Message-Id: <20200618012218.607130-157-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200618012218.607130-1-sashal@kernel.org> References: <20200618012218.607130-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Logan Gunthorpe [ Upstream commit a9c4211ac918ade1522aced6b5acfbe824722f7d ] ntb_perf should not require more than one memory window per peer. This was probably an off-by-one error. Fixes: 5648e56d03fa ("NTB: ntb_perf: Add full multi-port NTB API support") Signed-off-by: Logan Gunthorpe Acked-by: Allen Hubbe Tested-by: Alexander Fomichev Signed-off-by: Jon Mason Signed-off-by: Sasha Levin --- drivers/ntb/test/ntb_perf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/ntb/test/ntb_perf.c b/drivers/ntb/test/ntb_perf.c index 2ee41b988c5d..28d288ff3bae 100644 --- a/drivers/ntb/test/ntb_perf.c +++ b/drivers/ntb/test/ntb_perf.c @@ -656,7 +656,7 @@ static int perf_init_service(struct perf_ctx *perf) { u64 mask; - if (ntb_peer_mw_count(perf->ntb) < perf->pcnt + 1) { + if (ntb_peer_mw_count(perf->ntb) < perf->pcnt) { dev_err(&perf->ntb->dev, "Not enough memory windows\n"); return -EINVAL; } -- 2.25.1