From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B8DAF158D86; Tue, 16 Jan 2024 20:00:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705435212; cv=none; b=Oc3Ai9cljF6asx9rYsqxf2QoQuF0VycOzNMtEnAVGrWS70lRJ14pw9zyCgfLsouNwy3v6cc5w/MAKyfTeaJKKgyvq1sT0RlyujQuLGtC3pf7MMp8b2On/kXSk9OxXHb6Edaua15e7Y8eEBsQaL4OOcFiTu3uQFzRc23Ohyncx/0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705435212; c=relaxed/simple; bh=zIO1TX1zi5sOTvJ5L/DBIDGyOxuOuCNW9OYiMj1zxTQ=; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID: X-Mailer:In-Reply-To:References:MIME-Version:X-stable: X-Patchwork-Hint:X-stable-base:Content-Transfer-Encoding; b=R7cZbGaGDSw8d4Ql4IAojNvybISKNAEGydQHaCNBPiEs8xmBGpA+eTIwWN5DCe6oSgw3Y3vumjZbZVBt/jfWvHw6z6SFkvj1PrwN5tfsQITzN1SAFBaAQIRJagTjUGFdLsqYChc3Re7x8YkBV+fuqBKZQL8ubjIQH2y52zf8m/A= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=dOOarD0f; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="dOOarD0f" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A0CB2C43390; Tue, 16 Jan 2024 20:00:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705435212; bh=zIO1TX1zi5sOTvJ5L/DBIDGyOxuOuCNW9OYiMj1zxTQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dOOarD0fvVMaaOsC+nLB/Oap/iDVAbqxQtSb/GOMJPU26zihygIFHmkRG8wUSEgxg WUUSAe63e5h70AZojGA5ttwt5cPeajtZKFhmhTJ8CN/2Rlk9E8kuPwPR3NUX9XWWeY Dn6Qm4yAnZOYjASGCmkE9nH+k0/xhQY1UJ3s4hOKRnjr4CZp0W7h4OtTjHOORV7p8p Y9EKBw7S0bWDn3v7m7/YPZpgvLHNZR/K9Ok3omB7wLqEkp5pxRWLLVrpEV/GyeU2Pc 6dYyf8by50LVa2jlCsTHeHHj8/XVi728GQ+qCBjb2mWfeaLJRAhOZyISkCONAeT7yT VfFufnj5zfWMA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Suman Ghosh , Jakub Kicinski , Sasha Levin , sgoutham@marvell.com, lcherian@marvell.com, gakula@marvell.com, jerinj@marvell.com, hkelam@marvell.com, sbhatta@marvell.com, davem@davemloft.net, edumazet@google.com, pabeni@redhat.com, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.15 47/47] octeontx2-af: Fix max NPC MCAM entry check while validating ref_entry Date: Tue, 16 Jan 2024 14:57:50 -0500 Message-ID: <20240116195834.257313-47-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240116195834.257313-1-sashal@kernel.org> References: <20240116195834.257313-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.15.147 Content-Transfer-Encoding: 8bit From: Suman Ghosh [ Upstream commit 4ebb1f95e0c3c3e0eec5bb21aa43097580c4b6e4 ] As of today, the last MCAM entry was not getting allocated because of a <= check with the max_bmap count. This patch modifies that and if the requested entry is greater than the available entries then set it to the max value. Signed-off-by: Suman Ghosh Link: https://lore.kernel.org/r/20240101145042.419697-1-sumang@marvell.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c index 8b16738e249f..70b4f2a3b02f 100644 --- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c +++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c @@ -2625,18 +2625,17 @@ int rvu_mbox_handler_npc_mcam_alloc_entry(struct rvu *rvu, rsp->entry = NPC_MCAM_ENTRY_INVALID; rsp->free_count = 0; - /* Check if ref_entry is within range */ - if (req->priority && req->ref_entry >= mcam->bmap_entries) { - dev_err(rvu->dev, "%s: reference entry %d is out of range\n", - __func__, req->ref_entry); - return NPC_MCAM_INVALID_REQ; - } + /* Check if ref_entry is greater that the range + * then set it to max value. + */ + if (req->ref_entry > mcam->bmap_entries) + req->ref_entry = mcam->bmap_entries; /* ref_entry can't be '0' if requested priority is high. * Can't be last entry if requested priority is low. */ if ((!req->ref_entry && req->priority == NPC_MCAM_HIGHER_PRIO) || - ((req->ref_entry == (mcam->bmap_entries - 1)) && + ((req->ref_entry == mcam->bmap_entries) && req->priority == NPC_MCAM_LOWER_PRIO)) return NPC_MCAM_INVALID_REQ; -- 2.43.0