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=-19.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 AA642C4320A for ; Tue, 24 Aug 2021 00:56:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 933256124B for ; Tue, 24 Aug 2021 00:56:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234464AbhHXA5e (ORCPT ); Mon, 23 Aug 2021 20:57:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:48616 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234139AbhHXA4N (ORCPT ); Mon, 23 Aug 2021 20:56:13 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 31F876162E; Tue, 24 Aug 2021 00:55:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1629766512; bh=lKfRqbPBA5wqqoVsOu1k9FXGDg1cI20CZHXQg7wY26A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OQFqvCKd0PeU2SpZZQWRlyZ4qcdEUctjtkYvResmcct2G8KxY5qXgM8J1wLphWEDG lOFDoPL4qesHaa8lNiSNlMEf61Xx0JC9NPGAqJCPyIybBXyQ6uZbdlTKUOSuWVI7dH t0PaueiA6mm5U4Qwt5o+7tCNFzr22oJK8n4GF4gYwSjljWj+hZAEPi3zVkMXN6hExF O53C5Lpe0A3pAv9e/O/h/vK5oBBSxSqm0/MGjumXzP1SS8eQofGja4WxeWRpg9SI4f 2qMVPkcGdHl92b/SC729HNaf44n2ITRBUEka65j42YbB/ljpm2Q/p+18iQhqNaMhZp k33J2lKkW0ZHQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Gerd Rausch , Santosh Shilimkar , Jakub Kicinski , Sasha Levin , netdev@vger.kernel.org, linux-rdma@vger.kernel.org, rds-devel@oss.oracle.com Subject: [PATCH AUTOSEL 5.4 10/10] net/rds: dma_map_sg is entitled to merge entries Date: Mon, 23 Aug 2021 20:54:57 -0400 Message-Id: <20210824005458.631377-10-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210824005458.631377-1-sashal@kernel.org> References: <20210824005458.631377-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org From: Gerd Rausch [ Upstream commit fb4b1373dcab086d0619c29310f0466a0b2ceb8a ] Function "dma_map_sg" is entitled to merge adjacent entries and return a value smaller than what was passed as "nents". Subsequently "ib_map_mr_sg" needs to work with this value ("sg_dma_len") rather than the original "nents" parameter ("sg_len"). This old RDS bug was exposed and reliably causes kernel panics (using RDMA operations "rds-stress -D") on x86_64 starting with: commit c588072bba6b ("iommu/vt-d: Convert intel iommu driver to the iommu ops") Simply put: Linux 5.11 and later. Signed-off-by: Gerd Rausch Acked-by: Santosh Shilimkar Link: https://lore.kernel.org/r/60efc69f-1f35-529d-a7ef-da0549cad143@oracle.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/rds/ib_frmr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/rds/ib_frmr.c b/net/rds/ib_frmr.c index 06ecf9d2d4bf..ef6acd721118 100644 --- a/net/rds/ib_frmr.c +++ b/net/rds/ib_frmr.c @@ -131,9 +131,9 @@ static int rds_ib_post_reg_frmr(struct rds_ib_mr *ibmr) cpu_relax(); } - ret = ib_map_mr_sg_zbva(frmr->mr, ibmr->sg, ibmr->sg_len, + ret = ib_map_mr_sg_zbva(frmr->mr, ibmr->sg, ibmr->sg_dma_len, &off, PAGE_SIZE); - if (unlikely(ret != ibmr->sg_len)) + if (unlikely(ret != ibmr->sg_dma_len)) return ret < 0 ? ret : -EINVAL; if (cmpxchg(&frmr->fr_state, -- 2.30.2