From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BC8E911713; Thu, 6 Mar 2025 02:09:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741226970; cv=none; b=I21zJjkvYG/B4+4ENEp9SVn0LhJSvnpSF9vt/rHnxBNxSAhqRDIOF0tvlSkvrF2NSUYSWnRZUulKSqTTs3HojZgSY4O6NJU8iMjueQ3VLMa6OQnjUXHO8lrzzU4HWG6H0Fjd/Wi2ilmZoEIxcj9Mbm7XbpcrHjWeMRqGOjDFtEQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741226970; c=relaxed/simple; bh=yR20MrocLc0xWy0/rUVvFiw9xf4pRDqto20+qryWOxo=; h=Date:From:To:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=daW4yc7EDqFXJ3I3/CvIirbqBVNpRklNNLIGSmTAH0RpP0lpo4tcBCy/ztfy2r8nduhMYom+RxsrZeAR+6Aim/FQtIZbKG/tl3gJ+DC0nklIuSXj4W1PA1nXsjiV+fDfUyv79/pHvfu/YVrewyTG2vdc5Ct0D2ZcWkox+vAEyGU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=KV1grGz4; arc=none smtp.client-ip=209.85.214.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="KV1grGz4" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-224100e9a5cso1776425ad.2; Wed, 05 Mar 2025 18:09:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741226968; x=1741831768; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:from:to:cc:subject:date :message-id:reply-to; bh=z1rT13AxT6i7F5Ycxl5JT25b4uDj1fZ8K6rhKfIa2rM=; b=KV1grGz4zS8Z5VBKAquBJsiho35R4bK9ASqaJLDzwrn8ELDBQtp35hm2YWQqhdCVvh FdmbEZcBZDvPVdsKXyhAEHvv9OBeAkb45MaOofw6B2NeqsTayBXRRfRlbJqdOoVd9ez6 QRlaIX1Bom7n6YJIacBhbJB2fd0WIJrGzMjOD143SfqunwNAL5gh0jgkBwk5g/U9viWr xkU1cepZKbA2rOPko/IJ6rsHE6NwI0JQtOOrM2sBN5n4GzNgEECBJE4j5JNyGFHwEonJ UZAlPFguUwbMr0EOPLzYo7d8aSvMVL7eflqHIxxTvEJ7dy9J/K6PFdo7+1+mHoCnMP+F xH2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741226968; x=1741831768; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=z1rT13AxT6i7F5Ycxl5JT25b4uDj1fZ8K6rhKfIa2rM=; b=qglcFy+FFKRc9jRaRHwxcIOLzLDmHc18p3HMaB+Ds2Aw7j2CDTtolQulCW5VIh9sKb /oKSAwf8DsJs6NAbhqSXvq8OttrcWlw73XPFsXtXi42AHFxSKLLy5vbCIYZeFAoeEM1E 4DlfZzyiwP84w7C/z1B3Ys/iZJXAPqJEr6XycVgBMfmuOkZOuoobmA/9AGV14eEWOuag s2nzzO9g3E7oYj+zVBVVj9zDCkkdtIE2/CgTj/5emlPL7VC/2YSeOhN0adexefBSjMT/ jQI0akfUTSU69LyhbFNVo1k6HxzfRtDbwIoQ5SHcKcEde1KfRJfFgQpu01UUdkAVq5Gh pGCw== X-Forwarded-Encrypted: i=1; AJvYcCVPhdFVr5NWQ5hSJTGx0WqVWeD2JdXjIn89X7RDwtXahd7oVMRmpcljdF+8vr9cppKR/UaE5zqVjqLNGVRW@vger.kernel.org, AJvYcCVoewXN5IUrmRrIuJclDkYJog6RsUM9JiAPlJqVauNeKz6YXhLpytEvYWigFff3cCUZfus=@vger.kernel.org, AJvYcCX2k7kBBfgzQr33PUvCWeKHb8ssBTg7KL59Lh6uRSVaGJ1I2uvLt2QSbvA6J8HftlB+vKspCgfe@vger.kernel.org X-Gm-Message-State: AOJu0YyfCTP9Y93htQqkerLqjBeXyVlFoQOPeddlrW3b1MsAXKvWdXuW PfTeXtSywLKzoZvScCPF/padjxaY9692YV86XFz4eYgs0j/hY4Fm X-Gm-Gg: ASbGncuBkJdsoantJXP6T6FFC5T4WILHPlx7oW+jLiTwT05FukxmVn3Xs8nh9AuthaH Nb6m1+o5x5ZA09VNUM0NnulzY8gzqYDF12bKK0UzUC8OQDW9r6STabHbWSn6Q5ZDWrupHA/Phfe 9+CrR+4Ann3r3RXyyzq1UzzVGxzi7t5nCMlFbzYSJVHI++HLH1GIVZGqHr+VugD5bRSqADdUv5k LK0KPQDhpqH2zrGqiFISsEukNILKL/Fbe8Fsvdk0cb54fPQOgMkMxTgQ7J0kzDhwoN6W8Vs5yfC n3La7mOI4jwLWqWzJN0EodV1yVouvflNkGuL9g== X-Google-Smtp-Source: AGHT+IF9QeRgv+6Z/cPJtnzTG5KuBBCd8Qdr6JTrB73F+Bp0n4Wqinq/xvlObO2mPBHhOim0ujthOA== X-Received: by 2002:a05:6a00:889:b0:736:55ec:ea8b with SMTP id d2e1a72fcca58-73682d00a42mr7712708b3a.24.1741226967842; Wed, 05 Mar 2025 18:09:27 -0800 (PST) Received: from localhost ([144.24.43.60]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73698519026sm139246b3a.144.2025.03.05.18.09.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Mar 2025 18:09:27 -0800 (PST) Date: Thu, 6 Mar 2025 10:09:13 +0800 From: Furong Xu <0x1207@gmail.com> To: Faizal Rahim Cc: 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 , Russell King , Vladimir Oltean , Serge Semin , Xiaolei Wang , Suraj Jaiswal , Kory Maincent , Gal Pressman , Jesper Nilsson , Choong Yong Liang , Chwee-Lin Choong , 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: Re: [PATCH iwl-next v8 01/11] net: stmmac: move frag_size handling out of spin_lock Message-ID: <20250306100913.00005bb8@gmail.com> In-Reply-To: <20250305130026.642219-2-faizal.abdul.rahim@linux.intel.com> References: <20250305130026.642219-1-faizal.abdul.rahim@linux.intel.com> <20250305130026.642219-2-faizal.abdul.rahim@linux.intel.com> X-Mailer: Claws Mail 4.3.0 (GTK 3.24.42; x86_64-w64-mingw32) Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit On Wed, 5 Mar 2025 08:00:16 -0500 Faizal Rahim wrote: > 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 > --- > 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; > > + 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); Reviewed-by: Furong Xu <0x1207@gmail.com> From mboxrd@z Thu Jan 1 00:00:00 1970 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 smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (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 B5EB8C282EC for ; Thu, 6 Mar 2025 02:09:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 5285760B93; Thu, 6 Mar 2025 02:09:32 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id DcmfIiSGe8M5; Thu, 6 Mar 2025 02:09:31 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.142; helo=lists1.osuosl.org; envelope-from=intel-wired-lan-bounces@osuosl.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 8CAA960ED4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osuosl.org; s=default; t=1741226971; bh=z1rT13AxT6i7F5Ycxl5JT25b4uDj1fZ8K6rhKfIa2rM=; h=Date:From:To:Cc:In-Reply-To:References:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=D76nUhBrsqONcs6Cqnxbc8aKPFofZ981kRi7CG/zRP8E6QeRRCGbX8Qn5nahqv5nl eBGgB2KjQokCoqTAvmEYrpXVVbxTGkF9J+bo0pu+BfoJjeTWqUd4RdNnhz1igqC6eF s7Myl7E291I4IReRHKnocMl0Wwq6oIY6kGPsMyQX8frPnDkLbyOHm5s/sLsxUg8F9s d9uK6wGTmaNs+Lz90xQnOD6wxB+LBwiDeUEtmWlDQPtXxdZnpB3lvg+unjmqH+U8oo V2JWLnnuhmyv9F+KIjPFA1CnUKOkzbtIJ8IN2e8QnEoUSDHSDNH8MkaDKsQbiZtwJm 94YP5fwf89xeg== Received: from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142]) by smtp3.osuosl.org (Postfix) with ESMTP id 8CAA960ED4; Thu, 6 Mar 2025 02:09:31 +0000 (UTC) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) by lists1.osuosl.org (Postfix) with ESMTP id D32C7E2E for ; Thu, 6 Mar 2025 02:09:29 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id A25FE4088D for ; Thu, 6 Mar 2025 02:09:29 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id CWFzoX7KGK2t for ; Thu, 6 Mar 2025 02:09:28 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2607:f8b0:4864:20::629; helo=mail-pl1-x629.google.com; envelope-from=0x1207@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp4.osuosl.org B37004088E DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org B37004088E Received: from mail-pl1-x629.google.com (mail-pl1-x629.google.com [IPv6:2607:f8b0:4864:20::629]) by smtp4.osuosl.org (Postfix) with ESMTPS id B37004088E for ; Thu, 6 Mar 2025 02:09:28 +0000 (UTC) Received: by mail-pl1-x629.google.com with SMTP id d9443c01a7336-223785beedfso1598705ad.1 for ; Wed, 05 Mar 2025 18:09:28 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741226968; x=1741831768; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=z1rT13AxT6i7F5Ycxl5JT25b4uDj1fZ8K6rhKfIa2rM=; b=HtrQ0fn3rEzSu+hK03ysSc7tOwHxmUlW1l07hZ80kzHaCPMJ37vQtc8H1W2YlsuvWc GuCXZ1M95pah7l5NFp3Jk8amOq/PvtCY43cysKsfwh8+M7CiWC/fgXRxKXmiOiqqn9ik WeJxvOir242MiiFAkQejfmioXyjMpy2EN+yrQz5lOketIo3LJmCVk3dEBp4jqpclAweS gg4LPAjrbeZI/rgWPeqwpYLYw4TvX3aVfnnl12OYZeTz6lURoV7kYvXqCLQDcgHqodVV WdbaPzENdVFmTPj3rtDP0WjtQaXfIdknoMu5W9CtioH0OdT6fhqYaQEcAUioZZSKJI8r +iTQ== X-Forwarded-Encrypted: i=1; AJvYcCXFwfCmXf+Tm6aRr8MIqFf/5ch3xRpam1RUSTTLyYf9c8OvXizZTyVDnFPe2TNf67/5LExXmmZZxyEbfjceZ1k=@lists.osuosl.org X-Gm-Message-State: AOJu0Yw3SGwJhz2vbF06ZRFJaT4RBo33YBWwBey0nJ7O5wVMPbXi2HY2 3cnynynvgiD+M8V9ixi5u/Zd1Y6ROI7Uq7Ia5HDRPh3TaKONTDuni9OpAgp0 X-Gm-Gg: ASbGncvdUpU/142GzJgKxriKbQNk8M+Yy8Oe9uT/VO7oR2jyM+ZL4uqRmniK7BoHlkY /e8fedKS0Cn180WvWlnTfZaAkmzg/ZW/LwAFF7YTtLu+yVb7+oZl0oxSBIgnR0lSqtRsEvyrqDk HqWX3gR1/VF2aosFll3HyxEWjcLiU9GGmvKLrsPzq59Adf5y9BLhEEos0Wui7WhiSrlaghnxrl7 fAdffGnmuH3SWFM9GV5iQtDrAf/gLMGwb3dzvBT4WpsmEt3xHLuc3XORlMvxaB7YQdMBc3BuyLe AxzONdx2+zxbDAo1mgnp3G7KJh8J1A+qdARcEQ== X-Google-Smtp-Source: AGHT+IF9QeRgv+6Z/cPJtnzTG5KuBBCd8Qdr6JTrB73F+Bp0n4Wqinq/xvlObO2mPBHhOim0ujthOA== X-Received: by 2002:a05:6a00:889:b0:736:55ec:ea8b with SMTP id d2e1a72fcca58-73682d00a42mr7712708b3a.24.1741226967842; Wed, 05 Mar 2025 18:09:27 -0800 (PST) Received: from localhost ([144.24.43.60]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73698519026sm139246b3a.144.2025.03.05.18.09.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Mar 2025 18:09:27 -0800 (PST) Date: Thu, 6 Mar 2025 10:09:13 +0800 From: Furong Xu <0x1207@gmail.com> To: Faizal Rahim Cc: 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 , Russell King , Vladimir Oltean , Serge Semin , Xiaolei Wang , Suraj Jaiswal , Kory Maincent , Gal Pressman , Jesper Nilsson , Choong Yong Liang , Chwee-Lin Choong , 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 Message-ID: <20250306100913.00005bb8@gmail.com> In-Reply-To: <20250305130026.642219-2-faizal.abdul.rahim@linux.intel.com> References: <20250305130026.642219-1-faizal.abdul.rahim@linux.intel.com> <20250305130026.642219-2-faizal.abdul.rahim@linux.intel.com> X-Mailer: Claws Mail 4.3.0 (GTK 3.24.42; x86_64-w64-mingw32) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741226968; x=1741831768; darn=lists.osuosl.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:from:to:cc:subject:date :message-id:reply-to; bh=z1rT13AxT6i7F5Ycxl5JT25b4uDj1fZ8K6rhKfIa2rM=; b=QGEIEUz+Uj3U4Czj89v7AwmVhARf6pRaLdtlFhKmFnVzKc1yx46GFsHXcJi5Hf1Ol+ 086NA7FQLih4V746HTso7RO2lVvbAe+8tEHzPOSbzDd9UhIT2L6U4X1AwkGMJtzQWlSn sJuY0yUwW35/o5DsWh5f1QPVPQqd4J4q8/JLf0zZzMGSWH8RHokC1cE35fSG4syYm+CN nZnEHPB8NhivvXggCQNUepytzZZwdd8X9MSGoNx2UFbcKtM7gg76wwamgWuftZAJ49BR i4om4ozqu+/Pyip5Cj4xjHqTMd9k4dzQLQN8czeWv2FK36PprrZie02XwpQWz0ozph/l 9LDQ== X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dmarc=pass (p=none dis=none) header.from=gmail.com X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=QGEIEUz+ Subject: Re: [Intel-wired-lan] [PATCH iwl-next v8 01/11] net: stmmac: move frag_size handling out of spin_lock X-BeenThere: intel-wired-lan@osuosl.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Intel Wired Ethernet Linux Kernel Driver Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-wired-lan-bounces@osuosl.org Sender: "Intel-wired-lan" On Wed, 5 Mar 2025 08:00:16 -0500 Faizal Rahim wrote: > 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 > --- > 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; > > + 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); Reviewed-by: Furong Xu <0x1207@gmail.com>