From patchwork Mon Jan 2 16:03:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Nachum, Yonatan" X-Patchwork-Id: 13086794 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EE06EC4708E for ; Mon, 2 Jan 2023 16:03:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233554AbjABQDr (ORCPT ); Mon, 2 Jan 2023 11:03:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51244 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236478AbjABQDg (ORCPT ); Mon, 2 Jan 2023 11:03:36 -0500 Received: from smtp-fw-6001.amazon.com (smtp-fw-6001.amazon.com [52.95.48.154]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4D1C2BF2 for ; Mon, 2 Jan 2023 08:03:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1672675416; x=1704211416; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=xjjupqlsv79AEPQRnRJz/3eJDwLA1UTCFP6jwXCs0Po=; b=VQd4Odnvkgk5Zzi6ZtRtFc+2VK+BpYIwNk5XRsNfHEokNvGXEjzHpRwA Pf9wmU/odN451iLL57xSUCAKHxA9Fcicg0TcqUy6VvQUdw/d09qdii/BJ 2BWfkHAe1hnCKGOHTRk9HaVI3c2nuOnY1b/Ju3MyRZF72nbLnlibsoVHd w=; X-IronPort-AV: E=Sophos;i="5.96,294,1665446400"; d="scan'208";a="284353885" Received: from iad12-co-svc-p1-lb1-vlan2.amazon.com (HELO email-inbound-relay-iad-1d-m6i4x-d8e96288.us-east-1.amazon.com) ([10.43.8.2]) by smtp-border-fw-6001.iad6.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Jan 2023 16:03:33 +0000 Received: from EX13D39EUC003.ant.amazon.com (iad12-ws-svc-p26-lb9-vlan3.iad.amazon.com [10.40.163.38]) by email-inbound-relay-iad-1d-m6i4x-d8e96288.us-east-1.amazon.com (Postfix) with ESMTPS id DA93F86DDD; Mon, 2 Jan 2023 16:03:31 +0000 (UTC) Received: from EX19D045EUC003.ant.amazon.com (10.252.61.236) by EX13D39EUC003.ant.amazon.com (10.43.164.139) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Mon, 2 Jan 2023 16:03:30 +0000 Received: from 88665a2fa36d.ant.amazon.com.com (10.43.162.56) by EX19D045EUC003.ant.amazon.com (10.252.61.236) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.1118.7; Mon, 2 Jan 2023 16:03:28 +0000 From: Yonatan Nachum To: , , CC: Subject: [PATCH for-rc] RDMA: Fix ib block iterator counter overflow Date: Mon, 2 Jan 2023 18:03:17 +0200 Message-ID: <20230102160317.89851-1-ynachum@amazon.com> X-Mailer: git-send-email 2.37.2 MIME-Version: 1.0 X-Originating-IP: [10.43.162.56] X-ClientProxiedBy: EX13D29UWC001.ant.amazon.com (10.43.162.143) To EX19D045EUC003.ant.amazon.com (10.252.61.236) Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org When registering a new DMA MR after selecting the best aligned page size for it, we iterate over the given sglist to split each entry to smaller, aligned to the selected page size, DMA blocks. In given circumstances where the sg entry and page size fit certain sizes and the sg entry is not aligned to the selected page size, the total size of the aligned pages we need to cover the sg entry is >= 4GB. Under this circumstances, while iterating page aligned blocks, the counter responsible for counting how much we advanced from the start of the sg entry is overflowed because its type is u32 and we pass 4GB in size. This can lead to an infinite loop inside the iterator function because in some cases the overflow prevents the counter to be larger than the size of the sg entry. Fix the presented problem with changing the counter type to u64. Backtrace: [ 192.374329] efa_reg_user_mr_dmabuf [ 192.376783] efa_register_mr [ 192.382579] pgsz_bitmap 0xfffff000 rounddown 0x80000000 [ 192.386423] pg_sz [0x80000000] umem_length[0xc0000000] [ 192.392657] start 0x0 length 0xc0000000 params.page_shift 31 params.page_num 3 [ 192.399559] hp_cnt[3], pages_in_hp[524288] [ 192.403690] umem->sgt_append.sgt.nents[1] [ 192.407905] number entries: [1], pg_bit: [31] [ 192.411397] biter->__sg_nents [1] biter->__sg [0000000008b0c5d8] [ 192.415601] biter->__sg_advance [665837568] sg_dma_len[3221225472] [ 192.419823] biter->__sg_nents [1] biter->__sg [0000000008b0c5d8] [ 192.423976] biter->__sg_advance [2813321216] sg_dma_len[3221225472] [ 192.428243] biter->__sg_nents [1] biter->__sg [0000000008b0c5d8] [ 192.432397] biter->__sg_advance [665837568] sg_dma_len[3221225472] Fixes: a808273a495c Signed-off-by: Yonatan Nachum --- include/rdma/ib_verbs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h index 975d6e9efbcb..6821c7951363 100644 --- a/include/rdma/ib_verbs.h +++ b/include/rdma/ib_verbs.h @@ -2836,7 +2836,7 @@ struct ib_block_iter { struct scatterlist *__sg; /* sg holding the current aligned block */ dma_addr_t __dma_addr; /* unaligned DMA address of this block */ unsigned int __sg_nents; /* number of SG entries */ - unsigned int __sg_advance; /* number of bytes to advance in sg in next step */ + u64 __sg_advance; /* number of bytes to advance in sg in next step */ unsigned int __pg_bit; /* alignment of current block */ };