| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Thu, 12 Dec 2019 06:53:42 +0000
From: Parav Pandit <parav@...lanox.com>
To: Shannon Nelson <snelson@...sando.io>,
"netdev@...r.kernel.org" <netdev@...r.kernel.org>,
"davem@...emloft.net" <davem@...emloft.net>
Subject: Re: [PATCH v2 net-next 2/2] ionic: support sr-iov operations
On 12/11/2019 6:33 PM, Shannon Nelson wrote:
> Add the netdev ops for managing VFs. Since most of the
> management work happens in the NIC firmware, the driver becomes
> mostly a pass-through for the network stack commands that want
> to control and configure the VFs.
>
> We also tweak ionic_station_set() a little to allow for
> the VFs that start off with a zero'd mac address.
>
> Signed-off-by: Shannon Nelson <snelson@...sando.io>
> ---
> drivers/net/ethernet/pensando/ionic/ionic.h | 15 +-
> .../ethernet/pensando/ionic/ionic_bus_pci.c | 85 ++++++
> .../net/ethernet/pensando/ionic/ionic_dev.c | 58 ++++
> .../net/ethernet/pensando/ionic/ionic_dev.h | 7 +
> .../net/ethernet/pensando/ionic/ionic_lif.c | 254 +++++++++++++++++-
> .../net/ethernet/pensando/ionic/ionic_lif.h | 7 +
> .../net/ethernet/pensando/ionic/ionic_main.c | 4 +
> 7 files changed, 422 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/net/ethernet/pensando/ionic/ionic.h b/drivers/net/ethernet/pensando/ionic/ionic.h
> index 98e102af7756..e5c9e4b0450b 100644
> --- a/drivers/net/ethernet/pensando/ionic/ionic.h
> +++ b/drivers/net/ethernet/pensando/ionic/ionic.h
> @@ -12,7 +12,7 @@ struct ionic_lif;
>
> #define IONIC_DRV_NAME "ionic"
> #define IONIC_DRV_DESCRIPTION "Pensando Ethernet NIC Driver"
> -#define IONIC_DRV_VERSION "0.18.0-k"
> +#define IONIC_DRV_VERSION "0.20.0-k"
>
> #define PCI_VENDOR_ID_PENSANDO 0x1dd8
>
> @@ -25,6 +25,18 @@ struct ionic_lif;
>
> #define DEVCMD_TIMEOUT 10
>
> +struct ionic_vf {
> + u16 index;
> + u8 macaddr[6];
> + __le32 maxrate;
> + __le16 vlanid;
> + u8 spoofchk;
> + u8 trusted;
> + u8 linkstate;
> + dma_addr_t stats_pa;
> + struct ionic_lif_stats stats;
> +};
> +
> struct ionic {
> struct pci_dev *pdev;
> struct device *dev;
> @@ -46,6 +58,7 @@ struct ionic {
> DECLARE_BITMAP(intrs, IONIC_INTR_CTRL_REGS_MAX);
> struct work_struct nb_work;
> struct notifier_block nb;
> + struct ionic_vf **vf;
> struct timer_list watchdog_timer;
> int watchdog_period;
> };
> diff --git a/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c b/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c
> index 9a9ab8cb2cb3..057eb453dd11 100644
> --- a/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c
> +++ b/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c
> @@ -250,6 +250,87 @@ static int ionic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
> return err;
> }
>
> +static int ionic_sriov_configure(struct pci_dev *pdev, int num_vfs)
> +{
> + struct ionic *ionic = pci_get_drvdata(pdev);
> + struct device *dev = ionic->dev;
> + int i, ret = 0;
> + int nvfs = 0;
> +
> + if (test_and_set_bit(IONIC_LIF_VF_OP, ionic->master_lif->state)) {
Nop. This is not correct.
User space doesn't retry the command when you throw an error as EAGAIN.
These are not file system calls.
As I told in v1, you need rwsem here without below warning messages all
over the ops.
> + dev_warn(&pdev->dev, "Unable to configure VFs, other operation is pending.\n");
> + return -EAGAIN;
> + }
> +
> + if (num_vfs > 0) {
> + ret = pci_enable_sriov(pdev, num_vfs);
> + if (ret) {
> + dev_err(&pdev->dev, "Cannot enable SRIOV: %d\n", ret);
> + goto out;
> + }
> +
> + ionic->vf = kcalloc(num_vfs, sizeof(struct ionic_vf *),
> + GFP_KERNEL);
> + if (!ionic->vf) {
> + pci_disable_sriov(pdev);
> + ret = -ENOMEM;
> + goto out;
> + }
> +
> + for (i = 0; i < num_vfs; i++) {
> + struct ionic_vf *v;
> +
> + v = kzalloc(sizeof(*v), GFP_KERNEL);
> + if (!v) {
> + ret = -ENOMEM;
> + num_vfs = 0;
> + goto remove_vfs;
> + }
> +
> + v->stats_pa = dma_map_single(dev, &v->stats,
> + sizeof(v->stats),
> + DMA_FROM_DEVICE);
> + if (dma_mapping_error(dev, v->stats_pa)) {
> + ret = -ENODEV;
> + kfree(v);
> + ionic->vf[i] = NULL;
> + num_vfs = 0;
> + goto remove_vfs;
> + }
> +
> + ionic->vf[i] = v;
> + nvfs++;
No need for this extra nvfs. Run the loop from i to 0 in reverse order
in error unwinding.
> + }
> +
> + ret = num_vfs;
> + goto out;
> + }
> +
> +remove_vfs:
> + if (num_vfs == 0) {
> + if (ret)
> + dev_err(&pdev->dev, "SRIOV setup failed: %d\n", ret);
> +
> + pci_disable_sriov(pdev);
> +
> + if (!nvfs)
> + nvfs = pci_num_vf(pdev);
> + for (i = 0; i < nvfs; i++) {
error unwinding should be reverse of setup. It should run from i to 0.
> + dma_unmap_single(dev, ionic->vf[i]->stats_pa,
> + sizeof(struct ionic_lif_stats),
Please be consistent with dma_map_single which uses sizeof(v->stats).
> + DMA_FROM_DEVICE);
> + kfree(ionic->vf[i]);
> + }
> +
> + kfree(ionic->vf);
> + ionic->vf = NULL;
> + }
> +
> +out:
> + clear_bit(IONIC_LIF_VF_OP, ionic->master_lif->state);
> + return ret;
> +}
> +
> static void ionic_remove(struct pci_dev *pdev)
> {
> struct ionic *ionic = pci_get_drvdata(pdev);
> @@ -257,6 +338,9 @@ static void ionic_remove(struct pci_dev *pdev)
> if (!ionic)
> return;
>
> + if (pci_num_vf(pdev))
> + ionic_sriov_configure(pdev, 0);
> +
Usually sriov is left enabled while removing PF.
It is not the role of the pci PF removal to disable it sriov.
Powered by blists - more mailing lists