| 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: <20220922175821.4184622-11-andrew@lunn.ch>
Date: Thu, 22 Sep 2022 19:58:21 +0200
From: Andrew Lunn <andrew@...n.ch>
To: netdev <netdev@...r.kernel.org>
Cc: mattias.forsblad@...il.com,
Florian Fainelli <f.fainelli@...il.com>,
Vladimir Oltean <vladimir.oltean@....com>,
Christian Marangi <ansuelsmth@...il.com>,
Andrew Lunn <andrew@...n.ch>
Subject: [PATCH rfc v2 10/10] net: dsa: qca8: Move inband mutex into DSA core
The mutex serves two purposes:
It serialises operations on the switch, so that only one
request/response can be happening at once.
It protects priv->mgmt_master, which itself has two purposes. If the
hardware is wrongly wired, the wrong switch port is connected to the
cpu, inband cannot be used. In this case it has the value
NULL. Additionally, if the master is down, it is set to NULL.
Otherwise it points to the netdev used to send frames to the switch.
The protection of priv->mgmt_master is not required. It is a single
pointer, which will be updated atomically. It is not expected that the
interface disappears, it only goes down. Hence mgmt_master will always
be valid, or NULL.
Move the check for the master device being NULL into the core. Also,
move the mutex for serialisation into the core.
The MIB operations don't follow request/response semantics, so its
mutex is left untouched.
Signed-off-by: Andrew Lunn <andrew@...n.ch>
---
drivers/net/dsa/qca/qca8k-8xxx.c | 65 +++++---------------------------
drivers/net/dsa/qca/qca8k.h | 1 -
include/net/dsa.h | 4 ++
net/dsa/dsa.c | 7 ++++
4 files changed, 21 insertions(+), 56 deletions(-)
diff --git a/drivers/net/dsa/qca/qca8k-8xxx.c b/drivers/net/dsa/qca/qca8k-8xxx.c
index e0dc6dbafefe..d35f813e0024 100644
--- a/drivers/net/dsa/qca/qca8k-8xxx.c
+++ b/drivers/net/dsa/qca/qca8k-8xxx.c
@@ -238,15 +238,6 @@ static int qca8k_read_eth(struct qca8k_priv *priv, u32 reg, u32 *val, int len)
if (!skb)
return -ENOMEM;
- mutex_lock(&mgmt_eth_data->mutex);
-
- /* Check mgmt_master if is operational */
- if (!priv->mgmt_master) {
- kfree_skb(skb);
- mutex_unlock(&mgmt_eth_data->mutex);
- return -EINVAL;
- }
-
skb->dev = priv->mgmt_master;
ret = dsa_inband_request(&mgmt_eth_data->inband, skb,
@@ -254,48 +245,31 @@ static int qca8k_read_eth(struct qca8k_priv *priv, u32 reg, u32 *val, int len)
&data, sizeof(data),
QCA8K_ETHERNET_TIMEOUT);
if (ret < 0)
- goto out;
+ return ret;
*val = data[0];
if (len > QCA_HDR_MGMT_DATA1_LEN)
memcpy(val + 1, &data[1], len - QCA_HDR_MGMT_DATA1_LEN);
-out:
- mutex_unlock(&mgmt_eth_data->mutex);
-
- return ret;
+ return 0;
}
static int qca8k_write_eth(struct qca8k_priv *priv, u32 reg, u32 *val, int len)
{
struct qca8k_mgmt_eth_data *mgmt_eth_data = &priv->mgmt_eth_data;
struct sk_buff *skb;
- int ret;
skb = qca8k_alloc_mdio_header(MDIO_WRITE, reg, val,
QCA8K_ETHERNET_MDIO_PRIORITY, len);
if (!skb)
return -ENOMEM;
- mutex_lock(&mgmt_eth_data->mutex);
-
- /* Check mgmt_master if is operational */
- if (!priv->mgmt_master) {
- kfree_skb(skb);
- mutex_unlock(&mgmt_eth_data->mutex);
- return -EINVAL;
- }
-
skb->dev = priv->mgmt_master;
- ret = dsa_inband_request(&mgmt_eth_data->inband, skb,
- qca8k_mdio_header_fill_seq_num,
- NULL, 0,
- QCA8K_ETHERNET_TIMEOUT);
-
- mutex_unlock(&mgmt_eth_data->mutex);
-
- return ret;
+ return dsa_inband_request(&mgmt_eth_data->inband, skb,
+ qca8k_mdio_header_fill_seq_num,
+ NULL, 0,
+ QCA8K_ETHERNET_TIMEOUT);
}
static int
@@ -441,7 +415,6 @@ qca8k_phy_eth_command(struct qca8k_priv *priv, bool read, int phy,
struct sk_buff *write_skb, *clear_skb, *read_skb;
struct qca8k_mgmt_eth_data *mgmt_eth_data;
u32 write_val, clear_val = 0, val;
- struct net_device *mgmt_master;
u32 resp_data[4];
int ret, ret1;
@@ -487,19 +460,9 @@ qca8k_phy_eth_command(struct qca8k_priv *priv, bool read, int phy,
* 3. Get the data if we are reading
* 4. Reset the mdio master (even with error)
*/
- mutex_lock(&mgmt_eth_data->mutex);
-
- /* Check if mgmt_master is operational */
- mgmt_master = priv->mgmt_master;
- if (!mgmt_master) {
- mutex_unlock(&mgmt_eth_data->mutex);
- ret = -EINVAL;
- goto err_mgmt_master;
- }
-
- read_skb->dev = mgmt_master;
- clear_skb->dev = mgmt_master;
- write_skb->dev = mgmt_master;
+ read_skb->dev = priv->mgmt_master;
+ clear_skb->dev = priv->mgmt_master;
+ write_skb->dev = priv->mgmt_master;
ret = dsa_inband_request(&mgmt_eth_data->inband, write_skb,
qca8k_mdio_header_fill_seq_num,
@@ -542,13 +505,8 @@ qca8k_phy_eth_command(struct qca8k_priv *priv, bool read, int phy,
NULL, 0,
QCA8K_ETHERNET_TIMEOUT);
- mutex_unlock(&mgmt_eth_data->mutex);
-
- return ret;
+ return 0;
- /* Error handling before lock */
-err_mgmt_master:
- kfree_skb(read_skb);
err_read_skb:
kfree_skb(clear_skb);
err_clear_skb:
@@ -1530,13 +1488,11 @@ qca8k_master_change(struct dsa_switch *ds, const struct net_device *master,
if (dp->index != 0)
return;
- mutex_lock(&priv->mgmt_eth_data.mutex);
mutex_lock(&priv->mib_eth_data.mutex);
priv->mgmt_master = operational ? (struct net_device *)master : NULL;
mutex_unlock(&priv->mib_eth_data.mutex);
- mutex_unlock(&priv->mgmt_eth_data.mutex);
}
static int qca8k_connect_tag_protocol(struct dsa_switch *ds,
@@ -1854,7 +1810,6 @@ qca8k_sw_probe(struct mdio_device *mdiodev)
if (!priv->ds)
return -ENOMEM;
- mutex_init(&priv->mgmt_eth_data.mutex);
dsa_inband_init(&priv->mgmt_eth_data.inband, U32_MAX);
mutex_init(&priv->mib_eth_data.mutex);
diff --git a/drivers/net/dsa/qca/qca8k.h b/drivers/net/dsa/qca/qca8k.h
index e58cd7a5f91a..fe7928bccbf0 100644
--- a/drivers/net/dsa/qca/qca8k.h
+++ b/drivers/net/dsa/qca/qca8k.h
@@ -347,7 +347,6 @@ enum {
struct qca8k_mgmt_eth_data {
struct dsa_inband inband;
- struct mutex mutex; /* Enforce one mdio read/write at time */
};
struct qca8k_mib_eth_data {
diff --git a/include/net/dsa.h b/include/net/dsa.h
index 7450f413b709..81cec156564d 100644
--- a/include/net/dsa.h
+++ b/include/net/dsa.h
@@ -1311,8 +1311,12 @@ bool dsa_mdb_present_in_other_db(struct dsa_switch *ds, int port,
* If there is a thread waiting for the response, resp will point to a
* buffer to copy the response to. If the thread has given up waiting,
* resp will be a NULL pointer.
+ *
+ * The mutex is used to serialise all inband operations. It also protects
+ * the seqno, which is incremented while holding the lock.
*/
struct dsa_inband {
+ struct mutex lock; /* Serialise operations */
struct completion completion;
u32 seqno;
u32 seqno_mask;
diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index fc7be84dbafb..5596cdcd9a5a 100644
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@ -521,6 +521,7 @@ EXPORT_SYMBOL_GPL(dsa_mdb_present_in_other_db);
void dsa_inband_init(struct dsa_inband *inband, u32 seqno_mask)
{
init_completion(&inband->completion);
+ mutex_init(&inband->lock);
spin_lock_init(&inband->resp_lock);
inband->seqno_mask = seqno_mask;
inband->seqno = 0;
@@ -566,6 +567,11 @@ int dsa_inband_request(struct dsa_inband *inband, struct sk_buff *skb,
inband->err = 0;
+ if (!skb->dev)
+ return -EOPNOTSUPP;
+
+ mutex_lock(&inband->lock);
+
spin_lock(&inband->resp_lock);
inband->resp = resp;
inband->resp_len = resp_len;
@@ -586,6 +592,7 @@ int dsa_inband_request(struct dsa_inband *inband, struct sk_buff *skb,
inband->resp = NULL;
inband->resp_len = 0;
spin_unlock(&inband->resp_lock);
+ mutex_unlock(&inband->lock);
if (ret == 0)
return -ETIMEDOUT;
--
2.37.2
Powered by blists - more mailing lists