- Kernel - mailweb.openeuler.org

[PATCH OLK-5.10] EHCI:Clear wakeup signal locked in S0 state when device plug in
by LeoLiuoc 14 Jan '22

14 Jan '22

If we plug in a LS/FS device on USB2 port of EHCI, it will latch a wakeup signal in EHCI internal. This is a bug of EHCI for Some project of ZhaoXin. If enable EHCI runtime suspend and no device attach. PM core will let EHCI go to D3 to save power. However, once EHCI go to D3, it will release wakeup signal that latched on device connect to port during S0. Which will generate a SCI interrupt and bring EHCI to D0. But without device connect, EHCI will go to D3 again. So, there is suspend-resume loop and generate SCI interrupt Continuously. In order to fix this issues, we need to clear the wakeup signal latched in EHCI when EHCI suspend function is called. Signed-off-by: LeoLiu-oc <LeoLiu-oc(a)zhaoxin.com> --- drivers/pci/pci-driver.c | 6 +++++- drivers/usb/host/ehci-hcd.c | 21 +++++++++++++++++++++ drivers/usb/host/ehci-pci.c | 4 ++++ drivers/usb/host/ehci.h | 1 + 4 files changed, 31 insertions(+), 1 deletion(-) diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index 8b587fc97..c33d7e0a6 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -518,7 +518,11 @@ static int pci_restore_standard_config(struct pci_dev *pci_dev) } pci_restore_state(pci_dev); - pci_pme_restore(pci_dev); + if (!((pci_dev->vendor == PCI_VENDOR_ID_ZHAOXIN) && + (pci_dev->device == 0x3104) && + ((pci_dev->revision & 0xf0) == 0x90)) || + !(pci_dev->class == PCI_CLASS_SERIAL_USB_EHCI)) + pci_pme_restore(pci_dev); return 0; } diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index 8aff19ff8..586e2735d 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -1142,6 +1142,27 @@ int ehci_suspend(struct usb_hcd *hcd, bool do_wakeup) return -EBUSY; } + /*clear wakeup signal locked in S0 state when device plug in*/ + if (ehci->zx_wakeup_clear == 1) { + u32 __iomem *reg = &ehci->regs->port_status[4]; + u32 t1 = ehci_readl(ehci, reg); + + t1 &= (u32)~0xf0000; + t1 |= PORT_TEST_FORCE; + ehci_writel(ehci, t1, reg); + t1 = ehci_readl(ehci, reg); + usleep_range(1000, 2000); + t1 &= (u32)~0xf0000; + ehci_writel(ehci, t1, reg); + usleep_range(1000, 2000); + t1 = ehci_readl(ehci, reg); + ehci_writel(ehci, t1 | PORT_CSC, reg); + udelay(500); + t1 = ehci_readl(ehci, &ehci->regs->status); + ehci_writel(ehci, t1 & STS_PCD, &ehci->regs->status); + ehci_readl(ehci, &ehci->regs->status); + } + return 0; } EXPORT_SYMBOL_GPL(ehci_suspend); diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c index e87cf3a00..a5e27deda 100644 --- a/drivers/usb/host/ehci-pci.c +++ b/drivers/usb/host/ehci-pci.c @@ -222,6 +222,10 @@ static int ehci_pci_setup(struct usb_hcd *hcd) ehci->has_synopsys_hc_bug = 1; } break; + case PCI_VENDOR_ID_ZHAOXIN: + if (pdev->device == 0x3104 && (pdev->revision & 0xf0) == 0x90) + ehci->zx_wakeup_clear = 1; + break; } /* optional debug port, normally in the first BAR */ diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h index 59fd523c5..8da080a54 100644 --- a/drivers/usb/host/ehci.h +++ b/drivers/usb/host/ehci.h @@ -219,6 +219,7 @@ struct ehci_hcd { /* one per controller */ unsigned need_oc_pp_cycle:1; /* MPC834X port power */ unsigned imx28_write_fix:1; /* For Freescale i.MX28 */ unsigned is_aspeed:1; + unsigned zx_wakeup_clear:1; /* required for usb32 quirk */ #define OHCI_CTRL_HCFS (3 << 6) -- 2.25.1

1 0

[PATCH OLK-5.10] XHCI:Fix some device identify fail when enable xHCI runtime suspend
by LeoLiuoc 14 Jan '22

14 Jan '22

If plug out device form xhci with runtime suspend enabled. On the one hand, driver will disconnect this device and send disabled slot command to xhci. On the other hand, without no device connect to xhci, PM core will call xhci suspend function to let xhci go to D3 to save power. However there is a temporal competition to get xhci lock between disable slot command interrupt and xhci suspend. If xhci suspend function get xhci lock first, then this function will clear xhci command ring. It will get error command trb when driver to handle disable slot command interrupt. This is a serious error for driver and driver will cleanup xhci. So，any device connect to this xhci port again will not be recognized. In order to fix this issues, we let disable slot command interrupt ISR to get xhci lock first. So, add a delay in xhci suspend function before to get xhci lock. Signed-off-by: LeoLiu-oc <LeoLiu-oc(a)zhaoxin.com> --- drivers/usb/host/xhci-pci.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c index 583a8e895..83aa8e179 100644 --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c @@ -272,6 +272,8 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) xhci->quirks |= XHCI_LPM_SUPPORT; xhci->quirks |= XHCI_ZHAOXIN_HOST; } + if (pdev->vendor == PCI_VENDOR_ID_ZHAOXIN) + xhci->quirks |= XHCI_SUSPEND_DELAY; /* See https://bugzilla.kernel.org/show_bug.cgi?id=79511 */ if (pdev->vendor == PCI_VENDOR_ID_VIA && -- 2.20.1

1 0

[PATCH OLK-5.10] rtc: Fix set RTC time delay 500ms on some Zhaoxin SOCs
by LeoLiuoc 14 Jan '22

14 Jan '22

When the RTC divider is changed from reset to an operating time base, the first update cycle should be 500ms later. But on some Zhaoxin SOCs, this first update cycle is one second later. So set RTC time on these Zhaoxin SOCs will causing 500ms delay. Skip setup RTC divider on these SOCs in mc146818_set_time to fix it. Signed-off-by: LeoLiu-oc <LeoLiu-oc(a)zhaoxin.com> --- drivers/rtc/rtc-mc146818-lib.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/drivers/rtc/rtc-mc146818-lib.c b/drivers/rtc/rtc-mc146818-lib.c index 2ecd8752b..96d9d0219 100644 --- a/drivers/rtc/rtc-mc146818-lib.c +++ b/drivers/rtc/rtc-mc146818-lib.c @@ -171,8 +171,17 @@ int mc146818_set_time(struct rtc_time *time) save_control = CMOS_READ(RTC_CONTROL); CMOS_WRITE((save_control|RTC_SET), RTC_CONTROL); +#ifdef CONFIG_X86 + if (!((boot_cpu_data.x86_vendor == X86_VENDOR_CENTAUR || + boot_cpu_data.x86_vendor == X86_VENDOR_ZHAOXIN) && + (boot_cpu_data.x86 <= 7 && boot_cpu_data.x86_model <= 59))) { + save_freq_select = CMOS_READ(RTC_FREQ_SELECT); + CMOS_WRITE((save_freq_select|RTC_DIV_RESET2), RTC_FREQ_SELECT); + } +#else save_freq_select = CMOS_READ(RTC_FREQ_SELECT); CMOS_WRITE((save_freq_select|RTC_DIV_RESET2), RTC_FREQ_SELECT); +#endif #ifdef CONFIG_MACH_DECSTATION CMOS_WRITE(real_yrs, RTC_DEC_YEAR); @@ -190,7 +199,14 @@ int mc146818_set_time(struct rtc_time *time) #endif CMOS_WRITE(save_control, RTC_CONTROL); +#ifdef CONFIG_X86 + if (!((boot_cpu_data.x86_vendor == X86_VENDOR_CENTAUR || + boot_cpu_data.x86_vendor == X86_VENDOR_ZHAOXIN) && + (boot_cpu_data.x86 <= 7 && boot_cpu_data.x86_model <= 59))) + CMOS_WRITE(save_freq_select, RTC_FREQ_SELECT); +#else CMOS_WRITE(save_freq_select, RTC_FREQ_SELECT); +#endif spin_unlock_irqrestore(&rtc_lock, flags); -- 2.20.1

1 0

[PATCH OLK-5.10 v2 1/3] arm64: Add memmap parameter for pmem
by Zhuling 14 Jan '22

14 Jan '22

hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I4O31I?from=project-issue CVE: NA Add "!" in memmap parameter, use memmap(memmap=nn[KMG]!ss[KMG]) reserve memory for pmem which register persistent memory in arm64. Signed-off-by: Zhuling <zhuling8(a)huawei.com> --- Documentation/admin-guide/kernel-parameters.txt | 9 +++++++-- arch/arm64/mm/init.c | 6 ++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 64be32b..ab42db4 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -2829,10 +2829,15 @@ will be eaten. memmap=nn[KMG]!ss[KMG] - [KNL,X86] Mark specific memory as protected. + [KNL,X86,ARM64] Mark specific memory as protected. Region of memory to be used, from ss to ss+nn. - The memory region may be marked as e820 type 12 (0xc) + [X86]The memory region may be marked as e820 type 12 (0xc) and is NVDIMM or ADR memory. + [ARM64]Reserve memory for persistent storage when the kernel + restart or update. the data in PMEM will not be lost and can + be loaded faster + Example: + memmap=100K!0x1a0000000 memmap=<size>%<offset>-<oldtype>+<newtype> [KNL,ACPI] Convert memory within the specified region diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index 6ebfabd..b6512dc 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -56,6 +56,8 @@ s64 memstart_addr __ro_after_init = -1; EXPORT_SYMBOL(memstart_addr); +phys_addr_t start_at, mem_size; + #ifdef CONFIG_PIN_MEMORY struct resource pin_memory_resource = { .name = "Pin memory", @@ -442,6 +444,10 @@ static int __init parse_memmap_one(char *p) start_at = memparse(p + 1, &p); memblock_reserve(start_at, mem_size); memblock_mark_memmap(start_at, mem_size); + } else if (*p == '!') { + start_at = memparse(p+1, &p); + pmem_start = start_at; + pmem_size = mem_size; } else pr_info("Unrecognized memmap option, please check the parameter.\n"); -- 2.9.5

1 2

openEuler kernel技术分享第十七期 & 双周例会
by openEuler conference 14 Jan '22

14 Jan '22

您好！ Kernel SIG 邀请您参加 2021-12-31 14:00 召开的ZOOM会议(自动录制) 会议主题：openEuler kernel技术分享第十七期 & 双周例会会议内容： 14:10-15:30 openEuler kernel 技术分享第17期 - cgroup介绍会议链接：https://us06web.zoom.us/j/83118407147?pwd=elVzMVhGc2YzaDQ1TGorN2tPa1NhZz09 温馨提醒：建议接入会议后修改参会人的姓名，也可以使用您在gitee.com的ID 更多资讯尽在：https://openeuler.org/zh/ Hello! openEuler Kernel SIG invites you to attend the ZOOM conference(auto recording) will be held at 2021-12-31 14:00, The subject of the conference is openEuler kernel技术分享第十七期 & 双周例会, Summary: 14:10-15:30 openEuler kernel 技术分享第17期 - cgroup介绍 You can join the meeting at https://us06web.zoom.us/j/83118407147?pwd=elVzMVhGc2YzaDQ1TGorN2tPa1NhZz09. Note: You are advised to change the participant name after joining the conference or use your ID at gitee.com. More information: https://openeuler.org/en/

3 2

openEuler kernel SIG 双周例会
by openEuler conference 14 Jan '22

14 Jan '22

您好！ Kernel SIG 邀请您参加 2022-01-14 14:00 召开的ZOOM会议(自动录制) 会议主题：openEuler kernel SIG 双周例会会议内容：议题：ebpf增加机制以支持非主线helper从而保证一定的兼容性会议链接：https://us06web.zoom.us/j/86252266487?pwd=VjRNTVJzdkVwaXl6K2V1VUcxTWpEQT09 温馨提醒：建议接入会议后修改参会人的姓名，也可以使用您在gitee.com的ID 更多资讯尽在：https://openeuler.org/zh/ Hello! openEuler Kernel SIG invites you to attend the ZOOM conference(auto recording) will be held at 2022-01-14 14:00, The subject of the conference is openEuler kernel SIG 双周例会, Summary: 议题：ebpf增加机制以支持非主线helper从而保证一定的兼容性 You can join the meeting at https://us06web.zoom.us/j/86252266487?pwd=VjRNTVJzdkVwaXl6K2V1VUcxTWpEQT09. Note: You are advised to change the participant name after joining the conference or use your ID at gitee.com. More information: https://openeuler.org/en/

2 1

[PATCH OLK-5.10] scsi: core: Stop using DRIVER_ERROR
by Zhang Yi 14 Jan '22

14 Jan '22

From: Hannes Reinecke <hare(a)suse.de> mainline inclusion from mainline-5.14-rc1 commit ced202f7bd78eb6a79c441a8b217e0f3d38bccfc category: bugfix bugzilla: 185813 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… --------------------------- Return the actual error code in __scsi_execute() (which, according to the documentation, should have happened anyway). And audit all callers to cope with negative return values from __scsi_execute() and friends. [mkp: resolve conflict and return bool] Link: https://lore.kernel.org/r/20210427083046.31620-7-hare@suse.de Reviewed-by: Bart Van Assche <bvanassche(a)acm.org> Reviewed-by: Christoph Hellwig <hch(a)lst.de> Signed-off-by: Hannes Reinecke <hare(a)suse.de> Signed-off-by: Martin K. Petersen <martin.petersen(a)oracle.com> Signed-off-by: Zhang Yi <yi.zhang(a)huawei.com> --- drivers/ata/libata-scsi.c | 8 ++++++++ drivers/scsi/ch.c | 3 ++- drivers/scsi/cxlflash/superpipe.c | 2 +- drivers/scsi/scsi.c | 2 ++ drivers/scsi/scsi_ioctl.c | 4 +++- drivers/scsi/scsi_lib.c | 15 +++++++++------ drivers/scsi/scsi_scan.c | 4 ++-- drivers/scsi/scsi_transport_spi.c | 2 +- drivers/scsi/sd.c | 15 +++++++++------ drivers/scsi/sd_zbc.c | 2 +- drivers/scsi/sr_ioctl.c | 4 ++++ drivers/scsi/ufs/ufshcd.c | 2 +- drivers/scsi/virtio_scsi.c | 2 +- include/scsi/scsi.h | 7 +++++-- 14 files changed, 49 insertions(+), 23 deletions(-) diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index 48b8934970f3..c5129b9e3afd 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c @@ -409,6 +409,10 @@ int ata_cmd_ioctl(struct scsi_device *scsidev, void __user *arg) cmd_result = scsi_execute(scsidev, scsi_cmd, data_dir, argbuf, argsize, sensebuf, &sshdr, (10*HZ), 5, 0, 0, NULL); + if (cmd_result < 0) { + rc = cmd_result; + goto error; + } if (driver_byte(cmd_result) == DRIVER_SENSE) {/* sense data available */ u8 *desc = sensebuf + 8; cmd_result &= ~(0xFF<<24); /* DRIVER_SENSE is not an error */ @@ -490,6 +494,10 @@ int ata_task_ioctl(struct scsi_device *scsidev, void __user *arg) cmd_result = scsi_execute(scsidev, scsi_cmd, DMA_NONE, NULL, 0, sensebuf, &sshdr, (10*HZ), 5, 0, 0, NULL); + if (cmd_result < 0) { + rc = cmd_result; + goto error; + } if (driver_byte(cmd_result) == DRIVER_SENSE) {/* sense data available */ u8 *desc = sensebuf + 8; cmd_result &= ~(0xFF<<24); /* DRIVER_SENSE is not an error */ diff --git a/drivers/scsi/ch.c b/drivers/scsi/ch.c index cb74ab1ae5a4..0e7d1214c3d8 100644 --- a/drivers/scsi/ch.c +++ b/drivers/scsi/ch.c @@ -198,7 +198,8 @@ ch_do_scsi(scsi_changer *ch, unsigned char *cmd, int cmd_len, result = scsi_execute_req(ch->device, cmd, direction, buffer, buflength, &sshdr, timeout * HZ, MAX_RETRIES, NULL); - + if (result < 0) + return result; if (driver_byte(result) == DRIVER_SENSE) { if (debug) scsi_print_sense_hdr(ch->device, ch->name, &sshdr); diff --git a/drivers/scsi/cxlflash/superpipe.c b/drivers/scsi/cxlflash/superpipe.c index 5dddf67dfa24..3ebb7ac86a64 100644 --- a/drivers/scsi/cxlflash/superpipe.c +++ b/drivers/scsi/cxlflash/superpipe.c @@ -369,7 +369,7 @@ static int read_cap16(struct scsi_device *sdev, struct llun_info *lli) goto out; } - if (driver_byte(result) == DRIVER_SENSE) { + if (result > 0 && driver_byte(result) == DRIVER_SENSE) { result &= ~(0xFF<<24); /* DRIVER_SENSE is not an error */ if (result & SAM_STAT_CHECK_CONDITION) { switch (sshdr.sense_key) { diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c index 6ad834d61d4c..f561caabc771 100644 --- a/drivers/scsi/scsi.c +++ b/drivers/scsi/scsi.c @@ -495,6 +495,8 @@ int scsi_report_opcode(struct scsi_device *sdev, unsigned char *buffer, result = scsi_execute_req(sdev, cmd, DMA_FROM_DEVICE, buffer, len, &sshdr, 30 * HZ, 3, NULL); + if (result < 0) + return result; if (result && scsi_sense_valid(&sshdr) && sshdr.sense_key == ILLEGAL_REQUEST && (sshdr.asc == 0x20 || sshdr.asc == 0x24) && sshdr.ascq == 0x00) diff --git a/drivers/scsi/scsi_ioctl.c b/drivers/scsi/scsi_ioctl.c index 14872c9dc78c..d34e1b41dc71 100644 --- a/drivers/scsi/scsi_ioctl.c +++ b/drivers/scsi/scsi_ioctl.c @@ -101,6 +101,8 @@ static int ioctl_internal_command(struct scsi_device *sdev, char *cmd, SCSI_LOG_IOCTL(2, sdev_printk(KERN_INFO, sdev, "Ioctl returned 0x%x\n", result)); + if (result < 0) + goto out; if (driver_byte(result) == DRIVER_SENSE && scsi_sense_valid(&sshdr)) { switch (sshdr.sense_key) { @@ -133,7 +135,7 @@ static int ioctl_internal_command(struct scsi_device *sdev, char *cmd, break; } } - +out: SCSI_LOG_IOCTL(2, sdev_printk(KERN_INFO, sdev, "IOCTL Releasing command\n")); return result; diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 0a265a3e3dc6..9352a309fe55 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -245,20 +245,23 @@ int __scsi_execute(struct scsi_device *sdev, const unsigned char *cmd, { struct request *req; struct scsi_request *rq; - int ret = DRIVER_ERROR << 24; + int ret; req = blk_get_request(sdev->request_queue, data_direction == DMA_TO_DEVICE ? REQ_OP_SCSI_OUT : REQ_OP_SCSI_IN, rq_flags & RQF_PM ? BLK_MQ_REQ_PM : 0); if (IS_ERR(req)) - return ret; - rq = scsi_req(req); + return PTR_ERR(req); - if (bufflen && blk_rq_map_kern(sdev->request_queue, req, - buffer, bufflen, GFP_NOIO)) - goto out; + rq = scsi_req(req); + if (bufflen) { + ret = blk_rq_map_kern(sdev->request_queue, req, + buffer, bufflen, GFP_NOIO); + if (ret) + goto out; + } rq->cmd_len = COMMAND_SIZE(cmd[0]); memcpy(rq->cmd, cmd, rq->cmd_len); rq->retries = retries; diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c index 8e474b145249..57002529174f 100644 --- a/drivers/scsi/scsi_scan.c +++ b/drivers/scsi/scsi_scan.c @@ -599,7 +599,7 @@ static int scsi_probe_lun(struct scsi_device *sdev, unsigned char *inq_result, "scsi scan: INQUIRY %s with code 0x%x\n", result ? "failed" : "successful", result)); - if (result) { + if (result > 0) { /* * not-ready to ready transition [asc/ascq=0x28/0x0] * or power-on, reset [asc/ascq=0x29/0x0], continue. @@ -614,7 +614,7 @@ static int scsi_probe_lun(struct scsi_device *sdev, unsigned char *inq_result, (sshdr.ascq == 0)) continue; } - } else { + } else if (result == 0) { /* * if nothing was transferred, we try * again. It's a workaround for some USB diff --git a/drivers/scsi/scsi_transport_spi.c b/drivers/scsi/scsi_transport_spi.c index c37dd15d16d2..a9bb7ae2fafd 100644 --- a/drivers/scsi/scsi_transport_spi.c +++ b/drivers/scsi/scsi_transport_spi.c @@ -127,7 +127,7 @@ static int spi_execute(struct scsi_device *sdev, const void *cmd, REQ_FAILFAST_TRANSPORT | REQ_FAILFAST_DRIVER, RQF_PM, NULL); - if (driver_byte(result) != DRIVER_SENSE || + if (result < 0 || driver_byte(result) != DRIVER_SENSE || sshdr->sense_key != UNIT_ATTENTION) break; } diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 97713f595a29..3fc184e9702f 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -1673,7 +1673,7 @@ static unsigned int sd_check_events(struct gendisk *disk, unsigned int clearing) &sshdr); /* failed to execute TUR, assume media not present */ - if (host_byte(retval)) { + if (retval < 0 || host_byte(retval)) { set_media_not_present(sdkp); goto out; } @@ -1734,6 +1734,9 @@ static int sd_sync_cache(struct scsi_disk *sdkp, struct scsi_sense_hdr *sshdr) if (res) { sd_print_result(sdkp, "Synchronize Cache(10) failed", res); + if (res < 0) + return res; + if (driver_byte(res) == DRIVER_SENSE) sd_print_sense_hdr(sdkp, sshdr); @@ -1842,7 +1845,7 @@ static int sd_pr_command(struct block_device *bdev, u8 sa, result = scsi_execute_req(sdev, cmd, DMA_TO_DEVICE, &data, sizeof(data), &sshdr, SD_TIMEOUT, sdkp->max_retries, NULL); - if (driver_byte(result) == DRIVER_SENSE && + if (result > 0 && driver_byte(result) == DRIVER_SENSE && scsi_sense_valid(&sshdr)) { sdev_printk(KERN_INFO, sdev, "PR command failed: %d\n", result); scsi_print_sense_hdr(sdev, NULL, &sshdr); @@ -2194,7 +2197,7 @@ sd_spinup_disk(struct scsi_disk *sdkp) ((driver_byte(the_result) == DRIVER_SENSE) && sense_valid && sshdr.sense_key == UNIT_ATTENTION))); - if (driver_byte(the_result) != DRIVER_SENSE) { + if (the_result < 0 || driver_byte(the_result) != DRIVER_SENSE) { /* no sense, TUR either succeeded or failed * with a status error */ if(!spintime && !scsi_status_is_good(the_result)) { @@ -2379,7 +2382,7 @@ static int read_capacity_16(struct scsi_disk *sdkp, struct scsi_device *sdp, if (media_not_present(sdkp, &sshdr)) return -ENODEV; - if (the_result) { + if (the_result > 0) { sense_valid = scsi_sense_valid(&sshdr); if (sense_valid && sshdr.sense_key == ILLEGAL_REQUEST && @@ -2464,7 +2467,7 @@ static int read_capacity_10(struct scsi_disk *sdkp, struct scsi_device *sdp, if (media_not_present(sdkp, &sshdr)) return -ENODEV; - if (the_result) { + if (the_result > 0) { sense_valid = scsi_sense_valid(&sshdr); if (sense_valid && sshdr.sense_key == UNIT_ATTENTION && @@ -3614,7 +3617,7 @@ static int sd_start_stop_device(struct scsi_disk *sdkp, int start) SD_TIMEOUT, sdkp->max_retries, 0, RQF_PM, NULL); if (res) { sd_print_result(sdkp, "Start/Stop Unit failed", res); - if (driver_byte(res) == DRIVER_SENSE) + if (res > 0 && driver_byte(res) == DRIVER_SENSE) sd_print_sense_hdr(sdkp, &sshdr); if (scsi_sense_valid(&sshdr) && /* 0x3a is medium not present */ diff --git a/drivers/scsi/sd_zbc.c b/drivers/scsi/sd_zbc.c index 01088f333dbc..6834e029906a 100644 --- a/drivers/scsi/sd_zbc.c +++ b/drivers/scsi/sd_zbc.c @@ -116,7 +116,7 @@ static int sd_zbc_do_report_zones(struct scsi_disk *sdkp, unsigned char *buf, sd_printk(KERN_ERR, sdkp, "REPORT ZONES start lba %llu failed\n", lba); sd_print_result(sdkp, "REPORT ZONES", result); - if (driver_byte(result) == DRIVER_SENSE && + if (result > 0 && driver_byte(result) == DRIVER_SENSE && scsi_sense_valid(&sshdr)) sd_print_sense_hdr(sdkp, &sshdr); return -EIO; diff --git a/drivers/scsi/sr_ioctl.c b/drivers/scsi/sr_ioctl.c index ffcf902da390..4c1de11e69fb 100644 --- a/drivers/scsi/sr_ioctl.c +++ b/drivers/scsi/sr_ioctl.c @@ -205,6 +205,10 @@ int sr_do_ioctl(Scsi_CD *cd, struct packet_command *cgc) cgc->timeout, IOCTL_RETRIES, 0, 0, NULL); /* Minimal error checking. Ignore cases we know about, and report the rest. */ + if (result < 0) { + err = result; + goto out; + } if (driver_byte(result) != 0) { switch (sshdr->sense_key) { case UNIT_ATTENTION: diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index 930f35863cbb..b8462f54cb72 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -8354,7 +8354,7 @@ static int ufshcd_set_dev_pwr_mode(struct ufs_hba *hba, sdev_printk(KERN_WARNING, sdp, "START_STOP failed for power mode: %d, result %x\n", pwr_mode, ret); - if (driver_byte(ret) == DRIVER_SENSE) + if (ret > 0 && driver_byte(ret) == DRIVER_SENSE) scsi_print_sense_hdr(sdp, NULL, &sshdr); } diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c index 6dac58ae6120..fabbad5cda60 100644 --- a/drivers/scsi/virtio_scsi.c +++ b/drivers/scsi/virtio_scsi.c @@ -355,7 +355,7 @@ static void virtscsi_rescan_hotunplug(struct virtio_scsi *vscsi) if (result == 0 && inq_result[0] >> 5) { /* PQ indicates the LUN is not attached */ scsi_remove_device(sdev); - } else if (host_byte(result) == DID_BAD_TARGET) { + } else if (result > 0 && host_byte(result) == DID_BAD_TARGET) { /* * If all LUNs of a virtio-scsi device are unplugged * it will respond with BAD TARGET on any INQUIRY diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h index 7ac50dbee475..6f227b610681 100644 --- a/include/scsi/scsi.h +++ b/include/scsi/scsi.h @@ -256,10 +256,13 @@ static inline int scsi_is_wlun(u64 lun) * This returns true for known good conditions that may be treated as * command completed normally */ -static inline int scsi_status_is_good(int status) +static inline bool scsi_status_is_good(int status) { + if (status < 0) + return false; + if (host_byte(status) == DID_NO_CONNECT) - return 0; + return false; /* * FIXME: bit0 is listed as reserved in SCSI-2, but is -- 2.31.1

1 0

[PATCH OLK-5.10] SCSI: spfc: Update lb mode acquired solution
by Yanling Song 14 Jan '22

14 Jan '22

Ramaxel inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I4QLBP CVE: NA Changes: 1. Read lb mode from chip 2. Disable fake vf function 3. Remove unnecessary code Signed-off-by: Yanling Song <songyl(a)ramaxel.com> Reviewed-by: Yun Xu <xuyun(a)ramaxel.com> --- .../ethernet/ramaxel/spnic/hw/sphw_cfg_cmd.h | 3 +- .../ethernet/ramaxel/spnic/hw/sphw_hw_cfg.c | 3 + .../ethernet/ramaxel/spnic/hw/sphw_hw_cfg.h | 3 + drivers/scsi/spfc/hw/spfc_cqm_bat_cla.c | 43 +-- drivers/scsi/spfc/hw/spfc_cqm_bitmap_table.c | 10 +- drivers/scsi/spfc/hw/spfc_cqm_main.c | 299 +----------------- drivers/scsi/spfc/hw/spfc_cqm_main.h | 3 - drivers/scsi/spfc/hw/spfc_cqm_object.c | 21 -- 8 files changed, 29 insertions(+), 356 deletions(-) diff --git a/drivers/net/ethernet/ramaxel/spnic/hw/sphw_cfg_cmd.h b/drivers/net/ethernet/ramaxel/spnic/hw/sphw_cfg_cmd.h index 23644958e33a..63b89e71c552 100644 --- a/drivers/net/ethernet/ramaxel/spnic/hw/sphw_cfg_cmd.h +++ b/drivers/net/ethernet/ramaxel/spnic/hw/sphw_cfg_cmd.h @@ -40,7 +40,8 @@ struct cfg_cmd_dev_cap { u8 sf_svc_attr; u8 func_sf_en; - u16 rsvd_sf; + u8 lb_mode; + u8 smf_pg; u32 max_conn_num; u16 max_stick2cache_num; diff --git a/drivers/net/ethernet/ramaxel/spnic/hw/sphw_hw_cfg.c b/drivers/net/ethernet/ramaxel/spnic/hw/sphw_hw_cfg.c index 5d6a53307f0a..4b2674ec66f0 100644 --- a/drivers/net/ethernet/ramaxel/spnic/hw/sphw_hw_cfg.c +++ b/drivers/net/ethernet/ramaxel/spnic/hw/sphw_hw_cfg.c @@ -112,6 +112,9 @@ static void parse_pub_res_cap(struct sphw_hwdev *hwdev, else cap->sf_en = false; + cap->lb_mode = dev_cap->lb_mode; + cap->smf_pg = dev_cap->smf_pg; + cap->timer_en = (u8)timer_enable; /* timer enable */ cap->host_oq_id_mask_val = dev_cap->host_oq_id_mask_val; cap->max_connect_num = dev_cap->max_conn_num; diff --git a/drivers/net/ethernet/ramaxel/spnic/hw/sphw_hw_cfg.h b/drivers/net/ethernet/ramaxel/spnic/hw/sphw_hw_cfg.h index 1147beeb76ad..1b48e0991563 100644 --- a/drivers/net/ethernet/ramaxel/spnic/hw/sphw_hw_cfg.h +++ b/drivers/net/ethernet/ramaxel/spnic/hw/sphw_hw_cfg.h @@ -201,6 +201,9 @@ struct service_cap { u8 timer_en; /* 0:disable, 1:enable */ u8 bloomfilter_en; /* 0:disable, 1:enable*/ + u8 lb_mode; + u8 smf_pg; + /* For test */ u32 test_mode; u32 test_qpc_num; diff --git a/drivers/scsi/spfc/hw/spfc_cqm_bat_cla.c b/drivers/scsi/spfc/hw/spfc_cqm_bat_cla.c index 30fb56a9bfed..0c1d97d9e3e6 100644 --- a/drivers/scsi/spfc/hw/spfc_cqm_bat_cla.c +++ b/drivers/scsi/spfc/hw/spfc_cqm_bat_cla.c @@ -53,17 +53,6 @@ cqm_bat_fill_cla_common_gpa(struct cqm_handle *cqm_handle, gpa.acs_spu_en = 0; } - /* In fake mode, fake_vf_en in the GPA address of the BAT - * must be set to 1. - */ - if (cqm_handle->func_capability.fake_func_type == CQM_FAKE_FUNC_CHILD) { - gpa.fake_vf_en = 1; - func_attr = &cqm_handle->parent_cqm_handle->func_attribute; - gpa.pf_id = func_attr->func_global_idx; - } else { - gpa.fake_vf_en = 0; - } - memcpy(&cla_gpa_h, &gpa, sizeof(u32)); bat_entry_standerd->cla_gpa_h = cla_gpa_h; @@ -379,13 +368,8 @@ s32 cqm_bat_update(struct cqm_handle *cqm_handle) CQM_PTR_CHECK_RET(buf_in, CQM_FAIL, CQM_ALLOC_FAIL(buf_in)); buf_in->size = sizeof(struct cqm_cmdq_bat_update); - /* In non-fake mode, func_id is set to 0xffff, indicating the current func. - * In fake mode, the value of func_id is specified. This is a fake func_id. - */ - if (cqm_handle->func_capability.fake_func_type == CQM_FAKE_FUNC_CHILD) - func_id = cqm_handle->func_attribute.func_global_idx; - else - func_id = 0xffff; + /* In non-fake mode, func_id is set to 0xffff */ + func_id = 0xffff; /* The LB scenario is supported. * The normal mode is the traditional mode and is configured on SMF0. @@ -545,19 +529,6 @@ s32 cqm_cla_fill_buf(struct cqm_handle *cqm_handle, struct cqm_buf *cla_base_buf spu_en = 0; } - /* fake enable */ - if (cqm_handle->func_capability.fake_func_type == - CQM_FAKE_FUNC_CHILD) { - fake_en = 1ULL << 62; - func_attr = - &cqm_handle->parent_cqm_handle->func_attribute; - pf_id = func_attr->func_global_idx; - pf_id = (pf_id & 0x1f) << 57; - } else { - fake_en = 0; - pf_id = 0; - } - *base = (((((cla_sub_buf->buf_list[i].pa & CQM_CHIP_GPA_MASK) | spu_en) | fake_en) | @@ -1248,14 +1219,8 @@ s32 cqm_cla_update(struct cqm_handle *cqm_handle, struct cqm_buf_list *buf_node_ } } - /* In non-fake mode, set func_id to 0xffff. - * Indicates the current func fake mode, set func_id to the - * specified value, This is a fake func_id. - */ - if (cqm_handle->func_capability.fake_func_type == CQM_FAKE_FUNC_CHILD) - cmd.func_id = cqm_handle->func_attribute.func_global_idx; - else - cmd.func_id = 0xffff; + /* In non-fake mode, set func_id to 0xffff. */ + cmd.func_id = 0xffff; /* Mode 0 is hashed to 4 SMF engines (excluding PPF) by func ID. */ if (cqm_handle->func_capability.lb_mode == CQM_LB_MODE_NORMAL || diff --git a/drivers/scsi/spfc/hw/spfc_cqm_bitmap_table.c b/drivers/scsi/spfc/hw/spfc_cqm_bitmap_table.c index 4e482776a14f..21100e8db8f4 100644 --- a/drivers/scsi/spfc/hw/spfc_cqm_bitmap_table.c +++ b/drivers/scsi/spfc/hw/spfc_cqm_bitmap_table.c @@ -405,14 +405,8 @@ s32 cqm_cla_cache_invalid(struct cqm_handle *cqm_handle, dma_addr_t gpa, u32 cac cmd.gpa_h = CQM_ADDR_HI(gpa); cmd.gpa_l = CQM_ADDR_LW(gpa); - /* In non-fake mode, set func_id to 0xffff. - * Indicate the current func fake mode. - * The value of func_id is a fake func ID. - */ - if (cqm_handle->func_capability.fake_func_type == CQM_FAKE_FUNC_CHILD) - cmd.func_id = cqm_handle->func_attribute.func_global_idx; - else - cmd.func_id = 0xffff; + /* In non-fake mode, set func_id to 0xffff. */ + cmd.func_id = 0xffff; /* Mode 0 is hashed to 4 SMF engines (excluding PPF) by func ID. */ if (cqm_handle->func_capability.lb_mode == CQM_LB_MODE_NORMAL || diff --git a/drivers/scsi/spfc/hw/spfc_cqm_main.c b/drivers/scsi/spfc/hw/spfc_cqm_main.c index a4c8e60971b1..52cc2c7838e9 100644 --- a/drivers/scsi/spfc/hw/spfc_cqm_main.c +++ b/drivers/scsi/spfc/hw/spfc_cqm_main.c @@ -11,21 +11,8 @@ #include "sphw_crm.h" #include "sphw_hw.h" #include "sphw_hw_cfg.h" - #include "spfc_cqm_main.h" -static unsigned char cqm_lb_mode = CQM_LB_MODE_NORMAL; -module_param(cqm_lb_mode, byte, 0644); -MODULE_PARM_DESC(cqm_lb_mode, "for cqm lb mode (default=0xff)"); - -static unsigned char cqm_fake_mode = CQM_FAKE_MODE_DISABLE; -module_param(cqm_fake_mode, byte, 0644); -MODULE_PARM_DESC(cqm_fake_mode, "for cqm fake mode (default=0 disable)"); - -static unsigned char cqm_platform_mode = CQM_FPGA_MODE; -module_param(cqm_platform_mode, byte, 0644); -MODULE_PARM_DESC(cqm_platform_mode, "for cqm platform mode (default=0 FPGA)"); - s32 cqm3_init(void *ex_handle) { struct sphw_hwdev *handle = (struct sphw_hwdev *)ex_handle; @@ -63,19 +50,6 @@ s32 cqm3_init(void *ex_handle) goto err1; } - /* In FAKE mode, only the bitmap of the timer of the function is - * enabled, and resources are not initialized. Otherwise, the - * configuration of the fake function is overwritten. - */ - if (cqm_handle->func_capability.fake_func_type == CQM_FAKE_FUNC_CHILD_CONFLICT) { - if (sphw_func_tmr_bitmap_set(ex_handle, true) != CQM_SUCCESS) - cqm_err(handle->dev_hdl, "Timer start: enable timer bitmap failed\n"); - - handle->cqm_hdl = NULL; - kfree(cqm_handle); - return CQM_SUCCESS; - } - /* Initialize memory entries such as BAT, CLA, and bitmap. */ if (cqm_mem_init(ex_handle) != CQM_SUCCESS) { cqm_err(handle->dev_hdl, CQM_FUNCTION_FAIL(cqm_mem_init)); @@ -287,64 +261,6 @@ void cqm_service_capability_init(struct cqm_handle *cqm_handle, cqm_service_capability_init_fc(cqm_handle, (void *)service_capability); } -s32 cqm_get_fake_func_type(struct cqm_handle *cqm_handle) -{ - struct cqm_func_capability *func_cap = &cqm_handle->func_capability; - u32 parent_func, child_func_start, child_func_number, i; - u32 idx = cqm_handle->func_attribute.func_global_idx; - - /* Currently, only one set of fake configurations is implemented. - * fake_cfg_number = 1 - */ - for (i = 0; i < func_cap->fake_cfg_number; i++) { - parent_func = func_cap->fake_cfg[i].parent_func; - child_func_start = func_cap->fake_cfg[i].child_func_start; - child_func_number = func_cap->fake_cfg[i].child_func_number; - - if (idx == parent_func) { - return CQM_FAKE_FUNC_PARENT; - } else if ((idx >= child_func_start) && - (idx < (child_func_start + child_func_number))) { - return CQM_FAKE_FUNC_CHILD_CONFLICT; - } - } - - return CQM_FAKE_FUNC_NORMAL; -} - -s32 cqm_get_child_func_start(struct cqm_handle *cqm_handle) -{ - struct cqm_func_capability *func_cap = &cqm_handle->func_capability; - struct sphw_func_attr *func_attr = &cqm_handle->func_attribute; - u32 i; - - /* Currently, only one set of fake configurations is implemented. - * fake_cfg_number = 1 - */ - for (i = 0; i < func_cap->fake_cfg_number; i++) { - if (func_attr->func_global_idx == - func_cap->fake_cfg[i].parent_func) - return (s32)(func_cap->fake_cfg[i].child_func_start); - } - - return CQM_FAIL; -} - -s32 cqm_get_child_func_number(struct cqm_handle *cqm_handle) -{ - struct cqm_func_capability *func_cap = &cqm_handle->func_capability; - struct sphw_func_attr *func_attr = &cqm_handle->func_attribute; - u32 i; - - for (i = 0; i < func_cap->fake_cfg_number; i++) { - if (func_attr->func_global_idx == - func_cap->fake_cfg[i].parent_func) - return (s32)(func_cap->fake_cfg[i].child_func_number); - } - - return CQM_FAIL; -} - /* Set func_type in fake_cqm_handle to ppf, pf, or vf. */ void cqm_set_func_type(struct cqm_handle *cqm_handle) { @@ -358,41 +274,20 @@ void cqm_set_func_type(struct cqm_handle *cqm_handle) cqm_handle->func_attribute.func_type = CQM_VF; } -void cqm_lb_fake_mode_init(struct cqm_handle *cqm_handle) +void cqm_lb_fake_mode_init(struct cqm_handle *cqm_handle, struct service_cap *svc_cap) { struct cqm_func_capability *func_cap = &cqm_handle->func_capability; - struct cqm_fake_cfg *cfg = func_cap->fake_cfg; - func_cap->lb_mode = cqm_lb_mode; - func_cap->fake_mode = cqm_fake_mode; + func_cap->lb_mode = svc_cap->lb_mode; /* Initializing the LB Mode */ - if (func_cap->lb_mode == CQM_LB_MODE_NORMAL) { + if (func_cap->lb_mode == CQM_LB_MODE_NORMAL) func_cap->smf_pg = 0; - } else { - /* The LB mode is tailored on the FPGA. - * Only SMF0 and SMF2 are instantiated. - */ - if (cqm_platform_mode == CQM_FPGA_MODE) - func_cap->smf_pg = 0x5; - else - func_cap->smf_pg = 0xF; - } + else + func_cap->smf_pg = svc_cap->smf_pg; - /* Initializing the FAKE Mode */ - if (func_cap->fake_mode == CQM_FAKE_MODE_DISABLE) { - func_cap->fake_cfg_number = 0; - func_cap->fake_func_type = CQM_FAKE_FUNC_NORMAL; - } else { - func_cap->fake_cfg_number = 1; - - /* When configuring fake mode, ensure that the parent function - * cannot be contained in the child function; otherwise, the - * system will be initialized repeatedly. - */ - cfg[0].child_func_start = CQM_FAKE_CFUNC_START; - func_cap->fake_func_type = cqm_get_fake_func_type(cqm_handle); - } + func_cap->fake_cfg_number = 0; + func_cap->fake_func_type = CQM_FAKE_FUNC_NORMAL; } s32 cqm_capability_init(void *ex_handle) @@ -465,10 +360,9 @@ s32 cqm_capability_init(void *ex_handle) func_cap->gpa_check_enable = true; - cqm_lb_fake_mode_init(cqm_handle); + cqm_lb_fake_mode_init(cqm_handle, service_capability); cqm_info(handle->dev_hdl, "Cap init: lb_mode=%u\n", func_cap->lb_mode); cqm_info(handle->dev_hdl, "Cap init: smf_pg=%u\n", func_cap->smf_pg); - cqm_info(handle->dev_hdl, "Cap init: fake_mode=%u\n", func_cap->fake_mode); cqm_info(handle->dev_hdl, "Cap init: fake_func_type=%u\n", func_cap->fake_func_type); cqm_info(handle->dev_hdl, "Cap init: fake_cfg_number=%u\n", func_cap->fake_cfg_number); @@ -517,153 +411,6 @@ s32 cqm_capability_init(void *ex_handle) return err; } -void cqm_fake_uninit(struct cqm_handle *cqm_handle) -{ - u32 i; - - if (cqm_handle->func_capability.fake_func_type != - CQM_FAKE_FUNC_PARENT) - return; - - for (i = 0; i < CQM_FAKE_FUNC_MAX; i++) { - kfree(cqm_handle->fake_cqm_handle[i]); - cqm_handle->fake_cqm_handle[i] = NULL; - } -} - -s32 cqm_fake_init(struct cqm_handle *cqm_handle) -{ - struct sphw_hwdev *handle = cqm_handle->ex_handle; - struct cqm_func_capability *func_cap = NULL; - struct cqm_handle *fake_cqm_handle = NULL; - struct sphw_func_attr *func_attr = NULL; - s32 child_func_start, child_func_number; - u32 i; - - func_cap = &cqm_handle->func_capability; - if (func_cap->fake_func_type != CQM_FAKE_FUNC_PARENT) - return CQM_SUCCESS; - - child_func_start = cqm_get_child_func_start(cqm_handle); - if (child_func_start == CQM_FAIL) { - cqm_err(handle->dev_hdl, CQM_WRONG_VALUE(child_func_start)); - return CQM_FAIL; - } - - child_func_number = cqm_get_child_func_number(cqm_handle); - if (child_func_number == CQM_FAIL) { - cqm_err(handle->dev_hdl, CQM_WRONG_VALUE(child_func_number)); - return CQM_FAIL; - } - - for (i = 0; i < (u32)child_func_number; i++) { - fake_cqm_handle = kmalloc(sizeof(*fake_cqm_handle), GFP_KERNEL | __GFP_ZERO); - if (!fake_cqm_handle) { - cqm_err(handle->dev_hdl, - CQM_ALLOC_FAIL(fake_cqm_handle)); - goto err; - } - - /* Copy the attributes of the parent CQM handle to the child CQM - * handle and modify the values of function. - */ - memcpy(fake_cqm_handle, cqm_handle, sizeof(struct cqm_handle)); - func_attr = &fake_cqm_handle->func_attribute; - func_cap = &fake_cqm_handle->func_capability; - func_attr->func_global_idx = (u16)(child_func_start + i); - cqm_set_func_type(fake_cqm_handle); - func_cap->fake_func_type = CQM_FAKE_FUNC_CHILD; - cqm_info(handle->dev_hdl, "Fake func init: function[%u] type %d(0:PF,1:VF,2:PPF)\n", - func_attr->func_global_idx, func_attr->func_type); - - fake_cqm_handle->parent_cqm_handle = cqm_handle; - cqm_handle->fake_cqm_handle[i] = fake_cqm_handle; - } - - return CQM_SUCCESS; - -err: - cqm_fake_uninit(cqm_handle); - return CQM_FAIL; -} - -void cqm_fake_mem_uninit(struct cqm_handle *cqm_handle) -{ - struct sphw_hwdev *handle = cqm_handle->ex_handle; - struct cqm_handle *fake_cqm_handle = NULL; - s32 child_func_number; - u32 i; - - if (cqm_handle->func_capability.fake_func_type != CQM_FAKE_FUNC_PARENT) - return; - - child_func_number = cqm_get_child_func_number(cqm_handle); - if (child_func_number == CQM_FAIL) { - cqm_err(handle->dev_hdl, CQM_WRONG_VALUE(child_func_number)); - return; - } - - for (i = 0; i < (u32)child_func_number; i++) { - fake_cqm_handle = cqm_handle->fake_cqm_handle[i]; - cqm_object_table_uninit(fake_cqm_handle); - cqm_bitmap_uninit(fake_cqm_handle); - cqm_cla_uninit(fake_cqm_handle, CQM_BAT_ENTRY_MAX); - cqm_bat_uninit(fake_cqm_handle); - } -} - -s32 cqm_fake_mem_init(struct cqm_handle *cqm_handle) -{ - struct sphw_hwdev *handle = cqm_handle->ex_handle; - struct cqm_handle *fake_cqm_handle = NULL; - s32 child_func_number; - u32 i; - - if (cqm_handle->func_capability.fake_func_type != - CQM_FAKE_FUNC_PARENT) - return CQM_SUCCESS; - - child_func_number = cqm_get_child_func_number(cqm_handle); - if (child_func_number == CQM_FAIL) { - cqm_err(handle->dev_hdl, CQM_WRONG_VALUE(child_func_number)); - return CQM_FAIL; - } - - for (i = 0; i < (u32)child_func_number; i++) { - fake_cqm_handle = cqm_handle->fake_cqm_handle[i]; - - if (cqm_bat_init(fake_cqm_handle) != CQM_SUCCESS) { - cqm_err(handle->dev_hdl, - CQM_FUNCTION_FAIL(cqm_bat_init)); - goto err; - } - - if (cqm_cla_init(fake_cqm_handle) != CQM_SUCCESS) { - cqm_err(handle->dev_hdl, - CQM_FUNCTION_FAIL(cqm_cla_init)); - goto err; - } - - if (cqm_bitmap_init(fake_cqm_handle) != CQM_SUCCESS) { - cqm_err(handle->dev_hdl, - CQM_FUNCTION_FAIL(cqm_bitmap_init)); - goto err; - } - - if (cqm_object_table_init(fake_cqm_handle) != CQM_SUCCESS) { - cqm_err(handle->dev_hdl, - CQM_FUNCTION_FAIL(cqm_object_table_init)); - goto err; - } - } - - return CQM_SUCCESS; - -err: - cqm_fake_mem_uninit(cqm_handle); - return CQM_FAIL; -} - s32 cqm_mem_init(void *ex_handle) { struct sphw_hwdev *handle = (struct sphw_hwdev *)ex_handle; @@ -671,49 +418,35 @@ s32 cqm_mem_init(void *ex_handle) cqm_handle = (struct cqm_handle *)(handle->cqm_hdl); - if (cqm_fake_init(cqm_handle) != CQM_SUCCESS) { - cqm_err(handle->dev_hdl, CQM_FUNCTION_FAIL(cqm_fake_init)); - return CQM_FAIL; - } - - if (cqm_fake_mem_init(cqm_handle) != CQM_SUCCESS) { - cqm_err(handle->dev_hdl, CQM_FUNCTION_FAIL(cqm_fake_mem_init)); - goto err1; - } - if (cqm_bat_init(cqm_handle) != CQM_SUCCESS) { cqm_err(handle->dev_hdl, CQM_FUNCTION_FAIL(cqm_bat_init)); - goto err2; + return CQM_FAIL; } if (cqm_cla_init(cqm_handle) != CQM_SUCCESS) { cqm_err(handle->dev_hdl, CQM_FUNCTION_FAIL(cqm_cla_init)); - goto err3; + goto err1; } if (cqm_bitmap_init(cqm_handle) != CQM_SUCCESS) { cqm_err(handle->dev_hdl, CQM_FUNCTION_FAIL(cqm_bitmap_init)); - goto err4; + goto err2; } if (cqm_object_table_init(cqm_handle) != CQM_SUCCESS) { cqm_err(handle->dev_hdl, CQM_FUNCTION_FAIL(cqm_object_table_init)); - goto err5; + goto err3; } return CQM_SUCCESS; -err5: - cqm_bitmap_uninit(cqm_handle); -err4: - cqm_cla_uninit(cqm_handle, CQM_BAT_ENTRY_MAX); err3: - cqm_bat_uninit(cqm_handle); + cqm_bitmap_uninit(cqm_handle); err2: - cqm_fake_mem_uninit(cqm_handle); + cqm_cla_uninit(cqm_handle, CQM_BAT_ENTRY_MAX); err1: - cqm_fake_uninit(cqm_handle); + cqm_bat_uninit(cqm_handle); return CQM_FAIL; } @@ -728,8 +461,6 @@ void cqm_mem_uninit(void *ex_handle) cqm_bitmap_uninit(cqm_handle); cqm_cla_uninit(cqm_handle, CQM_BAT_ENTRY_MAX); cqm_bat_uninit(cqm_handle); - cqm_fake_mem_uninit(cqm_handle); - cqm_fake_uninit(cqm_handle); } s32 cqm_event_init(void *ex_handle) diff --git a/drivers/scsi/spfc/hw/spfc_cqm_main.h b/drivers/scsi/spfc/hw/spfc_cqm_main.h index 1b8cf8bdb3b7..cf10d7f5c339 100644 --- a/drivers/scsi/spfc/hw/spfc_cqm_main.h +++ b/drivers/scsi/spfc/hw/spfc_cqm_main.h @@ -328,9 +328,6 @@ void cqm_mem_uninit(void *ex_handle); s32 cqm_event_init(void *ex_handle); void cqm_event_uninit(void *ex_handle); u8 cqm_aeq_callback(void *ex_handle, u8 event, u8 *data); -s32 cqm_get_fake_func_type(struct cqm_handle *cqm_handle); -s32 cqm_get_child_func_start(struct cqm_handle *cqm_handle); -s32 cqm_get_child_func_number(struct cqm_handle *cqm_handle); s32 cqm3_init(void *ex_handle); void cqm3_uninit(void *ex_handle); diff --git a/drivers/scsi/spfc/hw/spfc_cqm_object.c b/drivers/scsi/spfc/hw/spfc_cqm_object.c index b895d37aebae..165794e9c7e5 100644 --- a/drivers/scsi/spfc/hw/spfc_cqm_object.c +++ b/drivers/scsi/spfc/hw/spfc_cqm_object.c @@ -155,8 +155,6 @@ struct cqm_qpc_mpt *cqm3_object_qpc_mpt_create(void *ex_handle, u32 service_type struct cqm_qpc_mpt_info *qpc_mpt_info = NULL; struct cqm_handle *cqm_handle = NULL; s32 ret = CQM_FAIL; - u32 relative_index; - u32 fake_func_id; CQM_PTR_CHECK_RET(ex_handle, NULL, CQM_PTR_NULL(ex_handle)); @@ -180,25 +178,6 @@ struct cqm_qpc_mpt *cqm3_object_qpc_mpt_create(void *ex_handle, u32 service_type return NULL; } - /* fake vf adaption, switch to corresponding VF. */ - if (cqm_handle->func_capability.fake_func_type == - CQM_FAKE_FUNC_PARENT) { - fake_func_id = index / cqm_handle->func_capability.qpc_number; - relative_index = index % cqm_handle->func_capability.qpc_number; - - cqm_info(handle->dev_hdl, "qpc create: fake_func_id=%u, relative_index=%u\n", - fake_func_id, relative_index); - - if ((s32)fake_func_id >= - cqm_get_child_func_number(cqm_handle)) { - cqm_err(handle->dev_hdl, CQM_WRONG_VALUE(fake_func_id)); - return NULL; - } - - index = relative_index; - cqm_handle = cqm_handle->fake_cqm_handle[fake_func_id]; - } - qpc_mpt_info = kmalloc(sizeof(*qpc_mpt_info), GFP_ATOMIC | __GFP_ZERO); CQM_PTR_CHECK_RET(qpc_mpt_info, NULL, CQM_ALLOC_FAIL(qpc_mpt_info)); -- 2.32.0

1 0

[PATCH v1 OLK-5.10 0/4] Add four modifications
by Yanling Song 14 Jan '22

14 Jan '22

1.Remove unused functions about ceq 2.Remove unused clp hardware channels 3.Remove the code of polling mode 4.Remove the code about little endian and big endian conversion Yanling Song (4): net/spnic:Remove unused functions about ceq net/spnic:Remove unused clp hardware channels net/spnic:Remove the code of polling mode net/spnic:Remove the code about little endian and big endian conversion .../net/ethernet/ramaxel/spnic/hw/sphw_cmdq.c | 58 +-- .../ethernet/ramaxel/spnic/hw/sphw_common.h | 12 - .../net/ethernet/ramaxel/spnic/hw/sphw_crm.h | 2 - .../net/ethernet/ramaxel/spnic/hw/sphw_csr.h | 13 - .../net/ethernet/ramaxel/spnic/hw/sphw_eqs.c | 104 +--- .../net/ethernet/ramaxel/spnic/hw/sphw_hw.h | 2 - .../ethernet/ramaxel/spnic/hw/sphw_hwdev.c | 31 -- .../ethernet/ramaxel/spnic/hw/sphw_hwdev.h | 2 - .../net/ethernet/ramaxel/spnic/hw/sphw_hwif.c | 27 +- .../net/ethernet/ramaxel/spnic/hw/sphw_mbox.c | 20 +- .../net/ethernet/ramaxel/spnic/hw/sphw_mbox.h | 2 - .../net/ethernet/ramaxel/spnic/hw/sphw_mgmt.c | 487 ------------------ .../net/ethernet/ramaxel/spnic/hw/sphw_mgmt.h | 50 -- .../net/ethernet/ramaxel/spnic/hw/sphw_mt.h | 1 - .../net/ethernet/ramaxel/spnic/spnic_nic_io.h | 6 +- .../net/ethernet/ramaxel/spnic/spnic_nic_qp.h | 7 +- drivers/net/ethernet/ramaxel/spnic/spnic_rx.c | 39 +- drivers/net/ethernet/ramaxel/spnic/spnic_tx.c | 20 +- 18 files changed, 41 insertions(+), 842 deletions(-) -- 2.23.0

1 4

[PATCH openEuler-1.0-LTS] ext4: Fix BUG_ON in ext4_bread when write quota data
by Yang Yingliang 13 Jan '22

13 Jan '22

From: Ye Bin <yebin10(a)huawei.com> mainline inclusion from mainline-v5.17 commit ce85548ab4295234b4f8e63a0eea0c157d2f6b25 category: bugfix bugzilla: 185930 CVE: NA ----------------------------------------------- We got issue as follows when run syzkaller: [ 167.936972] EXT4-fs error (device loop0): __ext4_remount:6314: comm rep: Abort forced by user [ 167.938306] EXT4-fs (loop0): Remounting filesystem read-only [ 167.981637] Assertion failure in ext4_getblk() at fs/ext4/inode.c:847: '(EXT4_SB(inode->i_sb)->s_mount_state & EXT4_FC_REPLAY) || handle != NULL || create == 0' [ 167.983601] ------------[ cut here ]------------ [ 167.984245] kernel BUG at fs/ext4/inode.c:847! [ 167.984882] invalid opcode: 0000 [#1] PREEMPT SMP KASAN PTI [ 167.985624] CPU: 7 PID: 2290 Comm: rep Tainted: G B 5.16.0-rc5-next-20211217+ #123 [ 167.986823] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS ?-20190727_073836-buildvm-ppc64le-16.ppc.fedoraproject.org-3.fc31 04/01/2014 [ 167.988590] RIP: 0010:ext4_getblk+0x17e/0x504 [ 167.989189] Code: c6 01 74 28 49 c7 c0 a0 a3 5c 9b b9 4f 03 00 00 48 c7 c2 80 9c 5c 9b 48 c7 c6 40 b6 5c 9b 48 c7 c7 20 a4 5c 9b e8 77 e3 fd ff <0f> 0b 8b 04 244 [ 167.991679] RSP: 0018:ffff8881736f7398 EFLAGS: 00010282 [ 167.992385] RAX: 0000000000000094 RBX: 1ffff1102e6dee75 RCX: 0000000000000000 [ 167.993337] RDX: 0000000000000001 RSI: ffffffff9b6e29e0 RDI: ffffed102e6dee66 [ 167.994292] RBP: ffff88816a076210 R08: 0000000000000094 R09: ffffed107363fa09 [ 167.995252] R10: ffff88839b1fd047 R11: ffffed107363fa08 R12: ffff88816a0761e8 [ 167.996205] R13: 0000000000000000 R14: 0000000000000021 R15: 0000000000000001 [ 167.997158] FS: 00007f6a1428c740(0000) GS:ffff88839b000000(0000) knlGS:0000000000000000 [ 167.998238] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 167.999025] CR2: 00007f6a140716c8 CR3: 0000000133216000 CR4: 00000000000006e0 [ 167.999987] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 168.000944] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 168.001899] Call Trace: [ 168.002235] <TASK> [ 168.007167] ext4_bread+0xd/0x53 [ 168.007612] ext4_quota_write+0x20c/0x5c0 [ 168.010457] write_blk+0x100/0x220 [ 168.010944] remove_free_dqentry+0x1c6/0x440 [ 168.011525] free_dqentry.isra.0+0x565/0x830 [ 168.012133] remove_tree+0x318/0x6d0 [ 168.014744] remove_tree+0x1eb/0x6d0 [ 168.017346] remove_tree+0x1eb/0x6d0 [ 168.019969] remove_tree+0x1eb/0x6d0 [ 168.022128] qtree_release_dquot+0x291/0x340 [ 168.023297] v2_release_dquot+0xce/0x120 [ 168.023847] dquot_release+0x197/0x3e0 [ 168.024358] ext4_release_dquot+0x22a/0x2d0 [ 168.024932] dqput.part.0+0x1c9/0x900 [ 168.025430] __dquot_drop+0x120/0x190 [ 168.025942] ext4_clear_inode+0x86/0x220 [ 168.026472] ext4_evict_inode+0x9e8/0xa22 [ 168.028200] evict+0x29e/0x4f0 [ 168.028625] dispose_list+0x102/0x1f0 [ 168.029148] evict_inodes+0x2c1/0x3e0 [ 168.030188] generic_shutdown_super+0xa4/0x3b0 [ 168.030817] kill_block_super+0x95/0xd0 [ 168.031360] deactivate_locked_super+0x85/0xd0 [ 168.031977] cleanup_mnt+0x2bc/0x480 [ 168.033062] task_work_run+0xd1/0x170 [ 168.033565] do_exit+0xa4f/0x2b50 [ 168.037155] do_group_exit+0xef/0x2d0 [ 168.037666] __x64_sys_exit_group+0x3a/0x50 [ 168.038237] do_syscall_64+0x3b/0x90 [ 168.038751] entry_SYSCALL_64_after_hwframe+0x44/0xae In order to reproduce this problem, the following conditions need to be met: 1. Ext4 filesystem with no journal; 2. Filesystem image with incorrect quota data; 3. Abort filesystem forced by user; 4. umount filesystem; As in ext4_quota_write: ... if (EXT4_SB(sb)->s_journal && !handle) { ext4_msg(sb, KERN_WARNING, "Quota write (off=%llu, len=%llu)" " cancelled because transaction is not started", (unsigned long long)off, (unsigned long long)len); return -EIO; } ... We only check handle if NULL when filesystem has journal. There is need check handle if NULL even when filesystem has no journal. Signed-off-by: Ye Bin <yebin10(a)huawei.com> Reviewed-by: Jan Kara <jack(a)suse.cz> Link: https://lore.kernel.org/r/20211223015506.297766-1-yebin10@huawei.com Signed-off-by: Theodore Ts'o <tytso(a)mit.edu> Cc: stable(a)kernel.org Signed-off-by: Ye Bin <yebin10(a)huawei.com> Reviewed-by: Zhang Yi <yi.zhang(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- fs/ext4/super.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 587817ac60990..b89f431ec78d3 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -6245,7 +6245,7 @@ static ssize_t ext4_quota_write(struct super_block *sb, int type, struct buffer_head *bh; handle_t *handle = journal_current_handle(); - if (EXT4_SB(sb)->s_journal && !handle) { + if (!handle) { ext4_msg(sb, KERN_WARNING, "Quota write (off=%llu, len=%llu)" " cancelled because transaction is not started", (unsigned long long)off, (unsigned long long)len); -- 2.25.1

1 0