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 B6715C433E0 for ; Tue, 23 Jun 2020 20:59:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 837CB20656 for ; Tue, 23 Jun 2020 20:59:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592945984; bh=+RLAkl0OX/JMe0emcI2RcMvX6C7nGx3/sqr1WrsFtpg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=XC727yaaVPORj5G9Ip0ghk1dwm6monAy0kTKCi5xXQxMIJVHwO4CRkl9ch8u8EWJA yIBZ44lK51prbUTCHdMaeBJN2dsf3rlGevGFoPqVV1jv3w+E//oTWc+7+RMhOE83uD N+DKe86o+VR16WK5FSLJ7aUYLOBx/7w0UU1+keKk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392300AbgFWU7m (ORCPT ); Tue, 23 Jun 2020 16:59:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:36926 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390102AbgFWUkp (ORCPT ); Tue, 23 Jun 2020 16:40:45 -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 CD80B2078A; Tue, 23 Jun 2020 20:40:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592944845; bh=+RLAkl0OX/JMe0emcI2RcMvX6C7nGx3/sqr1WrsFtpg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=i5qm8zhAKuZ5FJ39+EsYr+VQMhoTa65J5DUr6x0AWbXI+lwt15gwsTUwXGFT/9O6G LIYlJQphSLaC5TOwYycaKQB0X+hYlI21rVxLDxGOhzqlnYDyVnJRgOjwMfQwo3NXug hJfAnZPA4KNOxThS3VNrGjAquQMsU8twQpSdRIWk= 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 4.19 147/206] NTB: perf: Dont require one more memory window than number of peers Date: Tue, 23 Jun 2020 21:57:55 +0200 Message-Id: <20200623195324.217713338@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195316.864547658@linuxfoundation.org> References: <20200623195316.864547658@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 2ee41b988c5dd..28d288ff3baef 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