Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Jose Abreu <Jose.Abreu@synopsys.com>
To:     Christian Marangi <ansuelsmth@gmail.com>,
        Giuseppe Cavallaro <peppe.cavallaro@st.com>,
        Alexandre Torgue <alexandre.torgue@foss.st.com>,
        "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        Maxime Coquelin <mcoquelin.stm32@gmail.com>,
        Russell King <linux@armlinux.org.uk>,
        "netdev@vger.kernel.org" <netdev@vger.kernel.org>,
        "linux-stm32@st-md-mailman.stormreply.com" 
        <linux-stm32@st-md-mailman.stormreply.com>,
        "linux-arm-kernel@lists.infradead.org" 
        <linux-arm-kernel@lists.infradead.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
CC:     Jose Abreu <Jose.Abreu@synopsys.com>
Subject: RE: [net-next PATCH v5 4/5] net: ethernet: stmicro: stmmac: generate
 stmmac dma conf before open
Thread-Topic: [net-next PATCH v5 4/5] net: ethernet: stmicro: stmmac: generate
 stmmac dma conf before open
Thread-Index: AQHYnqCzb/lINFBB6kaBEWXyCUbVca+L4V/w
Date:   Wed, 14 Jun 2023 07:15:03 +0000
Message-ID: <DM4PR12MB508882D5BE351BD756A7A9A4D35AA@DM4PR12MB5088.namprd12.prod.outlook.com>
References: <20220723142933.16030-1-ansuelsmth@gmail.com>
 <20220723142933.16030-5-ansuelsmth@gmail.com>
In-Reply-To: <20220723142933.16030-5-ansuelsmth@gmail.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?LS4jvlfmTKPsNSAhH1zSQ5pT10yZLyo5MYfK6NY9JqJjdXxpGjRiN4ZfzIZz?=
 =?us-ascii?Q?EKr5E9wpRTYXoKRYkjuVPGgmhvQYgKvHWBVBoYb0MuSxY8PSaOvGbYOrw0bF?=
 =?us-ascii?Q?hUn+yYm58dM3RKWVLlIdz8RxfjX2F2ntKYq681GEJJO4QTtZyIxtzAiT/xsa?=
 =?us-ascii?Q?au3Po4Q0JDz5Mhho5qqd2k2RlNfd4ChKZVcstjKgwH114VKXNMJFRiMmWoFR?=
 =?us-ascii?Q?u8VlAMG1xoj1PyGOJauhRuth86i2Rh97FvdFVjjBGTwax5pUEitFfYfjZzW2?=
 =?us-ascii?Q?jKZWy0qPe2LeXC2RyMFimgVbZbALugevtmu2wekYE9AlXPIVkdeTFt/Y8tHU?=
 =?us-ascii?Q?bJwnjZpYe1K8HzLpALrz/c14cpf+K0DFgBp6GGcorjysHgaw8ABMmUJKjbz5?=
 =?us-ascii?Q?UoW0I7zvLHRTCY/MGXJgmtXEEdcI/COR9RSqDB1sXshtJEml89NNjX8sWtyM?=
 =?us-ascii?Q?YsJ82V5c7OzMvu8HnrgOdBAdHi094UvW/7quTYeA6yyNGPh62IYkgy204Wvu?=
 =?us-ascii?Q?t4RJtjzr21gOnyVX1WMOqe/W+TfYOmJTSdz2+jRu/sistX7s+OjdhqDdetTw?=
 =?us-ascii?Q?qh1Ey/a/IYQqqOYOBAqdAFDLnPYtKC7v91R2HGAUsgjGcRGiJUa1XfAHCEIK?=
 =?us-ascii?Q?pJ+nnfV0mvCeBAdnYfESdIHlZ/A08qDozpyXdn7KEO8F1+cFZ1wvaV2R/bq3?=
 =?us-ascii?Q?zLYsfi9fJ0eUlDJ6Z3Ney4UT4l04pyH89qP7Jy/WPI8UNP+H2deY8L+iYcN2?=
 =?us-ascii?Q?a+GHaFLp/lgJeoJ9/xanqXN5v0zwLTQW5JoYIptwZICLg0fro7NhITOmpLxe?=
 =?us-ascii?Q?Y7F3khlo3wIFbPXRaOhr2gwU34ZArNv9tXRCd+GMHg/vfgTHw/1MW3bmhprp?=
 =?us-ascii?Q?3zisPxnOLZtEOpr17Nliuzpe9pcSEBzk6pVrAPgNvrsZ1BW+zjtcPHwjvkRT?=
 =?us-ascii?Q?qtCinjPi8a3/ehpxwLcIaqBD5q+2fbqHnqv8i+NjewE9PjGBvxnJv7guGr3J?=
 =?us-ascii?Q?Z+au3BWPtxbPgOPAlMF7KojKM4A/zxm6wkkTzEQkMjN3tKsB90r5PAndMP5j?=
 =?us-ascii?Q?xfdrG+ZcIqsfFtG+6otRhTVdVWyb+0EQ7ElMAUvmVY1mURyYw65kHLOXNmHi?=
 =?us-ascii?Q?/oKnVtvugAsyCoxsASALkeVP+RBKKjLdod4KUi6a7CQ07xjcS1sU5X+lDerg?=
 =?us-ascii?Q?LZtFUzLDALrV4bTDdIoEZdh4BoCParWIUuOHsnLwkK8opwPyEDu/RCsY1phg?=
 =?us-ascii?Q?E4rJNQ7+aGGXeI1TjdFu4TEpKUsXnCCi4VL80kETAuK3eIpAnO3Llf/X2p0c?=
 =?us-ascii?Q?fmqhhWP3COS6n9uvDUI60DUEe5ZRzEWE6wf+EgJMbyImasOtDwZ5D2f1aWFZ?=
 =?us-ascii?Q?LzAlLf5vsUJRRCdzJVhvYZbYyBIMPRtqUllXdi3Wc8voFUi9o6mUQFD8rNtI?=
 =?us-ascii?Q?1npjv2ApIbz53c4nOwSshZTzuziObNwTF0QGIh3zYx8MBbP9+eSt6hACwRDs?=
 =?us-ascii?Q?iSldgJpfoVNkhclWqd7CXsU/kthOloysFTJEht/RuFNB+yBqFndASZvtsw?=
 =?us-ascii?Q?=3D=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?yuPy00iWwu4kwC4xPixaE62nGbs+1IphSIYuenH3Oak9fjTK9dA2ZbUXfPVo?=
 =?us-ascii?Q?FTnUMndEBeMCvumZxqcwFl3hFw2mcG3BVMbWRZuFoe0Fldg4duV7lTHHZp5x?=
 =?us-ascii?Q?9VDlHxY7Lx6yNW/8E31OQplvFPNM4bQesGIpeb6ooQRaSWTUXSeAyaEFaSvL?=
 =?us-ascii?Q?YTmwktoX0/3ELGNflLzhjNDElZhF8cTl5JkjMNdXx7yLJk53xRuzZPmfbDy6?=
 =?us-ascii?Q?JMQK9ge5qw8g5vpKzkcZlJ0v8naViYlc1q5fvRXzncKDIf2tICntVsBjNofl?=
 =?us-ascii?Q?BMzE4fLxMoLVKg965KKEt9BkCsUdW6mKLQPJg0X5xgqKlRWENX+1i664iWWw?=
 =?us-ascii?Q?SrSevXWVJKCO4SmfeD+Wd6eX/3e9pUGwgHsLc547qqCEQR6i3DjxURF10Iim?=
 =?us-ascii?Q?wrdLV5wArCawLHWzs19KycmJN8DUgCfkiQBhv97Q4kuplrRLKCDueBE+6VYn?=
 =?us-ascii?Q?3dRDn5Jm+B+ahjTdKqT9XcqUpqRmLXFrcsZsCnKnTLXpSIgy70Fo76V62b5p?=
 =?us-ascii?Q?G8Kjyh5mL4l56SbKMkMnfMqJpeUjIe2DvDIiEWTjnN8uuSs588mxQECqyvdh?=
 =?us-ascii?Q?bOePJM3oq6FBLskhQ9xZ4EAM/wt0CRvVsEpiPKKbZ8ZG1AnlWpA5bMhM41c/?=
 =?us-ascii?Q?sXIgVwAlseKN9RIIyFLa/Yqor1cfx1y9bWkjOXHFssZLERtzH354Pdf3V27p?=
 =?us-ascii?Q?wboDB/quY4BSsxqsaqKnT6x4HYqTvCRYIpl9REsFyhQI2/uNlU/HKaQ6fHVy?=
 =?us-ascii?Q?3p53s40cMRQxjsvAwHkqtFICrJcvL9I0DQQbQJ6bvr1RKxKdxyxhifN1/nYY?=
 =?us-ascii?Q?WaGBhx4Y7JgKNSU9Y6++a2GDmP1EtEjw3aFkNS2prAe94o64umvR+4KPAUIO?=
 =?us-ascii?Q?nWREruvsICv+K2Cs8l1W0qvlIW9/3IvIG/TxHZZChhHNij1at9dZNlRRSBtm?=
 =?us-ascii?Q?LPTBJQ/kQQp783bneoXQ6Vph+uO06hFC5MvW9faypsluzPHIkzkOTlDKTApT?=
 =?us-ascii?Q?NZ8V3Erd82YKe8zwNrLgEJGASmfPuPDCgkjMFci3l3tVHq31NhhB2byLBtpQ?=
 =?us-ascii?Q?TIVYMz22XIaXjvnWeSZq42XflUxshz+6L+U0BIAeqPi4Bj67x0xeMBM5uf6t?=
 =?us-ascii?Q?RAN+Hw+Qlb5nQDNrgndBZ1lxmoz0f0WOmGrxJjLVss7Z8qRNgqiA56Y=3D?=
X-OriginatorOrg: synopsys.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: DM4PR12MB5088.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: a5d167d5-3980-4913-20da-08db6ca712b2
X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Jun 2023 07:15:03.1677
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: c33c9f88-1eb7-4099-9700-16013fd9e8aa
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: yTVzepmXDKrOY6G4oeoeFPnEaO+MMFFhywfyEpIpXuLKGJ+Anaqeu4ToT7RiHS3vqsz/NBjLtvONZAUUF5ksYg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB7509
X-Proofpoint-GUID: yeh0lwdA9LfBIpV5xHn-7ojm1OPn4nM9
X-Proofpoint-ORIG-GUID: yeh0lwdA9LfBIpV5xHn-7ojm1OPn4nM9
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.957,Hydra:6.0.573,FMLib:17.11.176.26
 definitions=2023-06-14_03,2023-06-12_02,2023-05-22_02
X-Proofpoint-Spam-Details: rule=outbound_active_cloned_notspam policy=outbound_active_cloned score=0
 mlxlogscore=999 lowpriorityscore=0 priorityscore=1501 phishscore=0
 spamscore=0 impostorscore=0 malwarescore=0 mlxscore=0 adultscore=0
 clxscore=1011 bulkscore=0 suspectscore=0 classifier=spam adjust=0
 reason=mlx scancount=1 engine=8.12.0-2305260000
 definitions=main-2306140062
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,
        SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi Christian,

From: Christian Marangi <ansuelsmth@gmail.com>
Date: Sat, Jul 23, 2022 at 15:29:32

> +static int __stmmac_open(struct net_device *dev,
> +			 struct stmmac_dma_conf *dma_conf)
>  {
>  	struct stmmac_priv *priv =3D netdev_priv(dev);
>  	int mode =3D priv->plat->phy_interface;
> -	int bfsize =3D 0;
>  	u32 chan;
>  	int ret;
> =20
> @@ -3657,45 +3794,10 @@ static int stmmac_open(struct net_device *dev)
>  	memset(&priv->xstats, 0, sizeof(struct stmmac_extra_stats));
>  	priv->xstats.threshold =3D tc;
> =20
> -	bfsize =3D stmmac_set_16kib_bfsize(priv, dev->mtu);
> -	if (bfsize < 0)
> -		bfsize =3D 0;
> -
> -	if (bfsize < BUF_SIZE_16KiB)
> -		bfsize =3D stmmac_set_bfsize(dev->mtu, priv->dma_conf.dma_buf_sz);
> -
> -	priv->dma_conf.dma_buf_sz =3D bfsize;
> -	buf_sz =3D bfsize;
> -
>  	priv->rx_copybreak =3D STMMAC_RX_COPYBREAK;
> =20
> -	if (!priv->dma_conf.dma_tx_size)
> -		priv->dma_conf.dma_tx_size =3D DMA_DEFAULT_TX_SIZE;
> -	if (!priv->dma_conf.dma_rx_size)
> -		priv->dma_conf.dma_rx_size =3D DMA_DEFAULT_RX_SIZE;
> -
> -	/* Earlier check for TBS */
> -	for (chan =3D 0; chan < priv->plat->tx_queues_to_use; chan++) {
> -		struct stmmac_tx_queue *tx_q =3D &priv->dma_conf.tx_queue[chan];
> -		int tbs_en =3D priv->plat->tx_queues_cfg[chan].tbs_en;
> -
> -		/* Setup per-TXQ tbs flag before TX descriptor alloc */
> -		tx_q->tbs |=3D tbs_en ? STMMAC_TBS_AVAIL : 0;
> -	}
> -
> -	ret =3D alloc_dma_desc_resources(priv);
> -	if (ret < 0) {
> -		netdev_err(priv->dev, "%s: DMA descriptors allocation failed\n",
> -			   __func__);
> -		goto dma_desc_error;
> -	}
> -
> -	ret =3D init_dma_desc_rings(dev, GFP_KERNEL);
> -	if (ret < 0) {
> -		netdev_err(priv->dev, "%s: DMA descriptors initialization failed\n",
> -			   __func__);
> -		goto init_error;
> -	}
> +	buf_sz =3D dma_conf->dma_buf_sz;
> +	memcpy(&priv->dma_conf, dma_conf, sizeof(*dma_conf));

This memcpy() needs to be the first thing to be done on __stmmac_open(), ot=
herwise
you'll leak the dma_conf when stmmac_init_phy() fails.

Can you please send follow-up patch?

Thanks,
Jose