From nobody Sun Feb 8 17:42:43 2026 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.15]) (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 47FF524C667; Wed, 5 Mar 2025 13:01:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.15 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741179669; cv=none; b=ouV0zjShhaXkK1og5UX2PA9zHjYpkUyujWO8YRsLS13hJAc/v3yW1N2RbgYL5LC7IZMOG4v2B5USPsoFQwduxvXfp03wNaqguMMXn9SBoY9/NJjHXJdREd5IBWCSaKaf00MlG9oVPbdF5fG00YDYHxn/Vo6o9WshKs6M6E50gUI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741179669; c=relaxed/simple; bh=TXMXBDUa/9mgqdVRYWJGOfGPn2lcvQjcuO+122LWB50=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=cm4PbOxSg/rg6oWvw+UBwNDfgf4muGgM2cUD47xlF0Tjs7U+C6uiuH0ft5YTW1kKMSHCEaaGStfpiAK1qW9A/pJTnHFsEK1XRIqX3YvcaAtFSaUHCc1dltt3DnjtDFoGBFDNuwDEc217/pt+FFg//UATs/UVNXMP9Px6FTpdP+U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=lV5s5632; arc=none smtp.client-ip=198.175.65.15 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="lV5s5632" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741179669; x=1772715669; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=TXMXBDUa/9mgqdVRYWJGOfGPn2lcvQjcuO+122LWB50=; b=lV5s5632W5DHYaeUvd5DYqaDgBiL+sKteCQdncTUVrzF0ycZaPa5+xvU 1QER3V1VXLbgS8GNncad0DTtBiwI826blBiw2Hjtw5U6XlXIy4xa59IYM BmS9mQCErbHSVt7i7APS4ICdAfxNHsSgVWnvJMmbMG4gSO6yjZ+txj5n3 bxriD5JWCCi2raVSOMftVnnGzipu+wQQ/QTYTt8LXNqRaLFm+Z/e/zWDJ pO8M3x5Ay+wTP6Snvv0vahG8hextqhbA2HqrmcKXitFt1yc/Lm6uuaBQ0 wFTmgzRLHyBaJVlIsXKgL9zRlg1ovonyLGpq+5s6ANUQ55KM8cPCoruSs g==; X-CSE-ConnectionGUID: CS2i7OWPTAqI/Sm/408aaA== X-CSE-MsgGUID: xz4mBPimQ9Ok5Y5x0fZAMw== X-IronPort-AV: E=McAfee;i="6700,10204,11363"; a="45794883" X-IronPort-AV: E=Sophos;i="6.14,223,1736841600"; d="scan'208";a="45794883" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by orvoesa107.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Mar 2025 05:01:08 -0800 X-CSE-ConnectionGUID: 0dfTdEU5QF6bz8I116yfCQ== X-CSE-MsgGUID: vYf5Oc5dTd+WzvrtST/0Dg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,223,1736841600"; d="scan'208";a="123276969" Received: from mohdfai2-ilbpg12-1.png.intel.com ([10.88.227.73]) by fmviesa005.fm.intel.com with ESMTP; 05 Mar 2025 05:01:00 -0800 From: Faizal Rahim To: Tony Nguyen , Przemek Kitszel , Andrew Lunn , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Maxime Coquelin , Alexandre Torgue , Simon Horman , Russell King , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , Furong Xu <0x1207@gmail.com>, Russell King , Vladimir Oltean , Serge Semin , Xiaolei Wang , Suraj Jaiswal , Kory Maincent , Gal Pressman , Jesper Nilsson , Choong Yong Liang , Chwee-Lin Choong , Faizal Rahim , Kunihiko Hayashi , Vinicius Costa Gomes , intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, bpf@vger.kernel.org Subject: [PATCH iwl-next v8 01/11] net: stmmac: move frag_size handling out of spin_lock Date: Wed, 5 Mar 2025 08:00:16 -0500 Message-Id: <20250305130026.642219-2-faizal.abdul.rahim@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250305130026.642219-1-faizal.abdul.rahim@linux.intel.com> References: <20250305130026.642219-1-faizal.abdul.rahim@linux.intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The upcoming patch will extract verification logic into a new module, MMSV (MAC Merge Software Verification). MMSV will handle most FPE fields, except frag_size. It introduces its own lock (mmsv->lock), replacing fpe_cfg->lock. Since frag_size handling remains in the driver, the existing rtnl_lock() is sufficient. Move frag_size handling out of spin_lock_irq_save() to keep the upcoming patch a pure refactoring without behavior changes. Signed-off-by: Faizal Rahim Reviewed-by: Furong Xu <0x1207@gmail.com> Reviewed-by: Vladimir Oltean --- drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c b/drivers= /net/ethernet/stmicro/stmmac/stmmac_ethtool.c index 918a32f8fda8..cfe5aea24549 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c @@ -1216,6 +1216,10 @@ static int stmmac_get_mm(struct net_device *ndev, if (!stmmac_fpe_supported(priv)) return -EOPNOTSUPP; =20 + state->rx_min_frag_size =3D ETH_ZLEN; + frag_size =3D stmmac_fpe_get_add_frag_size(priv); + state->tx_min_frag_size =3D ethtool_mm_frag_size_add_to_min(frag_size); + spin_lock_irqsave(&priv->fpe_cfg.lock, flags); =20 state->max_verify_time =3D STMMAC_FPE_MM_MAX_VERIFY_TIME_MS; @@ -1224,7 +1228,6 @@ static int stmmac_get_mm(struct net_device *ndev, state->verify_time =3D priv->fpe_cfg.verify_time; state->tx_enabled =3D priv->fpe_cfg.tx_enabled; state->verify_status =3D priv->fpe_cfg.status; - state->rx_min_frag_size =3D ETH_ZLEN; =20 /* FPE active if common tx_enabled and * (verification success or disabled(forced)) @@ -1236,9 +1239,6 @@ static int stmmac_get_mm(struct net_device *ndev, else state->tx_active =3D false; =20 - frag_size =3D stmmac_fpe_get_add_frag_size(priv); - state->tx_min_frag_size =3D ethtool_mm_frag_size_add_to_min(frag_size); - spin_unlock_irqrestore(&priv->fpe_cfg.lock, flags); =20 return 0; @@ -1258,6 +1258,8 @@ static int stmmac_set_mm(struct net_device *ndev, str= uct ethtool_mm_cfg *cfg, if (err) return err; =20 + stmmac_fpe_set_add_frag_size(priv, frag_size); + /* Wait for the verification that's currently in progress to finish */ timer_shutdown_sync(&fpe_cfg->verify_timer); =20 @@ -1271,7 +1273,6 @@ static int stmmac_set_mm(struct net_device *ndev, str= uct ethtool_mm_cfg *cfg, if (!cfg->verify_enabled) fpe_cfg->status =3D ETHTOOL_MM_VERIFY_STATUS_DISABLED; =20 - stmmac_fpe_set_add_frag_size(priv, frag_size); stmmac_fpe_apply(priv); =20 spin_unlock_irqrestore(&fpe_cfg->lock, flags); --=20 2.34.1