From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) (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 62CFC501F52 for ; Fri, 4 Sep 2026 16:31:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.47 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788539477; cv=none; b=LWFDmR4gkbAGQXv9VqkErqcNodxIVNqm9NVqpTDOLCl2djsZsMjkx8JCvkATso4BVnlpIjwOcap28YgRK3H3FHx8aDVnbL4Ng2KOvFxj5+YvkCtJlxyGTwUYujLNJh5qjeEf3sideFp7HR9nyo7mw3hQoBoRw/ffDdAZNBkcjAY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788539477; c=relaxed/simple; bh=9+bfhV3bKwYKq6jbJEd7Jz4nKsBAMRkbK1/fmkT6QO8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tGx82xOKqB56Ifc8W/xkTMxl1bwqFFwKXv1uLaRtcB1TuuudXxBCHT4DOZmpD/M/riPB49ul/puKRGNWsIu14qajwxnVwwSqnEklrry1sPT1w99FIk0z+OEC2cp3Ln08UTTDCbEXk4S01xABH5cyN/A4mbZVlH9PUPLI0i3qZMs= 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=Tep47Jx4; arc=none smtp.client-ip=209.85.216.47 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="Tep47Jx4" Received: by mail-pj1-f47.google.com with SMTP id 98e67ed59e1d1-3856d6fbcb3so930298a91.2 for ; Fri, 04 Sep 2026 09:31:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1788539474; x=1789144274; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=oJMCXgDxT0gClhbr75BMCzC3pWErrQPjx1FIrmQQWzA=; b=Tep47Jx4dpwQYGUDzh73wVsxHENaH+qUhQjAnQDdYqN1XWzMz3HTG+rNNSDayEgNV5 b+ibCADHHq58mT4JsMpCs09QqaQzgYlc3D4p1KbhxapmLvgg4E+LUBv675t395ALLG7m hklvZ4MEU5Mc7qJkAuFmVD3bLiPtJNELeZbcpAzAItHpdv5M9ye1SnksVQDfyt324wBg 56O9TrtOx9X3l3Rfw3xBUpqioEdMDkKDkl0MQA5ggi8Td9raGYwNu36bHqzs8nnFie2r 2NK7Xt2IDjEWuR+u5zFGB77uiQ4qK/+vKF3qE5PzEDwoV5ibjP8IDDZ27sSQhDN1jFOF hFKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788539474; x=1789144274; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=oJMCXgDxT0gClhbr75BMCzC3pWErrQPjx1FIrmQQWzA=; b=P5RSVE1qaAEY5aWew7+5Rzk43B46cYtqRxgtTgnn0KszXgvEbHz84OVukNC06m4B0c 9zJFq1SLnFasgOI4OvD29xmCoLP6cMPELvQhzjyW0GyzZxDotuVp4OKltcjD995XJC0N 9O8+34qOlz7YvDjHRfnEQOwJMlGjgP1EPsaszt2udhnRMUe7gXAHOZQ3Y80/ESGTxApi StPwjNV4v/ogW5atH3hEJ6svJPAd7nLhD0HiPhYWoJ9rtaHxhEpfQJoW1U0t/AtnUS4+ MXE6+x5Pfy7mZ9+MXLbS0gbE6/DBu4ju+etIo9shTLeVMJ8vk8vuKCqDdFgkbHeINJDx U2eg== X-Forwarded-Encrypted: i=1; AKwUvBxlAxJpNzLm/OvkjtfwH2Knk8Xu6ShIkEqRHvslltxdmNKTu4W8MZUUDbCaK8GBfnLcxFr0AJfmkEQNaog=@vger.kernel.org X-Gm-Message-State: AFuF++nJyr2i8hOaXQcxm72mkOI9k2pwCcDZDzZHKIO+lra5ZcZmArnD Ll0Yw0GxWMbkzjIu3wFvUlHcTcmlSyzfUfpXxL+/qTmmrsPsxmbcjkr/ X-Gm-Gg: AYBFou3oYQYuRbVDEvE6zGnZh3n2ZRPRbNj9InKTv7q+oFrvdrU+05svsx+XCGGmdDn 75yReokqoMnDs1GNsniqEiCJgKez/jPu91Mj3ZeGha/u4czOIaB1sXPU2ybqAVfbwbBsoD7YYVz vpQBsrlC9rvqi0sWuSSlNoPwFSCyk1iUp888WjM27Jg21z+jKuWZ1HG+2vRDDr9oNO09TDQup50 s8cR6N3uNQdnbNSNpjiQuer96/5cD8wtyOuL7QZzP3GjMsZ7LXxCs4OulKow09MfwCc8TMRVh7Q o/FTcEr1K7l34vgBwyHdrmhGmpo80mra26wcee/MqCYBZ52/wjJiYJGRMa3XEoe2OU2etGJ4twq vQhkJsfLzWjsN18m8WDC0BguXMWWYivWovfXj0ZKTIMwHfrjCT/gOBRKo2k1JkBtz9egGQbBKsZ 3sOmBlcLy8ludQDGOLoa2e1f01luNBARN3Rktk4k4N5qfdqGfKdcmWz7X4QMBraeNRggXJmkx9v 00RNZrJR1AunTkV/lTZUlFuWg== X-Received: by 2002:a17:90b:4d06:b0:366:10f1:3d91 with SMTP id 98e67ed59e1d1-39b2614df74mr9767547a91.1.1788539472141; Fri, 04 Sep 2026 09:31:12 -0700 (PDT) Received: from d.home.yangfl.dn42 ([2a09:bac5:661b:3050::4d0:46]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-39b25c974cfsm5383010a91.0.2026.09.04.09.31.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Sep 2026 09:31:11 -0700 (PDT) From: David Yang To: netdev@vger.kernel.org Cc: David Yang , Andrew Lunn , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Russell King , linux-kernel@vger.kernel.org Subject: [PATCH net-next v2 2/6] net: dsa: motorcomm: Split MIB buffers Date: Sat, 5 Sep 2026 00:29:44 +0800 Message-ID: <20260904162952.709368-3-mmyangfl@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260904162952.709368-1-mmyangfl@gmail.com> References: <20260904162952.709368-1-mmyangfl@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit With MIB improvement introduced later, struct yt921x_priv will be over 20k which is not very good for a single kmalloc(). Dynamically allocate the MIB structures to reduce the size of struct yt921x_priv, and do not waste memory on dummy ports. Signed-off-by: David Yang --- drivers/net/dsa/motorcomm/chip.c | 112 +++++++++++++++++++++++-------- drivers/net/dsa/motorcomm/chip.h | 16 +++-- 2 files changed, 96 insertions(+), 32 deletions(-) diff --git a/drivers/net/dsa/motorcomm/chip.c b/drivers/net/dsa/motorcomm/chip.c index ad5fe1ccb1d7..bd8486cc10ac 100644 --- a/drivers/net/dsa/motorcomm/chip.c +++ b/drivers/net/dsa/motorcomm/chip.c @@ -549,9 +549,12 @@ static int yt921x_mib_read(struct yt921x_priv *priv, int port) { struct yt921x_port *pp = &priv->ports[port]; struct device *dev = to_device(priv); - struct yt921x_mib_stats *mib = &pp->mib; + struct yt921x_mib *pm = pp->mib; + struct yt921x_mib_stats *mib; int res = 0; + mib = &pm->stats; + /* Reading of yt921x_port::mib is not protected by a lock and it's vain * to keep its consistency, since we have to read registers one by one * and there is no way to make a snapshot of MIB stats. @@ -589,11 +592,11 @@ static int yt921x_mib_read(struct yt921x_priv *priv, int port) WRITE_ONCE(*valp, val); } - pp->rx_frames = mib->rx_64byte + mib->rx_65_127byte + + pm->rx_frames = mib->rx_64byte + mib->rx_65_127byte + mib->rx_128_255byte + mib->rx_256_511byte + mib->rx_512_1023byte + mib->rx_1024_1518byte + mib->rx_jumbo; - pp->tx_frames = mib->tx_64byte + mib->tx_65_127byte + + pm->tx_frames = mib->tx_64byte + mib->tx_65_127byte + mib->tx_128_255byte + mib->tx_256_511byte + mib->tx_512_1023byte + mib->tx_1024_1518byte + mib->tx_jumbo; @@ -606,10 +609,11 @@ static int yt921x_mib_read(struct yt921x_priv *priv, int port) static void yt921x_mib_poll(struct work_struct *work) { - struct yt921x_port *pp = container_of_const(work, struct yt921x_port, - mib_read.work); - struct yt921x_priv *priv = (void *)(pp - pp->index) - - offsetof(struct yt921x_priv, ports); + struct yt921x_mib *pm = container_of_const(work, struct yt921x_mib, + work.work); + struct yt921x_port *pp = pm->port; + struct yt921x_priv *priv = container_of_const(pp, struct yt921x_priv, + ports[pp->index]); unsigned long delay = YT921X_STATS_INTERVAL_JIFFIES; int port = pp->index; int res; @@ -620,7 +624,7 @@ static void yt921x_mib_poll(struct work_struct *work) if (res) delay *= 4; - schedule_delayed_work(&pp->mib_read, delay); + schedule_delayed_work(&pm->work, delay); } static void @@ -643,9 +647,14 @@ yt921x_dsa_get_ethtool_stats(struct dsa_switch *ds, int port, uint64_t *data) { struct yt921x_priv *priv = to_yt921x_priv(ds); struct yt921x_port *pp = &priv->ports[port]; - struct yt921x_mib_stats *mib = &pp->mib; + struct yt921x_mib *pm = pp->mib; + struct yt921x_mib_stats *mib; size_t j; + if (!pm) + return; + mib = &pm->stats; + mutex_lock(&priv->reg_lock); yt921x_mib_read(priv, port); mutex_unlock(&priv->reg_lock); @@ -685,16 +694,21 @@ yt921x_dsa_get_eth_mac_stats(struct dsa_switch *ds, int port, { struct yt921x_priv *priv = to_yt921x_priv(ds); struct yt921x_port *pp = &priv->ports[port]; - struct yt921x_mib_stats *mib = &pp->mib; + struct yt921x_mib *pm = pp->mib; + struct yt921x_mib_stats *mib; + + if (!pm) + return; + mib = &pm->stats; mutex_lock(&priv->reg_lock); yt921x_mib_read(priv, port); mutex_unlock(&priv->reg_lock); - mac_stats->FramesTransmittedOK = pp->tx_frames; + mac_stats->FramesTransmittedOK = pm->tx_frames; mac_stats->SingleCollisionFrames = mib->tx_single_collisions; mac_stats->MultipleCollisionFrames = mib->tx_multiple_collisions; - mac_stats->FramesReceivedOK = pp->rx_frames; + mac_stats->FramesReceivedOK = pm->rx_frames; mac_stats->FrameCheckSequenceErrors = mib->rx_crc_errors; mac_stats->AlignmentErrors = mib->rx_alignment_errors; mac_stats->OctetsTransmittedOK = mib->tx_good_bytes; @@ -721,7 +735,12 @@ yt921x_dsa_get_eth_ctrl_stats(struct dsa_switch *ds, int port, { struct yt921x_priv *priv = to_yt921x_priv(ds); struct yt921x_port *pp = &priv->ports[port]; - struct yt921x_mib_stats *mib = &pp->mib; + struct yt921x_mib *pm = pp->mib; + struct yt921x_mib_stats *mib; + + if (!pm) + return; + mib = &pm->stats; mutex_lock(&priv->reg_lock); yt921x_mib_read(priv, port); @@ -750,7 +769,12 @@ yt921x_dsa_get_rmon_stats(struct dsa_switch *ds, int port, { struct yt921x_priv *priv = to_yt921x_priv(ds); struct yt921x_port *pp = &priv->ports[port]; - struct yt921x_mib_stats *mib = &pp->mib; + struct yt921x_mib *pm = pp->mib; + struct yt921x_mib_stats *mib; + + if (!pm) + return; + mib = &pm->stats; mutex_lock(&priv->reg_lock); yt921x_mib_read(priv, port); @@ -786,7 +810,12 @@ yt921x_dsa_get_stats64(struct dsa_switch *ds, int port, { struct yt921x_priv *priv = to_yt921x_priv(ds); struct yt921x_port *pp = &priv->ports[port]; - struct yt921x_mib_stats *mib = &pp->mib; + struct yt921x_mib *pm = pp->mib; + struct yt921x_mib_stats *mib; + + if (!pm) + return; + mib = &pm->stats; stats->rx_length_errors = mib->rx_undersize_errors + mib->rx_fragment_errors; @@ -802,8 +831,8 @@ yt921x_dsa_get_stats64(struct dsa_switch *ds, int port, /* stats->tx_heartbeat_errors */ stats->tx_window_errors = mib->tx_late_collisions; - stats->rx_packets = pp->rx_frames; - stats->tx_packets = pp->tx_frames; + stats->rx_packets = pm->rx_frames; + stats->tx_packets = pm->tx_frames; stats->rx_bytes = mib->rx_good_bytes - ETH_FCS_LEN * stats->rx_packets; stats->tx_bytes = mib->tx_good_bytes - ETH_FCS_LEN * stats->tx_packets; stats->rx_errors = stats->rx_length_errors + stats->rx_over_errors + @@ -822,7 +851,12 @@ yt921x_dsa_get_pause_stats(struct dsa_switch *ds, int port, { struct yt921x_priv *priv = to_yt921x_priv(ds); struct yt921x_port *pp = &priv->ports[port]; - struct yt921x_mib_stats *mib = &pp->mib; + struct yt921x_mib *pm = pp->mib; + struct yt921x_mib_stats *mib; + + if (!pm) + return; + mib = &pm->stats; mutex_lock(&priv->reg_lock); yt921x_mib_read(priv, port); @@ -3953,11 +3987,14 @@ yt921x_phylink_mac_link_down(struct phylink_config *config, unsigned int mode, { struct dsa_port *dp = dsa_phylink_to_port(config); struct yt921x_priv *priv = to_yt921x_priv(dp->ds); + struct yt921x_mib *pm; int port = dp->index; int res; /* No need to sync; port control block is hold until device remove */ - cancel_delayed_work(&priv->ports[port].mib_read); + pm = priv->ports[port].mib; + if (pm) + cancel_delayed_work(&pm->work); mutex_lock(&priv->reg_lock); res = yt921x_port_down(priv, port); @@ -3976,6 +4013,7 @@ yt921x_phylink_mac_link_up(struct phylink_config *config, { struct dsa_port *dp = dsa_phylink_to_port(config); struct yt921x_priv *priv = to_yt921x_priv(dp->ds); + struct yt921x_mib *pm; int port = dp->index; int res; @@ -3988,7 +4026,9 @@ yt921x_phylink_mac_link_up(struct phylink_config *config, dev_err(dp->ds->dev, "Failed to %s port %d: %i\n", "bring up", port, res); - schedule_delayed_work(&priv->ports[port].mib_read, 0); + pm = priv->ports[port].mib; + if (pm) + schedule_delayed_work(&pm->work, 0); } static void @@ -4108,11 +4148,35 @@ yt921x_dsa_get_tag_protocol(struct dsa_switch *ds, int port, return DSA_TAG_PROTO_YT921X; } +static void yt921x_dsa_port_teardown(struct dsa_switch *ds, int port) +{ + struct yt921x_priv *priv = to_yt921x_priv(ds); + struct yt921x_port *pp = &priv->ports[port]; + struct yt921x_mib *pm = pp->mib; + + if (pm) + disable_delayed_work_sync(&pm->work); +} + static int yt921x_dsa_port_setup(struct dsa_switch *ds, int port) { struct yt921x_priv *priv = to_yt921x_priv(ds); + struct yt921x_port *pp = &priv->ports[port]; + struct device *dev = to_device(priv); + struct yt921x_mib *pm = pp->mib; int res; + if (!pm && !(BIT(port) & (priv->info->internal_mask | + priv->info->external_mask))) { + pm = devm_kzalloc(dev, sizeof(*pm), GFP_KERNEL); + if (!pm) + return -ENOMEM; + pp->mib = pm; + + pm->port = pp; + INIT_DELAYED_WORK(&pm->work, yt921x_mib_poll); + } + mutex_lock(&priv->reg_lock); res = yt921x_port_setup(priv, port); mutex_unlock(&priv->reg_lock); @@ -4667,6 +4731,7 @@ static const struct dsa_switch_ops yt921x_dsa_switch_ops = { /* port */ .get_tag_protocol = yt921x_dsa_get_tag_protocol, .phylink_get_caps = yt921x_dsa_phylink_get_caps, + .port_teardown = yt921x_dsa_port_teardown, .port_setup = yt921x_dsa_port_setup, #if IS_ENABLED(CONFIG_DCB) /* dscp */ @@ -4696,12 +4761,6 @@ static void yt921x_mdio_remove(struct mdio_device *mdiodev) if (!priv) return; - for (size_t i = ARRAY_SIZE(priv->ports); i-- > 0; ) { - struct yt921x_port *pp = &priv->ports[i]; - - disable_delayed_work_sync(&pp->mib_read); - } - dsa_unregister_switch(&priv->ds); for (unsigned int i = 0; i < ARRAY_SIZE(priv->acl_blks); i++) { @@ -4749,7 +4808,6 @@ static int yt921x_mdio_probe(struct mdio_device *mdiodev) struct yt921x_port *pp = &priv->ports[i]; pp->index = i; - INIT_DELAYED_WORK(&pp->mib_read, yt921x_mib_poll); } ds = &priv->ds; diff --git a/drivers/net/dsa/motorcomm/chip.h b/drivers/net/dsa/motorcomm/chip.h index 805febb48683..5bf2d3409f4b 100644 --- a/drivers/net/dsa/motorcomm/chip.h +++ b/drivers/net/dsa/motorcomm/chip.h @@ -913,6 +913,15 @@ struct yt921x_mib_stats { u64 tx_oam; }; +struct yt921x_mib { + struct yt921x_port *port; + + struct delayed_work work; + struct yt921x_mib_stats stats; + u64 rx_frames; + u64 tx_frames; +}; + struct yt921x_acl_entry { u32 key[2]; u32 mask[2]; @@ -939,11 +948,6 @@ struct yt921x_port { bool hairpin; bool isolated; - struct delayed_work mib_read; - struct yt921x_mib_stats mib; - u64 rx_frames; - u64 tx_frames; - #if IS_ENABLED(CONFIG_NET_DSA_YT921X_LEDS) unsigned char led_duty; unsigned short led_cycle; @@ -953,6 +957,8 @@ struct yt921x_port { struct yt921x_led *leds[YT921X_LED_GROUP_NUM]; #endif + + struct yt921x_mib *mib; }; struct yt921x_reg_ops { -- 2.53.0