From patchwork Tue Oct 27 13:44:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 289572 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=-9.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, 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 2A550C838AB for ; Tue, 27 Oct 2020 15:48:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CEFB722284 for ; Tue, 27 Oct 2020 15:48:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603813734; bh=htMghhJ7hNVrTPVpLs+2ANNfToQbljdEbr5KCsZv74s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=PYIbd0M6uDzY6/UkRh/jxAidFMb3E0/3EKuIk8DVXD12K5/jPIT36tp7jUeMocpfx p8cc3m9sdO/5zmR6eDsehK+RBTUGMLu2JeOfUQE4rbTalkH+sMswT3Xm4abfI9nCtb YUKM1PChUcdgrwBindBiy4i0vnQbGM18MMGR07sk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1802460AbgJ0Psu (ORCPT ); Tue, 27 Oct 2020 11:48:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:55444 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1796385AbgJ0PSC (ORCPT ); Tue, 27 Oct 2020 11:18:02 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 1B23E21527; Tue, 27 Oct 2020 15:18:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603811881; bh=htMghhJ7hNVrTPVpLs+2ANNfToQbljdEbr5KCsZv74s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ly2S71JCj1fzfObG3axEzWHZ0Sf388L1IrRD3vcV8MdFtpMBHyt5HAKO3O7UCvfDx REYSgc/72Kr0FOJmQFVCBAvFihhsZaZZuhpPJPOFebVgKNVQKu2q34DePo4yJM3qC/ GGsxP27MgirUKhcJOeywAym0JOYC49j5AnlllsBA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Karsten Graul , Jakub Kicinski Subject: [PATCH 5.9 016/757] net/smc: fix valid DMBE buffer sizes Date: Tue, 27 Oct 2020 14:44:26 +0100 Message-Id: <20201027135451.284123198@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135450.497324313@linuxfoundation.org> References: <20201027135450.497324313@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Karsten Graul [ Upstream commit ef12ad45880b696eb993d86c481ca891836ab593 ] The SMCD_DMBE_SIZES should include all valid DMBE buffer sizes, so the correct value is 6 which means 1MB. With 7 the registration of an ISM buffer would always fail because of the invalid size requested. Fix that and set the value to 6. Fixes: c6ba7c9ba43d ("net/smc: add base infrastructure for SMC-D and ISM") Signed-off-by: Karsten Graul Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- net/smc/smc_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/smc/smc_core.c +++ b/net/smc/smc_core.c @@ -1597,7 +1597,7 @@ out: return rc; } -#define SMCD_DMBE_SIZES 7 /* 0 -> 16KB, 1 -> 32KB, .. 6 -> 1MB */ +#define SMCD_DMBE_SIZES 6 /* 0 -> 16KB, 1 -> 32KB, .. 6 -> 1MB */ static struct smc_buf_desc *smcd_new_buf_create(struct smc_link_group *lgr, bool is_dmb, int bufsize)