| 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
| ||
|
Message-ID: <20221207145428.31544-2-gautam.dawar@amd.com>
Date: Wed, 7 Dec 2022 20:24:17 +0530
From: Gautam Dawar <gautam.dawar@....com>
To: <linux-net-drivers@....com>, <netdev@...r.kernel.org>,
<jasowang@...hat.com>, <eperezma@...hat.com>
CC: <tanuj.kamde@....com>, <Koushik.Dutta@....com>,
<harpreet.anand@....com>, Gautam Dawar <gautam.dawar@....com>,
Martin Habets <habetsm.xilinx@...il.com>,
Edward Cree <ecree.xilinx@...il.com>,
"David S. Miller" <davem@...emloft.net>,
Eric Dumazet <edumazet@...gle.com>,
"Jakub Kicinski" <kuba@...nel.org>,
Paolo Abeni <pabeni@...hat.com>, <linux-kernel@...r.kernel.org>
Subject: [PATCH net-next 01/11] sfc: add function personality support for EF100 devices
A function personality defines the location and semantics of
registers in the BAR. EF100 NICs allow different personalities
of a PCIe function and changing it at run-time. A total of three
function personalities are defined as of now: EF100, vDPA and
None with EF100 being the default.
For now, vDPA net devices can be created on a EF100 virtual
function and the VF personality will be changed to vDPA in the
process.
Co-developed-by: Martin Habets <habetsm.xilinx@...il.com>
Signed-off-by: Martin Habets <habetsm.xilinx@...il.com>
Signed-off-by: Gautam Dawar <gautam.dawar@....com>
---
drivers/net/ethernet/sfc/ef100.c | 6 +-
drivers/net/ethernet/sfc/ef100_nic.c | 98 +++++++++++++++++++++++++++-
drivers/net/ethernet/sfc/ef100_nic.h | 11 ++++
3 files changed, 111 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/sfc/ef100.c b/drivers/net/ethernet/sfc/ef100.c
index 71aab3d0480f..c1c69783db7b 100644
--- a/drivers/net/ethernet/sfc/ef100.c
+++ b/drivers/net/ethernet/sfc/ef100.c
@@ -429,8 +429,7 @@ static void ef100_pci_remove(struct pci_dev *pci_dev)
if (!efx)
return;
- probe_data = container_of(efx, struct efx_probe_data, efx);
- ef100_remove_netdev(probe_data);
+ efx_ef100_set_bar_config(efx, EF100_BAR_CONFIG_NONE);
#ifdef CONFIG_SFC_SRIOV
efx_fini_struct_tc(efx);
#endif
@@ -443,6 +442,7 @@ static void ef100_pci_remove(struct pci_dev *pci_dev)
pci_disable_pcie_error_reporting(pci_dev);
pci_set_drvdata(pci_dev, NULL);
+ probe_data = container_of(efx, struct efx_probe_data, efx);
efx_fini_struct(efx);
kfree(probe_data);
};
@@ -508,7 +508,7 @@ static int ef100_pci_probe(struct pci_dev *pci_dev,
goto fail;
efx->state = STATE_PROBED;
- rc = ef100_probe_netdev(probe_data);
+ rc = efx_ef100_set_bar_config(efx, EF100_BAR_CONFIG_EF100);
if (rc)
goto fail;
diff --git a/drivers/net/ethernet/sfc/ef100_nic.c b/drivers/net/ethernet/sfc/ef100_nic.c
index ad686c671ab8..a57ec6d5b781 100644
--- a/drivers/net/ethernet/sfc/ef100_nic.c
+++ b/drivers/net/ethernet/sfc/ef100_nic.c
@@ -751,6 +751,99 @@ static int efx_ef100_get_base_mport(struct efx_nic *efx)
}
#endif
+/* BAR configuration.
+ * To change BAR configuration, tear down the current configuration (which
+ * leaves the hardware in the PROBED state), and then initialise the new
+ * BAR state.
+ */
+struct ef100_bar_config_ops {
+ int (*init)(struct efx_probe_data *probe_data);
+ void (*fini)(struct efx_probe_data *probe_data);
+};
+
+static const struct ef100_bar_config_ops bar_config_ops[] = {
+ [EF100_BAR_CONFIG_EF100] = {
+ .init = ef100_probe_netdev,
+ .fini = ef100_remove_netdev
+ },
+#ifdef CONFIG_SFC_VDPA
+ [EF100_BAR_CONFIG_VDPA] = {
+ .init = NULL,
+ .fini = NULL
+ },
+#endif
+ [EF100_BAR_CONFIG_NONE] = {
+ .init = NULL,
+ .fini = NULL
+ },
+};
+
+/* Keep this in sync with the definition of enum ef100_bar_config. */
+static char *bar_config_name[] = {
+ [EF100_BAR_CONFIG_NONE] = "None",
+ [EF100_BAR_CONFIG_EF100] = "EF100",
+ [EF100_BAR_CONFIG_VDPA] = "vDPA",
+};
+
+#ifdef CONFIG_SFC_VDPA
+static bool efx_vdpa_supported(struct efx_nic *efx)
+{
+ return efx->type->is_vf;
+}
+#endif
+
+int efx_ef100_set_bar_config(struct efx_nic *efx,
+ enum ef100_bar_config new_config)
+{
+ const struct ef100_bar_config_ops *old_config_ops;
+ const struct ef100_bar_config_ops *new_config_ops;
+ struct ef100_nic_data *nic_data = efx->nic_data;
+ struct efx_probe_data *probe_data;
+ enum ef100_bar_config old_config;
+ int rc;
+
+ if (WARN_ON_ONCE(nic_data->bar_config > EF100_BAR_CONFIG_VDPA))
+ return -EINVAL;
+
+#ifdef CONFIG_SFC_VDPA
+ /* Current EF100 hardware supports vDPA on VFs only */
+ if (new_config == EF100_BAR_CONFIG_VDPA && !efx_vdpa_supported(efx)) {
+ pci_err(efx->pci_dev, "vdpa over PF not supported : %s",
+ efx->name);
+ return -EOPNOTSUPP;
+ }
+#endif
+ mutex_lock(&nic_data->bar_config_lock);
+ old_config = nic_data->bar_config;
+ if (new_config == old_config) {
+ mutex_unlock(&nic_data->bar_config_lock);
+ return 0;
+ }
+
+ old_config_ops = &bar_config_ops[old_config];
+ new_config_ops = &bar_config_ops[new_config];
+
+ probe_data = container_of(efx, struct efx_probe_data, efx);
+ if (old_config_ops->fini)
+ old_config_ops->fini(probe_data);
+ nic_data->bar_config = EF100_BAR_CONFIG_NONE;
+
+ if (new_config_ops->init) {
+ rc = new_config_ops->init(probe_data);
+ if (rc) {
+ mutex_unlock(&nic_data->bar_config_lock);
+ return rc;
+ }
+ }
+
+ nic_data->bar_config = new_config;
+ pci_dbg(efx->pci_dev, "BAR configuration changed to %s\n",
+ bar_config_name[new_config]);
+ mutex_unlock(&nic_data->bar_config_lock);
+
+ return 0;
+}
+
static int compare_versions(const char *a, const char *b)
{
int a_major, a_minor, a_point, a_patch;
@@ -1004,6 +1097,7 @@ static int ef100_probe_main(struct efx_nic *efx)
return -ENOMEM;
efx->nic_data = nic_data;
nic_data->efx = efx;
+ mutex_init(&nic_data->bar_config_lock);
efx->max_vis = EF100_MAX_VIS;
/* Populate design-parameter defaults */
@@ -1159,8 +1253,10 @@ void ef100_remove(struct efx_nic *efx)
efx_mcdi_detach(efx);
efx_mcdi_fini(efx);
- if (nic_data)
+ if (nic_data) {
efx_nic_free_buffer(efx, &nic_data->mcdi_buf);
+ mutex_destroy(&nic_data->bar_config_lock);
+ }
kfree(nic_data);
efx->nic_data = NULL;
}
diff --git a/drivers/net/ethernet/sfc/ef100_nic.h b/drivers/net/ethernet/sfc/ef100_nic.h
index 0295933145fa..5ed693fbe79f 100644
--- a/drivers/net/ethernet/sfc/ef100_nic.h
+++ b/drivers/net/ethernet/sfc/ef100_nic.h
@@ -61,6 +61,13 @@ enum {
EF100_STAT_COUNT
};
+/* Keep this in sync with the contents of bar_config_name. */
+enum ef100_bar_config {
+ EF100_BAR_CONFIG_NONE,
+ EF100_BAR_CONFIG_EF100,
+ EF100_BAR_CONFIG_VDPA,
+};
+
struct ef100_nic_data {
struct efx_nic *efx;
struct efx_buffer mcdi_buf;
@@ -71,6 +78,8 @@ struct ef100_nic_data {
u16 warm_boot_count;
u8 port_id[ETH_ALEN];
DECLARE_BITMAP(evq_phases, EFX_MAX_CHANNELS);
+ enum ef100_bar_config bar_config;
+ struct mutex bar_config_lock; /* lock to control access to bar config */
u64 stats[EF100_STAT_COUNT];
u32 base_mport;
bool have_mport; /* base_mport was populated successfully */
@@ -88,4 +97,6 @@ int efx_ef100_init_datapath_caps(struct efx_nic *efx);
int ef100_phy_probe(struct efx_nic *efx);
int ef100_filter_table_probe(struct efx_nic *efx);
+int efx_ef100_set_bar_config(struct efx_nic *efx,
+ enum ef100_bar_config new_config);
#endif /* EFX_EF100_NIC_H */
--
2.30.1
Powered by blists - more mailing lists