- Kernel - mailweb.openeuler.org

[PATCH OLK-5.10] roh: Fix ROH multi-BD cmdq issue
by Ke Chen 08 Jun '23

08 Jun '23

driver inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I77OGM --------------------------------------------------------------- When the ROH CMDQ processes multiple BDs, the operations are inconsistent with those in the UM manual. As a result, the CMDQ parses unexpected return values, interrupts the CMDQ processing process, and the ROH MIB statistics query may fail. This patch fix the process method of roh cmdq multiple BDs. Signed-off-by: Ke Chen <chenke54(a)huawei.com> Reviewed-by: Gang Zhang <gang.zhang(a)huawei.com> --- drivers/roh/core/core.c | 35 +----- drivers/roh/core/core.h | 22 +--- drivers/roh/core/core_priv.h | 3 +- drivers/roh/core/sysfs.c | 180 ++++++++++++++++++++----------- drivers/roh/hw/hns3/hns3_cmdq.c | 131 +++++++++++++++------- drivers/roh/hw/hns3/hns3_cmdq.h | 32 +++--- drivers/roh/hw/hns3/hns3_main.c | 10 +- drivers/roh/hw/hns3/hns3_verbs.c | 22 +--- drivers/roh/hw/hns3/hns3_verbs.h | 1 - 9 files changed, 237 insertions(+), 199 deletions(-) diff --git a/drivers/roh/core/core.c b/drivers/roh/core/core.c index 5d27fcbfd..1b8041004 100644 --- a/drivers/roh/core/core.c +++ b/drivers/roh/core/core.c @@ -2,10 +2,10 @@ // Copyright (c) 2022 Hisilicon Limited. #include <linux/pci.h> -#include <net/rtnetlink.h> +#include <linux/inetdevice.h> -#include "core.h" #include "core_priv.h" +#include "core.h" static DEFINE_XARRAY_FLAGS(devices, XA_FLAGS_ALLOC); static DECLARE_RWSEM(devices_rwsem); @@ -193,20 +193,6 @@ static int assign_name(struct roh_device *device) return ret; } -static int setup_device(struct roh_device *device) -{ - int ret; - - /* Query GUID */ - ret = device->ops.query_guid(device, &device->node_guid); - if (ret) { - pr_err("failed to query guid, ret = %d\n", ret); - return ret; - } - - return 0; -} - static void disable_device(struct roh_device *device) { u32 cid; @@ -264,10 +250,8 @@ static int roh_ipv4_event(struct notifier_block *this, unsigned long event, void device = container_of(this, struct roh_device, nb); ndev = ifa->ifa_dev->dev; - if (device->netdev != ndev) { - pr_warn("netdev mismatch.\n"); + if (device->netdev != ndev || event != NETDEV_UP) return NOTIFY_DONE; - } in.sin_addr.s_addr = ifa->ifa_address; @@ -318,12 +302,6 @@ int roh_register_device(struct roh_device *device) return ret; } - ret = setup_device(device); - if (ret) { - pr_err("roh_core: failed to setup device, ret = %d\n", ret); - return ret; - } - dev_set_uevent_suppress(&device->dev, true); ret = device_add(&device->dev); if (ret) { @@ -559,7 +537,7 @@ static int roh_set_pf_mac_by_eid(struct roh_device *device, u32 eid = eid_attr->base; struct net_device *ndev; struct sockaddr s_addr; - u8 mac[ETH_ALEN]; + u8 mac[ETH_ALEN] = {0}; int ret; ndev = device->netdev; @@ -628,11 +606,6 @@ void roh_device_get_eid(struct roh_device *device, struct roh_eid_attr *attr) mutex_unlock(&device->eid_mutex); } -void roh_device_query_guid(struct roh_device *device, struct roh_guid_attr *attr) -{ - memcpy(attr, &device->node_guid, sizeof(*attr)); -} - enum roh_link_status roh_device_query_link_status(struct roh_device *device) { return device->link_status; diff --git a/drivers/roh/core/core.h b/drivers/roh/core/core.h index fd37192eb..11c8a4578 100644 --- a/drivers/roh/core/core.h +++ b/drivers/roh/core/core.h @@ -7,7 +7,7 @@ #include <linux/types.h> #include <linux/workqueue.h> #include <linux/netdevice.h> -#include <net/bonding.h> +#include <linux/etherdevice.h> #define ROH_DEVICE_NAME_MAX 64 #define MAX_DEVICE_REFCOUNT 2 @@ -23,14 +23,9 @@ enum roh_link_status { ROH_LINK_DOWN = 0, ROH_LINK_UP }; enum roh_mib_type { ROH_MIB_PUBLIC = 0, ROH_MIB_PRIVATE }; -static inline void convert_eid_to_mac(u8 mac[6], u32 eid) +static inline void convert_eid_to_mac(u8 *mac, u32 eid) { - mac[0] = 0; - mac[1] = 0; - mac[2] = 0; - mac[3] = (eid >> 16) & 0xff; - mac[4] = (eid >> 8) & 0xff; - mac[5] = eid & 0xff; + u64_to_ether_addr((u64)eid, mac); } struct roh_eid_attr { @@ -38,10 +33,6 @@ struct roh_eid_attr { u32 num; }; -struct roh_guid_attr { - u8 data[16]; -}; - struct roh_mib_stats { struct mutex lock; /* Protect values[] */ const char * const *names; @@ -51,13 +42,7 @@ struct roh_mib_stats { struct roh_device; struct roh_device_ops { - int (*query_guid)(struct roh_device *device, struct roh_guid_attr *attr); int (*set_eid)(struct roh_device *device, struct roh_eid_attr *attr); - struct sk_buff *(*pkt_create)(struct net_device *ndev, - u8 *dest_mac, u8 *src_mac, int ptype, - struct roh_guid_attr *guid, u16 eid_nums); - int (*pkt_parse)(struct sk_buff *skb, struct roh_eid_attr *eid_attr, int ptype); - enum roh_dev_tx (*xmit_pkt)(struct roh_device *device, struct sk_buff *skb); struct roh_mib_stats *(*alloc_hw_stats)(struct roh_device *device, enum roh_mib_type); int (*get_hw_stats)(struct roh_device *device, struct roh_mib_stats *stats, enum roh_mib_type); @@ -85,7 +70,6 @@ struct roh_device { struct completion unreg_completion; struct mutex unregistration_lock; /* lock for unregiste */ - struct roh_guid_attr node_guid; struct roh_eid_attr eid; struct mutex eid_mutex; /* operate eid needs to be mutexed */ u32 link_status; diff --git a/drivers/roh/core/core_priv.h b/drivers/roh/core/core_priv.h index b8337636f..56f581820 100644 --- a/drivers/roh/core/core_priv.h +++ b/drivers/roh/core/core_priv.h @@ -4,6 +4,8 @@ #ifndef __CORE_PRIV_H__ #define __CORE_PRIV_H__ +#include "core.h" + struct roh_client { char *name; int (*add)(struct roh_device *device); @@ -24,7 +26,6 @@ void roh_device_unregister_sysfs(struct roh_device *device); int roh_device_set_eid(struct roh_device *device, struct roh_eid_attr *attr); void roh_device_get_eid(struct roh_device *device, struct roh_eid_attr *attr); -void roh_device_query_guid(struct roh_device *device, struct roh_guid_attr *attr); enum roh_link_status roh_device_query_link_status(struct roh_device *device); #endif /* __CORE_PRIV_H__ */ diff --git a/drivers/roh/core/sysfs.c b/drivers/roh/core/sysfs.c index a502b9f4f..a65185861 100644 --- a/drivers/roh/core/sysfs.c +++ b/drivers/roh/core/sysfs.c @@ -1,9 +1,9 @@ // SPDX-License-Identifier: GPL-2.0+ // Copyright (c) 2020-2022 Hisilicon Limited. +#include <net/sock.h> #include <linux/sysfs.h> #include <linux/stat.h> -#include <net/sock.h> #include "core.h" #include "core_priv.h" @@ -21,18 +21,6 @@ static ssize_t node_eid_show(struct device *device, return sprintf(buf, "base:%u num:%u\n", eid.base, eid.num); } -static ssize_t node_guid_show(struct device *device, - struct device_attribute *attr, char *buf) -{ - struct roh_device *dev = container_of(device, struct roh_device, dev); - struct roh_guid_attr guid; - u32 *val = (u32 *)guid.data; - - roh_device_query_guid(dev, &guid); - - return sprintf(buf, "%08x:%08x:%08x:%08x\n", val[0], val[1], val[2], val[3]); -} - static ssize_t node_link_status_show(struct device *device, struct device_attribute *attr, char *buf) { @@ -44,12 +32,10 @@ static ssize_t node_link_status_show(struct device *device, } static DEVICE_ATTR_RO(node_eid); -static DEVICE_ATTR_RO(node_guid); static DEVICE_ATTR_RO(node_link_status); static struct device_attribute *roh_class_attr[] = { &dev_attr_node_eid, - &dev_attr_node_guid, &dev_attr_node_link_status, }; @@ -71,7 +57,7 @@ static void remove_device_sysfs(struct roh_device *device) device_remove_file(&device->dev, roh_class_attr[i]); } -static const char * const roh_hw_stats_name[ROH_MIB_STATS_TYPE_NUM] = { +static const char * const g_roh_hw_stats_name[ROH_MIB_STATS_TYPE_NUM] = { "mib_public", "mib_private", }; @@ -91,18 +77,19 @@ static ssize_t print_hw_stat(struct roh_device *dev, static ssize_t node_public_mib_stats_show(struct kobject *kobj, struct attribute *attr, char *buf) { - struct roh_hw_stats_attribute *hsa; struct roh_mib_stats *public_stats; struct roh_device *dev; int ret; - hsa = container_of(attr, struct roh_hw_stats_attribute, attr); dev = container_of(kobj, struct roh_device, dev.kobj); public_stats = dev->hw_public_stats; mutex_lock(&public_stats->lock); ret = dev->ops.get_hw_stats(dev, public_stats, ROH_MIB_PUBLIC); - if (ret) + if (ret) { + dev_err(&dev->dev, + "failed to get roh public hw stats, ret = %d.\n", ret); goto unlock; + } ret = print_hw_stat(dev, public_stats, buf); @@ -115,17 +102,18 @@ static ssize_t node_private_mib_stats_show(struct kobject *kobj, struct attribute *attr, char *buf) { struct roh_mib_stats *private_stats; - struct roh_hw_stats_attribute *hsa; struct roh_device *dev; int ret; - hsa = container_of(attr, struct roh_hw_stats_attribute, attr); dev = container_of(kobj, struct roh_device, dev.kobj); private_stats = dev->hw_private_stats; mutex_lock(&private_stats->lock); ret = dev->ops.get_hw_stats(dev, private_stats, ROH_MIB_PRIVATE); - if (ret) + if (ret) { + dev_err(&dev->dev, + "failed to get roh private hw stats, ret = %d.\n", ret); goto unlock; + } ret = print_hw_stat(dev, private_stats, buf); @@ -134,7 +122,7 @@ static ssize_t node_private_mib_stats_show(struct kobject *kobj, return ret; } -static ssize_t (*show_roh_mib_hw_stats[ROH_MIB_STATS_TYPE_NUM]) +static ssize_t (*g_show_roh_mib_hw_stats[ROH_MIB_STATS_TYPE_NUM]) (struct kobject *, struct attribute *, char *) = { node_public_mib_stats_show, node_private_mib_stats_show @@ -168,70 +156,129 @@ static struct attribute *alloc_hsa(const char *name, return &hsa->attr; } -static void setup_mib_stats(struct roh_device *device) +static void free_hw_stats(struct roh_device *device) +{ + kfree(device->hw_private_stats); + kfree(device->hw_public_stats); +} + +static int alloc_and_get_hw_stats(struct roh_device *device) { struct roh_mib_stats *privite_stats, *public_stats; - struct attribute_group *hsag; - struct kobject *kobj; - int i, j; int ret; public_stats = device->ops.alloc_hw_stats(device, ROH_MIB_PUBLIC); - if (!public_stats) - return; + if (!public_stats) { + dev_err(&device->dev, "failed to alloc roh public hw stats.\n"); + return -ENOMEM; + } privite_stats = device->ops.alloc_hw_stats(device, ROH_MIB_PRIVATE); if (!privite_stats) { + dev_err(&device->dev, "failed to alloc roh privite hw stats.\n"); kfree(public_stats); - return; + return -ENOMEM; } - hsag = kzalloc(sizeof(*hsag) + - sizeof(void *) * (ARRAY_SIZE(roh_hw_stats_name)), - GFP_KERNEL); - if (!hsag) - goto err_free_stats; - ret = device->ops.get_hw_stats(device, public_stats, ROH_MIB_PUBLIC); - if (ret) - goto err_free_hsag; + if (ret) { + dev_err(&device->dev, + "failed to get roh public mib stats, ret = %d\n", ret); + goto err; + } ret = device->ops.get_hw_stats(device, privite_stats, ROH_MIB_PRIVATE); - if (ret) - goto err_free_hsag; + if (ret) { + dev_err(&device->dev, + "failed to get roh privite mib stats, ret = %d\n", ret); + goto err; + } + + mutex_init(&privite_stats->lock); + mutex_init(&public_stats->lock); + + device->hw_public_stats = public_stats; + device->hw_private_stats = privite_stats; + + return 0; + +err: + free_hw_stats(device); + + return ret; +} + +static int alloc_hsag(struct roh_device *device) +{ + struct attribute_group *hsag; + struct kobject *kobj; + int i, j; + int ret; + + /* + * one extra attribue elements here, terminate the + * list for the sysfs core code + */ + hsag = kzalloc(sizeof(*hsag) + + sizeof(void *) * (ARRAY_SIZE(g_roh_hw_stats_name) + 1), + GFP_KERNEL); + if (!hsag) { + dev_err(&device->dev, "failed to kzalloc hsag.\n"); + return -ENOMEM; + } hsag->name = "node_mib_stats"; hsag->attrs = (void *)hsag + sizeof(*hsag); - for (i = 0; i < ARRAY_SIZE(roh_hw_stats_name); i++) { - hsag->attrs[i] = alloc_hsa(roh_hw_stats_name[i], - show_roh_mib_hw_stats[i]); - if (!hsag->attrs[i]) + for (i = 0; i < ARRAY_SIZE(g_roh_hw_stats_name); i++) { + hsag->attrs[i] = alloc_hsa(g_roh_hw_stats_name[i], + g_show_roh_mib_hw_stats[i]); + if (!hsag->attrs[i]) { + ret = -ENOMEM; + dev_err(&device->dev, + "failed to alloc hsa for hsag attrs[%d].\n", i); goto err; + } sysfs_attr_init(hsag->attrs[i]); } - mutex_init(&privite_stats->lock); - mutex_init(&public_stats->lock); - kobj = &device->dev.kobj; ret = sysfs_create_group(kobj, hsag); - if (ret) + if (ret) { + dev_err(&device->dev, + "failed to create roh sysfs group, ret = %d\n", ret); goto err; - device->hw_stats_ag = hsag; - device->hw_public_stats = public_stats; - device->hw_private_stats = privite_stats; + } - return; + device->hw_stats_ag = hsag; + return 0; err: for (j = i - 1; j >= 0; j--) kfree(hsag->attrs[j]); -err_free_hsag: - kfree(hsag); -err_free_stats: - kfree(public_stats); - kfree(privite_stats); + return ret; +} + +static int setup_mib_stats(struct roh_device *device) +{ + int ret; + + ret = alloc_and_get_hw_stats(device); + if (ret) { + dev_err(&device->dev, + "failed to alloc and get roh hw stats, ret = %d.\n", ret); + return ret; + } + + ret = alloc_hsag(device); + if (ret) { + dev_err(&device->dev, + "failed to alloc hsag, ret = %d.\n", ret); + free_hw_stats(device); + return ret; + } + + return 0; } int roh_device_register_sysfs(struct roh_device *device) @@ -242,17 +289,23 @@ int roh_device_register_sysfs(struct roh_device *device) for (i = 0; i < ARRAY_SIZE(roh_class_attr); i++) { ret = device_create_file(&device->dev, roh_class_attr[i]); if (ret) { - pr_err("failed to create node %s, ret = %d.\n", - roh_class_attr[i]->attr.name, ret); + dev_err(&device->dev, + "failed to create node %s, ret = %d.\n", + roh_class_attr[i]->attr.name, ret); goto err; } } - if (device->ops.alloc_hw_stats) - setup_mib_stats(device); + if (device->ops.alloc_hw_stats) { + ret = setup_mib_stats(device); + if (ret) { + dev_err(&device->dev, + "failed to setup roh mib stats, ret = %d.\n", ret); + goto err; + } + } return 0; - err: remove_device_sysfs(device); return ret; @@ -263,8 +316,7 @@ void roh_device_unregister_sysfs(struct roh_device *device) if (device->hw_stats_ag) free_hsag(&device->dev.kobj, device->hw_stats_ag); - kfree(device->hw_private_stats); - kfree(device->hw_public_stats); + free_hw_stats(device); remove_device_sysfs(device); } diff --git a/drivers/roh/hw/hns3/hns3_cmdq.c b/drivers/roh/hw/hns3/hns3_cmdq.c index fccb0c482..75fa2e852 100644 --- a/drivers/roh/hw/hns3/hns3_cmdq.c +++ b/drivers/roh/hw/hns3/hns3_cmdq.c @@ -10,8 +10,8 @@ #include "core.h" #include "hns3_device.h" #include "hns3_common.h" -#include "hns3_cmdq.h" #include "hns3_reg.h" +#include "hns3_cmdq.h" static int hns3_roh_alloc_cmdq_desc(struct hns3_roh_device *hroh_dev, struct hns3_roh_cmdq_ring *ring) @@ -224,6 +224,11 @@ static int hns3_roh_cmdq_build(struct hns3_roh_device *hroh_dev, int handle = 0; if (num > hns3_roh_cmdq_space(csq)) { + /* If CMDQ ring is full, SW HEAD and HW HEAD may be different, + * need update the SW HEAD pointer csq->next_to_clean + */ + csq->next_to_clean = + hns3_roh_read(hroh_dev, HNS3_ROH_TX_CMDQ_HEAD_REG); dev_err(hroh_dev->dev, "cmdq is full, opcode %x\n", desc->opcode); return -EBUSY; } @@ -241,49 +246,96 @@ static int hns3_roh_cmdq_build(struct hns3_roh_device *hroh_dev, return 0; } -static int hns3_roh_cmdq_done_parse(struct hns3_roh_device *hroh_dev, - struct hns3_roh_desc *desc, - int num, int ntc) +static void hns3_roh_cmd_wait_for_resp(struct hns3_roh_device *hroh_dev, + bool *is_completed) { struct hns3_roh_priv *priv = (struct hns3_roh_priv *)hroh_dev->priv; - struct hns3_roh_cmdq_ring *csq = &priv->cmdq.csq; - struct hns3_roh_desc *desc_to_use = NULL; - int handle = 0; - u16 desc_ret; - int ret; + u32 timeout = 0; - if (hns3_roh_cmdq_csq_done(hroh_dev)) { - while (handle < num) { - desc_to_use = &csq->desc[ntc]; - desc[handle] = *desc_to_use; - desc_ret = le16_to_cpu(desc[handle].retval); - if (desc_ret == HNS3_ROH_CMD_EXEC_SUCCESS) { - ret = 0; - } else if (desc_ret == HNS3_ROH_CMD_EXEC_TIMEOUT) { - priv->cmdq.last_status = desc_ret; - ret = -ETIME; - } else { - pr_err("desc_ret = %d\n", desc_ret); - ret = -EIO; - } - - ntc++; - handle++; - if (ntc == csq->desc_num) - ntc = 0; + do { + if (hns3_roh_cmdq_csq_done(hroh_dev)) { + *is_completed = true; + break; } - } else { - ret = -EAGAIN; + udelay(1); + timeout++; + } while (timeout < priv->cmdq.tx_timeout); +} + +static const u16 spec_opcode[] = { HNS3_ROH_OPC_QUERY_MIB_PUBLIC, + HNS3_ROH_OPC_QUERY_MIB_PRIVATE }; + +static bool hns_roh_is_special_opcode(u16 opcode) +{ + /* these commands have several descriptors, + * and use the first one to save opcode and return value + */ + u32 i; + + for (i = 0; i < ARRAY_SIZE(spec_opcode); i++) + if (spec_opcode[i] == opcode) + return true; + + return false; +} + +static int hns3_roh_cmd_convert_err_code(u16 desc_ret) +{ + struct hns3_roh_errcode hns3_roh_cmd_errcode[] = { + { HNS3_ROH_CMD_EXEC_SUCCESS, 0 }, + { HNS3_ROH_CMD_NO_AUTH, -EPERM }, + { HNS3_ROH_CMD_NOT_SUPPORTED, -EOPNOTSUPP }, + { HNS3_ROH_CMD_QUEUE_FULL, -EXFULL }, + { HNS3_ROH_CMD_NEXT_ERR, -ENOSR }, + { HNS3_ROH_CMD_UNEXE_ERR, -ENOTBLK }, + { HNS3_ROH_CMD_PARA_ERR, -EINVAL }, + { HNS3_ROH_CMD_RESULT_ERR, -ERANGE }, + { HNS3_ROH_CMD_TIMEOUT, -ETIME }, + { HNS3_ROH_CMD_HILINK_ERR, -ENOLINK }, + { HNS3_ROH_CMD_QUEUE_ILLEGAL, -ENXIO }, + { HNS3_ROH_CMD_INVALID, -EBADR }, + }; + u32 errcode_count = ARRAY_SIZE(hns3_roh_cmd_errcode); + u32 i; + + for (i = 0; i < errcode_count; i++) + if (hns3_roh_cmd_errcode[i].imp_errcode == desc_ret) + return hns3_roh_cmd_errcode[i].common_errno; + + return -EIO; +} + +static int hns3_roh_cmd_check_retval(struct hns3_roh_device *hroh_dev, + struct hns3_roh_desc *desc, int num, + int next_to_clean) +{ + struct hns3_roh_priv *priv = (struct hns3_roh_priv *)hroh_dev->priv; + int ntc = next_to_clean; + u16 opcode, desc_ret; + int handle; + + opcode = le16_to_cpu(desc[0].opcode); + for (handle = 0; handle < num; handle++) { + desc[handle] = priv->cmdq.csq.desc[ntc]; + ntc++; + if (ntc >= priv->cmdq.csq.desc_num) + ntc = 0; } + if (likely(!hns_roh_is_special_opcode(opcode))) + desc_ret = le16_to_cpu(desc[num - 1].retval); + else + desc_ret = le16_to_cpu(desc[0].retval); - return ret; + priv->cmdq.last_status = desc_ret; + + return hns3_roh_cmd_convert_err_code(desc_ret); } int hns3_roh_cmdq_send(struct hns3_roh_device *hroh_dev, struct hns3_roh_desc *desc, int num) { struct hns3_roh_priv *priv = (struct hns3_roh_priv *)hroh_dev->priv; struct hns3_roh_cmdq_ring *csq = &priv->cmdq.csq; - u32 timeout = 0; + bool is_completed = false; int handle = 0; int ntc = 0; int ret = 0; @@ -298,16 +350,13 @@ int hns3_roh_cmdq_send(struct hns3_roh_device *hroh_dev, struct hns3_roh_desc *d /* Write to hardware */ hns3_roh_write(hroh_dev, HNS3_ROH_TX_CMDQ_TAIL_REG, csq->next_to_use); - if (desc->flag & cpu_to_le16(HNS3_ROH_CMD_FLAG_NO_INTR)) { - do { - if (hns3_roh_cmdq_csq_done(hroh_dev)) - break; - udelay(1); - timeout++; - } while (timeout < priv->cmdq.tx_timeout); - } + if (le16_to_cpu(desc->flag) & HNS3_ROH_CMD_FLAG_NO_INTR) + hns3_roh_cmd_wait_for_resp(hroh_dev, &is_completed); - ret = hns3_roh_cmdq_done_parse(hroh_dev, desc, num, ntc); + if (!is_completed) + ret = -EBADE; + else + ret = hns3_roh_cmd_check_retval(hroh_dev, desc, num, ntc); handle = hns3_roh_cmdq_csq_clean(hroh_dev); if (handle != num) diff --git a/drivers/roh/hw/hns3/hns3_cmdq.h b/drivers/roh/hw/hns3/hns3_cmdq.h index 0176c93d0..224fe1d30 100644 --- a/drivers/roh/hw/hns3/hns3_cmdq.h +++ b/drivers/roh/hw/hns3/hns3_cmdq.h @@ -28,21 +28,28 @@ enum hns3_roh_opcode_type { HNS3_ROH_OPC_GET_INTR_INFO = 0x0023, HNS3_ROH_OPC_QUERY_PORT_LINK_STATUS = 0x038a, HNS3_ROH_OPC_SET_EID = 0x9001, - HNS3_ROH_OPC_GET_GUID = 0x9002, HNS3_ROH_OPC_QUERY_MIB_PUBLIC = 0x9005, HNS3_ROH_OPC_QUERY_MIB_PRIVATE = 0x9006, }; +struct hns3_roh_errcode { + u32 imp_errcode; + int common_errno; +}; + enum hns3_roh_cmd_return_status { - HNS3_ROH_CMD_EXEC_SUCCESS = 0, - HNS3_ROH_CMD_NO_AUTH, - HNS3_ROH_CMD_NOT_EXIST, - HNS3_ROH_CMD_QUEUE_FULL, - HNS3_ROH_CMD_NEXT_ERR, - HNS3_ROH_CMD_NOT_EXEC, - HNS3_ROH_CMD_PARA_ERR, - HNS3_ROH_CMD_RESULT_ERR, - HNS3_ROH_CMD_EXEC_TIMEOUT + HNS3_ROH_CMD_EXEC_SUCCESS = 0, + HNS3_ROH_CMD_NO_AUTH = 1, + HNS3_ROH_CMD_NOT_SUPPORTED = 2, + HNS3_ROH_CMD_QUEUE_FULL = 3, + HNS3_ROH_CMD_NEXT_ERR = 4, + HNS3_ROH_CMD_UNEXE_ERR = 5, + HNS3_ROH_CMD_PARA_ERR = 6, + HNS3_ROH_CMD_RESULT_ERR = 7, + HNS3_ROH_CMD_TIMEOUT = 8, + HNS3_ROH_CMD_HILINK_ERR = 9, + HNS3_ROH_CMD_QUEUE_ILLEGAL = 10, + HNS3_ROH_CMD_INVALID = 11, }; enum hns3_roh_mbx_opcode { @@ -69,11 +76,6 @@ struct hns3_roh_set_eid_info { u8 rsv[16]; }; -struct hns3_roh_get_guid_info { - u8 guid[16]; - u8 rsv[8]; -}; - struct hns3_roh_query_link_status_info { __le32 query_link_status; u8 rsv[20]; diff --git a/drivers/roh/hw/hns3/hns3_main.c b/drivers/roh/hw/hns3/hns3_main.c index 9c618c191..64f9a13e5 100644 --- a/drivers/roh/hw/hns3/hns3_main.c +++ b/drivers/roh/hw/hns3/hns3_main.c @@ -77,7 +77,6 @@ static int hns3_roh_register_device(struct hns3_roh_device *hroh_dev) rohdev->netdev = hroh_dev->netdev; rohdev->ops.set_eid = hns3_roh_set_eid; - rohdev->ops.query_guid = hns3_roh_query_guid; rohdev->ops.alloc_hw_stats = hns3_roh_alloc_hw_stats; rohdev->ops.get_hw_stats = hns3_roh_get_hw_stats; @@ -332,10 +331,8 @@ static int hns3_roh_init_instance(struct hnae3_handle *handle) int ret; id = pci_match_id(hns3_roh_pci_tbl, handle->pdev); - if (!id) { - dev_err(dev, "failed to match pci id.\n"); + if (!id) return 0; - } if (id->driver_data) { dev_err(dev, "not support vf.\n"); @@ -562,8 +559,9 @@ static void hns3_roh_dfx_init(struct hns3_roh_device *hroh_dev) if (IS_ERR_OR_NULL(hroh_dev->dfx_debugfs)) return; - entry = debugfs_create_file("hns3_roh_dfx", 0600, hroh_dev->dfx_debugfs, - hroh_dev, &hns3_roh_dfx_cmd_fops); + entry = debugfs_create_file("hns3_roh_dfx", 0600, + hroh_dev->dfx_debugfs, hroh_dev, + &hns3_roh_dfx_cmd_fops); if (IS_ERR_OR_NULL(entry)) { debugfs_remove_recursive(hroh_dev->dfx_debugfs); hroh_dev->dfx_debugfs = NULL; diff --git a/drivers/roh/hw/hns3/hns3_verbs.c b/drivers/roh/hw/hns3/hns3_verbs.c index 8171f9756..b4d23d66c 100644 --- a/drivers/roh/hw/hns3/hns3_verbs.c +++ b/drivers/roh/hw/hns3/hns3_verbs.c @@ -3,8 +3,8 @@ #include "core.h" -#include "hns3_verbs.h" #include "hns3_cmdq.h" +#include "hns3_verbs.h" int hns3_roh_set_eid(struct roh_device *rohdev, struct roh_eid_attr *eid_attr) { @@ -28,26 +28,6 @@ int hns3_roh_set_eid(struct roh_device *rohdev, struct roh_eid_attr *eid_attr) return 0; } -int hns3_roh_query_guid(struct roh_device *rohdev, struct roh_guid_attr *guid_attr) -{ - struct hns3_roh_device *hroh_dev = to_hroh_dev(rohdev); - struct hns3_roh_get_guid_info *req; - struct hns3_roh_desc desc; - int ret; - - hns3_roh_cmdq_setup_basic_desc(&desc, HNS3_ROH_OPC_GET_GUID, true); - ret = hns3_roh_cmdq_send(hroh_dev, &desc, 1); - if (ret) { - dev_err(hroh_dev->dev, "failed to query guid, ret = %d\n", ret); - return ret; - } - - req = (struct hns3_roh_get_guid_info *)desc.data; - memcpy(guid_attr->data, req->guid, sizeof(req->guid)); - - return 0; -} - static const char * const hns3_roh_hw_stats_name_public[] = { "mac_tx_packet_num", "mac_rx_packet_num", diff --git a/drivers/roh/hw/hns3/hns3_verbs.h b/drivers/roh/hw/hns3/hns3_verbs.h index 152d9b162..f72d0f643 100644 --- a/drivers/roh/hw/hns3/hns3_verbs.h +++ b/drivers/roh/hw/hns3/hns3_verbs.h @@ -7,7 +7,6 @@ #include "hns3_common.h" int hns3_roh_set_eid(struct roh_device *rohdev, struct roh_eid_attr *eid_attr); -int hns3_roh_query_guid(struct roh_device *rohdev, struct roh_guid_attr *guid_attr); struct roh_mib_stats *hns3_roh_alloc_hw_stats(struct roh_device *rohdev, enum roh_mib_type mib_type); int hns3_roh_get_hw_stats(struct roh_device *rohdev, struct roh_mib_stats *stats, -- 2.30.0

2 1

[PATCH PATCH OLK-5.10 0/2] bugfix the lost interruption problem after live migration
by liulongfang 08 Jun '23

08 Jun '23

The problem of service interruption and loss may be triggered during live migration. In order to ensure normal business, it is necessary to resend an interrupt in the live migration driver. And in the QM service driver, it is guaranteed that the retransmission interrupt can be received normally. Longfang Liu (2): crypto: hisilicon/qm - fix EQ/AEQ interrupt issue vfio/migration: bugfix lost interruption after live migration .../hisilicon/migration/acc_vf_migration.c | 66 +++++++---- .../hisilicon/migration/acc_vf_migration.h | 2 + drivers/crypto/hisilicon/qm.c | 107 +++++++----------- include/linux/hisi_acc_qm.h | 1 + 4 files changed, 86 insertions(+), 90 deletions(-) -- 2.24.0

1 2

[PATCH OLK-5.10] drivers/perf: hisi: Fix incorrect get one active cpu
by Junhao He 08 Jun '23

08 Jun '23

driver inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I7BUN2 CVE: NA ---------------------------------------------------------------------- When a cpu going offline, it may be returned by function cpumask_first(). If this happens, the PCIe PMU context is still migrated to the old cpu. Then the CPU continues to run offline processing, which also leads to the call trace. ... [ 368.104662][ T932] task:cpuhp/0 state:D stack: 0 pid: 15 ppid: 2 flags:0x00000008 [ 368.113699][ T932] Call trace: [ 368.116834][ T932] __switch_to+0x7c/0xbc [ 368.120924][ T932] __schedule+0x338/0x6f0 [ 368.125098][ T932] schedule+0x50/0xe0 [ 368.128926][ T932] schedule_preempt_disabled+0x18/0x24 [ 368.134229][ T932] __mutex_lock.constprop.0+0x1d4/0x5dc [ 368.139617][ T932] __mutex_lock_slowpath+0x1c/0x30 [ 368.144573][ T932] mutex_lock+0x50/0x60 [ 368.148579][ T932] perf_pmu_migrate_context+0x84/0x2b0 [ 368.153884][ T932] hisi_pcie_pmu_offline_cpu+0x90/0xe0 [hisi_pcie_pmu] [ 368.160579][ T932] cpuhp_invoke_callback+0x2a0/0x650 [ 368.165707][ T932] cpuhp_thread_fun+0xe4/0x190 [ 368.170316][ T932] smpboot_thread_fn+0x15c/0x1a0 [ 368.175099][ T932] kthread+0x108/0x13c [ 368.179012][ T932] ret_from_fork+0x10/0x18 ... Use function cpumask_any_but() to find one correct active cpu to fixes this issue. Fixes: 8404b0fbc7fb ("drivers/perf: hisi: Add driver for HiSilicon PCIe PMU") Signed-off-by: Junhao He <hejunhao3(a)huawei.com> --- drivers/perf/hisilicon/hisi_pcie_pmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/perf/hisilicon/hisi_pcie_pmu.c b/drivers/perf/hisilicon/hisi_pcie_pmu.c index 88d488765203..8f59387aeab0 100644 --- a/drivers/perf/hisilicon/hisi_pcie_pmu.c +++ b/drivers/perf/hisilicon/hisi_pcie_pmu.c @@ -689,7 +689,7 @@ static int hisi_pcie_pmu_offline_cpu(unsigned int cpu, struct hlist_node *node) pcie_pmu->on_cpu = -1; /* Choose a new CPU from all online cpus. */ - target = cpumask_first(cpu_online_mask); + target = cpumask_any_but(cpu_online_mask, cpu); if (target >= nr_cpu_ids) { pci_err(pcie_pmu->pdev, "There is no CPU to set\n"); return 0; -- 2.33.0

2 1

[PATCH openEuler-1.0-LTS 0/2] smart grid scheduler
by Wang ShaoBo 08 Jun '23

08 Jun '23

v6: ��OK��OK�� ,��mask��level0�� v5: ��pelt. ��review��. v4: fix KABI add 'cpu.affinity_domain_mask' add some statistics v3: ��patchwork��KABI�� v2: formal version 1. Hui Tang (1): sched: Introduce smart grid scheduling strategy for cfs Wang ShaoBo (1): sched: smart grid: init sched_grid_qos structure on QOS purpose fs/proc/array.c | 13 + include/linux/sched.h | 18 ++ include/linux/sched/grid_qos.h | 92 +++++++ include/linux/sched/sysctl.h | 4 + init/Kconfig | 13 + kernel/fork.c | 9 + kernel/sched/Makefile | 1 + kernel/sched/core.c | 145 +++++++++++ kernel/sched/fair.c | 437 ++++++++++++++++++++++++++++++++- kernel/sched/grid/Makefile | 2 + kernel/sched/grid/internal.h | 6 + kernel/sched/grid/power.c | 10 + kernel/sched/grid/qos.c | 126 ++++++++++ kernel/sched/grid/stat.c | 15 ++ kernel/sched/sched.h | 50 ++++ kernel/sysctl.c | 9 + mm/mempolicy.c | 12 +- 17 files changed, 959 insertions(+), 3 deletions(-) create mode 100644 include/linux/sched/grid_qos.h create mode 100644 kernel/sched/grid/Makefile create mode 100644 kernel/sched/grid/internal.h create mode 100644 kernel/sched/grid/power.c create mode 100644 kernel/sched/grid/qos.c create mode 100644 kernel/sched/grid/stat.c -- 2.25.1

1 2

[PATCH openEuler-1.0-LTS 1/3] nbd: get config_lock before sock_shutdown
by Yongqiang Liu 07 Jun '23

07 Jun '23

From: Zhong Jinghua <zhongjinghua(a)huaweicloud.com> hulk inclusion category: bugfix bugzilla: 188799, https://gitee.com/openeuler/kernel/issues/I79QWO CVE: NA ---------------------------------------- Config->socks in sock_shutdown may trigger a UAF problem. The reason is that sock_shutdown does not hold the config_lock, so that nbd_ioctl can release config->socks at this time. T0: NBD_SET_SOCK T1: NBD_DO_IT T0 T1 nbd_ioctl mutex_lock(&nbd->config_lock) // get lock __nbd_ioctl nbd_start_device_ioctl nbd_start_device mutex_unlock(&nbd->config_lock) // relase lock wait_event_interruptible (kill, enter sock_shutdown) sock_shutdown nbd_ioctl mutex_lock(&nbd->config_lock) // get lock __nbd_ioctl nbd_add_socket krealloc kfree(p) //config->socks is NULL nbd_sock *nsock = config->socks // error Fix it by moving config_lock up before sock_shutdown. Signed-off-by: Zhong Jinghua <zhongjinghua(a)huawei.com> Reviewed-by: Yu Kuai <yukuai3(a)huawei.com> Reviewed-by: Hou Tao <houtao1(a)huawei.com> Signed-off-by: Yongqiang Liu <liuyongqiang13(a)huawei.com> --- drivers/block/nbd.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index 551b2f7da8ef..a08f35946718 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -1347,11 +1347,16 @@ static int nbd_start_device_ioctl(struct nbd_device *nbd, struct block_device *b mutex_unlock(&nbd->config_lock); ret = wait_event_interruptible(config->recv_wq, atomic_read(&config->recv_threads) == 0); + + /* + * recv_work in flush_workqueue will not get this lock, because nbd_open + * will hold nbd->config_refs + */ + mutex_lock(&nbd->config_lock); if (ret) sock_shutdown(nbd); flush_workqueue(nbd->recv_workq); - mutex_lock(&nbd->config_lock); nbd_bdev_reset(bdev); /* user requested, ignore socket errors */ if (test_bit(NBD_RT_DISCONNECT_REQUESTED, &config->runtime_flags)) -- 2.25.1

1 2

[PATCH OLK-5.10 0/2] ubi: Fix deadlock caused by recursively holding work_sem
by ZhaoLong Wang 07 Jun '23

07 Jun '23

Fix deadlock caused by recursively holding work_sem Lee Jones (1): mtd: ubi: wl: Fix a couple of kernel-doc issues ZhaoLong Wang (1): ubi: Fix deadlock caused by recursively holding work_sem drivers/mtd/ubi/wl.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- 2.39.2

2 3

[PATCH OLK-5.10 0/4] io_uring: fix the problem of running
by Li Lingfeng 07 Jun '23

07 Jun '23

patch1: arch: setup PF_IO_WORKER threads like PF_KTHREAD pre patch of patch4 patch2: arch: ensure parisc/powerpc handle PF_IO_WORKER in copy_thread() fix patch of patch1 patch3: kernel: don't call do_exit() for PF_IO_WORKER threads fix the segfault patch4: x86/process: setup io_threads more like normal user space threads allow io worker to exit Jens Axboe (3): arch: setup PF_IO_WORKER threads like PF_KTHREAD arch: ensure parisc/powerpc handle PF_IO_WORKER in copy_thread() kernel: don't call do_exit() for PF_IO_WORKER threads Stefan Metzmacher (1): x86/process: setup io_threads more like normal user space threads arch/alpha/kernel/process.c | 2 +- arch/arc/kernel/process.c | 2 +- arch/arm/kernel/process.c | 2 +- arch/arm64/kernel/process.c | 2 +- arch/csky/kernel/process.c | 2 +- arch/h8300/kernel/process.c | 2 +- arch/hexagon/kernel/process.c | 2 +- arch/ia64/kernel/process.c | 2 +- arch/m68k/kernel/process.c | 2 +- arch/microblaze/kernel/process.c | 2 +- arch/mips/kernel/process.c | 2 +- arch/nds32/kernel/process.c | 2 +- arch/nios2/kernel/process.c | 2 +- arch/openrisc/kernel/process.c | 2 +- arch/parisc/kernel/process.c | 2 +- arch/powerpc/kernel/process.c | 2 +- arch/riscv/kernel/process.c | 2 +- arch/s390/kernel/process.c | 2 +- arch/sh/kernel/process_32.c | 2 +- arch/sparc/kernel/process_32.c | 2 +- arch/sparc/kernel/process_64.c | 2 +- arch/um/kernel/process.c | 2 +- arch/x86/kernel/process.c | 17 +++++++++++++++++ arch/xtensa/kernel/process.c | 2 +- kernel/signal.c | 10 +++++++++- 25 files changed, 49 insertions(+), 24 deletions(-) -- 2.31.1

2 5

[PATCH OLK-5.10 0/4] crypto: hisilicon - fix mailbox operation process
by Weili Qian 07 Jun '23

07 Jun '23

From: JiangShui Yang <yangjiangshui(a)h-partners.com> The mailbox of the Kunpeng accelerator is a special operation. Data(128 bits) needs to be read from hardware or written to hardware at one time. And the operation cannot be canceled by software. Therefore, the software process needs to be modified to avoid mailbox operation errors. Weili Qian (4): crypto: hisilicon/qm - obtain the mailbox configuration at one time vfio/migration: obtain the mailbox configuration at one time crypto: hisilicon/qm - fix the pf2vf timeout when device reset crypto: hisilicon/qm - alloc buffer to set and get xqc drivers/crypto/hisilicon/debugfs.c | 75 +-- .../hisilicon/migration/acc_vf_migration.c | 176 +++--- .../hisilicon/migration/acc_vf_migration.h | 8 +- drivers/crypto/hisilicon/qm.c | 532 +++++++++--------- drivers/crypto/hisilicon/qm_common.h | 5 +- include/linux/hisi_acc_qm.h | 18 +- 6 files changed, 429 insertions(+), 385 deletions(-) -- 2.30.0

1 4

[PATCH OLK-5.10] kobject: Fix slab-out-of-bounds in fill_kobj_path()
by Xia Fukun 07 Jun '23

07 Jun '23

mainline inclusion from mainline-v6.4-rc3 commit 3bb2a01caa813d3a1845d378bbe4169ef280d394 category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I697JG CVE: NA Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… ---------------------------------------- In kobject_get_path(), if kobj->name is changed between calls get_kobj_path_length() and fill_kobj_path() and the length becomes longer, then fill_kobj_path() will have an out-of-bounds bug. The actual current problem occurs when the ixgbe probe. In ixgbe_mii_bus_init(), if the length of netdev->dev.kobj.name length becomes longer, out-of-bounds will occur. cpu0 cpu1 ixgbe_probe register_netdev(netdev) netdev_register_kobject device_add kobject_uevent // Sending ADD events systemd-udevd // rename netdev dev_change_name device_rename kobject_rename ixgbe_mii_bus_init | mdiobus_register | __mdiobus_register | device_register | device_add | kobject_uevent | kobject_get_path | len = get_kobj_path_length // old name | path = kzalloc(len, gfp_mask); | kobj->name = name; /* name length becomes * longer */ fill_kobj_path /* kobj path length is * longer than path, * resulting in out of * bounds when filling path */ This is the kasan report: ================================================================== BUG: KASAN: slab-out-of-bounds in fill_kobj_path+0x50/0xc0 Write of size 7 at addr ff1100090573d1fd by task kworker/28:1/673 Workqueue: events work_for_cpu_fn Call Trace: <TASK> dump_stack_lvl+0x34/0x48 print_address_description.constprop.0+0x86/0x1e7 print_report+0x36/0x4f kasan_report+0xad/0x130 kasan_check_range+0x35/0x1c0 memcpy+0x39/0x60 fill_kobj_path+0x50/0xc0 kobject_get_path+0x5a/0xc0 kobject_uevent_env+0x140/0x460 device_add+0x5c7/0x910 __mdiobus_register+0x14e/0x490 ixgbe_probe.cold+0x441/0x574 [ixgbe] local_pci_probe+0x78/0xc0 work_for_cpu_fn+0x26/0x40 process_one_work+0x3b6/0x6a0 worker_thread+0x368/0x520 kthread+0x165/0x1a0 ret_from_fork+0x1f/0x30 This reproducer triggers that bug: while: do rmmod ixgbe sleep 0.5 modprobe ixgbe sleep 0.5 When calling fill_kobj_path() to fill path, if the name length of kobj becomes longer, return failure and retry. This fixes the problem. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Wang Hai <wanghai38(a)huawei.com> Link: https://lore.kernel.org/r/20221220012143.52141-1-wanghai38@huawei.com Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Signed-off-by: Xia Fukun <xiafukun(a)huawei.com> --- lib/kobject.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/kobject.c b/lib/kobject.c index ea53b30cf483..617a25ec355d 100644 --- a/lib/kobject.c +++ b/lib/kobject.c @@ -144,7 +144,7 @@ static int get_kobj_path_length(struct kobject *kobj) return length; } -static void fill_kobj_path(struct kobject *kobj, char *path, int length) +static int fill_kobj_path(struct kobject *kobj, char *path, int length) { struct kobject *parent; @@ -153,12 +153,16 @@ static void fill_kobj_path(struct kobject *kobj, char *path, int length) int cur = strlen(kobject_name(parent)); /* back up enough to print this name with '/' */ length -= cur; + if (length <= 0) + return -EINVAL; memcpy(path + length, kobject_name(parent), cur); *(path + --length) = '/'; } pr_debug("kobject: '%s' (%p): %s: path = '%s'\n", kobject_name(kobj), kobj, __func__, path); + + return 0; } /** @@ -173,13 +177,17 @@ char *kobject_get_path(struct kobject *kobj, gfp_t gfp_mask) char *path; int len; +retry: len = get_kobj_path_length(kobj); if (len == 0) return NULL; path = kzalloc(len, gfp_mask); if (!path) return NULL; - fill_kobj_path(kobj, path, len); + if (fill_kobj_path(kobj, path, len)) { + kfree(path); + goto retry; + } return path; } -- 2.17.1

2 1

[PATCH OLK-5.10 0/2] Fix ORC unwinder on paravirt {save,restore}_fl
by Chen Zhongjin 07 Jun '23

07 Jun '23

ISSUE: gitee.com/openeuler/kernel/issues/I6DK3O Chen Zhongjin (2): x86/unwind: Fix orc entry for paravirt {save,restore}_fl x86/unwind: Fix check_paravirt() calls orc_find() before declaration arch/x86/kernel/unwind_orc.c | 45 +++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) -- 2.17.1

2 3