Received-SPF: pass (google.com: domain of linux-kernel+bounces-178349-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
From: Bharat Bhushan <bbhushan2@marvell.com>
To: Simon Horman <horms@kernel.org>
CC: "netdev@vger.kernel.org" <netdev@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        Sunil Kovvuri
 Goutham <sgoutham@marvell.com>,
        Geethasowjanya Akula <gakula@marvell.com>,
        Subbaraya Sundeep Bhatta <sbhatta@marvell.com>,
        Hariprasad Kelam
	<hkelam@marvell.com>,
        "davem@davemloft.net" <davem@davemloft.net>,
        "edumazet@google.com" <edumazet@google.com>,
        "kuba@kernel.org"
	<kuba@kernel.org>,
        "pabeni@redhat.com" <pabeni@redhat.com>,
        Jerin Jacob
	<jerinj@marvell.com>, Linu Cherian <lcherian@marvell.com>,
        "richardcochran@gmail.com" <richardcochran@gmail.com>
Subject: RE: [EXTERNAL] Re: [net-next,v2 3/8] octeontx2-af: Disable
 backpressure between CPT and NIX
Thread-Topic: [EXTERNAL] Re: [net-next,v2 3/8] octeontx2-af: Disable
 backpressure between CPT and NIX
Thread-Index: AQHapSQKuOy9XZhP3kiH1e4gTcWZRbGVVxCAgADtLRA=
Date: Tue, 14 May 2024 06:39:45 +0000
Message-ID: 
 <SN7PR18MB53149716909DE5993145509AE3E32@SN7PR18MB5314.namprd18.prod.outlook.com>
References: <20240513105446.297451-1-bbhushan2@marvell.com>
 <20240513105446.297451-4-bbhushan2@marvell.com>
 <20240513161447.GR2787@kernel.org>
In-Reply-To: <20240513161447.GR2787@kernel.org>
Accept-Language: en-IN, en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: 
 =?us-ascii?Q?UWmeEshkA4adBX1P0zjyR4JEZqsodjzSJ2qOoHujEXFziBV/8BZMS9hwCZ6I?=
 =?us-ascii?Q?bVrO6fOPvadQxjDeO/nzUGVzI8/J118PJIemLqonhdIiRSyQhgWXYjPWyWEW?=
 =?us-ascii?Q?Ds9mkCgS1+JLJhFL9GTdM2TItd6nCVQ8Ql68iw+jQIgllEuaS0T9o4gJILU4?=
 =?us-ascii?Q?C2gE/cL1YIBHwtWbiQJh7AeIKFphoIoXzgaOYOfsn2hd+4QOv8uOdc8pzOIA?=
 =?us-ascii?Q?FVAgDdBQ5KlLD5YEUpun+9V8ZkvecdAtYED15AoDoMaAhyEPcWbdPpjIukvG?=
 =?us-ascii?Q?VbBOj34OjQvh0aktHg+JHDvLCT/w2AwqBvR/R1yX+wKTJnQ2VQHRZHhvtQFd?=
 =?us-ascii?Q?BSd2y6DgS0xxIfWqR91dTCki6bRoy0eSi8WT/A4K1Fqmdv1c2O5tY6FoVama?=
 =?us-ascii?Q?xrNTuh55R7AgqwS6ek3wB/JwYpZN2ZBd74pXlHYhm6WJ6d2dq9p6iNkJpCkk?=
 =?us-ascii?Q?NVRfzluPCHupJWtS7M7omPi26kklVpuf6/Nc7hzkmIPuVaTSCczgWFGrT9Jh?=
 =?us-ascii?Q?cpcIJ4R0E46GHnXCXGqBbUMsa0CD5x4CsCeAREz19K/czv5ex2ocSWL/ronn?=
 =?us-ascii?Q?9me2KoswMA3HJJYljt0KL0YnIyLYLodRKQncYq9ZyWhEXQIo57XF8SPi1mTg?=
 =?us-ascii?Q?h0NxxjQEIs5BPzkzimupsF02Dxb/mUlGGYfHuSNEXzTbTG+7N2NtvKum0PSC?=
 =?us-ascii?Q?Pd7WDEiCoMisFEmoHdfjq8WJr5uwcj/IZ1NdHbTuCA9P+W/f9t3aKmDorSty?=
 =?us-ascii?Q?oBrtFPixbkGsEIvKN0VDHpp8UbVALCza7fJCMmrMyEQmlTzj9GrkcO8m8upR?=
 =?us-ascii?Q?ffV67iVmz7yrN3btJ1K887YmKR9I+33Xj9E9cPZnQcLPXm/Mfb37YUw7RQHf?=
 =?us-ascii?Q?E2sfecp0IXqeIYOXdXte36bpgiY2lcEgbifMiDC3EILKUZykzdFENHDNoF6c?=
 =?us-ascii?Q?RNkH978wFbXfFO3IT1Qckqgg7uvvOpIk996p/1e0sG/qZcuUQoEveSkCAD6O?=
 =?us-ascii?Q?4IBaXyY0WKAoWfSrlHXRTsG9zn8tX/WrB+avvimJOHTHIjtVdlFludGYu7mM?=
 =?us-ascii?Q?+lucNap6qe3zwwOAgB85rEArlnCq9XXGjKJE9q0ClssnljZKN5GC+ceEOWXp?=
 =?us-ascii?Q?HXLpL0XIyfIAblXsQ3vlcCmFGlRplgvGWSYIgHr917Th2ksesvcUfS9TaeG/?=
 =?us-ascii?Q?XWT1jLp9njM1sIvhuRwH65kBoUvkBdrm8Zm+Tnt/QzPJTZunOOtkXsAGT9yp?=
 =?us-ascii?Q?6BWAxDaPu1twnJ0aT24bKD8bVUXVdlXaf1qewrLUQop/oXD/UXA+wQ/BKEde?=
 =?us-ascii?Q?KBvohoyJXsxvnEwpcVMsl438u0edRGCz0rFeI2Iaw736KtM+VC+QCuwY3+9N?=
 =?us-ascii?Q?mcLegOzLcijQ8DkABHte0jaCqWMZ0ody3uPU5xK2Gh688tuEn6HiE/DsQpU0?=
 =?us-ascii?Q?xp4JasIbrLA6VILyLsoHt37rpAPMHdFj8M0KWkqqFDqa7G+EB7lZulAqmndo?=
 =?us-ascii?Q?KxP4f836vtrmf0LcMzTsos69cFGIrfjMOvBoZu3IVIr1mtivvYJFkAky/4Zl?=
 =?us-ascii?Q?uX4IbOk7s+Pvqhpvr0GWx85PnqrayoCjbwqw/aWp?=
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk
X-Mailing-List: linux-kernel@vger.kernel.org
List-Id: <linux-kernel.vger.kernel.org>
List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
X-OriginatorOrg: marvell.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: SN7PR18MB5314.namprd18.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ec65e74b-b0d4-449a-f231-08dc73e0a4bc
X-MS-Exchange-CrossTenant-originalarrivaltime: 14 May 2024 06:39:45.2955
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 70e1fb47-1155-421d-87fc-2e58f638b6e0
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: 3M41pIh9PgiK6wvru357RUMJnFOFcQpMfIPqYp1eyw9q7tLgRnpLpa12mimCdrGMSIDOy/5B/QninvzuR+hCQQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR18MB3505
X-Proofpoint-ORIG-GUID: 3YngV1FnOqb6IYPwRSPBxtdJWWqDGP77
X-Proofpoint-GUID: 3YngV1FnOqb6IYPwRSPBxtdJWWqDGP77
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.650,FMLib:17.11.176.26
 definitions=2024-05-14_02,2024-05-10_02,2023-05-22_02

Please see inline

> -----Original Message-----
> From: Simon Horman <horms@kernel.org>
> Sent: Monday, May 13, 2024 9:45 PM
> To: Bharat Bhushan <bbhushan2@marvell.com>
> Cc: netdev@vger.kernel.org; linux-kernel@vger.kernel.org; Sunil Kovvuri
> Goutham <sgoutham@marvell.com>; Geethasowjanya Akula
> <gakula@marvell.com>; Subbaraya Sundeep Bhatta <sbhatta@marvell.com>;
> Hariprasad Kelam <hkelam@marvell.com>; davem@davemloft.net;
> edumazet@google.com; kuba@kernel.org; pabeni@redhat.com; Jerin Jacob
> <jerinj@marvell.com>; Linu Cherian <lcherian@marvell.com>;
> richardcochran@gmail.com
> Subject: [EXTERNAL] Re: [net-next,v2 3/8] octeontx2-af: Disable backpress=
ure
> between CPT and NIX
>=20
>=20
> ----------------------------------------------------------------------
> On Mon, May 13, 2024 at 04:24:41PM +0530, Bharat Bhushan wrote:
> > NIX can assert backpressure to CPT on the NIX<=3D>CPT link.
> > Keep the backpressure disabled for now. NIX block anyways
> > handles backpressure asserted by MAC due to PFC or flow
> > control pkts.
> >
> > Signed-off-by: Bharat Bhushan <bbhushan2@marvell.com>
>=20
> ...
>=20
> > diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c
> b/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c
>=20
> ...
>=20
> > @@ -592,8 +596,16 @@ int rvu_mbox_handler_nix_bp_disable(struct rvu
> *rvu,
> >  	bp =3D &nix_hw->bp;
> >  	chan_base =3D pfvf->rx_chan_base + req->chan_base;
> >  	for (chan =3D chan_base; chan < (chan_base + req->chan_cnt); chan++) =
{
> > -		cfg =3D rvu_read64(rvu, blkaddr,
> NIX_AF_RX_CHANX_CFG(chan));
> > -		rvu_write64(rvu, blkaddr, NIX_AF_RX_CHANX_CFG(chan),
> > +		/* CPT channel for a given link channel is always
> > +		 * assumed to be BIT(11) set in link channel.
> > +		 */
> > +		if (cpt_link)
> > +			chan_v =3D chan | BIT(11);
> > +		else
> > +			chan_v =3D chan;
>=20
> Hi Bharat,
>=20
> The chan_v logic above seems to appear twice in this patch.
> I'd suggest adding a helper.

Will fix in next version.

>=20
> > +
> > +		cfg =3D rvu_read64(rvu, blkaddr,
> NIX_AF_RX_CHANX_CFG(chan_v));
> > +		rvu_write64(rvu, blkaddr, NIX_AF_RX_CHANX_CFG(chan_v),
> >  			    cfg & ~BIT_ULL(16));
> >
> >  		if (type =3D=3D NIX_INTF_TYPE_LBK) {
>=20
> ...
>=20
> > diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c
> b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c
> > index 7ec99c8d610c..e9d2e039a322 100644
> > --- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c
> > +++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c
> > @@ -1705,6 +1705,31 @@ int otx2_nix_config_bp(struct otx2_nic *pfvf,
> bool enable)
> >  }
> >  EXPORT_SYMBOL(otx2_nix_config_bp);
> >
> > +int otx2_nix_cpt_config_bp(struct otx2_nic *pfvf, bool enable)
> > +{
> > +	struct nix_bp_cfg_req *req;
> > +
> > +	if (enable)
> > +		req =3D otx2_mbox_alloc_msg_nix_cpt_bp_enable(&pfvf-
> >mbox);
> > +	else
> > +		req =3D otx2_mbox_alloc_msg_nix_cpt_bp_disable(&pfvf-
> >mbox);
> > +
> > +	if (!req)
> > +		return -ENOMEM;
> > +
> > +	req->chan_base =3D 0;
> > +#ifdef CONFIG_DCB
> > +	req->chan_cnt =3D pfvf->pfc_en ? IEEE_8021QAZ_MAX_TCS : 1;
> > +	req->bpid_per_chan =3D pfvf->pfc_en ? 1 : 0;
> > +#else
> > +	req->chan_cnt =3D  1;
> > +	req->bpid_per_chan =3D 0;
> > +#endif
>=20
> IMHO, inline #ifdefs reduce readability and reduce maintainability.
>=20
> Would it be possible to either:
>=20
> 1. Include the pfc_en field in struct otx2_nic and make
>    sure it is set to 0 if CONFIG_DCB is unset; or
> 2. Provide a wrapper that returns 0 if CONFIG_DCB is unset,
>    otherwise pfvf->pfc_en.
>=20
> I suspect 1 will have little downside and be easiest to implement.

pfc_en is already a field of otx2_nic but under CONFIG_DCB. Will fix by add=
ing a wrapper function like:

static bool is_pfc_enabled(struct otx2_nic *pfvf)
{
#ifdef CONFIG_DCB
        return pfvf->pfc_en ? true : false;
#endif
        return false;
}

Using same like..
..
        if (is_pfc_enabled(pfvf)) {
                req->chan_cnt =3D IEEE_8021QAZ_MAX_TCS;
                req->bpid_per_chan =3D 1;
        } else {
                req->chan_cnt =3D 1;
                req->bpid_per_chan =3D 0;
        }
..

Thanks
-Bharat

>=20
> > +
> > +	return otx2_sync_mbox_msg(&pfvf->mbox);
> > +}
> > +EXPORT_SYMBOL(otx2_nix_cpt_config_bp);
> > +
> >  /* Mbox message handlers */
> >  void mbox_handler_cgx_stats(struct otx2_nic *pfvf,
> >  			    struct cgx_stats_rsp *rsp)
>=20
> ...