lp:~bodong-wang/ubuntu/+source/linux-bluefield/+git/jammy

Author: Tony Duan
Author Date: 2023-08-30 13:36:21 UTC

UBUNTU: SAUCE: xfrm: fix conflict for netdev and tx stats

BugLink: https://bugs.launchpad.net/bugs/2034578

This commit is used to solve the compile error for previous 28
xfrm related patches. Some patches are clean cherry picked. But since
netdev_put() and other netdev related functions are not introduced
into this branch, to avoid compile error, change netdev functions
to dev functions. Use atomic_long_inc instead of
dev_core_stats_tx_dropped_inc.

Fixes: 651c1acc16a5a ("xfrm: add an interface to offload policy")
Fixes: 63b0f89a9eb63 ("xfrm: add TX datapath support for IPsec packet offload mode")
Signed-off-by: Tony Duan <yifeid@nvidia.com>

Author: Jiri Pirko
Author Date: 2022-07-29 07:10:36 UTC

net: devlink: convert reload command to take implicit devlink->lock

BugLink: https://bugs.launchpad.net/bugs/2032378

Convert reload command to behave the same way as the rest of the
commands and let if be called with devlink->lock held. Remove the
temporary devl_lock taking from drivers. As the DEVLINK_NL_FLAG_NO_LOCK
flag is no longer used, remove it alongside.

Signed-off-by: Jiri Pirko <jiri@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(backported from commit 644a66c60f02f302d82c3008ae2ffe67cf495383)
Signed-off-by: William Tu <witu@nvidia.com>
[witu: fix dev_lock and ignore mlx5 conflicts]

Author: Zachary Tahenakos
Author Date: 2022-04-28 18:03:53 UTC

UBUNTU: Ubuntu-nv-bluefield-5.15.0-1001.2

Signed-off-by: Zachary Tahenakos <zachary.tahenakos@canonical.com>