提交 · 1d9e855e57eb1dac5d06fa12b7ba3c45bc0a9995 · openeuler / Kernel

27 12月, 2019 40 次提交

ACC: fixup sec2 watchdog calltrace · 1d9e855e

由 zhangwei 提交于 8月 09, 2019

driver inclusion
category: bugfix
bugzilla: NA
CVE: NA

Feature or Bugfix:Bugfix
Signed-off-by: NZhangwei <zhangwei375@huawei.com>
Reviewed-by: Nhucheng.hu <hucheng.hu@huawei.com>
Signed-off-by: Nlingmingqiang <lingmingqiang@huawei.com>
Reviewed-by: Nlingmingqiang <lingmingqiang@huawei.com>
Reviewed-by: NYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>

1d9e855e

MAINTAINERS: add maintainers for hns3_cae module · f7ff2756

由 Weiwei 提交于 8月 14, 2019

driver inclusion
category: bugfix
bugzilla: NA
CVE: NA

Add Weiwei Deng and Zhaohui Zhong as new maintainers for hns3_cae driver.
Signed-off-by: NWeiwei <dengweiwei@huawei.com>
Reviewed-by: NZhaohui Zhong <zhongzhaohui@huawei.com>
Reviewed-by: NYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>

f7ff2756

net: hns3: clean static check detect problems · 8910def1

由 Weiwei 提交于 8月 14, 2019

driver inclusion
category: bugfix
bugzilla: NA
CVE: NA

This patch clean the problems of static check detect problems.
Reported-by: NYongxin Li <liyongxin1@huawei.com>
Signed-off-by: NWeiwei <dengweiwei@huawei.com>
Reviewed-by: NYongxin Li <liyongxin1@huawei.com>
Reviewed-by: Ngaoxun <gaoxun3@huawei.com>
Reviewed-by: NShengzui You <youshengzui@huawei.com>
Reviewed-by: NYunsheng Lin <linyunsheng@huawei.com>
Reviewed-by: NZhaohui Zhong <zhongzhaohui@huawei.com>
Reviewed-by: NYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>

8910def1

config: add default config for CONFIG_HNS3_CAE · be8bad40

由 Weiwei 提交于 8月 14, 2019

driver inclusion
category: bugfix
bugzilla: NA
CVE: NA

Add default config for CONFIG_HNS3_CAE in hulk_defconfig and
syzkaller_defconfig.
Signed-off-by: NWeiwei <dengweiwei@huawei.com>
Reviewed-by: NZhaohui Zhong <zhongzhaohui@huawei.com>
Reviewed-by: NYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>

be8bad40

net: hns3: add hns3 cae drivers to kernel · d0203361

由 Weiwei 提交于 8月 14, 2019

driver inclusion
category: bugfix
bugzilla: NA
CVE: NA

add hns3 cae drivers to kernel.
Signed-off-by: NWeiwei <dengweiwei@huawei.com>
Reviewed-by: Ngaoxun <gaoxun3@huawei.com>
Reviewed-by: NShengzui You <youshengzui@huawei.com>
Reviewed-by: NZhaohui Zhong <zhongzhaohui@huawei.com>
Reviewed-by: NYongxin Li <liyongxin1@huawei.com>
Tested-by: Junxin Chen <chenjunxin1@huawei.com>i
Reviewed-by: NYunsheng Lin <linyunsheng@huawei.com>
Acked-by: NHanjun Guo <guohanjun@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>

d0203361

net: hns3: add ethtool_ops.set_channels support for HNS3 VF driver · b4535f93

由 Guangbin Huang 提交于 8月 08, 2019

driver inclusion
category: bugfix
bugzilla: NA
CVE: NA

This patch adds ethtool_ops.set_channels support for HNS3 VF driver,
and updates related tqp information and RSS information, to support
modification of VF tqp number.

Feature or Bugfix:Bugfix
Signed-off-by: NGuangbin Huang <huangguangbin2@huawei.com>
Reviewed-by: Nlipeng <lipeng321@huawei.com>
Reviewed-by: NYunsheng Lin <linyunsheng@huawei.com>
Reviewed-by: NYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>

b4535f93

net: hns3: fix VF interrupt clearing error for revision 0x20 · 12c636ae

由 Huazhong Tan 提交于 8月 07, 2019

driver inclusion
category: bugfix
bugzilla: NA
CVE: NA

For revision 0x21, interrupt clear register is writing 0 clear
register, it means write 0 will clear the bit, write 1 make no
sence. So should just write 0 to the interrupt bit, other bits
keep 1.

For revision 0x20, this interrupt clear register is a read & write
register, for the bit has not interrupt, can not write 1, otherwise
it will be 1.

So this patch adds a compatible handler for revision 0x20.

Fixes: a8a77dda7665 ("net: hns3: fix interrupt clearing error for VF")
Feature or Bugfix:Bugfix
Signed-off-by: NHuazhong Tan <tanhuazhong@huawei.com>
Reviewed-by: Nlipeng <lipeng321@huawei.com>
Reviewed-by: NYunsheng Lin <linyunsheng@huawei.com>
Reviewed-by: NYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>

12c636ae

net: hinic: static check warnings fix · f2663cc8

由 Xue 提交于 8月 14, 2019

driver inclusion
category:bugfix
bugzilla:4472
CVE:NA

-----------------------------------------------------------------------

This patch fixes static check warnings, mainly adding parameter checks.
Reviewed-by: NChiQijun <chiqijun@huawei.com>
Signed-off-by: NXue <xuechaojing@huawei.com>
Reviewed-by: NYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>

f2663cc8

ACC: sync acc kernel driver code to hulk · 339f5888

由 zhangwei 提交于 8月 13, 2019

driver inclusion
category: bugfix
bugzilla: NA
CVE: NA

Feature or Bugfix:Bugfix
Signed-off-by: NZhangwei <zhangwei375@huawei.com>
Reviewed-by: Nlingmingqiang <lingmingqiang@huawei.com>
Reviewed-by: NYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>

339f5888

crypto/hisilicon/qm: fix qm_log_hw_error() cycle bug · 0d32604c

由 tanshukun 提交于 8月 13, 2019

driver inclusion
category: bugfix
bugzilla: NA
CVE: NA

Feature or Bugfix:Bugfix
Signed-off-by: Ntanshukun (A) <tanshukun1@huawei.com>
Reviewed-by: Nwangzhou <wangzhou1@hisilicon.com>
Reviewed-by: NYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>

0d32604c

crypto/hisilicon/zip: Bugfix for some review comments · f38b78ca

由 lingmingqiang 提交于 8月 09, 2019

driver inclusion
category: bugfix
bugzilla: NA
CVE: NA

ACC module sixth round code review, some good comments were adopted.

Feature or Bugfix:Bugfix
Signed-off-by: Ntanshukun (A) <tanshukun1@huawei.com>
Reviewed-by: Nwangzhou <wangzhou1@hisilicon.com>
Signed-off-by: Nlingmingqiang <lingmingqiang@huawei.com>
Reviewed-by: Nlingmingqiang <lingmingqiang@huawei.com>
Reviewed-by: NYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>

f38b78ca

UACCE: WD_HPRE:Fix the WD_HPRE LLT & SC warning · 2a4a33f8

由 liulongfang 提交于 8月 09, 2019

driver inclusion
category: bugfix
bugzilla: NA
CVE: NA

Feature or Bugfix:Bugfix
Signed-off-by: Nliulongfang <liulongfang@huawei.com>
Reviewed-by: Nxuzaibo <xuzaibo@huawei.com>
Signed-off-by: Nlingmingqiang <lingmingqiang@huawei.com>
Reviewed-by: Nlingmingqiang <lingmingqiang@huawei.com>
Reviewed-by: NYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>

2a4a33f8

ACC: HPRE&ZIP: qm current_q limit num modify · 047b9b2a

由 liulongfang 提交于 8月 09, 2019

driver inclusion
category: bugfix
bugzilla: NA
CVE: NA

Exclusion divided by zero operation

Feature or Bugfix:Bugfix
Signed-off-by: Nliulongfang <liulongfang@huawei.com>
Reviewed-by: Nwangzhou <wangzhou1@hisilicon.com>
Signed-off-by: Nlingmingqiang <lingmingqiang@huawei.com>
Reviewed-by: Nlingmingqiang <lingmingqiang@huawei.com>
Reviewed-by: NYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>

047b9b2a

ACC: QM: use dus map flag to handle error · 7a8808dc

由 tanshukun 提交于 8月 09, 2019

driver inclusion
category: bugfix
bugzilla: NA
CVE: NA

Feature or Bugfix:Bugfix
Signed-off-by: Ntanshukun (A) <tanshukun1@huawei.com>
Reviewed-by: Nwangzhou <wangzhou1@hisilicon.com>
Signed-off-by: Nlingmingqiang <lingmingqiang@huawei.com>
Reviewed-by: Nlingmingqiang <lingmingqiang@huawei.com>
Reviewed-by: NYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>

7a8808dc

ACC: fixup sec2 create multi crypt disk failed problem · f16cf291

由 zhangwei 提交于 8月 09, 2019

driver inclusion
category: bugfix
bugzilla: NA
CVE: NA

Feature or Bugfix:Bugfix
Signed-off-by: NZhangwei <zhangwei375@huawei.com>
Reviewed-by: Nhucheng.hu <hucheng.hu@huawei.com>
Signed-off-by: Nlingmingqiang <lingmingqiang@huawei.com>
Reviewed-by: Nlingmingqiang <lingmingqiang@huawei.com>
Reviewed-by: NYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>

f16cf291

ACC: fixup sec2 soft reset failed problem · ffd62ef4

由 lingmingqiang 提交于 8月 09, 2019

driver inclusion
category: bugfix
bugzilla: NA
CVE: NA

Feature or Bugfix:Bugfix
Signed-off-by: NZhangwei <zhangwei375@huawei.com>
Reviewed-by: Nlingmingqiang <lingmingqiang@huawei.com>
Signed-off-by: Nlingmingqiang <lingmingqiang@huawei.com>
Reviewed-by: NYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>

ffd62ef4

UACCE: Support err device isolation of UACCE · cf79ddf5

由 lingmingqiang 提交于 8月 09, 2019

driver inclusion
category: bugfix
bugzilla: NA
CVE: NA

Feature or Bugfix:Feature
Signed-off-by: Ntanghui20 <tanghui20@huawei.com>
Reviewed-by: Nwangzhou <wangzhou1@hisilicon.com>
Signed-off-by: Nlingmingqiang <lingmingqiang@huawei.com>
Reviewed-by: Nlingmingqiang <lingmingqiang@huawei.com>
Reviewed-by: NYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>

cf79ddf5

ACC: optimize qm workqueue code to reduce CPU usage · d1b93f65

由 zhangwei 提交于 8月 09, 2019

driver inclusion
category: bugfix
bugzilla: NA
CVE: NA

Feature or Bugfix:Feature
Signed-off-by: NZhangwei <zhangwei375@huawei.com>
Reviewed-by: Nwangzhou <wangzhou1@hisilicon.com>
Signed-off-by: Nlingmingqiang <lingmingqiang@huawei.com>
Reviewed-by: Nlingmingqiang <lingmingqiang@huawei.com>
Reviewed-by: NYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>

d1b93f65

ACC: HPRE&ZIP: qm current_q limit num error · 3bc26c9c

由 liulongfang 提交于 8月 09, 2019

driver inclusion
category: bugfix
bugzilla: NA
CVE: NA

After creating the acc's VF device and select the VF device ID.
The acc's qm current_q num sync with the VF's queue num.
The patch let it sync with the selected VF's queue num

Feature or Bugfix:Bugfix
Signed-off-by: Nliulongfang <liulongfang@huawei.com>
Reviewed-by: Nwangzhou <wangzhou1@hisilicon.com>
Signed-off-by: Nlingmingqiang <lingmingqiang@huawei.com>
Reviewed-by: Nlingmingqiang <lingmingqiang@huawei.com>
Reviewed-by: NYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>

3bc26c9c

ACC: crypto/hisilicon/qm: some fixes for qm review · 582541d1

由 lingmingqiang 提交于 8月 09, 2019

driver inclusion
category: bugfix
bugzilla: NA
CVE: NA

1.change lockless -> nolock.
2.remove unlock twice.
3.add err print.
4.some tinyfix.
and qp_dma clear except ds page.

Feature or Bugfix:Bugfix
Signed-off-by: NHao Fang <fanghao11@huawei.com>
Reviewed-by: Nwangzhou <wangzhou1@hisilicon.com>
Signed-off-by: Nlingmingqiang <lingmingqiang@huawei.com>
Reviewed-by: Nlingmingqiang <lingmingqiang@huawei.com>
Reviewed-by: NYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>

582541d1

ACC: add sec fusion code · ab1c1db8

由 lingmingqiang 提交于 8月 09, 2019

driver inclusion
category: bugfix
bugzilla: NA
CVE: NA

Feature or Bugfix:Feature
Signed-off-by: NZhangwei <zhangwei375@huawei.com>
Reviewed-by: Nhucheng.hu <hucheng.hu@huawei.com>
Signed-off-by: Nlingmingqiang <lingmingqiang@huawei.com>
Reviewed-by: Nlingmingqiang <lingmingqiang@huawei.com>
Reviewed-by: NYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>

ab1c1db8

net: hinic: fix bug in set vlan · 2db79a68

由 Xue 提交于 8月 12, 2019

driver inclusion
category:bugfix
bugzilla:4472
CVE:NA

-----------------------------------------------------------------------

When the ip link set is configured with the vlan vlan for the first time,
the default initial vlan id is 0. When the vlan is deleted, the new vlan id is 0.
The non-zero judgment is made when the interface is invoked, resulting in the
vlan id being 0. Returns an illegal value directly. This patch fix this bug.
Reviewed-by: NGuan Xiaodong <guanxiaodong@huawei.com>
Signed-off-by: NXue <xuechaojing@huawei.com>
Reviewed-by: NYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>

2db79a68

drivers : sysctl LPC renamed TDH · 4b4ffac3

由 fengsheng 提交于 8月 09, 2019

driver inclusion
category: feature
bugzilla: NA
CVE: NA

sysctl: 1. LPC renamed TDH
        2. Add SATA RAS printing
Signed-off-by: Nfengsheng <fengsheng5@huawei.com>
Reviewed-by: Nzhangmu <zhangmu1@huawei.com>
Reviewed-by: NYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>

4b4ffac3

drivers : sfc change driver name · 1cea86cc

由 fengsheng 提交于 8月 09, 2019

driver inclusion
category: feature
bugzilla: NA
CVE: NA

sfc: 1. chang driver name to hi-sfc.ko
     2. kconfig remove dependence on lbc
Signed-off-by: Nfengsheng <fengsheng5@huawei.com>
Reviewed-by: Nzhangmu <zhangmu1@huawei.com>
Reviewed-by: NYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>

1cea86cc

net: hns3: add a log for getting chain failure in hns3_nic_uninit_vector_data() · 3b814bb0

由 Huazhong Tan 提交于 8月 13, 2019

driver inclusion
category: bugfix
bugzilla: NA
CVE: NA

Since the mapping can be overwritten, when fail to get
the chain between vector and ring, we should go on to
deal with the remaining options. For debugging, this
patch adds log info for this failure.

Feature or Bugfix:Bugfix
Signed-off-by: NHuazhong Tan <tanhuazhong@huawei.com>
Reviewed-by: Nlinyunsheng <linyunsheng@huawei.com>
Reviewed-by: NYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>

3b814bb0

net: hns3: prevent unnecessary MAC TNL interruption · c14ab0f4

由 Huazhong Tan 提交于 8月 13, 2019

driver inclusion
category: bugfix
bugzilla: NA
CVE: NA

MAC TNL interrupt is used to collect statistics info about
link status changing suddenly when netdev running.

But when stopping netdev, there also be a MAC TNL interrupt
which is unnecessary, and may add some noise to the statistics
info. So this patch disables it before stopping MAC.

Fixes: a6345787 ("net: hns3: Add handling of MAC tunnel interruption")

Feature or Bugfix:Bugfix
Signed-off-by: NHuazhong Tan <tanhuazhong@huawei.com>
Reviewed-by: Nlinyunsheng <linyunsheng@huawei.com>
Reviewed-by: NYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>

c14ab0f4

ACC: crypto/hisilicon/qm: Fix warning of reviewbot check · 60712dc2

由 tanshukun 提交于 8月 09, 2019

driver inclusion
category: bugfix
bugzilla: NA
CVE: NA

Feature or Bugfix:Bugfix
Signed-off-by: Ntanshukun (A) <tanshukun1@huawei.com>
Reviewed-by: Nwangzhou <wangzhou1@hisilicon.com>
Signed-off-by: Nlingmingqiang <lingmingqiang@huawei.com>
Reviewed-by: Nlingmingqiang <lingmingqiang@huawei.com>
Reviewed-by: NYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>

60712dc2

uacce: remove VA unmap in release q flow · c467ca4d

由 Hao Fang 提交于 8月 09, 2019

driver inclusion
category: bugfix
bugzilla: NA
CVE: NA

As VA unmap at user space, kernel va unmap in release q flow
can lead dead_lock.

[  506.703275] ======================================================
[  506.709426] WARNING: possible circular locking dependency detected
[  506.715580] 5.2.0-rc4-ge984cac-dirty #3 Tainted: G         C O
[  506.721817] ------------------------------------------------------
[  506.727968] wd_zip_test/1341 is trying to acquire lock:
[  506.733169] (____ptrval____) (&mm->mmap_sem){++++}, at: __vm_munmap+0x54/0xd0
[  506.740278]
[  506.740278] but task is already holding lock:
[  506.746082] (____ptrval____) (uacce_qs_lock){+.+.}, at: uacce_fops_release+0x2c/0x220 [uacce]
[  506.754571]
[  506.754571] which lock already depends on the new lock.
[  506.754571]
[  506.762709]
[  506.762709] the existing dependency chain (in reverse order) is:
[  506.770155]
[  506.770155] -> #1 (uacce_qs_lock){+.+.}:
[  506.775533]        down_write+0x50/0xc8
[  506.779352]        uacce_fops_mmap+0x3c/0x668 [uacce]
[  506.784380]        mmap_region+0x3c0/0x580
[  506.788456]        do_mmap+0x34c/0x4e0
[  506.792190]        vm_mmap_pgoff+0xe4/0x110
[  506.796353]        ksys_mmap_pgoff+0xa8/0x240
[  506.800690]        __arm64_sys_mmap+0x28/0x38
[  506.805028]        el0_svc_common.constprop.0+0x74/0x170
[  506.810314]        el0_svc_handler+0x28/0x78
[  506.814563]        el0_svc+0x8/0xc
[  506.817948]
[  506.817948] -> #0 (&mm->mmap_sem){++++}:
[  506.823325]        lock_acquire+0xe4/0x270
[  506.827402]        down_write_killable+0x50/0xe8
[  506.831997]        __vm_munmap+0x54/0xd0
[  506.835901]        vm_munmap+0x10/0x18
[  506.839633]        uacce_fops_release+0xc8/0x220 [uacce]
[  506.844921]        __fput+0xac/0x1f0
[  506.848478]        ____fput+0xc/0x18
[  506.852037]        task_work_run+0x98/0xc8
[  506.856114]        do_notify_resume+0x314/0x388
[  506.860623]        work_pending+0x8/0x14
[  506.864526]
[  506.864526] other info that might help us debug this:
[  506.864526]
[  506.872492]  Possible unsafe locking scenario:
[  506.872492]
[  506.878382]        CPU0                    CPU1
[  506.882890]        ----                    ----
[  506.887399]   lock(uacce_qs_lock);
[  506.890784]                                lock(&mm->mmap_sem);
[  506.896675]                                lock(uacce_qs_lock);
[  506.902565]   lock(&mm->mmap_sem);
[  506.905951]
[  506.905951]  *** DEADLOCK ***
[  506.905951]
[  506.911841] 1 lock held by wd_zip_test/1341:
[  506.916092]  #0: (____ptrval____) (uacce_qs_lock){+.+.}, at: uacce_fops_release+0x2c/0x220 [uacce]
[  506.925009]
[  506.925009] stack backtrace:
[  506.929348] CPU: 6 PID: 1341 Comm: wd_zip_test Tainted: G         C O      5.2.0-rc4-ge984cac-dirty #3
[  506.938609] Hardware name: Huawei TaiShan 2280 V2/BC82AMDC, BIOS 2280-V2 CS V3.B010.01 06/21/2019
[  506.947438] Call trace:
[  506.949875]  dump_backtrace+0x0/0x148
[  506.953521]  show_stack+0x14/0x20
[  506.956821]  dump_stack+0xc8/0x114
[  506.960207]  print_circular_bug+0x1c8/0x2d8
[  506.964370]  __lock_acquire+0x1f38/0x23a8
[  506.968360]  lock_acquire+0xe4/0x270
[  506.971918]  down_write_killable+0x50/0xe8
[  506.975994]  __vm_munmap+0x54/0xd0
[  506.979380]  vm_munmap+0x10/0x18
[  506.982593]  uacce_fops_release+0xc8/0x220 [uacce]
[  506.987360]  __fput+0xac/0x1f0
[  506.990399]  ____fput+0xc/0x18
[  506.993439]  task_work_run+0x98/0xc8
[  506.996997]  do_notify_resume+0x314/0x388
[  507.000987]  work_pending+0x8/0x14

Feature or Bugfix:Bugfix
Signed-off-by: NHao Fang <fanghao11@huawei.com>
Reviewed-by: Nwangzhou <wangzhou1@hisilicon.com>
Signed-off-by: Nlingmingqiang <lingmingqiang@huawei.com>
Reviewed-by: Nlingmingqiang <lingmingqiang@huawei.com>
Reviewed-by: NYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>

c467ca4d

ZIP:Clear the zip's regs after rmmod · 570a8695

由 liulongfang 提交于 8月 09, 2019

driver inclusion
category: bugfix
bugzilla: NA
CVE: NA

After the ZIP accelerator rmmoded,the values of some registers are not cleared.
Therefore, we need to delete the values when initializing or unloading the ZIP accelerator

Feature or Bugfix:Bugfix
Signed-off-by: Nliulongfang <liulongfang@huawei.com>
Reviewed-by: Nwangzhou <wangzhou1@hisilicon.com>
Signed-off-by: Nlingmingqiang <lingmingqiang@huawei.com>
Reviewed-by: Nlingmingqiang <lingmingqiang@huawei.com>
Reviewed-by: NYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>

570a8695

UACCE: use mmap flag to handle hw error · 2a79a6bc

由 lingmingqiang 提交于 8月 09, 2019

driver inclusion
category: bugfix
bugzilla: NA
CVE: NA

Feature or Bugfix:Feature
Signed-off-by: Ntanshukun (A) <tanshukun1@huawei.com>
Reviewed-by: Nxuzaibo <xuzaibo@huawei.com>
Signed-off-by: Nlingmingqiang <lingmingqiang@huawei.com>
Reviewed-by: Nlingmingqiang <lingmingqiang@huawei.com>
Reviewed-by: NYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>

2a79a6bc

ACC: apply for memory using "GFP_KERNEL"in the lock · 733c2fd1

由 tanghui20 提交于 8月 09, 2019

driver inclusion
category: bugfix
bugzilla: NA
CVE: NA

Using GFP_KERNEL when applying for memory may sleep,
if this action may trigger a deadlock in the lock

Feature or Bugfix:Bugfix
Signed-off-by: Ntanghui20 <tanghui20@huawei.com>
Reviewed-by: Nxuzaibo <xuzaibo@huawei.com>
Signed-off-by: Nlingmingqiang <lingmingqiang@huawei.com>
Reviewed-by: Nlingmingqiang <lingmingqiang@huawei.com>
Reviewed-by: NYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>

733c2fd1

ACC: add qm workqueue support · 0068a2ec

由 zhangwei 提交于 8月 09, 2019

driver inclusion
category: bugfix
bugzilla: NA
CVE: NA

Feature or Bugfix:Feature
Signed-off-by: NZhangwei <zhangwei375@huawei.com>
Reviewed-by: Nhucheng.hu <hucheng.hu@huawei.com>
Signed-off-by: Nlingmingqiang <lingmingqiang@huawei.com>
Reviewed-by: Nlingmingqiang <lingmingqiang@huawei.com>
Reviewed-by: NYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>

0068a2ec

scsi: hisi_sas: use true/false as input parameter of sas_phy_reset() · 9a8b5a9e

由 Jiaxing Luo 提交于 8月 09, 2019

driver inclusion
category: bugfix
bugzilla: NA
CVE: NA

When calling sas_phy_reset(), we need to specify whether the reset type
is hard reset or link reset. In the code we use two numbers: 0 and 1.
In fact, we can't immediately determine whether these two numbers is
a normal number or true/false.

Therefore, we use true/false to replace 1/0. When set true, it mean we
will run hardreset; When false, we don't run hardreset this time, which
mean that we will run linkreset.

Feature or Bugfix: Bugfix
Signed-off-by: NJiaxing Luo <luojiaxing@huawei.com>
Signed-off-by: NJohn Garry <john.garry@huawei.com>
Signed-off-by: Nluojiaxing <luojiaxing@huawei.com>
Reviewed-by: Nchenxiang <chenxiang66@hisilicon.com>
Reviewed-by: NYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>

9a8b5a9e

RDMA/hns: Fix spelling errors of roce dfx query · 552023dd

由 Lang Cheng 提交于 8月 09, 2019

driver inclusion
category: bugfix
bugzilla: NA
CVE: NA

Correct sysfs print information.

Feature or Bugfix:Bugfix
Signed-off-by: NLang Cheng <chenglang@huawei.com>
Reviewed-by: Noulijun <oulijun@huawei.com>
Reviewed-by: Nliyangyang20 <liyangyang20@huawei.com>
Reviewed-by: Nliuyixian <liuyixian@huawei.com>
Reviewed-by: NYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>

552023dd

net: hns3: add handshake with VF for PF · 6e5ad103

由 Huazhong Tan 提交于 8月 08, 2019

driver inclusion
category: bugfix
bugzilla: NA
CVE: NA

Before PF asserting function reset, it should make sure that all
its VFs have been ready, otherwise, it will cause some hardware errors.

Feature or Bugfix:Bugfix
Signed-off-by: NHuazhong Tan <tanhuazhong@huawei.com>
Reviewed-by: Nlinyunsheng <linyunsheng@huawei.com>
Reviewed-by: NYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>

6e5ad103

bonding: Add vlan tx offload to hw_enc_features · cabb3a72

由 YueHaibing 提交于 8月 08, 2019

hulk inclusion
category: bugfix
bugzilla: 16589
CVE: NA

-------------------------------------------------

As commit 30d8177e ("bonding: Always enable vlan tx offload")
said, we should always enable bonding's vlan tx offload, pass the
vlan packets to the slave devices with vlan tci, let them to handle
vlan implementation.

Now if encapsulation protocols like VXLAN is used, skb->encapsulation
may be set, then the packet is passed to vlan device which based on
bonding device. However in netif_skb_features(), the check of
hw_enc_features:

	 if (skb->encapsulation)
                 features &= dev->hw_enc_features;

clears NETIF_F_HW_VLAN_CTAG_TX/NETIF_F_HW_VLAN_STAG_TX. This results
in same issue in commit 30d8177e like this:

vlan_dev_hard_start_xmit
  -->dev_queue_xmit
    -->validate_xmit_skb
      -->netif_skb_features //NETIF_F_HW_VLAN_CTAG_TX is cleared
      -->validate_xmit_vlan
        -->__vlan_hwaccel_push_inside //skb->tci is cleared
...
 --> bond_start_xmit
   --> bond_xmit_hash //BOND_XMIT_POLICY_ENCAP34
     --> __skb_flow_dissect // nhoff point to IP header
        -->  case htons(ETH_P_8021Q)
             // skb_vlan_tag_present is false, so
             vlan = __skb_header_pointer(skb, nhoff, sizeof(_vlan),
             //vlan point to ip header wrongly

Link: https://patchwork.ozlabs.org/patch/1143194/
Fixes: b2a103e6 ("bonding: convert to ndo_fix_features")
Signed-off-by: NYueHaibing <yuehaibing@huawei.com>
Acked-by: NJay Vosburgh <jay.vosburgh@canonical.com>
Reviewed-by: NWei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>

cabb3a72

Revert "flow_dissector: Fix vlan header offset in __skb_flow_dissect" · 2700c381

由 Yang Yingliang 提交于 8月 08, 2019

hulk inclusion
category: bugfix
bugzilla: 16589
CVE: NA

-------------------------------------------------

This reverts commit 703f67f815bc382034f72a0ac8b2e35fcd37688b.
The patch has introduced a bug, revert it and use a new fix.

2700c381

Linux 4.19.65 · 3b7f6980

由 Greg Kroah-Hartman 提交于 8月 07, 2019

Merge 82 patches from 4.19.65 stable
branch (82 total) beside 0 already merged patches.
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>

3b7f6980

Documentation: Add swapgs description to the Spectre v1 documentation · 47aa8b7d

由 Josh Poimboeuf 提交于 8月 07, 2019

commit 4c92057661a3412f547ede95715641d7ee16ddac upstream

Add documentation to the Spectre document about the new swapgs variant of
Spectre v1.
Signed-off-by: NJosh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: NThomas Gleixner <tglx@linutronix.de>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>

47aa8b7d

x86/speculation/swapgs: Exclude ATOMs from speculation through SWAPGS · 7c62b5d2

由 Thomas Gleixner 提交于 8月 07, 2019

commit f36cf386e3fec258a341d446915862eded3e13d8 upstream

Intel provided the following information:

 On all current Atom processors, instructions that use a segment register
 value (e.g. a load or store) will not speculatively execute before the
 last writer of that segment retires. Thus they will not use a
 speculatively written segment value.

That means on ATOMs there is no speculation through SWAPGS, so the SWAPGS
entry paths can be excluded from the extra LFENCE if PTI is disabled.

Create a separate bug flag for the through SWAPGS speculation and mark all
out-of-order ATOMs and AMD/HYGON CPUs as not affected. The in-order ATOMs
are excluded from the whole mitigation mess anyway.
Reported-by: NAndrew Cooper <andrew.cooper3@citrix.com>
Signed-off-by: NThomas Gleixner <tglx@linutronix.de>
Reviewed-by: NTyler Hicks <tyhicks@canonical.com>
Reviewed-by: NJosh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>

7c62b5d2

openeuler / Kernel 1 年多 前同步成功

openeuler / Kernel
1 年多前同步成功