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=-9.8 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 4FDE5C43603 for ; Wed, 11 Dec 2019 16:11:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1142820836 for ; Wed, 11 Dec 2019 16:11:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576080664; bh=wbC5A6leomBKVGZf/uRvC1lsTAzOW5rIUhYBm2z4gqw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=cKMdxuIYofZVqjHIyp8dKZtWwaCU70vdYGttJ1FEMWTRdwKO2itYu/EEJ5074v9hW QKrcHQLPpMoJdgwejICaawj6WahfUV72JGYYjxW9t+Uta49itda7lcGMx2ar5gTpSS xBUWpFIk6sexn0Cz6Lcmp694ZT/oxGVfBxC+eZ7U= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731073AbfLKQLC (ORCPT ); Wed, 11 Dec 2019 11:11:02 -0500 Received: from mail.kernel.org ([198.145.29.99]:60370 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730598AbfLKPLl (ORCPT ); Wed, 11 Dec 2019 10:11:41 -0500 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 1CDAD24658; Wed, 11 Dec 2019 15:11:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576077100; bh=wbC5A6leomBKVGZf/uRvC1lsTAzOW5rIUhYBm2z4gqw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WzG8BK5+Q7mFuF8efZJSibDlmdiX/5rYPexWIi9btv8CL4wKfqF49tHNkY53sZwVA ykiGZByoFQUB2BreU/63LD3S0Ew0JsiwWgVVtPY8feyGAx8zg8LAMyFy7FIVFSwcKU SQ0URQoW7ohWDxbzKSVuVwV3qy942uBU1u5Qpo2A= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sirong Wang , Weihang Li , Jason Gunthorpe , Sasha Levin Subject: [PATCH 5.3 017/105] RDMA/hns: Correct the value of HNS_ROCE_HEM_CHUNK_LEN Date: Wed, 11 Dec 2019 16:05:06 +0100 Message-Id: <20191211150224.955573972@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191211150221.153659747@linuxfoundation.org> References: <20191211150221.153659747@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sirong Wang [ Upstream commit 531eb45b3da4267fc2a64233ba256c8ffb02edd2 ] Size of pointer to buf field of struct hns_roce_hem_chunk should be considered when calculating HNS_ROCE_HEM_CHUNK_LEN, or sg table size will be larger than expected when allocating hem. Fixes: 9a4435375cd1 ("IB/hns: Add driver files for hns RoCE driver") Link: https://lore.kernel.org/r/1572575610-52530-2-git-send-email-liweihang@hisilicon.com Signed-off-by: Sirong Wang Signed-off-by: Weihang Li Signed-off-by: Jason Gunthorpe Signed-off-by: Sasha Levin --- drivers/infiniband/hw/hns/hns_roce_hem.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/infiniband/hw/hns/hns_roce_hem.h b/drivers/infiniband/hw/hns/hns_roce_hem.h index f1ccb8f35fe59..e41ebc25b1f90 100644 --- a/drivers/infiniband/hw/hns/hns_roce_hem.h +++ b/drivers/infiniband/hw/hns/hns_roce_hem.h @@ -59,7 +59,7 @@ enum { #define HNS_ROCE_HEM_CHUNK_LEN \ ((256 - sizeof(struct list_head) - 2 * sizeof(int)) / \ - (sizeof(struct scatterlist))) + (sizeof(struct scatterlist) + sizeof(void *))) #define check_whether_bt_num_3(type, hop_num) \ (type < HEM_TYPE_MTT && hop_num == 2) -- 2.20.1