mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2025-01-04 12:54:37 +08:00
c54f042dcc
Michael reports that after the blamed patch, unbinding a VF would cause
these transactions to remain pending, and trigger some warnings with the
DMA API debug:
$ echo 1 > /sys/bus/pci/devices/0000\:00\:00.0/sriov_numvfs
pci 0000:00:01.0: [1957:ef00] type 00 class 0x020001
fsl_enetc_vf 0000:00:01.0: Adding to iommu group 19
fsl_enetc_vf 0000:00:01.0: enabling device (0000 -> 0002)
fsl_enetc_vf 0000:00:01.0 eno0vf0: renamed from eth0
$ echo 0 > /sys/bus/pci/devices/0000\:00\:00.0/sriov_numvfs
DMA-API: pci 0000:00:01.0: device driver has pending DMA allocations while released from device [count=1]
One of leaked entries details: [size=2048 bytes] [mapped with DMA_BIDIRECTIONAL] [mapped as coherent]
WARNING: CPU: 0 PID: 2547 at kernel/dma/debug.c:853 dma_debug_device_change+0x174/0x1c8
(...)
Call trace:
dma_debug_device_change+0x174/0x1c8
blocking_notifier_call_chain+0x74/0xa8
device_release_driver_internal+0x18c/0x1f0
device_release_driver+0x20/0x30
pci_stop_bus_device+0x8c/0xe8
pci_stop_and_remove_bus_device+0x20/0x38
pci_iov_remove_virtfn+0xb8/0x128
sriov_disable+0x3c/0x110
pci_disable_sriov+0x24/0x30
enetc_sriov_configure+0x4c/0x108
sriov_numvfs_store+0x11c/0x198
(...)
DMA-API: Mapped at:
dma_entry_alloc+0xa4/0x130
debug_dma_alloc_coherent+0xbc/0x138
dma_alloc_attrs+0xa4/0x108
enetc_setup_cbdr+0x4c/0x1d0
enetc_vf_probe+0x11c/0x250
pci 0000:00:01.0: Removing from iommu group 19
This happens because stupid me moved enetc_teardown_cbdr outside of
enetc_free_si_resources, but did not bother to keep calling
enetc_teardown_cbdr from all the places where enetc_free_si_resources
was called. In particular, now it is no longer called from the main
unbind function, just from the probe error path.
Fixes: 4b47c0b81f
("net: enetc: don't initialize unused ports from a separate code path")
Reported-by: Michael Walle <michael@walle.cc>
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Tested-by: Michael Walle <michael@walle.cc>
Signed-off-by: David S. Miller <davem@davemloft.net>
249 lines
5.7 KiB
C
249 lines
5.7 KiB
C
// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
|
|
/* Copyright 2017-2019 NXP */
|
|
|
|
#include <linux/module.h>
|
|
#include "enetc.h"
|
|
|
|
#define ENETC_DRV_NAME_STR "ENETC VF driver"
|
|
|
|
/* Messaging */
|
|
static void enetc_msg_vsi_write_msg(struct enetc_hw *hw,
|
|
struct enetc_msg_swbd *msg)
|
|
{
|
|
u32 val;
|
|
|
|
val = enetc_vsi_set_msize(msg->size) | lower_32_bits(msg->dma);
|
|
enetc_wr(hw, ENETC_VSIMSGSNDAR1, upper_32_bits(msg->dma));
|
|
enetc_wr(hw, ENETC_VSIMSGSNDAR0, val);
|
|
}
|
|
|
|
static int enetc_msg_vsi_send(struct enetc_si *si, struct enetc_msg_swbd *msg)
|
|
{
|
|
int timeout = 100;
|
|
u32 vsimsgsr;
|
|
|
|
enetc_msg_vsi_write_msg(&si->hw, msg);
|
|
|
|
do {
|
|
vsimsgsr = enetc_rd(&si->hw, ENETC_VSIMSGSR);
|
|
if (!(vsimsgsr & ENETC_VSIMSGSR_MB))
|
|
break;
|
|
|
|
usleep_range(1000, 2000);
|
|
} while (--timeout);
|
|
|
|
if (!timeout)
|
|
return -ETIMEDOUT;
|
|
|
|
/* check for message delivery error */
|
|
if (vsimsgsr & ENETC_VSIMSGSR_MS) {
|
|
dev_err(&si->pdev->dev, "VSI command execute error: %d\n",
|
|
ENETC_SIMSGSR_GET_MC(vsimsgsr));
|
|
return -EIO;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int enetc_msg_vsi_set_primary_mac_addr(struct enetc_ndev_priv *priv,
|
|
struct sockaddr *saddr)
|
|
{
|
|
struct enetc_msg_cmd_set_primary_mac *cmd;
|
|
struct enetc_msg_swbd msg;
|
|
int err;
|
|
|
|
msg.size = ALIGN(sizeof(struct enetc_msg_cmd_set_primary_mac), 64);
|
|
msg.vaddr = dma_alloc_coherent(priv->dev, msg.size, &msg.dma,
|
|
GFP_KERNEL);
|
|
if (!msg.vaddr) {
|
|
dev_err(priv->dev, "Failed to alloc Tx msg (size: %d)\n",
|
|
msg.size);
|
|
return -ENOMEM;
|
|
}
|
|
|
|
cmd = (struct enetc_msg_cmd_set_primary_mac *)msg.vaddr;
|
|
cmd->header.type = ENETC_MSG_CMD_MNG_MAC;
|
|
cmd->header.id = ENETC_MSG_CMD_MNG_ADD;
|
|
memcpy(&cmd->mac, saddr, sizeof(struct sockaddr));
|
|
|
|
/* send the command and wait */
|
|
err = enetc_msg_vsi_send(priv->si, &msg);
|
|
|
|
dma_free_coherent(priv->dev, msg.size, msg.vaddr, msg.dma);
|
|
|
|
return err;
|
|
}
|
|
|
|
static int enetc_vf_set_mac_addr(struct net_device *ndev, void *addr)
|
|
{
|
|
struct enetc_ndev_priv *priv = netdev_priv(ndev);
|
|
struct sockaddr *saddr = addr;
|
|
|
|
if (!is_valid_ether_addr(saddr->sa_data))
|
|
return -EADDRNOTAVAIL;
|
|
|
|
return enetc_msg_vsi_set_primary_mac_addr(priv, saddr);
|
|
}
|
|
|
|
static int enetc_vf_set_features(struct net_device *ndev,
|
|
netdev_features_t features)
|
|
{
|
|
return enetc_set_features(ndev, features);
|
|
}
|
|
|
|
/* Probing/ Init */
|
|
static const struct net_device_ops enetc_ndev_ops = {
|
|
.ndo_open = enetc_open,
|
|
.ndo_stop = enetc_close,
|
|
.ndo_start_xmit = enetc_xmit,
|
|
.ndo_get_stats = enetc_get_stats,
|
|
.ndo_set_mac_address = enetc_vf_set_mac_addr,
|
|
.ndo_set_features = enetc_vf_set_features,
|
|
.ndo_do_ioctl = enetc_ioctl,
|
|
.ndo_setup_tc = enetc_setup_tc,
|
|
};
|
|
|
|
static void enetc_vf_netdev_setup(struct enetc_si *si, struct net_device *ndev,
|
|
const struct net_device_ops *ndev_ops)
|
|
{
|
|
struct enetc_ndev_priv *priv = netdev_priv(ndev);
|
|
|
|
SET_NETDEV_DEV(ndev, &si->pdev->dev);
|
|
priv->ndev = ndev;
|
|
priv->si = si;
|
|
priv->dev = &si->pdev->dev;
|
|
si->ndev = ndev;
|
|
|
|
priv->msg_enable = (NETIF_MSG_IFUP << 1) - 1;
|
|
ndev->netdev_ops = ndev_ops;
|
|
enetc_set_ethtool_ops(ndev);
|
|
ndev->watchdog_timeo = 5 * HZ;
|
|
ndev->max_mtu = ENETC_MAX_MTU;
|
|
|
|
ndev->hw_features = NETIF_F_SG | NETIF_F_RXCSUM |
|
|
NETIF_F_HW_VLAN_CTAG_TX |
|
|
NETIF_F_HW_VLAN_CTAG_RX;
|
|
ndev->features = NETIF_F_HIGHDMA | NETIF_F_SG | NETIF_F_RXCSUM |
|
|
NETIF_F_HW_VLAN_CTAG_TX |
|
|
NETIF_F_HW_VLAN_CTAG_RX;
|
|
|
|
if (si->num_rss)
|
|
ndev->hw_features |= NETIF_F_RXHASH;
|
|
|
|
/* pick up primary MAC address from SI */
|
|
enetc_get_primary_mac_addr(&si->hw, ndev->dev_addr);
|
|
}
|
|
|
|
static int enetc_vf_probe(struct pci_dev *pdev,
|
|
const struct pci_device_id *ent)
|
|
{
|
|
struct enetc_ndev_priv *priv;
|
|
struct net_device *ndev;
|
|
struct enetc_si *si;
|
|
int err;
|
|
|
|
err = enetc_pci_probe(pdev, KBUILD_MODNAME, 0);
|
|
if (err) {
|
|
dev_err(&pdev->dev, "PCI probing failed\n");
|
|
return err;
|
|
}
|
|
|
|
si = pci_get_drvdata(pdev);
|
|
|
|
enetc_get_si_caps(si);
|
|
|
|
ndev = alloc_etherdev_mq(sizeof(*priv), ENETC_MAX_NUM_TXQS);
|
|
if (!ndev) {
|
|
err = -ENOMEM;
|
|
dev_err(&pdev->dev, "netdev creation failed\n");
|
|
goto err_alloc_netdev;
|
|
}
|
|
|
|
enetc_vf_netdev_setup(si, ndev, &enetc_ndev_ops);
|
|
|
|
priv = netdev_priv(ndev);
|
|
|
|
enetc_init_si_rings_params(priv);
|
|
|
|
err = enetc_setup_cbdr(priv->dev, &si->hw, ENETC_CBDR_DEFAULT_SIZE,
|
|
&si->cbd_ring);
|
|
if (err)
|
|
goto err_setup_cbdr;
|
|
|
|
err = enetc_alloc_si_resources(priv);
|
|
if (err) {
|
|
dev_err(&pdev->dev, "SI resource alloc failed\n");
|
|
goto err_alloc_si_res;
|
|
}
|
|
|
|
err = enetc_configure_si(priv);
|
|
if (err) {
|
|
dev_err(&pdev->dev, "Failed to configure SI\n");
|
|
goto err_config_si;
|
|
}
|
|
|
|
err = enetc_alloc_msix(priv);
|
|
if (err) {
|
|
dev_err(&pdev->dev, "MSIX alloc failed\n");
|
|
goto err_alloc_msix;
|
|
}
|
|
|
|
err = register_netdev(ndev);
|
|
if (err)
|
|
goto err_reg_netdev;
|
|
|
|
netif_carrier_off(ndev);
|
|
|
|
return 0;
|
|
|
|
err_reg_netdev:
|
|
enetc_free_msix(priv);
|
|
err_config_si:
|
|
err_alloc_msix:
|
|
enetc_free_si_resources(priv);
|
|
err_alloc_si_res:
|
|
enetc_teardown_cbdr(&si->cbd_ring);
|
|
err_setup_cbdr:
|
|
si->ndev = NULL;
|
|
free_netdev(ndev);
|
|
err_alloc_netdev:
|
|
enetc_pci_remove(pdev);
|
|
|
|
return err;
|
|
}
|
|
|
|
static void enetc_vf_remove(struct pci_dev *pdev)
|
|
{
|
|
struct enetc_si *si = pci_get_drvdata(pdev);
|
|
struct enetc_ndev_priv *priv;
|
|
|
|
priv = netdev_priv(si->ndev);
|
|
unregister_netdev(si->ndev);
|
|
|
|
enetc_free_msix(priv);
|
|
|
|
enetc_free_si_resources(priv);
|
|
enetc_teardown_cbdr(&si->cbd_ring);
|
|
|
|
free_netdev(si->ndev);
|
|
|
|
enetc_pci_remove(pdev);
|
|
}
|
|
|
|
static const struct pci_device_id enetc_vf_id_table[] = {
|
|
{ PCI_DEVICE(PCI_VENDOR_ID_FREESCALE, ENETC_DEV_ID_VF) },
|
|
{ 0, } /* End of table. */
|
|
};
|
|
MODULE_DEVICE_TABLE(pci, enetc_vf_id_table);
|
|
|
|
static struct pci_driver enetc_vf_driver = {
|
|
.name = KBUILD_MODNAME,
|
|
.id_table = enetc_vf_id_table,
|
|
.probe = enetc_vf_probe,
|
|
.remove = enetc_vf_remove,
|
|
};
|
|
module_pci_driver(enetc_vf_driver);
|
|
|
|
MODULE_DESCRIPTION(ENETC_DRV_NAME_STR);
|
|
MODULE_LICENSE("Dual BSD/GPL");
|