On 6/14/24 00:49, Andrew Lunn wrote: > [Some people who received this message don't often get email from andrew@xxxxxxx. Learn why this is important at https://aka.ms/LearnAboutSenderIdentification ] > >> +static int hbl_en_napi_poll(struct napi_struct *napi, int budget); >> +static int hbl_en_port_open(struct hbl_en_port *port); > > When you do the Intel internal review, i expect this is crop up. No > forward declarations please. Put the code in the right order so they > are not needed. > I'll try to get rid of these forward declarations by re-odering the functions. >> +static int hbl_en_get_src_ip(struct hbl_aux_dev *aux_dev, u32 port_idx, u32 *src_ip) >> +{ >> + struct hbl_en_port *port = HBL_EN_PORT(aux_dev, port_idx); >> + struct net_device *ndev = port->ndev; >> + struct in_device *in_dev; >> + struct in_ifaddr *ifa; >> + int rc = 0; >> + >> + /* for the case where no src IP is configured */ >> + *src_ip = 0; >> + >> + /* rtnl lock should be acquired in relevant flows before taking configuration lock */ >> + if (!rtnl_is_locked()) { >> + netdev_err(port->ndev, "Rtnl lock is not acquired, can't proceed\n"); >> + rc = -EFAULT; >> + goto out; >> + } > > You will find all other drivers just do: > > ASSERT_RTNL(). > > If your locking is broken, you are probably dead anyway, so you might > as well keep going and try to explode in the most interesting way > possible. > Thanks, I'll switch to ASSERT_RTNL(). >> +static void hbl_en_reset_stats(struct hbl_aux_dev *aux_dev, u32 port_idx) >> +{ >> + struct hbl_en_port *port = HBL_EN_PORT(aux_dev, port_idx); >> + >> + port->net_stats.rx_packets = 0; >> + port->net_stats.tx_packets = 0; >> + port->net_stats.rx_bytes = 0; >> + port->net_stats.tx_bytes = 0; >> + port->net_stats.tx_errors = 0; >> + atomic64_set(&port->net_stats.rx_dropped, 0); >> + atomic64_set(&port->net_stats.tx_dropped, 0); > > Why atomic64_set? Atomics are expensive, so you should not be using > them. netdev has other cheaper methods, which other Intel developers > should be happy to tell you all about. > We used atomic64_set as these counters are updated also from non-netdev flow in case of HW errors. I can switch to use u64_stats_sync is that's the intention. I'm about to start a review process with Intel developers regardless of this issue and I'll bring this up too. >> +static u32 hbl_en_get_mtu(struct hbl_aux_dev *aux_dev, u32 port_idx) >> +{ >> + struct hbl_en_port *port = HBL_EN_PORT(aux_dev, port_idx); >> + struct net_device *ndev = port->ndev; >> + u32 mtu; >> + >> + if (atomic_cmpxchg(&port->in_reset, 0, 1)) { >> + netdev_err(ndev, "port is in reset, can't get MTU\n"); >> + return 0; >> + } >> + >> + mtu = ndev->mtu; > > I think you need a better error message. All this does is access > ndev->mtu. What does it matter if the port is in reset? You don't > access it. > This function is called from the CN driver to get the current MTU in order to configure it to the HW, for exmaple when configuring an IB QP. The MTU value might be changed by user while we execute this function. Such an MTU change requires port reset. Hence, if the port is under reset we cannot be sure what is the MTU value. Since the user should not change the MTU while QPs are being configured (but we cannot block this flow either), we report an error because the MTU value cannot be retrieved. The other option to read the MTU value without checking for an in-progress reset flow but in that case the MTU value might be incorrect. >> +static int hbl_en_close(struct net_device *netdev) >> +{ >> + struct hbl_en_port *port = hbl_netdev_priv(netdev); >> + struct hbl_en_device *hdev = port->hdev; >> + ktime_t timeout; >> + >> + /* Looks like the return value of this function is not checked, so we can't just return >> + * EBUSY if the port is under reset. We need to wait until the reset is finished and then >> + * close the port. Otherwise the netdev will set the port as closed although port_close() >> + * wasn't called. Only if we waited long enough and the reset hasn't finished, we can return >> + * an error without actually closing the port as it is a fatal flow anyway. >> + */ >> + timeout = ktime_add_ms(ktime_get(), PORT_RESET_TIMEOUT_MSEC); >> + while (atomic_cmpxchg(&port->in_reset, 0, 1)) { >> + /* If this is called from unregister_netdev() then the port was already closed and >> + * hence we can safely return. >> + * We could have just check the port_open boolean, but that might hide some future >> + * bugs. Hence it is better to use a dedicated flag for that. >> + */ >> + if (READ_ONCE(hdev->in_teardown)) >> + return 0; >> + >> + usleep_range(50, 200); >> + if (ktime_compare(ktime_get(), timeout) > 0) { >> + netdev_crit(netdev, >> + "Timeout while waiting for port to finish reset, can't close it\n" >> + ); >> + return -EBUSY; >> + } > > This has the usual bug. Please look at include/linux/iopoll.h. > I'll take a look, thanks. >> + timeout = ktime_add_ms(ktime_get(), PORT_RESET_TIMEOUT_MSEC); >> + while (atomic_cmpxchg(&port->in_reset, 0, 1)) { >> + usleep_range(50, 200); >> + if (ktime_compare(ktime_get(), timeout) > 0) { >> + netdev_crit(port->ndev, >> + "Timeout while waiting for port %d to finish reset\n", >> + port->idx); >> + break; >> + } >> + } > > and again. Don't roll your own timeout loops like this, use the core > version. > I will look for some core alternative. >> +static int hbl_en_change_mtu(struct net_device *netdev, int new_mtu) >> +{ >> + struct hbl_en_port *port = hbl_netdev_priv(netdev); >> + int rc = 0; >> + >> + if (atomic_cmpxchg(&port->in_reset, 0, 1)) { >> + netdev_err(netdev, "port is in reset, can't change MTU\n"); >> + return -EBUSY; >> + } >> + >> + if (netif_running(port->ndev)) { >> + hbl_en_port_close(port); >> + >> + /* Sleep in order to let obsolete events to be dropped before re-opening the port */ >> + msleep(20); >> + >> + netdev->mtu = new_mtu; >> + >> + rc = hbl_en_port_open(port); >> + if (rc) >> + netdev_err(netdev, "Failed to reinit port for MTU change, rc %d\n", rc); > > Does that mean the port is FUBAR? > > Most operations like this are expected to roll back to the previous > working configuration on failure. So if changing the MTU requires new > buffers in your ring, you should first allocate the new buffers, then > free the old buffers, so that if allocation fails, you still have > buffers, and the device can continue operating. > A failure in opening a port is a fatal error. It shouldn't happen. This is not something we wish to recover from. This kind of an error indicates a severe system error that will usually require a driver removal and reload anyway. >> +module_param(poll_enable, bool, 0444); >> +MODULE_PARM_DESC(poll_enable, >> + "Enable Rx polling rather than IRQ + NAPI (0 = no, 1 = yes, default: no)"); > > Module parameters are not liked. This probably needs to go away. > I see that various vendors under net/ethernet/* use module parameters. Can't we add another one? >> +static int hbl_en_ethtool_get_module_info(struct net_device *ndev, struct ethtool_modinfo *modinfo) >> +{ >> + modinfo->eeprom_len = ETH_MODULE_SFF_8636_LEN; >> + modinfo->type = ETH_MODULE_SFF_8636; > > Is this an SFF, not an SFP? How else can you know what module it is > without doing an I2C transfer to ask the module what it is? > The current type is SFF and it is unlikely to be changed. >> +static int hbl_en_ethtool_get_module_eeprom(struct net_device *ndev, struct ethtool_eeprom *ee, >> + u8 *data) >> +{ > > This is the old API. Please update to the new API so there is access > to all the pages of the SFF/SFP. > Are you referring to get_module_eeprom_by_page()? if so, then it is not supported by our FW, we read the entire data on device load. However, I can hide that behind the new API and return only the requested page if that's the intention. >> +static int hbl_en_ethtool_get_link_ksettings(struct net_device *ndev, >> + struct ethtool_link_ksettings *cmd) >> +{ >> + struct hbl_en_aux_ops *aux_ops; >> + struct hbl_aux_dev *aux_dev; >> + struct hbl_en_device *hdev; >> + struct hbl_en_port *port; >> + u32 port_idx, speed; >> + >> + port = hbl_netdev_priv(ndev); >> + hdev = port->hdev; >> + port_idx = port->idx; >> + aux_dev = hdev->aux_dev; >> + aux_ops = aux_dev->aux_ops; >> + speed = aux_ops->get_speed(aux_dev, port_idx); >> + >> + cmd->base.speed = speed; >> + cmd->base.duplex = DUPLEX_FULL; >> + >> + ethtool_link_ksettings_zero_link_mode(cmd, supported); >> + ethtool_link_ksettings_zero_link_mode(cmd, advertising); >> + >> + switch (speed) { >> + case SPEED_100000: >> + ethtool_link_ksettings_add_link_mode(cmd, supported, 100000baseCR4_Full); >> + ethtool_link_ksettings_add_link_mode(cmd, supported, 100000baseSR4_Full); >> + ethtool_link_ksettings_add_link_mode(cmd, supported, 100000baseKR4_Full); >> + ethtool_link_ksettings_add_link_mode(cmd, supported, 100000baseLR4_ER4_Full); >> + >> + ethtool_link_ksettings_add_link_mode(cmd, advertising, 100000baseCR4_Full); >> + ethtool_link_ksettings_add_link_mode(cmd, advertising, 100000baseSR4_Full); >> + ethtool_link_ksettings_add_link_mode(cmd, advertising, 100000baseKR4_Full); >> + ethtool_link_ksettings_add_link_mode(cmd, advertising, 100000baseLR4_ER4_Full); >> + >> + cmd->base.port = PORT_FIBRE; >> + >> + ethtool_link_ksettings_add_link_mode(cmd, supported, FIBRE); >> + ethtool_link_ksettings_add_link_mode(cmd, advertising, FIBRE); >> + >> + ethtool_link_ksettings_add_link_mode(cmd, supported, Backplane); >> + ethtool_link_ksettings_add_link_mode(cmd, advertising, Backplane); >> + break; >> + case SPEED_50000: >> + ethtool_link_ksettings_add_link_mode(cmd, supported, 50000baseSR2_Full); >> + ethtool_link_ksettings_add_link_mode(cmd, supported, 50000baseCR2_Full); >> + ethtool_link_ksettings_add_link_mode(cmd, supported, 50000baseKR2_Full); >> + >> + ethtool_link_ksettings_add_link_mode(cmd, advertising, 50000baseSR2_Full); >> + ethtool_link_ksettings_add_link_mode(cmd, advertising, 50000baseCR2_Full); >> + ethtool_link_ksettings_add_link_mode(cmd, advertising, 50000baseKR2_Full); >> + break; >> + case SPEED_25000: >> + ethtool_link_ksettings_add_link_mode(cmd, supported, 25000baseCR_Full); >> + >> + ethtool_link_ksettings_add_link_mode(cmd, advertising, 25000baseCR_Full); >> + break; >> + case SPEED_200000: >> + ethtool_link_ksettings_add_link_mode(cmd, supported, 200000baseCR4_Full); >> + ethtool_link_ksettings_add_link_mode(cmd, supported, 200000baseKR4_Full); >> + >> + ethtool_link_ksettings_add_link_mode(cmd, advertising, 200000baseCR4_Full); >> + ethtool_link_ksettings_add_link_mode(cmd, advertising, 200000baseKR4_Full); >> + break; >> + case SPEED_400000: >> + ethtool_link_ksettings_add_link_mode(cmd, supported, 400000baseCR4_Full); >> + ethtool_link_ksettings_add_link_mode(cmd, supported, 400000baseKR4_Full); >> + >> + ethtool_link_ksettings_add_link_mode(cmd, advertising, 400000baseCR4_Full); >> + ethtool_link_ksettings_add_link_mode(cmd, advertising, 400000baseKR4_Full); >> + break; >> + default: >> + netdev_err(port->ndev, "unknown speed %d\n", speed); >> + return -EFAULT; >> + } >> + >> + ethtool_link_ksettings_add_link_mode(cmd, supported, Autoneg); >> + >> + if (port->auto_neg_enable) { >> + ethtool_link_ksettings_add_link_mode(cmd, advertising, Autoneg); >> + cmd->base.autoneg = AUTONEG_ENABLE; >> + if (port->auto_neg_resolved) >> + ethtool_link_ksettings_add_link_mode(cmd, lp_advertising, Autoneg); > > That looks odd. Care to explain? > The HW of all of our ports supports autoneg. But in addition, the ports are divided to two groups: internal: ports which are connected to other Gaudi2 ports in the same server. external: ports which are connected to an external switch. Only internal ports use autoneg. The ports mask which sets each port as internal/external is fetched from the FW on device load. >> + } else { >> + cmd->base.autoneg = AUTONEG_DISABLE; >> + } >> + >> + ethtool_link_ksettings_add_link_mode(cmd, supported, Pause); >> + >> + if (port->pfc_enable) >> + ethtool_link_ksettings_add_link_mode(cmd, advertising, Pause); > > And is suspect that is wrong. Everybody gets pause wrong. Please > double check my previous posts about pause. > Our HW supports Pause frames. But, PFC can be disabled via lldptool for exmaple, so we won't advertise it. I'll try to find more info about it, but can you please share what's wrong with the curent code? BTW I will change it to Asym_Pause as we support Tx pause frames as well. >> + if (auto_neg && !(hdev->auto_neg_mask & BIT(port_idx))) { >> + netdev_err(port->ndev, "port autoneg is disabled by BMC\n"); >> + rc = -EFAULT; >> + goto out; > > Don't say you support autoneg in supported if that is the case. > > And EFAULT is about memory problems. EINVAL, maybe EPERM? or > EOPNOTSUPP. > > Andrew Yeah, should be switched to EPERM/EOPNOTSUPP. Regarding the support of autoneg - the HW supports autoneg but it might be disabled by the FW. Hence we might not be able to switch it on.
