From patchwork Fri Apr 18 16:38:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Nguyen X-Patchwork-Id: 14057486 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E57A7C369CA for ; Fri, 18 Apr 2025 16:43:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=8ckJ2ikJpOlIPbQNWekZFPm6xQMztjRRL7IzWS/4VTc=; b=WsmJHUBP2kOwQf0KuQRfzksAXn 2SU/BXcyFwLHA5S070viY1B3v7y7HxgCU5CA6NmJmX6S69IIiin+rz8va5S5TDcDjzzExY/9rZoBH qH5+pdZ3CPBYXMirkGnzIL539NiitEEOwE3VwAFprgkx1v61o15p1yVMhnVkAizsPvvrMf9qzSnf7 Xtcp0mgPOW3i2iZY6bCq1vtMYBZyLkNd2LKj6j1viwEHKTnthpnlbnqPIkF9wpbV0A7bOjTtfUj17 T8zWShf8muVSfXdAh1uoXTCaQegqtInNLalhAjURxcnGBiUsmDS6nTFeCgF9aGHen+YF3fXp0NaOa op4KjA0w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1u5onv-0000000H0TP-3f6u; Fri, 18 Apr 2025 16:43:03 +0000 Received: from mgamail.intel.com ([192.198.163.12]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1u5ojb-0000000Gygf-2UYl for linux-arm-kernel@lists.infradead.org; Fri, 18 Apr 2025 16:38:37 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1744994316; x=1776530316; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=LBEVVzl9AqXsVCeuCIZBkBF+uqNuleXQBotMixba0Y0=; b=ERh4icUuGWhs9TB/gunAjldtzZUK+PBDigGSeKfXeRStR73FydrF4SLe 2rGxUMG+qp3OMNgRUh35NKLkISyXXDnMrKHtq+zeZzmHaxGXGZNrZOq72 AlLt8M290uarUlCk3WtKMOD9zDB8qit/xq08c/1xWZzddWxb+zkQ4surV A1m8Z3xV3V13Ch2vW4Faal/kLZoTpUuTh3Q/IAMQLiHfBc5Sd7cGv4ORH iygAojmtD6jjRYR19g7Day2QflXKjEIjja8DSAzxG4VBEsYkC3jMF2XvI jWebqvRm7935POrmKumvcZcfmhpBjDndSn5P3Cd/grsDTRXTpCEbkLffX g==; X-CSE-ConnectionGUID: VAnTwmh3Rr6iB5L4ksDt1w== X-CSE-MsgGUID: AihOZ9jaTX+VVuWrJA5a5g== X-IronPort-AV: E=McAfee;i="6700,10204,11407"; a="50454259" X-IronPort-AV: E=Sophos;i="6.15,222,1739865600"; d="scan'208";a="50454259" Received: from orviesa009.jf.intel.com ([10.64.159.149]) by fmvoesa106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Apr 2025 09:38:33 -0700 X-CSE-ConnectionGUID: PvzPpXi1TC29X9FFsJKjtA== X-CSE-MsgGUID: 2+PQ3pQOTYe7nr/OGXoxIg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,222,1739865600"; d="scan'208";a="130892221" Received: from anguy11-upstream.jf.intel.com ([10.166.9.133]) by orviesa009.jf.intel.com with ESMTP; 18 Apr 2025 09:38:32 -0700 From: Tony Nguyen To: davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, edumazet@google.com, andrew+netdev@lunn.ch, netdev@vger.kernel.org Cc: Faizal Rahim , anthony.l.nguyen@intel.com, vinicius.gomes@intel.com, vitaly.lifshits@intel.com, dima.ruinskiy@intel.com, przemyslaw.kitszel@intel.com, chwee.lin.choong@intel.com, yong.liang.choong@linux.intel.com, vladimir.oltean@nxp.com, horms@kernel.org, linux@armlinux.org.uk, xiaolei.wang@windriver.com, hayashi.kunihiko@socionext.com, ast@kernel.org, jesper.nilsson@axis.com, mcoquelin.stm32@gmail.com, rmk+kernel@armlinux.org.uk, fancer.lancer@gmail.com, kory.maincent@bootlin.com, linux-stm32@st-md-mailman.stormreply.com, hkelam@marvell.com, alexandre.torgue@foss.st.com, daniel@iogearbox.net, linux-arm-kernel@lists.infradead.org, hawk@kernel.org, quic_jsuraj@quicinc.com, gal@nvidia.com, john.fastabend@gmail.com, 0x1207@gmail.com, bpf@vger.kernel.org Subject: [PATCH net-next 01/14] net: stmmac: move frag_size handling out of spin_lock Date: Fri, 18 Apr 2025 09:38:07 -0700 Message-ID: <20250418163822.3519810-2-anthony.l.nguyen@intel.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250418163822.3519810-1-anthony.l.nguyen@intel.com> References: <20250418163822.3519810-1-anthony.l.nguyen@intel.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250418_093835_674664_DC028BDB X-CRM114-Status: GOOD ( 11.44 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Faizal Rahim 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: Vladimir Oltean Reviewed-by: Furong Xu <0x1207@gmail.com> Signed-off-by: Tony Nguyen --- 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 844f7d516a40..53f51eebb746 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; + state->rx_min_frag_size = ETH_ZLEN; + frag_size = stmmac_fpe_get_add_frag_size(priv); + state->tx_min_frag_size = ethtool_mm_frag_size_add_to_min(frag_size); + spin_lock_irqsave(&priv->fpe_cfg.lock, flags); state->max_verify_time = STMMAC_FPE_MM_MAX_VERIFY_TIME_MS; @@ -1224,7 +1228,6 @@ static int stmmac_get_mm(struct net_device *ndev, state->verify_time = priv->fpe_cfg.verify_time; state->tx_enabled = priv->fpe_cfg.tx_enabled; state->verify_status = priv->fpe_cfg.status; - state->rx_min_frag_size = ETH_ZLEN; /* 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 = false; - frag_size = stmmac_fpe_get_add_frag_size(priv); - state->tx_min_frag_size = ethtool_mm_frag_size_add_to_min(frag_size); - spin_unlock_irqrestore(&priv->fpe_cfg.lock, flags); return 0; @@ -1258,6 +1258,8 @@ static int stmmac_set_mm(struct net_device *ndev, struct ethtool_mm_cfg *cfg, if (err) return err; + 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); @@ -1271,7 +1273,6 @@ static int stmmac_set_mm(struct net_device *ndev, struct ethtool_mm_cfg *cfg, if (!cfg->verify_enabled) fpe_cfg->status = ETHTOOL_MM_VERIFY_STATUS_DISABLED; - stmmac_fpe_set_add_frag_size(priv, frag_size); stmmac_fpe_apply(priv); spin_unlock_irqrestore(&fpe_cfg->lock, flags);