- Linuxarm - mailweb.openeuler.org

[PATCH net-next 0/9] net: hns3: add some cleanups
by Huazhong Tan 27 Mar '21

27 Mar '21

This series includes some cleanups for the HNS3 ethernet driver. Guojia Liao (1): net: hns3: split out hclge_tm_vport_tc_info_update() Huazhong Tan (3): net: hns3: remove unused parameter from hclge_dbg_dump_loopback() net: hns3: fix prototype warning net: hns3: fix some typos in hclge_main.c Jian Shen (1): net: hns3: remove unused code of vmdq Jiaran Zhang (1): net: hns3: remove redundant query in hclge_config_tm_hw_err_int() Peng Li (2): net: hns3: remove redundant blank lines net: hns3: remove unused parameter from hclge_set_vf_vlan_common() Yufeng Mo (1): net: hns3: split function hclge_reset_rebuild() drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 7 - drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 2 +- .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c | 1 - .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 2 - .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c | 5 +- .../net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c | 10 +- .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 283 +++++++++------------ .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 2 - .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 11 +- .../ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c | 1 - .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 2 - .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 1 - 12 files changed, 130 insertions(+), 197 deletions(-) -- 2.7.4

2 10

[PATCH for-next] RDMA/hns: Support to query firmware version
by Weihang Li 26 Mar '21

26 Mar '21

From: Lang Cheng <chenglang(a)huawei.com> Implement the ops named get_dev_fw_str to support ib_get_device_fw_str(). Signed-off-by: Lang Cheng <chenglang(a)huawei.com> Signed-off-by: Weihang Li <liweihang(a)huawei.com> --- drivers/infiniband/hw/hns/hns_roce_main.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/drivers/infiniband/hw/hns/hns_roce_main.c b/drivers/infiniband/hw/hns/hns_roce_main.c index 1a747f7..2b9e501 100644 --- a/drivers/infiniband/hw/hns/hns_roce_main.c +++ b/drivers/infiniband/hw/hns/hns_roce_main.c @@ -394,6 +394,19 @@ static void hns_roce_disassociate_ucontext(struct ib_ucontext *ibcontext) { } +static void hns_roce_get_fw_ver(struct ib_device *device, char *str) +{ + u64 fw_ver = to_hr_dev(device)->caps.fw_ver; + unsigned int major, minor, sub_minor; + + major = upper_32_bits(fw_ver); + minor = high_16_bits(lower_32_bits(fw_ver)); + sub_minor = low_16_bits(fw_ver); + + snprintf(str, IB_FW_VERSION_NAME_MAX, "%u.%u.%04u", major, minor, + sub_minor); +} + static void hns_roce_unregister_device(struct hns_roce_dev *hr_dev) { struct hns_roce_ib_iboe *iboe = &hr_dev->iboe; @@ -409,6 +422,7 @@ static const struct ib_device_ops hns_roce_dev_ops = { .uverbs_abi_ver = 1, .uverbs_no_driver_id_binding = 1, + .get_dev_fw_str = hns_roce_get_fw_ver, .add_gid = hns_roce_add_gid, .alloc_pd = hns_roce_alloc_pd, .alloc_ucontext = hns_roce_alloc_ucontext, -- 2.8.1

3 2

[PATCH v2 0/4] Fix the parameter of dma_map_sg()
by chenxiang 26 Mar '21

26 Mar '21

From: Xiang Chen <chenxiang66(a)hisilicon.com> According to Documentation/core-api/dma-api-howto.rst, the parameters of dma_unmap_sg() must be the same as those which are passed in to the scatter/gather mapping API. But for some drivers under crypto, the <nents> parameter of dma_unmap_sg() is number of elements after mapping. So fix them. Part of the document is as follows: To unmap a scatterlist, just call:: dma_unmap_sg(dev, sglist, nents, direction); Again, make sure DMA activity has already finished. .. note:: The 'nents' argument to the dma_unmap_sg call must be the _same_ one you passed into the dma_map_sg call, it should _NOT_ be the 'count' value _returned_ from the dma_map_sg call. Change Log: v1 -> v2: Remove changing the count passed to create_sg_component in driver cavium; Xiang Chen (4): crypto: amlogic - Fix the parameter of dma_unmap_sg() crypto: cavium - Fix the parameter of dma_unmap_sg() crypto: ux500 - Fix the parameter of dma_unmap_sg() crypto: allwinner - Fix the parameter of dma_unmap_sg() drivers/crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c | 9 ++++++--- drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c | 3 ++- drivers/crypto/allwinner/sun8i-ss/sun8i-ss-cipher.c | 9 ++++++--- drivers/crypto/allwinner/sun8i-ss/sun8i-ss-hash.c | 3 ++- drivers/crypto/amlogic/amlogic-gxl-cipher.c | 6 +++--- drivers/crypto/cavium/nitrox/nitrox_reqmgr.c | 9 +++++---- drivers/crypto/ux500/cryp/cryp_core.c | 4 ++-- drivers/crypto/ux500/hash/hash_core.c | 2 +- 8 files changed, 27 insertions(+), 18 deletions(-) -- 2.8.1

2 5

[PATCH v5 0/2] add IRQF_NO_AUTOEN for request_irq
by Barry Song 26 Mar '21

26 Mar '21

-v5: * add the same check for IRQF_NO_AUTOEN in request_nmi() * combine a dozen of separate patches of input into one (hopefully this could easy the life of the maintainers) -v4: * remove the irq_settings magic for NOAUTOEN with respect to Thomas's comment Barry Song (2): genirq: add IRQF_NO_AUTOEN for request_irq Input: move to use request_irq by IRQF_NO_AUTOEN flag drivers/input/keyboard/tca6416-keypad.c | 3 +-- drivers/input/keyboard/tegra-kbc.c | 5 ++--- drivers/input/touchscreen/ar1021_i2c.c | 5 +---- drivers/input/touchscreen/atmel_mxt_ts.c | 5 ++--- drivers/input/touchscreen/bu21029_ts.c | 4 ++-- drivers/input/touchscreen/cyttsp_core.c | 5 ++--- drivers/input/touchscreen/melfas_mip4.c | 5 ++--- drivers/input/touchscreen/mms114.c | 4 ++-- drivers/input/touchscreen/stmfts.c | 3 +-- drivers/input/touchscreen/wm831x-ts.c | 3 +-- drivers/input/touchscreen/zinitix.c | 4 ++-- include/linux/interrupt.h | 4 ++++ kernel/irq/manage.c | 11 +++++++++-- 13 files changed, 31 insertions(+), 30 deletions(-) -- 2.25.1

2 3

[PATCH v2 0/3] drivers/perf: convert sysfs sprintf/snprintf/scnprintf to sysfs_emit
by Qi Liu 25 Mar '21

25 Mar '21

Use the generic sysfs_emit() and sysfs_emit_at() function to take place of sprintf/snprintf/scnprintf, to avoid buffer overrun. Qi Liu (2): drivers/perf: convert sysfs scnprintf family to sysfs_emit_at() and sysfs_emit() drivers/perf: convert sysfs sprintf family to sysfs_emit Zihao Tang (1): drivers/perf: convert sysfs snprintf family to sysfs_emit drivers/perf/arm-cci.c | 12 ++++++------ drivers/perf/arm-ccn.c | 31 +++++++++++++------------------ drivers/perf/arm-cmn.c | 22 +++++++++++----------- drivers/perf/arm_dmc620_pmu.c | 2 +- drivers/perf/arm_dsu_pmu.c | 5 ++--- drivers/perf/arm_smmuv3_pmu.c | 4 ++-- drivers/perf/arm_spe_pmu.c | 3 +-- drivers/perf/fsl_imx8_ddr_perf.c | 7 +++---- drivers/perf/hisilicon/hisi_uncore_pmu.c | 8 ++++---- drivers/perf/qcom_l2_pmu.c | 2 +- drivers/perf/qcom_l3_pmu.c | 4 ++-- drivers/perf/thunderx2_pmu.c | 4 ++-- drivers/perf/xgene_pmu.c | 4 ++-- 13 files changed, 50 insertions(+), 58 deletions(-) -- 2.8.1

2 4

[PATCH] drivers/perf: Simplify the SMMUv3 PMU event attributes
by Qi Liu 25 Mar '21

25 Mar '21

For each PMU event, there is a SMMU_EVENT_ATTR(xx, XX) and &smmu_event_attr_xx.attr.attr. Let's redefine the SMMU_EVENT_ATTR to simplify the smmu_pmu_events. Signed-off-by: Qi Liu <liuqi115(a)huawei.com> --- drivers/perf/arm_smmuv3_pmu.c | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/drivers/perf/arm_smmuv3_pmu.c b/drivers/perf/arm_smmuv3_pmu.c index 8ff7a67..4c8cb1b 100644 --- a/drivers/perf/arm_smmuv3_pmu.c +++ b/drivers/perf/arm_smmuv3_pmu.c @@ -509,27 +509,21 @@ static ssize_t smmu_pmu_event_show(struct device *dev, return sprintf(page, "event=0x%02llx\n", pmu_attr->id); } -#define SMMU_EVENT_ATTR(name, config) \ - PMU_EVENT_ATTR(name, smmu_event_attr_##name, \ - config, smmu_pmu_event_show) -SMMU_EVENT_ATTR(cycles, 0); -SMMU_EVENT_ATTR(transaction, 1); -SMMU_EVENT_ATTR(tlb_miss, 2); -SMMU_EVENT_ATTR(config_cache_miss, 3); -SMMU_EVENT_ATTR(trans_table_walk_access, 4); -SMMU_EVENT_ATTR(config_struct_access, 5); -SMMU_EVENT_ATTR(pcie_ats_trans_rq, 6); -SMMU_EVENT_ATTR(pcie_ats_trans_passed, 7); +#define SMMU_EVENT_ATTR(name, config) \ + (&((struct perf_pmu_events_attr) { \ + .attr = __ATTR(name, 0444, smmu_pmu_event_show, NULL), \ + .id = config, \ + }).attr.attr) static struct attribute *smmu_pmu_events[] = { - &smmu_event_attr_cycles.attr.attr, - &smmu_event_attr_transaction.attr.attr, - &smmu_event_attr_tlb_miss.attr.attr, - &smmu_event_attr_config_cache_miss.attr.attr, - &smmu_event_attr_trans_table_walk_access.attr.attr, - &smmu_event_attr_config_struct_access.attr.attr, - &smmu_event_attr_pcie_ats_trans_rq.attr.attr, - &smmu_event_attr_pcie_ats_trans_passed.attr.attr, + SMMU_EVENT_ATTR(cycles, 0), + SMMU_EVENT_ATTR(transaction, 1), + SMMU_EVENT_ATTR(tlb_miss, 2), + SMMU_EVENT_ATTR(config_cache_miss, 3), + SMMU_EVENT_ATTR(trans_table_walk_access, 4), + SMMU_EVENT_ATTR(config_struct_access, 5), + SMMU_EVENT_ATTR(pcie_ats_trans_rq, 6), + SMMU_EVENT_ATTR(pcie_ats_trans_passed, 7), NULL }; -- 2.8.1

2 1

[PATCH] nvme: use octal permissions '0444', '0200' and '0644'
by Meng Yu 25 Mar '21

25 Mar '21

Fixed following checkpatch warnings: 1. Symbolic permissions 'S_IRUGO' are not preferred. Consider using octal permissions '0444'; 2. Symbolic permissions 'S_IWUSR' are not preferred. Consider using octal permissions '0200'; 3. Symbolic permissions 'S_IRUGO | S_IWUSR' are not preferred. Consider using octal permissions '0644'; 4. And coding style fix. Signed-off-by: Meng Yu <yumeng18(a)huawei.com> --- drivers/nvme/host/core.c | 30 +++++++++++++++--------------- drivers/nvme/host/lightnvm.c | 6 +++--- drivers/nvme/host/multipath.c | 6 +++--- drivers/nvme/host/pci.c | 4 ++-- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index c2c5bc4..46dadfb 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -2578,7 +2578,7 @@ static void nvme_init_subnqn(struct nvme_subsystem *subsys, struct nvme_ctrl *ct size_t nqnlen; int off; - if(!(ctrl->quirks & NVME_QUIRK_IGNORE_DEV_SUBNQN)) { + if (!(ctrl->quirks & NVME_QUIRK_IGNORE_DEV_SUBNQN)) { nqnlen = strnlen(id->subnqn, NVMF_NQN_SIZE); if (nqnlen > 0 && nqnlen < NVMF_NQN_SIZE) { strlcpy(subsys->subnqn, id->subnqn, NVMF_NQN_SIZE); @@ -2670,7 +2670,7 @@ static ssize_t nvme_subsys_show_nqn(struct device *dev, return snprintf(buf, PAGE_SIZE, "%s\n", subsys->subnqn); } -static SUBSYS_ATTR_RO(subsysnqn, S_IRUGO, nvme_subsys_show_nqn); +static SUBSYS_ATTR_RO(subsysnqn, 0444, nvme_subsys_show_nqn); #define nvme_subsys_show_str_function(field) \ static ssize_t subsys_##field##_show(struct device *dev, \ @@ -2681,7 +2681,7 @@ static ssize_t subsys_##field##_show(struct device *dev, \ return sprintf(buf, "%.*s\n", \ (int)sizeof(subsys->field), subsys->field); \ } \ -static SUBSYS_ATTR_RO(field, S_IRUGO, subsys_##field##_show); +static SUBSYS_ATTR_RO(field, 0444, subsys_##field##_show); nvme_subsys_show_str_function(model); nvme_subsys_show_str_function(serial); @@ -3014,7 +3014,7 @@ int nvme_init_identify(struct nvme_ctrl *ctrl) ret = nvme_configure_apst(ctrl); if (ret < 0) return ret; - + ret = nvme_configure_timestamp(ctrl); if (ret < 0) return ret; @@ -3134,7 +3134,7 @@ static ssize_t nvme_sysfs_reset(struct device *dev, return ret; return count; } -static DEVICE_ATTR(reset_controller, S_IWUSR, NULL, nvme_sysfs_reset); +static DEVICE_ATTR(reset_controller, 0200, NULL, nvme_sysfs_reset); static ssize_t nvme_sysfs_rescan(struct device *dev, struct device_attribute *attr, const char *buf, @@ -3145,7 +3145,7 @@ static ssize_t nvme_sysfs_rescan(struct device *dev, nvme_queue_scan(ctrl); return count; } -static DEVICE_ATTR(rescan_controller, S_IWUSR, NULL, nvme_sysfs_rescan); +static DEVICE_ATTR(rescan_controller, 0200, NULL, nvme_sysfs_rescan); static inline struct nvme_ns_head *dev_to_ns_head(struct device *dev) { @@ -3290,7 +3290,7 @@ static ssize_t field##_show(struct device *dev, \ return sprintf(buf, "%.*s\n", \ (int)sizeof(ctrl->subsys->field), ctrl->subsys->field); \ } \ -static DEVICE_ATTR(field, S_IRUGO, field##_show, NULL); +static DEVICE_ATTR(field, 0444, field##_show, NULL); nvme_show_str_function(model); nvme_show_str_function(serial); @@ -3303,7 +3303,7 @@ static ssize_t field##_show(struct device *dev, \ struct nvme_ctrl *ctrl = dev_get_drvdata(dev); \ return sprintf(buf, "%d\n", ctrl->field); \ } \ -static DEVICE_ATTR(field, S_IRUGO, field##_show, NULL); +static DEVICE_ATTR(field, 0444, field##_show, NULL); nvme_show_int_function(cntlid); nvme_show_int_function(numa_node); @@ -3324,7 +3324,7 @@ static ssize_t nvme_sysfs_delete(struct device *dev, nvme_delete_ctrl_sync(ctrl); return count; } -static DEVICE_ATTR(delete_controller, S_IWUSR, NULL, nvme_sysfs_delete); +static DEVICE_ATTR(delete_controller, 0200, NULL, nvme_sysfs_delete); static ssize_t nvme_sysfs_show_transport(struct device *dev, struct device_attribute *attr, @@ -3334,7 +3334,7 @@ static ssize_t nvme_sysfs_show_transport(struct device *dev, return snprintf(buf, PAGE_SIZE, "%s\n", ctrl->ops->name); } -static DEVICE_ATTR(transport, S_IRUGO, nvme_sysfs_show_transport, NULL); +static DEVICE_ATTR(transport, 0444, nvme_sysfs_show_transport, NULL); static ssize_t nvme_sysfs_show_state(struct device *dev, struct device_attribute *attr, @@ -3357,7 +3357,7 @@ static ssize_t nvme_sysfs_show_state(struct device *dev, return sprintf(buf, "unknown state\n"); } -static DEVICE_ATTR(state, S_IRUGO, nvme_sysfs_show_state, NULL); +static DEVICE_ATTR(state, 0444, nvme_sysfs_show_state, NULL); static ssize_t nvme_sysfs_show_subsysnqn(struct device *dev, struct device_attribute *attr, @@ -3367,7 +3367,7 @@ static ssize_t nvme_sysfs_show_subsysnqn(struct device *dev, return snprintf(buf, PAGE_SIZE, "%s\n", ctrl->subsys->subnqn); } -static DEVICE_ATTR(subsysnqn, S_IRUGO, nvme_sysfs_show_subsysnqn, NULL); +static DEVICE_ATTR(subsysnqn, 0444, nvme_sysfs_show_subsysnqn, NULL); static ssize_t nvme_sysfs_show_hostnqn(struct device *dev, struct device_attribute *attr, @@ -3377,7 +3377,7 @@ static ssize_t nvme_sysfs_show_hostnqn(struct device *dev, return snprintf(buf, PAGE_SIZE, "%s\n", ctrl->opts->host->nqn); } -static DEVICE_ATTR(hostnqn, S_IRUGO, nvme_sysfs_show_hostnqn, NULL); +static DEVICE_ATTR(hostnqn, 0444, nvme_sysfs_show_hostnqn, NULL); static ssize_t nvme_sysfs_show_hostid(struct device *dev, struct device_attribute *attr, @@ -3387,7 +3387,7 @@ static ssize_t nvme_sysfs_show_hostid(struct device *dev, return snprintf(buf, PAGE_SIZE, "%pU\n", &ctrl->opts->host->id); } -static DEVICE_ATTR(hostid, S_IRUGO, nvme_sysfs_show_hostid, NULL); +static DEVICE_ATTR(hostid, 0444, nvme_sysfs_show_hostid, NULL); static ssize_t nvme_sysfs_show_address(struct device *dev, struct device_attribute *attr, @@ -3397,7 +3397,7 @@ static ssize_t nvme_sysfs_show_address(struct device *dev, return ctrl->ops->get_address(ctrl, buf, PAGE_SIZE); } -static DEVICE_ATTR(address, S_IRUGO, nvme_sysfs_show_address, NULL); +static DEVICE_ATTR(address, 0444, nvme_sysfs_show_address, NULL); static struct attribute *nvme_dev_attrs[] = { &dev_attr_reset_controller.attr, diff --git a/drivers/nvme/host/lightnvm.c b/drivers/nvme/host/lightnvm.c index 6960875..2c7b99f 100644 --- a/drivers/nvme/host/lightnvm.c +++ b/drivers/nvme/host/lightnvm.c @@ -1138,11 +1138,11 @@ static ssize_t nvm_dev_attr_show_20(struct device *dev, } #define NVM_DEV_ATTR_RO(_name) \ - DEVICE_ATTR(_name, S_IRUGO, nvm_dev_attr_show, NULL) + DEVICE_ATTR(_name, 0444, nvm_dev_attr_show, NULL) #define NVM_DEV_ATTR_12_RO(_name) \ - DEVICE_ATTR(_name, S_IRUGO, nvm_dev_attr_show_12, NULL) + DEVICE_ATTR(_name, 0444, nvm_dev_attr_show_12, NULL) #define NVM_DEV_ATTR_20_RO(_name) \ - DEVICE_ATTR(_name, S_IRUGO, nvm_dev_attr_show_20, NULL) + DEVICE_ATTR(_name, 0444, nvm_dev_attr_show_20, NULL) /* general attributes */ static NVM_DEV_ATTR_RO(version); diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c index da78e49..deab995 100644 --- a/drivers/nvme/host/multipath.c +++ b/drivers/nvme/host/multipath.c @@ -621,8 +621,8 @@ static ssize_t nvme_subsys_iopolicy_store(struct device *dev, return -EINVAL; } -SUBSYS_ATTR_RW(iopolicy, S_IRUGO | S_IWUSR, - nvme_subsys_iopolicy_show, nvme_subsys_iopolicy_store); +SUBSYS_ATTR_RW(iopolicy, 0644, nvme_subsys_iopolicy_show, + nvme_subsys_iopolicy_store); static ssize_t ana_grpid_show(struct device *dev, struct device_attribute *attr, char *buf) @@ -662,7 +662,7 @@ void nvme_mpath_add_disk(struct nvme_ns *ns, struct nvme_id_ns *id) mutex_unlock(&ns->ctrl->ana_lock); } else { mutex_lock(&ns->head->lock); - ns->ana_state = NVME_ANA_OPTIMIZED; + ns->ana_state = NVME_ANA_OPTIMIZED; nvme_mpath_set_live(ns); mutex_unlock(&ns->head->lock); } diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index e2bacd3..47ee949 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -1739,7 +1739,7 @@ static ssize_t nvme_cmb_show(struct device *dev, return scnprintf(buf, PAGE_SIZE, "cmbloc : x%08x\ncmbsz : x%08x\n", ndev->cmbloc, ndev->cmbsz); } -static DEVICE_ATTR(cmb, S_IRUGO, nvme_cmb_show, NULL); +static DEVICE_ATTR(cmb, 0444, nvme_cmb_show, NULL); static u64 nvme_cmb_size_unit(struct nvme_dev *dev) { @@ -2108,7 +2108,7 @@ static int nvme_setup_io_queues(struct nvme_dev *dev) if (nr_io_queues == 0) return 0; - + clear_bit(NVMEQ_ENABLED, &adminq->flags); if (dev->cmb_use_sqes) { -- 2.8.1

1 0

[PATCH] nvme: use octal permissions '0444' and '0644'
by yumeng 25 Mar '21

25 Mar '21

-------- 转发的消息 -------- 主题: [PATCH] nvme: use octal permissions '0444' and '0644' 日期: Thu, 25 Mar 2021 11:45:45 +0800 From: Meng Yu <yumeng18(a)huawei.com> 收件人: xuzaibo(a)huawei.com, wangzhou1(a)hisilicon.com, fanghao11(a)huawei.com, yekai13(a)huawei.com, qianweili(a)huawei.com, shenyang39(a)huawei.com, tanghui20(a)huawei.com, liulongfang(a)huawei.com, chensihang1(a)hisilicon.com, yumeng18(a)huawei.com, songzhiqi1(a)huawei.com Fixed following checkpatch warnings: 1. Symbolic permissions 'S_IRUGO | S_IWUSR' are not preferred. Consider using octal permissions '0644'; 2. Symbolic permissions 'S_IRUGO | S_IWUSR' are not preferred. Consider using octal permissions '0644'. Signed-off-by: Meng Yu <yumeng18(a)huawei.com> --- drivers/nvme/host/core.c | 30 +++++++++++++++--------------- drivers/nvme/host/lightnvm.c | 6 +++--- drivers/nvme/host/multipath.c | 6 +++--- drivers/nvme/host/pci.c | 4 ++-- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index e68a8c4..aec94d2 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -2867,7 +2867,7 @@ static ssize_t nvme_subsys_show_nqn(struct device *dev, return sysfs_emit(buf, "%s\n", subsys->subnqn); } -static SUBSYS_ATTR_RO(subsysnqn, S_IRUGO, nvme_subsys_show_nqn); +static SUBSYS_ATTR_RO(subsysnqn, 0444, nvme_subsys_show_nqn); #define nvme_subsys_show_str_function(field) \ static ssize_t subsys_##field##_show(struct device *dev, \ @@ -2878,7 +2878,7 @@ static ssize_t subsys_##field##_show(struct device *dev, \ return sprintf(buf, "%.*s\n", \ (int)sizeof(subsys->field), subsys->field); \ } \ -static SUBSYS_ATTR_RO(field, S_IRUGO, subsys_##field##_show); +static SUBSYS_ATTR_RO(field, 0444, subsys_##field##_show); nvme_subsys_show_str_function(model); nvme_subsys_show_str_function(serial); @@ -3224,7 +3224,7 @@ int nvme_init_identify(struct nvme_ctrl *ctrl) ret = nvme_configure_apst(ctrl); if (ret < 0) return ret; - + ret = nvme_configure_timestamp(ctrl); if (ret < 0) return ret; @@ -3520,7 +3520,7 @@ static ssize_t field##_show(struct device *dev, \ return sprintf(buf, "%.*s\n", \ (int)sizeof(ctrl->subsys->field), ctrl->subsys->field); \ } \ -static DEVICE_ATTR(field, S_IRUGO, field##_show, NULL); +static DEVICE_ATTR(field, 0444, field##_show, NULL); nvme_show_str_function(model); nvme_show_str_function(serial); @@ -3533,7 +3533,7 @@ static ssize_t field##_show(struct device *dev, \ struct nvme_ctrl *ctrl = dev_get_drvdata(dev); \ return sprintf(buf, "%d\n", ctrl->field); \ } \ -static DEVICE_ATTR(field, S_IRUGO, field##_show, NULL); +static DEVICE_ATTR(field, 0444, field##_show, NULL); nvme_show_int_function(cntlid); nvme_show_int_function(numa_node); @@ -3560,7 +3560,7 @@ static ssize_t nvme_sysfs_show_transport(struct device *dev, return sysfs_emit(buf, "%s\n", ctrl->ops->name); } -static DEVICE_ATTR(transport, S_IRUGO, nvme_sysfs_show_transport, NULL); +static DEVICE_ATTR(transport, 0444, nvme_sysfs_show_transport, NULL); static ssize_t nvme_sysfs_show_state(struct device *dev, struct device_attribute *attr, @@ -3584,7 +3584,7 @@ static ssize_t nvme_sysfs_show_state(struct device *dev, return sprintf(buf, "unknown state\n"); } -static DEVICE_ATTR(state, S_IRUGO, nvme_sysfs_show_state, NULL); +static DEVICE_ATTR(state, 0444, nvme_sysfs_show_state, NULL); static ssize_t nvme_sysfs_show_subsysnqn(struct device *dev, struct device_attribute *attr, @@ -3594,7 +3594,7 @@ static ssize_t nvme_sysfs_show_subsysnqn(struct device *dev, return sysfs_emit(buf, "%s\n", ctrl->subsys->subnqn); } -static DEVICE_ATTR(subsysnqn, S_IRUGO, nvme_sysfs_show_subsysnqn, NULL); +static DEVICE_ATTR(subsysnqn, 0444, nvme_sysfs_show_subsysnqn, NULL); static ssize_t nvme_sysfs_show_hostnqn(struct device *dev, struct device_attribute *attr, @@ -3604,7 +3604,7 @@ static ssize_t nvme_sysfs_show_hostnqn(struct device *dev, return sysfs_emit(buf, "%s\n", ctrl->opts->host->nqn); } -static DEVICE_ATTR(hostnqn, S_IRUGO, nvme_sysfs_show_hostnqn, NULL); +static DEVICE_ATTR(hostnqn, 0444, nvme_sysfs_show_hostnqn, NULL); static ssize_t nvme_sysfs_show_hostid(struct device *dev, struct device_attribute *attr, @@ -3614,7 +3614,7 @@ static ssize_t nvme_sysfs_show_hostid(struct device *dev, return sysfs_emit(buf, "%pU\n", &ctrl->opts->host->id); } -static DEVICE_ATTR(hostid, S_IRUGO, nvme_sysfs_show_hostid, NULL); +static DEVICE_ATTR(hostid, 0444, nvme_sysfs_show_hostid, NULL); static ssize_t nvme_sysfs_show_address(struct device *dev, struct device_attribute *attr, @@ -3624,7 +3624,7 @@ static ssize_t nvme_sysfs_show_address(struct device *dev, return ctrl->ops->get_address(ctrl, buf, PAGE_SIZE); } -static DEVICE_ATTR(address, S_IRUGO, nvme_sysfs_show_address, NULL); +static DEVICE_ATTR(address, 0444, nvme_sysfs_show_address, NULL); static ssize_t nvme_ctrl_loss_tmo_show(struct device *dev, struct device_attribute *attr, char *buf) @@ -3656,8 +3656,8 @@ static ssize_t nvme_ctrl_loss_tmo_store(struct device *dev, opts->reconnect_delay); return count; } -static DEVICE_ATTR(ctrl_loss_tmo, S_IRUGO | S_IWUSR, - nvme_ctrl_loss_tmo_show, nvme_ctrl_loss_tmo_store); +static DEVICE_ATTR(ctrl_loss_tmo, 0644, nvme_ctrl_loss_tmo_show, + nvme_ctrl_loss_tmo_store); static ssize_t nvme_ctrl_reconnect_delay_show(struct device *dev, struct device_attribute *attr, char *buf) @@ -3683,8 +3683,8 @@ static ssize_t nvme_ctrl_reconnect_delay_store(struct device *dev, ctrl->opts->reconnect_delay = v; return count; } -static DEVICE_ATTR(reconnect_delay, S_IRUGO | S_IWUSR, - nvme_ctrl_reconnect_delay_show, nvme_ctrl_reconnect_delay_store); +static DEVICE_ATTR(reconnect_delay, 0644, nvme_ctrl_reconnect_delay_show, + nvme_ctrl_reconnect_delay_store); static struct attribute *nvme_dev_attrs[] = { &dev_attr_reset_controller.attr, diff --git a/drivers/nvme/host/lightnvm.c b/drivers/nvme/host/lightnvm.c index b705988..ec25565 100644 --- a/drivers/nvme/host/lightnvm.c +++ b/drivers/nvme/host/lightnvm.c @@ -1137,11 +1137,11 @@ static ssize_t nvm_dev_attr_show_20(struct device *dev, } #define NVM_DEV_ATTR_RO(_name) \ - DEVICE_ATTR(_name, S_IRUGO, nvm_dev_attr_show, NULL) + DEVICE_ATTR(_name, 0444, nvm_dev_attr_show, NULL) #define NVM_DEV_ATTR_12_RO(_name) \ - DEVICE_ATTR(_name, S_IRUGO, nvm_dev_attr_show_12, NULL) + DEVICE_ATTR(_name, 0444, nvm_dev_attr_show_12, NULL) #define NVM_DEV_ATTR_20_RO(_name) \ - DEVICE_ATTR(_name, S_IRUGO, nvm_dev_attr_show_20, NULL) + DEVICE_ATTR(_name, 0444, nvm_dev_attr_show_20, NULL) /* general attributes */ static NVM_DEV_ATTR_RO(version); diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c index a1d476e..216604f 100644 --- a/drivers/nvme/host/multipath.c +++ b/drivers/nvme/host/multipath.c @@ -622,8 +622,8 @@ static ssize_t nvme_subsys_iopolicy_store(struct device *dev, return -EINVAL; } -SUBSYS_ATTR_RW(iopolicy, S_IRUGO | S_IWUSR, - nvme_subsys_iopolicy_show, nvme_subsys_iopolicy_store); +SUBSYS_ATTR_RW(iopolicy, 0644, nvme_subsys_iopolicy_show, + nvme_subsys_iopolicy_store); static ssize_t ana_grpid_show(struct device *dev, struct device_attribute *attr, char *buf) @@ -670,7 +670,7 @@ void nvme_mpath_add_disk(struct nvme_ns *ns, struct nvme_id_ns *id) nvme_update_ns_ana_state(&desc, ns); } } else { - ns->ana_state = NVME_ANA_OPTIMIZED; + ns->ana_state = NVME_ANA_OPTIMIZED; nvme_mpath_set_live(ns); } diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 17ab332..678eeba 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -1801,7 +1801,7 @@ static ssize_t nvme_cmb_show(struct device *dev, return scnprintf(buf, PAGE_SIZE, "cmbloc : x%08x\ncmbsz : x%08x\n", ndev->cmbloc, ndev->cmbsz); } -static DEVICE_ATTR(cmb, S_IRUGO, nvme_cmb_show, NULL); +static DEVICE_ATTR(cmb, 0444, nvme_cmb_show, NULL); static u64 nvme_cmb_size_unit(struct nvme_dev *dev) { @@ -2178,7 +2178,7 @@ static int nvme_setup_io_queues(struct nvme_dev *dev) if (nr_io_queues == 0) return 0; - + clear_bit(NVMEQ_ENABLED, &adminq->flags); if (dev->cmb_use_sqes) { -- 2.8.1 .

1 0

[PATCH v2] sched/topology: remove redundant cpumask_and in init_overlap_sched_group
by Barry Song 25 Mar '21

25 Mar '21

mask is built in build_balance_mask() by for_each_cpu(i, sg_span), so it must be a subset of sched_group_span(sg). Though cpumask_first_and doesn't lead to a wrong result of balance cpu, it is pointless to do cpumask_and again. Signed-off-by: Barry Song <song.bao.hua(a)hisilicon.com> Reviewed-by: Valentin Schneider <Valentin.Schneider(a)arm.com> --- -v2: add reviewed-by of Valentin, thanks! kernel/sched/topology.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c index f2066d682cd8..d1aec244c027 100644 --- a/kernel/sched/topology.c +++ b/kernel/sched/topology.c @@ -934,7 +934,7 @@ static void init_overlap_sched_group(struct sched_domain *sd, int cpu; build_balance_mask(sd, sg, mask); - cpu = cpumask_first_and(sched_group_span(sg), mask); + cpu = cpumask_first(mask); sg->sgc = *per_cpu_ptr(sdd->sgc, cpu); if (atomic_inc_return(&sg->sgc->ref) == 1) -- 2.25.1

1 0

[PATCH net v2] net: sched: fix packet stuck problem for lockless qdisc
by Yunsheng Lin 25 Mar '21

25 Mar '21

Lockless qdisc has below concurrent problem: cpu0 cpu1 . . q->enqueue . . . qdisc_run_begin() . . . dequeue_skb() . . . sch_direct_xmit() . . . . q->enqueue . qdisc_run_begin() . return and do nothing . . qdisc_run_end() . cpu1 enqueue a skb without calling __qdisc_run() because cpu0 has not released the lock yet and spin_trylock() return false for cpu1 in qdisc_run_begin(), and cpu0 do not see the skb enqueued by cpu1 when calling dequeue_skb() because cpu1 may enqueue the skb after cpu0 calling dequeue_skb() and before cpu0 calling qdisc_run_end(). Lockless qdisc has below another concurrent problem when tx_action is involved: cpu0(serving tx_action) cpu1 cpu2 . . . . q->enqueue . . qdisc_run_begin() . . dequeue_skb() . . . q->enqueue . . . . sch_direct_xmit() . . . qdisc_run_begin() . . return and do nothing . . . clear __QDISC_STATE_SCHED . . qdisc_run_begin() . . return and do nothing . . . . . . qdisc_run_end() . This patch fixes the above data race by: 1. Get the flag before doing spin_trylock(). 2. If the first spin_trylock() return false and the flag is not set before the first spin_trylock(), Set the flag and retry another spin_trylock() in case other CPU may not see the new flag after it releases the lock. 3. reschedule if the flags is set after the lock is released at the end of qdisc_run_end(). For tx_action case, the flags is also set when cpu1 is at the end if qdisc_run_end(), so tx_action will be rescheduled again to dequeue the skb enqueued by cpu2. Only clear the flag before retrying a dequeuing when dequeuing returns NULL in order to reduce the overhead of the above double spin_trylock() and __netif_schedule() calling. The performance impact of this patch, tested using pktgen and dummy netdev with pfifo_fast qdisc attached: threads without+this_patch with+this_patch delta 1 2.6Mpps 2.6Mpps +0.0% 2 3.9Mpps 3.8Mpps -2.5% 4 5.6Mpps 5.6Mpps -0.0% 8 2.7Mpps 2.8Mpps +3.7% 16 2.2Mpps 2.2Mpps +0.0% Fixes: 6b3ba9146fe6 ("net: sched: allow qdiscs to handle locking") Signed-off-by: Yunsheng Lin <linyunsheng(a)huawei.com> --- V2: Avoid the overhead of fixing the data race as much as possible. --- include/net/sch_generic.h | 48 ++++++++++++++++++++++++++++++++++++++++++++++- net/sched/sch_generic.c | 12 ++++++++++++ 2 files changed, 59 insertions(+), 1 deletion(-) diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h index f7a6e14..09a755d 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h @@ -36,6 +36,7 @@ struct qdisc_rate_table { enum qdisc_state_t { __QDISC_STATE_SCHED, __QDISC_STATE_DEACTIVATED, + __QDISC_STATE_NEED_RESCHEDULE, }; struct qdisc_size_table { @@ -159,12 +160,42 @@ static inline bool qdisc_is_empty(const struct Qdisc *qdisc) static inline bool qdisc_run_begin(struct Qdisc *qdisc) { if (qdisc->flags & TCQ_F_NOLOCK) { + bool dont_retry = test_bit(__QDISC_STATE_NEED_RESCHEDULE, + &qdisc->state); + + if (spin_trylock(&qdisc->seqlock)) + goto out; + + /* If the flag is set before doing the spin_trylock() and + * the above spin_trylock() return false, it means other cpu + * holding the lock will do dequeuing for us, or it wil see + * the flag set after releasing lock and reschedule the + * net_tx_action() to do the dequeuing. + */ + if (dont_retry) + return false; + + /* We could do set_bit() before the first spin_trylock(), + * and avoid doing secord spin_trylock() completely, then + * we could have multi cpus doing the test_bit(). Here use + * dont_retry to avoiding the test_bit() and the second + * spin_trylock(), which has 5% performance improvement than + * doing the set_bit() before the first spin_trylock(). + */ + set_bit(__QDISC_STATE_NEED_RESCHEDULE, + &qdisc->state); + + /* Retry again in case other CPU may not see the new flag + * after it releases the lock at the end of qdisc_run_end(). + */ if (!spin_trylock(&qdisc->seqlock)) return false; WRITE_ONCE(qdisc->empty, false); } else if (qdisc_is_running(qdisc)) { return false; } + +out: /* Variant of write_seqcount_begin() telling lockdep a trylock * was attempted. */ @@ -176,8 +207,23 @@ static inline bool qdisc_run_begin(struct Qdisc *qdisc) static inline void qdisc_run_end(struct Qdisc *qdisc) { write_seqcount_end(&qdisc->running); - if (qdisc->flags & TCQ_F_NOLOCK) + if (qdisc->flags & TCQ_F_NOLOCK) { spin_unlock(&qdisc->seqlock); + + /* qdisc_run_end() is protected by RCU lock, and + * qdisc reset will do a synchronize_net() after + * setting __QDISC_STATE_DEACTIVATED, so testing + * the below two bits separately should be fine. + * For qdisc_run() in net_tx_action() case, we + * really should provide rcu protection explicitly + * for document purposes or PREEMPT_RCU. + */ + if (unlikely(test_bit(__QDISC_STATE_NEED_RESCHEDULE, + &qdisc->state) && + !test_bit(__QDISC_STATE_DEACTIVATED, + &qdisc->state))) + __netif_schedule(qdisc); + } } static inline bool qdisc_may_bulk(const struct Qdisc *qdisc) diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c index 44991ea..7e3426b 100644 --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c @@ -640,8 +640,10 @@ static struct sk_buff *pfifo_fast_dequeue(struct Qdisc *qdisc) { struct pfifo_fast_priv *priv = qdisc_priv(qdisc); struct sk_buff *skb = NULL; + bool need_retry = true; int band; +retry: for (band = 0; band < PFIFO_FAST_BANDS && !skb; band++) { struct skb_array *q = band2list(priv, band); @@ -652,6 +654,16 @@ static struct sk_buff *pfifo_fast_dequeue(struct Qdisc *qdisc) } if (likely(skb)) { qdisc_update_stats_at_dequeue(qdisc, skb); + } else if (need_retry && + test_and_clear_bit(__QDISC_STATE_NEED_RESCHEDULE, + &qdisc->stat)) { + /* do another enqueuing after clearing the flag to + * avoid calling __netif_schedule(). + */ + smp_mb__after_atomic(); + need_retry = false; + + goto retry; } else { WRITE_ONCE(qdisc->empty, true); } -- 2.7.4

2 2

2024

2023

2022

2021

2020

Linuxarm