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.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,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 13421C433E1 for ; Tue, 23 Jun 2020 20:32:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E3BDB2080C for ; Tue, 23 Jun 2020 20:32:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592944339; bh=ZWvo8ei2v+ko2AWk/oWELmt2FduBkYTaof/REalsYHc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Vh5hpojhsv9WtTQFUPhKoEMxpkViLepChqGvil8keFT9fjI8ICqI1dbi4tK15vWEW Zii8G/ka6IvBYsWwYHp9mnwE8cYcy+aDZQO/pI2e7UXKGy08N4V/RZi3Dx2Q1q5Ccq nnhTH5IfZfg36pl7zqF+ws7c0G79FVr9WQJbBZPc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391290AbgFWUcS (ORCPT ); Tue, 23 Jun 2020 16:32:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:53060 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391284AbgFWUcP (ORCPT ); Tue, 23 Jun 2020 16:32:15 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C67C02072E; Tue, 23 Jun 2020 20:32:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592944335; bh=ZWvo8ei2v+ko2AWk/oWELmt2FduBkYTaof/REalsYHc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qJRNOviWO8ipcFqTVhCYtGvBxp/gPbgGrgF6ExY7RhqpxntLMhgHjrz3TF3UJaI7o oSm5WEH9CCxCCUR+gUGnRSeiaf99PKrmStS95xb6AKD6mlkVztgApszfCmN2JotAcW xMHwycmhEFxUxbFPBCIOe37eSyoXIKAEns6frPtU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Logan Gunthorpe , Allen Hubbe , Alexander Fomichev , Jon Mason , Sasha Levin Subject: [PATCH 5.4 234/314] NTB: perf: Dont require one more memory window than number of peers Date: Tue, 23 Jun 2020 21:57:09 +0200 Message-Id: <20200623195350.113906648@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195338.770401005@linuxfoundation.org> References: <20200623195338.770401005@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 52c29791fc02a..3817eadab2cf9 100644 --- a/drivers/ntb/test/ntb_perf.c +++ b/drivers/ntb/test/ntb_perf.c @@ -653,7 +653,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