27 Mar, 2020
23 commits
-
This patch adds a new MACsec offloading option, MACSEC_OFFLOAD_MAC,
allowing a user to select a MAC as a provider for MACsec offloading
operations.Signed-off-by: Antoine Tenart
Signed-off-by: Mark Starovoytov
Signed-off-by: Igor Russkikh
Signed-off-by: David S. Miller -
The TI AM65x/J721E SoCs Gigabit Ethernet Switch subsystem (CPSW2G NUSS) has
two ports - One Ethernet port (port 1) with selectable RGMII and RMII
interfaces and an internal Communications Port Programming Interface (CPPI)
port (Host port 0) and with ALE in between. It also contains
- Management Data Input/Output (MDIO) interface for physical layer device
(PHY) management;
- Updated Address Lookup Engine (ALE) module;
- (TBD) New version of Common platform time sync (CPTS) module.On the TI am65x/J721E SoCs CPSW NUSS Ethernet subsystem into device MCU
domain named MCU_CPSW0.Host Port 0 CPPI Packet Streaming Interface interface supports 8 TX
channels and one RX channels operating by TI am654 NAVSS Unified DMA
Peripheral Root Complex (UDMA-P) controller.Introduced driver provides standard Linux net_device to user space and supports:
- ifconfig up/down
- MAC address configuration
- ethtool operation:
--driver
--change
--register-dump
--negotiate phy
--statistics
--set-eee phy
--show-ring
--show-channels
--set-channels
- net_device ioctl mii-control
- promisc mode- rx checksum offload for non-fragmented IPv4/IPv6 TCP/UDP packets.
The CPSW NUSS can verify IPv4/IPv6 TCP/UDP packets checksum and fills
csum information for each packet in psdata[2] word:
- BIT(16) CHECKSUM_ERROR - indicates csum error
- BIT(17) FRAGMENT - indicates fragmented packet
- BIT(18) TCP_UDP_N - Indicates TCP packet was detected
- BIT(19) IPV6_VALID, BIT(20) IPV4_VALID - indicates IPv6/IPv4 packet
- BIT(15, 0) CHECKSUM_ADD - This is the value that was summed
during the checksum computation. This value is FFFFh for non fragmented
IPV4/6 UDP/TCP packets with no checksum error.RX csum offload can be disabled:
ethtool -K rx-checksum on|off- tx checksum offload support for IPv4/IPv6 TCP/UDP packets (J721E only).
TX csum HW offload can be enabled/disabled:
ethtool -K tx-checksum-ip-generic on|off- multiq and switch between round robin/prio modes for cppi tx queues by
using Netdev private flag "p0-rx-ptype-rrobin" to switch between
Round Robin and Fixed priority modes:
# ethtool --show-priv-flags eth0
Private flags for eth0:
p0-rx-ptype-rrobin: on
# ethtool --set-priv-flags eth0 p0-rx-ptype-rrobin offNumber of TX DMA channels can be changed using "ethtool -L eth0 tx ".
- GRO support: the napi_gro_receive() and napi_complete_done() are used.
Signed-off-by: Grygorii Strashko
Tested-by: Murali Karicheri
Tested-by: Peter Ujfalusi
Signed-off-by: David S. Miller -
Add support for default thread configuration for AM65x CPSW NUSS ALE to
allow route all ingress packets to one default RX UDMA flow.Signed-off-by: Grygorii Strashko
Tested-by: Murali Karicheri
Tested-by: Peter Ujfalusi
Signed-off-by: David S. Miller -
The new CPSW ALE version, available on TI K3 AM654/J721E SoCs family,
allows to switch any external port to MAC only mode. When MAC only mode
enabled this port be treated like a MAC port for the host. All traffic
received is only sent to the host. The host must direct traffic to this
port as the lookup engine will not send traffic to the ports with the
p0_maconly bit set and the p0_no_learn also set. If p0_maconly bit is set
and the p0_no_learn is not set, the host can send non-directed packets that
can be sent to the destination of a MacOnly port. It is also possible that
The host can broadcast to all ports including MacOnly ports in this mode.This patch add ALE supprt for MAC only mode.
Signed-off-by: Grygorii Strashko
Tested-by: Murali Karicheri
Tested-by: Peter Ujfalusi
Signed-off-by: David S. Miller -
On AM65xx MCU CPSW2G NUSS and 66AK2E/L NUSS the unregistered multicast
packets are still can be received with promisc and allmulti disabled.This happens, because ALE VLAN entries on these SoCs do not contain port
masks for reg/unreg mcast packets, but instead store indexes of
ALE_VLAN_MASK_MUXx_REG registers which intended for store port masks for
reg/unreg mcast packets.ALE VLAN entry:UNREG_MCAST_FLOOD_INDEX -> ALE_VLAN_MASK_MUXx
ALE VLAN entry:REG_MCAST_FLOOD_INDEX -> ALE_VLAN_MASK_MUXyThe commit b361da837392 ("net: netcp: ale: add proper ale entry mask bits
for netcp switch ALE") update ALE code to support such ALE entries, it is
always used ALE_VLAN_MASK_MUX0_REG index in ALE VLAN entry for unreg mcast
packets mask configuration, which is read-only, at least for AM65xx MCU
CPSW2G NUSS and 66AK2E/L NUSS. As result unreg mcast packets are allowed
always.Hence, update ALE code to use ALE_VLAN_MASK_MUX1_REG index for ALE VLAN
entries to configure unreg mcast port mask.Fixes: b361da837392 ("net: netcp: ale: add proper ale entry mask bits for netcp switch ALE")
Signed-off-by: Grygorii Strashko
Tested-by: Murali Karicheri
Tested-by: Peter Ujfalusi
Signed-off-by: David S. Miller -
The phy-gmii-sel can be only auto selected in Kconfig and now the pretty
complex Kconfig dependencies are defined for phy-gmii-sel driver, which
also need to be updated every time phy-gmii-sel is re-used for any new
networking driver.Simplify Kconfig definition for phy-gmii-sel PHY driver - drop all
dependencies and from networking drivers and rely on using 'imply
PHY_TI_GMII_SEL' in Kconfig definitions for networking drivers instead.Signed-off-by: Grygorii Strashko
Acked-by: Kishon Vijay Abraham I
Tested-by: Murali Karicheri
Tested-by: Peter Ujfalusi
Signed-off-by: David S. Miller -
An MDIO controller present on development boards for Marvell switches
from the Link Street (88E6xxx) family.Using this module, you can use the following setup as a development
platform for switchdev and DSA related work..-------. .-----------------.
| USB----USB |
| SoC | | 88E6390X-DB ETH1-10
| ETH----ETH0 |
'-------' '-----------------'Signed-off-by: Tobias Waldekranz
Reviewed-by: Greg Kroah-Hartman
Reviewed-by: Andrew Lunn
Reviewed-by: Florian Fainelli
Signed-off-by: David S. Miller -
If we have scenarios like
mdiobus_register()
-> loads PHY driver module(s)
-> registers PHY driver(s)
-> may schedule async probe
phydev = mdiobus_get_phy()or
phydev = phy_device_create()
-> loads PHY driver module
-> registers PHY driver
-> may schedule async probethen we expect the PHY driver to be bound to the phydev when triggering
the action. This may not be the case in case of asynchronous probing.
Therefore ensure that PHY drivers are probed synchronously.Default still is sync probing, except async probing is explicitly
requested. I saw some comments that the intention is to promote
async probing for more parallelism in boot process and want to be
prepared for the case that the default is changed to async probing.Signed-off-by: Heiner Kallweit
Reviewed-by: Florian Fainelli
Reviewed-by: Andrew Lunn
Signed-off-by: David S. Miller -
Add a devlink region for exposing the device's Non Volatime Memory flash
contents.Support the recently added .snapshot operation, enabling userspace to
request a snapshot of the NVM contents via DEVLINK_CMD_REGION_NEW.Signed-off-by: Jacob Keller
Reviewed-by: Jiri Pirko
Signed-off-by: David S. Miller -
Implement the .snapshot region operation for the dummy data region. This
enables a region snapshot to be taken upon request via the new
DEVLINK_CMD_REGION_SNAPSHOT command.Signed-off-by: Jacob Keller
Reviewed-by: Jiri Pirko
Signed-off-by: David S. Miller -
Each snapshot created for a devlink region must have an id. These ids
are supposed to be unique per "event" that caused the snapshot to be
created. Drivers call devlink_region_snapshot_id_get to obtain a new id
to use for a new event trigger. The id values are tracked per devlink,
so that the same id number can be used if a triggering event creates
multiple snapshots on different regions.There is no mechanism for snapshot ids to ever be reused. Introduce an
xarray to store the count of how many snapshots are using a given id,
replacing the snapshot_id field previously used for picking the next id.The devlink_region_snapshot_id_get() function will use xa_alloc to
insert an initial value of 1 value at an available slot between 0 and
U32_MAX.The new __devlink_snapshot_id_increment() and
__devlink_snapshot_id_decrement() functions will be used to track how
many snapshots currently use an id.Drivers must now call devlink_snapshot_id_put() in order to release
their reference of the snapshot id after adding region snapshots.By tracking the total number of snapshots using a given id, it is
possible for the decrement() function to erase the id from the xarray
when it is not in use.With this method, a snapshot id can become reused again once all
snapshots that referred to it have been deleted via
DEVLINK_CMD_REGION_DEL, and the driver has finished adding snapshots.This work also paves the way to introduce a mechanism for userspace to
request a snapshot.Signed-off-by: Jacob Keller
Reviewed-by: Jiri Pirko
Signed-off-by: David S. Miller -
The devlink_snapshot_id_get() function returns a snapshot id. The
snapshot id is a u32, so there is no way to indicate an error code.A future change is going to possibly add additional cases where this
function could fail. Refactor the function to return the snapshot id in
an argument, so that it can return zero or an error value.This ensures that snapshot ids cannot be confused with error values, and
aids in the future refactor of snapshot id allocation management.Because there is no current way to release previously used snapshot ids,
add a simple check ensuring that an error is reported in case the
snapshot_id would over flow.Signed-off-by: Jacob Keller
Reviewed-by: Jiri Pirko
Signed-off-by: David S. Miller -
It does not makes sense that two snapshots for a given region would use
different destructors. Simplify snapshot creation by adding
a .destructor op for regions.This operation will replace the data_destructor for the snapshot
creation, and makes snapshot creation easier.Noticed-by: Jakub Kicinski
Signed-off-by: Jacob Keller
Reviewed-by: Jiri Pirko
Signed-off-by: David S. Miller -
Modify the devlink region code in preparation for adding new operations
on regions.Create a devlink_region_ops structure, and move the name pointer from
within the devlink_region structure into the ops structure (similar to
the devlink_health_reporter_ops).This prepares the regions to enable support of additional operations in
the future such as requesting snapshots, or accessing the region
directly without a snapshot.In order to re-use the constant strings in the mlx4 driver their
declaration must be changed to 'const char * const' to ensure the
compiler realizes that both the data and the pointer cannot change.Signed-off-by: Jacob Keller
Reviewed-by: Jakub Kicinski
Reviewed-by: Jiri Pirko
Signed-off-by: David S. Miller -
Rely on 'remote' veth_rq to account ndo_xdp_xmit ethtool counters.
Move XDP_TX accounting to veth_xdp_flush_bq routine.
Remove 'rx' prefix in rx xdp ethool countersSigned-off-by: Lorenzo Bianconi
Acked-by: Toshiaki Makita
Signed-off-by: David S. Miller -
Substitute net_device point with veth_rq one in veth_xdp_flush_bq,
veth_xdp_flush and veth_xdp_tx signature. This is a preliminary patch
to account xdp_xmit counter on 'receiving' veth_rqAcked-by: Toshiaki Makita
Signed-off-by: Lorenzo Bianconi
Signed-off-by: David S. Miller -
Move away from the deprecated API and return the shiny new ERRPTR where
useful.Signed-off-by: Wolfram Sang
Signed-off-by: David S. Miller -
Move away from the deprecated API and return the shiny new ERRPTR where
useful.Signed-off-by: Wolfram Sang
Signed-off-by: David S. Miller -
Offload action pedit ex munge when used with a flower classifier. Only
allow setting of DSCP, ECN, or the whole DSField in IPv4 and IPv6 packets.Signed-off-by: Petr Machata
Reviewed-by: Jiri Pirko
Signed-off-by: Ido Schimmel
Signed-off-by: David S. Miller -
The QOS_ACTION is used for manipulating the QOS attributes of the packet.
Add the defines and helpers related to DSCP and ECN fields, and dscp_rw.Signed-off-by: Petr Machata
Reviewed-by: Jiri Pirko
Signed-off-by: Ido Schimmel
Signed-off-by: David S. Miller -
The original idea was to reuse this set of actions for ECN rewrite as well,
but on second look, it's not such a great idea. These two items should each
have its own command. Rename the existing enum to make it obvious that it
belongs to switch_prio_cmd.Signed-off-by: Petr Machata
Reviewed-by: Jiri Pirko
Signed-off-by: Ido Schimmel
Signed-off-by: David S. Miller -
Saeed Mahameed says:
====================
mlx5-updates-2020-03-251) Cleanups from Dan Carpenter and wenxu.
2) Paul and Roi, Some minor updates and fixes to E-Switch to address
issues introduced in the previous reg_c0 updates series.3) Eli Cohen simplifies and improves flow steering matching group searches
and flow table entries version management.4) Parav Pandit, improves devlink eswitch mode changes thread safety.
By making devlink rely on driver for thread safety and introducing mlx5
eswitch mode change protection.
====================Signed-off-by: David S. Miller
-
drivers/net/ethernet/atheros/atlx/atl2.c:40:19: warning: ‘atl2_driver_string’ defined but not used [-Wunused-const-variable=]
static const char atl2_driver_string[] = "Atheros(R) L2 Ethernet Driver";
^~~~~~~~~~~~~~~~~~commit ea973742140b ("net/atheros: Clean atheros code from driver version")
left behind this, remove it.Reported-by: Hulk Robot
Signed-off-by: YueHaibing
Signed-off-by: David S. Miller
26 Mar, 2020
17 commits
-
Currently eswitch mode change is occurring from 2 different execution
contexts as below.
1. sriov sysfs enable/disable
2. devlink eswitch set commandsBoth of them need to access eswitch related data structures in
synchronized manner.
Without any synchronization below race condition exist.SR-IOV enable/disable with devlink eswitch mode change:
cpu-0 cpu-1
----- -----
mlx5_device_disable_sriov() mlx5_devlink_eswitch_mode_set()
mlx5_eswitch_disable() esw_offloads_stop()
esw_offloads_disable() mlx5_eswitch_disable()
esw_offloads_disable()Hence, they are synchronized using a new mode_lock.
eswitch's state_lock is not used as it can lead to a deadlock scenario
below and state_lock is only for vport and fdb exclusive access.ip link set vf
netlink rcv_msg() - Lock A
rtnl_lock
vfinfo()
esw->state_lock() - Lock B
devlink eswitch_set
devlink_mutex
esw->state_lock() - Lock B
attach_netdev()
register_netdev()
rtnl_lock - Lock AAlternatives considered:
1. Acquiring rtnl lock before taking esw->state_lock to follow similar
locking sequence as ip link flow during eswitch mode set.
rtnl lock is not good idea for two reasons.
(a) Holding rtnl lock for several hundred device commands is not good
idea.
(b) It leads to below and more similar deadlocks.devlink eswitch_set
devlink_mutex
rtnl_lock - Lock A
esw->state_lock() - Lock B
eswitch_disable()
reload()
ib_register_device()
ib_cache_setup_one()
rtnl_lock()2. Exporting devlink lock may lead to undesired use of it in vendor
driver(s) in future.3. Unloading representors outside of the mode_lock requires
serialization with other process trying to enable the eswitch.4. Differing the representors life cycle to a different workqueue
requires synchronization with func_change_handler workqueue.Reviewed-by: Roi Dayan
Reviewed-by: Bodong Wang
Reviewed-by: Mark Bloch
Signed-off-by: Parav Pandit
Signed-off-by: Saeed Mahameed -
Subsequent patch protects eswitch mode changes across sriov and devlink
interfaces. It is desirable for eswitch to provide thread safe eswitch
enable and disable APIs.
Hence, extend eswitch enable API to optionally update num_vfs when
requested.In subsequent patch, eswitch num_vfs are updated after all the eswitch
users eswitch drops its reference count.Reviewed-by: Roi Dayan
Reviewed-by: Bodong Wang
Reviewed-by: Mark Bloch
Signed-off-by: Parav Pandit
Signed-off-by: Saeed Mahameed -
In order to check eswitch state under a lock, prepare code to split
capability check and eswitch state check into two helper functions.Reviewed-by: Roi Dayan
Reviewed-by: Bodong Wang
Reviewed-by: Mark Bloch
Signed-off-by: Parav Pandit
Signed-off-by: Saeed Mahameed -
mlx5_unload_one() always returns 0.
Simplify callers of mlx5_unload_one() and remove the dead code.Reviewed-by: Moshe Shemesh
Signed-off-by: Parav Pandit
Signed-off-by: Saeed Mahameed -
mlx5_register_device() doesn't check for any error and always returns 0.
Simplify mlx5_register_device() to return void and its caller, remove
dead code related to it.Reviewed-by: Moshe Shemesh
Signed-off-by: Parav Pandit
Signed-off-by: Saeed Mahameed -
Group version is used when modifying a rule is allowed
(FLOW_ACT_NO_APPEND is clear) to detect a case where the rule was found
but while the groups where unlocked a new FTE was added. In this case,
the added FTE could be one with identical match value so we need to
attempt again with group lock held.Change the code so version is retrieved only when FLOW_ACT_NO_APPEND is
cleared. As result, later compare can also be avoided if FLOW_ACT_NO_APPEND
is cleared.Also improve comments text.
Signed-off-by: Eli Cohen
Reviewed-by: Mark Bloch
Signed-off-by: Saeed Mahameed -
FTE version is not used anywhere in the code so avoid incrementing it.
Signed-off-by: Eli Cohen
Reviewed-by: Mark Bloch
Signed-off-by: Saeed Mahameed -
When adding a rule to a flow group we need increment the version of the
group. Current code fails to do that and as a result, when trying to add
a rule, we will fail to discover a case where an FTE with the same match
value was added while we scanned the groups of the same match criteria,
thus we may try to add an FTE that was already added.Signed-off-by: Eli Cohen
Reviewed-by: Mark Bloch
Signed-off-by: Saeed Mahameed -
Instead of using two different structs for searching groups with the
same match, use a single struct and thus simplify the code, make it more
readable and smaller size which means less code cache misses.text data bss dec hex
before: 35524 2744 0 38268 957c
after: 35038 2744 0 37782 9396When testing add 70000 rules, delete all the rules, and repeat three
times taking the average, we get (time in seconds):Before the change: insert 16.80, delete 11.02
After the change: insert 16.55, delete 10.95Signed-off-by: Eli Cohen
Reviewed-by: Mark Bloch
Reviewed-by: Maor Gottlieb
Signed-off-by: Saeed Mahameed -
The correct type is u32.
Fixes: d18296ffd9cc ("net/mlx5: E-Switch, Introduce global tables")
Signed-off-by: Roi Dayan
Reviewed-by: Paul Blakey
Signed-off-by: Saeed Mahameed -
We allocate a temporary memory but forget to free it.
Fixes: 11b717d61526 ("net/mlx5: E-Switch, Get reg_c0 value on CQE")
Signed-off-by: Roi Dayan
Reviewed-by: Paul Blakey
Signed-off-by: Saeed Mahameed -
Register c0 loopback is needed to fully support chains and prios.
Enable chains and prio only if loopback (of reg c1 which came together
with c0), is enabled. To be able to check that, move enabling of loopback
before eswitch chains init.Signed-off-by: Paul Blakey
Reviewed-by: Roi Dayan
Signed-off-by: Saeed Mahameed -
Reg c0/c1 matching, rewrite of regs c0/c1, and copy header of regs c1,B
is needed for the restore table to function, might not be supported by
firmware, and creation of the restore table or the copy header will
fail.Check reg_c1 loopback support, as firmware which supports this,
should have all of the above.Fixes: 11b717d61526 ("net/mlx5: E-Switch, Get reg_c0 value on CQE")
Signed-off-by: Paul Blakey
Reviewed-by: Roi Dayan
Signed-off-by: Saeed Mahameed -
The function mlx5e_rep_setup_ft_cb check chain_index is zero twice.
Signed-off-by: wenxu
Signed-off-by: Saeed Mahameed -
The actions_match_supported() function returns a bool, true for success
and false for failure. This error path is returning a negative which
is cast to true but it should return false.Fixes: 4c3844d9e97e ("net/mlx5e: CT: Introduce connection tracking")
Signed-off-by: Dan Carpenter
Reviewed-by: Leon Romanovsky
Signed-off-by: Saeed Mahameed -
Overlapping header include additions in macsec.c
A bug fix in 'net' overlapping with the removal of 'version'
string in ena_netdev.cOverlapping test additions in selftests Makefile
Overlapping PCI ID table adjustments in iwlwifi driver.
Signed-off-by: David S. Miller
-
Pull networking fixes from David Miller:
1) Fix deadlock in bpf_send_signal() from Yonghong Song.
2) Fix off by one in kTLS offload of mlx5, from Tariq Toukan.
3) Add missing locking in iwlwifi mvm code, from Avraham Stern.
4) Fix MSG_WAITALL handling in rxrpc, from David Howells.
5) Need to hold RTNL mutex in tcindex_partial_destroy_work(), from Cong
Wang.6) Fix producer race condition in AF_PACKET, from Willem de Bruijn.
7) cls_route removes the wrong filter during change operations, from
Cong Wang.8) Reject unrecognized request flags in ethtool netlink code, from
Michal Kubecek.9) Need to keep MAC in reset until PHY is up in bcmgenet driver, from
Doug Berger.10) Don't leak ct zone template in act_ct during replace, from Paul
Blakey.11) Fix flushing of offloaded netfilter flowtable flows, also from Paul
Blakey.12) Fix throughput drop during tx backpressure in cxgb4, from Rahul
Lakkireddy.13) Don't let a non-NULL skb->dev leave the TCP stack, from Eric
Dumazet.14) TCP_QUEUE_SEQ socket option has to update tp->copied_seq as well,
also from Eric Dumazet.15) Restrict macsec to ethernet devices, from Willem de Bruijn.
16) Fix reference leak in some ethtool *_SET handlers, from Michal
Kubecek.17) Fix accidental disabling of MSI for some r8169 chips, from Heiner
Kallweit.* git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (138 commits)
net: Fix CONFIG_NET_CLS_ACT=n and CONFIG_NFT_FWD_NETDEV={y, m} build
net: ena: Add PCI shutdown handler to allow safe kexec
selftests/net/forwarding: define libs as TEST_PROGS_EXTENDED
selftests/net: add missing tests to Makefile
r8169: re-enable MSI on RTL8168c
net: phy: mdio-bcm-unimac: Fix clock handling
cxgb4/ptp: pass the sign of offset delta in FW CMD
net: dsa: tag_8021q: replace dsa_8021q_remove_header with __skb_vlan_pop
net: cbs: Fix software cbs to consider packet sending time
net/mlx5e: Do not recover from a non-fatal syndrome
net/mlx5e: Fix ICOSQ recovery flow with Striding RQ
net/mlx5e: Fix missing reset of SW metadata in Striding RQ reset
net/mlx5e: Enhance ICOSQ WQE info fields
net/mlx5_core: Set IB capability mask1 to fix ib_srpt connection failure
selftests: netfilter: add nfqueue test case
netfilter: nft_fwd_netdev: allow to redirect to ifb via ingress
netfilter: nft_fwd_netdev: validate family and chain type
netfilter: nft_set_rbtree: Detect partial overlaps on insertion
netfilter: nft_set_rbtree: Introduce and use nft_rbtree_interval_start()
netfilter: nft_set_pipapo: Separate partial and complete overlap cases on insertion
...
