From patchwork Mon Jan 1 14:50:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suman Ghosh X-Patchwork-Id: 184163 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp4001547dyb; Mon, 1 Jan 2024 06:51:39 -0800 (PST) X-Google-Smtp-Source: AGHT+IHuUOMuuwePD6LVpukugNZuLDi+AN3OKJIezGSeEY3C6kBm90/hbvs8Njq+wOt7PtFNJkKX X-Received: by 2002:ac8:5782:0:b0:423:6e3e:72ab with SMTP id v2-20020ac85782000000b004236e3e72abmr25756281qta.55.1704120699047; Mon, 01 Jan 2024 06:51:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704120699; cv=none; d=google.com; s=arc-20160816; b=v7gpHNEW6yd1qBI34c4iE1UkQuri65NQi77XWqsedposvpQyr8Qq1k/MAnO9xfAcuY HLXUsfUqpXscDyuGTWgaZfyMq+Y6XfXlR5BvDk1eWDu+aoxBXkOOnOoSqMOqkslUFH0V 8XIn6BJamSO4sHGpWwCKkicZ4bLNSIdHoEOaAVAiSi9JrrgmeEsNGwDNfzv0lwertnCw 0vIPJiENDUmgiNtfSrwVNmLwE6JgLNM5PW4VNk7UlERoYPPzEjvYqhI1ZdMsuvXd7SQc xY2fci+2tt9OHV61zITur3e2YJgze7R5YwbjDgpvMLGyCoGxcBzYs1+/XZZDnz93V055 LYqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=6sriA2l42T78+rHF9EwLHfRICQQCLeM75RC67WJEGqU=; fh=pK51JAizWKp9jwq8870a7Zs4DJFrvE+hT0N4i+cGlR0=; b=DcoUE+TAgSUmEAJUccBx9b3gOrd9jKFQ98x4DPs8Kaa3Dxw992FGohYXPRs2DJTNca 61mY9TbD7fAicTaVtpNjhANUbgsOFMIpupPH2MY/W2bxr4294Xvu1eb/q3UzjyFBMA6q ZEWaitsnb6wpISnmg/g1tkJl55yTB0PKOdC6GHsmngJuXSAgNNwNeYj/e6xS4XOfLUx2 h5k8UlbBrFAf1KPI3a620KiCNpgpZwBbJ5qKVTYSAUIzcZ0cT7UxAwvE/M9WFrxvzbh0 NCYuoIThaEMqEL1uBjyzgYh9iY45tb3i0SG7IHFEA7oLbfOL658XWrXeGHWEwIoZu4FL CuHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@marvell.com header.s=pfpt0220 header.b=NnY9GSAv; spf=pass (google.com: domain of linux-kernel+bounces-13881-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-13881-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=REJECT dis=NONE) header.from=marvell.com Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id m12-20020a0cf18c000000b0067aa7c0f61csi24936417qvl.359.2024.01.01.06.51.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jan 2024 06:51:39 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-13881-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@marvell.com header.s=pfpt0220 header.b=NnY9GSAv; spf=pass (google.com: domain of linux-kernel+bounces-13881-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-13881-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=REJECT dis=NONE) header.from=marvell.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id D47A91C20B7D for ; Mon, 1 Jan 2024 14:51:38 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0077A79F2; Mon, 1 Jan 2024 14:51:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=marvell.com header.i=@marvell.com header.b="NnY9GSAv" X-Original-To: linux-kernel@vger.kernel.org Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) (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 D70F8610B; Mon, 1 Jan 2024 14:51:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=marvell.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=marvell.com Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 401D0MkN007851; Mon, 1 Jan 2024 06:50:52 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h= from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding:content-type; s=pfpt0220; bh=6sriA2l4 2T78+rHF9EwLHfRICQQCLeM75RC67WJEGqU=; b=NnY9GSAv0Iw8dGWUb1/pqvg3 1v28ohFD994wNvIOG5ualhth8Y8E/FnjwsDFodQRkBnWvTbczSFHfMmMM5J9F+hn vxVCGgupzSsFkEP5V6jjGt8TDSCCpDDRczE5I60Wwo+3Kc+fHj8skfij8SE92T4K 9GSQEmB2a3rE3dPIuaQsIejh9ak08Ws3Hkkv5bM92gpQVE+j2RFyTq4TSk5VS9XS 7cNtjWQcR9I8wdE0bFcoX6sU5gG3zRfnoxVlqqF6d3/96ruUaQpKYB9b3RzpE3Wd uY5EzSbLfYD9KugWgj5fFWaAk1GZlqzaFwXpo//xw4WVn9SI+58I833Y2cxW6g== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3vakkkvj29-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Mon, 01 Jan 2024 06:50:51 -0800 (PST) Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.48; Mon, 1 Jan 2024 06:50:49 -0800 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.48 via Frontend Transport; Mon, 1 Jan 2024 06:50:49 -0800 Received: from localhost.localdomain (unknown [10.28.36.166]) by maili.marvell.com (Postfix) with ESMTP id 7359F3F7093; Mon, 1 Jan 2024 06:50:45 -0800 (PST) From: Suman Ghosh To: , , , , , , , , , , , CC: Suman Ghosh Subject: [net PATCH] octeontx2-af: Fix max NPC MCAM entry check while validating ref_entry Date: Mon, 1 Jan 2024 20:20:42 +0530 Message-ID: <20240101145042.419697-1-sumang@marvell.com> X-Mailer: git-send-email 2.25.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: BatOGr3U1s7txp9LhqQMDsP5HozhSEpY X-Proofpoint-GUID: BatOGr3U1s7txp9LhqQMDsP5HozhSEpY X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-12-09_02,2023-12-07_01,2023-05-22_02 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1786900066425830792 X-GMAIL-MSGID: 1786900066425830792 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. Fixes: f92749586176 ("octeontx2-af: NPC MCAM entry alloc/free support") Signed-off-by: Suman Ghosh --- 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 0bcf3e559280..3784347b6fd8 100644 --- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c +++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c @@ -2678,18 +2678,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;