This provides a way to {get|set} whether loopback-ism device supports
merging sndbuf with peer DMB to eliminate data copies between them.
echo 0 > /sys/devices/virtual/smc/loopback-ism/dmb_copy # support
echo 1 > /sys/devices/virtual/smc/loopback-ism/dmb_copy # not support
The settings take effect after re-activating loopback-ism by:
echo 0 > /sys/devices/virtual/smc/loopback-ism/active
echo 1 > /sys/devices/virtual/smc/loopback-ism/active
After this, the link group related to loopback-ism will be flushed and
the sndbufs of subsequent connections will be merged or not merged with
peer DMB.
The motivation of this control is that the bandwidth will be highly
improved when sndbuf and DMB are merged, but when virtually contiguous
DMB is provided and merged with sndbuf, it will be concurrently accessed
on Tx and Rx, then there will be a bottleneck caused by lock contention
of find_vmap_area when there are many CPUs and CONFIG_HARDENED_USERCOPY
is set (see link below). So an option is provided.
Link: https://lore.kernel.org/all/238e63cd-e0e8-4fbf-852f-bc4d5bc35d5a@xxxxxxxxxxxxxxxxx/
Signed-off-by: Wen Gu <guwen@xxxxxxxxxxxxxxxxx>
---
net/smc/smc_loopback.c | 46 ++++++++++++++++++++++++++++++++++++++++++
net/smc/smc_loopback.h | 8 +++++++-
2 files changed, 53 insertions(+), 1 deletion(-)
diff --git a/net/smc/smc_loopback.c b/net/smc/smc_loopback.c
index 2e734f8e08f5..bfbb346ef01a 100644
--- a/net/smc/smc_loopback.c
+++ b/net/smc/smc_loopback.c
@@ -26,6 +26,7 @@
static const char smc_lo_dev_name[] = "loopback-ism";
static unsigned int smc_lo_dmb_type = SMC_LO_DMB_PHYS;
+static unsigned int smc_lo_dmb_copy = SMC_LO_DMB_NOCOPY;
static struct smc_lo_dev *lo_dev;
static struct class *smc_class;
@@ -167,9 +168,52 @@ static ssize_t dmb_type_store(struct device *dev,
return count;
}
static DEVICE_ATTR_RW(dmb_type);
+
+static ssize_t dmb_copy_show(struct device *dev,
+ struct device_attribute *attr, char *buf)
+{
+ struct smc_lo_dev *ldev =
+ container_of(dev, struct smc_lo_dev, dev);
+ const char *copy;
+
+ switch (ldev->dmb_copy) {
+ case SMC_LO_DMB_NOCOPY:
+ copy = "sndbuf and DMB merged and no data copied";
+ break;
+ case SMC_LO_DMB_COPY:
+ copy = "sndbuf and DMB separated and data copied";
+ break;
+ default:
+ copy = "Unknown setting";
+ }
+
+ return sysfs_emit(buf, "%d: %s\n", ldev->dmb_copy, copy);
+}
+
+static ssize_t dmb_copy_store(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t count)
+{
+ unsigned int dmb_copy;
+ int ret;
+
+ ret = kstrtouint(buf, 0, &dmb_copy);
+ if (ret)
+ return ret;
+
+ if (dmb_copy != SMC_LO_DMB_NOCOPY &&
+ dmb_copy != SMC_LO_DMB_COPY)
+ return -EINVAL;
+
+ smc_lo_dmb_copy = dmb_copy; /* re-activate to take effect */
+ return count;
+}
+static DEVICE_ATTR_RW(dmb_copy);
+
static struct attribute *smc_lo_attrs[] = {
&dev_attr_active.attr,
&dev_attr_dmb_type.attr,
+ &dev_attr_dmb_copy.attr,
&dev_attr_xfer_bytes.attr,
&dev_attr_dmbs_cnt.attr,
NULL,
@@ -451,6 +495,7 @@ static int smcd_lo_register_dev(struct smc_lo_dev *ldev)
smcd->priv = ldev;
smc_ism_set_v2_capable();
ldev->dmb_type = smc_lo_dmb_type;
+ ldev->dmb_copy = smc_lo_dmb_copy;
mutex_lock(&smcd_dev_list.mutex);
list_add(&smcd->list, &smcd_dev_list.list);
mutex_unlock(&smcd_dev_list.mutex);
@@ -475,6 +520,7 @@ static void smcd_lo_unregister_dev(struct smc_lo_dev *ldev)
kfree(smcd->conn);
kfree(smcd);
ldev->dmb_type = smc_lo_dmb_type;
+ ldev->dmb_copy = smc_lo_dmb_copy;
smc_lo_clear_stats(ldev);
}
diff --git a/net/smc/smc_loopback.h b/net/smc/smc_loopback.h
index 8ee5c6805fc4..7ecb4a35eb36 100644
--- a/net/smc/smc_loopback.h
+++ b/net/smc/smc_loopback.h
@@ -28,6 +28,11 @@ enum {
SMC_LO_DMB_VIRT,
};
+enum {
+ SMC_LO_DMB_NOCOPY,
+ SMC_LO_DMB_COPY,
+};
+
struct smc_lo_dmb_node {
struct hlist_node list;
u64 token;
@@ -45,7 +50,8 @@ struct smc_lo_dev_stats64 {
struct smc_lo_dev {
struct smcd_dev *smcd;
struct device dev;
- u8 active;
+ u8 active : 1;
+ u8 dmb_copy : 1;
u8 dmb_type;
u16 chid;
struct smcd_gid local_gid;
--
2.32.0.3.g01195cf9f
