* Re: [PATCH net-next v6 08/13] net: wwan: t7xx: Add data path interface
From: Ilpo Järvinen @ 2022-04-21 10:54 UTC (permalink / raw)
To: Ricardo Martinez
Cc: netdev, linux-wireless, kuba, davem, johannes, ryazanov.s.a,
loic.poulain, m.chetan.kumar, chandrashekar.devegowda, linuxwwan,
chiranjeevi.rapolu, haijun.liu, amir.hanania, andriy.shevchenko,
dinesh.sharma, eliot.lee, ilpo.johannes.jarvinen, moises.veleta,
pierre-louis.bossart, muralidharan.sethuraman,
Soumya.Prakash.Mishra, sreehari.kancharla, madhusmita.sahu
In-Reply-To: <20220407223629.21487-9-ricardo.martinez@linux.intel.com>
On Thu, 7 Apr 2022, Ricardo Martinez wrote:
> From: Haijun Liu <haijun.liu@mediatek.com>
>
> Data Path Modem AP Interface (DPMAIF) HIF layer provides methods
> for initialization, ISR, control and event handling of TX/RX flows.
>
> DPMAIF TX
> Exposes the 'dmpaif_tx_send_skb' function which can be used by the
> network device to transmit packets.
> The uplink data management uses a Descriptor Ring Buffer (DRB).
> First DRB entry is a message type that will be followed by 1 or more
> normal DRB entries. Message type DRB will hold the skb information
> and each normal DRB entry holds a pointer to the skb payload.
>
> DPMAIF RX
> The downlink buffer management uses Buffer Address Table (BAT) and
> Packet Information Table (PIT) rings.
> The BAT ring holds the address of skb data buffer for the HW to use,
> while the PIT contains metadata about a whole network packet including
> a reference to the BAT entry holding the data buffer address.
> The driver reads the PIT and BAT entries written by the modem, when
> reaching a threshold, the driver will reload the PIT and BAT rings.
>
> Signed-off-by: Haijun Liu <haijun.liu@mediatek.com>
> Signed-off-by: Chandrashekar Devegowda <chandrashekar.devegowda@intel.com>
> Co-developed-by: Ricardo Martinez <ricardo.martinez@linux.intel.com>
> Signed-off-by: Ricardo Martinez <ricardo.martinez@linux.intel.com>
>
> >From a WWAN framework perspective:
> Reviewed-by: Loic Poulain <loic.poulain@linaro.org>
> + if (txq->tx_skb_head.qlen >= txq->tx_list_max_len)
> + goto report_full_state;
> +
> + skb_cb = T7XX_SKB_CB(skb);
> + skb_cb->txq_number = txq_number;
> + skb_queue_tail(&txq->tx_skb_head, skb);
> + wake_up(&dpmaif_ctrl->tx_wq);
> + return 0;
> +
> +report_full_state:
> + callbacks = dpmaif_ctrl->callbacks;
> + callbacks->state_notify(dpmaif_ctrl->t7xx_dev, DMPAIF_TXQ_STATE_FULL, txq_number>
> + return -EBUSY;
> +}
Should this actually report full earlier so that the queue can be stopped
before NETDEV_TX_BUSY has to be returned (by the callers in 09/13)?
(see Documentation/networking/driver.rst)
> + /* Wait for active Tx to be doneg */
doneg -> done
> +struct dpmaif_drb {
> + __le32 header;
> + union {
> + struct {
> + __le32 data_addr_l;
> + __le32 data_addr_h;
> + __le32 reserved;
> + } pd;
> + struct {
> + __le32 msg_hdr;
> + __le32 reserved1;
> + __le32 reserved2;
> + } msg;
> + };
> +};
"reserved" and "reserved2" could be placed outside of the union
as they have the same offset.
--
i.
^ permalink raw reply
* Re: [PATCH v2 bpf 00/11] bpf: random unpopular userspace fixes (32 bit et al)
From: Toke Høiland-Jørgensen @ 2022-04-21 10:52 UTC (permalink / raw)
To: Alexei Starovoitov, Alexander Lobakin
Cc: Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko,
Maciej Fijalkowski, Song Liu, Kumar Kartikeya Dwivedi, bpf,
Network Development, LKML
In-Reply-To: <CAADnVQJJiBO5T3dvYaifhu3crmce7CH9b5ioc1u4=Y25SUxVRA@mail.gmail.com>
Alexei Starovoitov <alexei.starovoitov@gmail.com> writes:
> On Wed, Apr 20, 2022 at 5:38 PM Alexander Lobakin <alobakin@pm.me> wrote:
>
> Again?
>
> -----BEGIN PGP MESSAGE-----
> Version: ProtonMail
>
> wcFMA165ASBBe6s8AQ/8C9y4TqXgASA5xBT7UIf2GyTQRjKWcy/6kT1dkjkF
> FldAOhehhgLYjLJzNAIkecOQfz/XNapW3GdrQDq11pq9Bzs1SJJekGXlHVIW
>
> Sorry I'm tossing the series out of patchwork.
FWIW I'm not seeing this in the version I pulled from Lore. So maybe
it's something ProtonMail does on a per-recipient basis? Still really
weird to do behind the scenes, though... :/
-Toke
^ permalink raw reply
* [GIT PULL] Networking for 5.18-rc4
From: Paolo Abeni @ 2022-04-21 10:52 UTC (permalink / raw)
To: torvalds; +Cc: kuba, davem, netdev, linux-kernel
Hi Linus!
The following changes since commit d20339fa93e9810fcf87518bdd62e44f62bb64ee:
Merge tag 'net-5.18-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (2022-04-14 11:58:19 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git tags/net-5.18-rc4
for you to fetch changes up to bc6de2878429e85c1f1afaa566f7b5abb2243eef:
drivers: net: hippi: Fix deadlock in rr_close() (2022-04-21 10:30:45 +0200)
----------------------------------------------------------------
Networking fixes for 5.18-rc4, including fixes from xfrm and can.
Current release - regressions:
- rxrpc: restore removed timer deletion
Current release - new code bugs:
- gre: fix device lookup for l3mdev use-case
- xfrm: fix egress device lookup for l3mdev use-case
Previous releases - regressions:
- sched: cls_u32: fix netns refcount changes in u32_change()
- smc: fix sock leak when release after smc_shutdown()
- xfrm: limit skb_page_frag_refill use to a single page
- eth: atlantic: invert deep par in pm functions, preventing null
derefs
- eth: stmmac: use readl_poll_timeout_atomic() in atomic state
Previous releases - always broken:
- gre: fix skb_under_panic on xmit
- openvswitch: fix OOB access in reserve_sfa_size()
- dsa: hellcreek: calculate checksums in tagger
- eth: ice: fix crash in switchdev mode
- eth: igc:
- fix infinite loop in release_swfw_sync
- fix scheduling while atomic
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
----------------------------------------------------------------
Arun Ramadoss (1):
net: phy: LAN937x: added PHY_POLL_CABLE_TEST flag
David Ahern (3):
xfrm: Pass flowi_oif or l3mdev as oif to xfrm_dst_lookup
l3mdev: l3mdev_master_upper_ifindex_by_index_rcu should be using netdev_master_upper_dev_get_rcu
net: Handle l3mdev in ip_tunnel_init_flow
David Howells (1):
rxrpc: Restore removed timer deletion
David S. Miller (3):
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue
Merge tag 'linux-can-fixes-for-5.18-20220417' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can
Duoming Zhou (1):
drivers: net: hippi: Fix deadlock in rr_close()
Eric Dumazet (4):
net/sched: cls_u32: fix netns refcount changes in u32_change()
net/sched: cls_u32: fix possible leak in u32_init_knode()
ipv6: make ip6_rt_gc_expire an atomic_t
netlink: reset network and mac headers in netlink_dump()
Hangbin Liu (1):
net/packet: fix packet_sock xmit return value checking
Horatiu Vultur (1):
net: lan966x: Make sure to release ptp interrupt
Ido Schimmel (2):
selftests: mlxsw: vxlan_flooding: Prevent flooding of unwanted packets
selftests: mlxsw: vxlan_flooding_ipv6: Prevent flooding of unwanted packets
Jakub Kicinski (3):
Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue
Merge branch 'net-sched-two-fixes-for-cls_u32'
Merge branch 'l3mdev-fix-ip-tunnel-case-after-recent-l3mdev-change'
Jianglei Nie (1):
ice: Fix memory leak in ice_get_orom_civd_data()
Kevin Hao (1):
net: stmmac: Use readl_poll_timeout_atomic() in atomic state
Krzysztof Kozlowski (1):
nfc: MAINTAINERS: add Bug entry
Kurt Kanzenbach (1):
net: dsa: hellcreek: Calculate checksums in tagger
Maciej Fijalkowski (2):
ice: xsk: check if Rx ring was filled up to the end
ice: allow creating VFs for !CONFIG_NET_SWITCHDEV
Manuel Ullmann (1):
net: atlantic: invert deep par in pm functions, preventing null derefs
Nicolas Dichtel (1):
doc/ip-sysctl: add bc_forwarding
Oliver Hartkopp (1):
can: isotp: stop timeout monitoring when no first frame was sent
Paolo Valerio (1):
openvswitch: fix OOB access in reserve_sfa_size()
Peilin Ye (2):
ip6_gre: Avoid updating tunnel->tun_hlen in __gre6_xmit()
ip6_gre: Fix skb_under_panic in __gre6_xmit()
Sabrina Dubroca (1):
esp: limit skb_page_frag_refill use to a single page
Sasha Neftin (3):
igc: Fix infinite loop in release_swfw_sync
igc: Fix BUG: scheduling while atomic
e1000e: Fix possible overflow in LTR decoding
Stephen Hemminger (1):
net: restore alpha order to Ethernet devices in config
Sukadev Bhattiprolu (1):
powerpc: Update MAINTAINERS for ibmvnic and VAS
Tony Lu (1):
net/smc: Fix sock leak when release after smc_shutdown()
Vinicius Costa Gomes (1):
igc: Fix suspending when PTM is active
Vladimir Oltean (1):
net: mscc: ocelot: fix broken IP multicast flooding
Wojciech Drewek (1):
ice: fix crash in switchdev mode
suresh kumar (1):
bonding: do not discard lowest hash bit for non layer3+4 hashing
Documentation/networking/ip-sysctl.rst | 7 ++++++
MAINTAINERS | 3 +--
drivers/net/bonding/bond_main.c | 13 +++++++----
drivers/net/ethernet/Kconfig | 26 +++++++++++-----------
.../net/ethernet/aquantia/atlantic/aq_pci_func.c | 8 +++----
drivers/net/ethernet/intel/e1000e/ich8lan.c | 4 ++--
drivers/net/ethernet/intel/ice/ice_eswitch.c | 3 ++-
drivers/net/ethernet/intel/ice/ice_eswitch.h | 2 +-
drivers/net/ethernet/intel/ice/ice_nvm.c | 1 +
drivers/net/ethernet/intel/ice/ice_xsk.c | 7 +++++-
drivers/net/ethernet/intel/igc/igc_i225.c | 11 +++++++--
drivers/net/ethernet/intel/igc/igc_phy.c | 4 ++--
drivers/net/ethernet/intel/igc/igc_ptp.c | 15 ++++++++++++-
.../net/ethernet/mellanox/mlxsw/spectrum_span.c | 2 +-
.../net/ethernet/microchip/lan966x/lan966x_main.c | 3 +++
drivers/net/ethernet/mscc/ocelot.c | 2 ++
.../net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c | 4 ++--
drivers/net/hippi/rrunner.c | 2 ++
drivers/net/phy/microchip_t1.c | 1 +
include/net/esp.h | 2 --
include/net/ip_tunnels.h | 11 +++++++--
include/net/netns/ipv6.h | 4 ++--
net/can/isotp.c | 10 ++++++++-
net/dsa/tag_hellcreek.c | 8 +++++++
net/ipv4/esp4.c | 5 ++---
net/ipv4/ip_gre.c | 4 ++--
net/ipv4/ip_tunnel.c | 9 ++++----
net/ipv6/esp6.c | 5 ++---
net/ipv6/ip6_gre.c | 14 +++++++-----
net/ipv6/route.c | 11 ++++-----
net/l3mdev/l3mdev.c | 2 +-
net/netlink/af_netlink.c | 7 ++++++
net/openvswitch/flow_netlink.c | 2 +-
net/packet/af_packet.c | 13 +++++++----
net/rxrpc/net_ns.c | 2 ++
net/sched/cls_u32.c | 24 +++++++++++---------
net/smc/af_smc.c | 4 +++-
net/xfrm/xfrm_policy.c | 4 +++-
.../net/mlxsw/spectrum-2/vxlan_flooding_ipv6.sh | 17 ++++++++++++++
.../selftests/drivers/net/mlxsw/vxlan_flooding.sh | 17 ++++++++++++++
40 files changed, 210 insertions(+), 83 deletions(-)
^ permalink raw reply
* Re: [PATCH v5 7/9] ARM: dts: omap3/4/5: fix ethernet node name for different OMAP boards
From: Tony Lindgren @ 2022-04-21 10:47 UTC (permalink / raw)
To: Oleksij Rempel
Cc: Benoît Cousson, David S. Miller, Florian Fainelli,
Jakub Kicinski, Krzysztof Kozlowski, Nicolas Saenz Julienne,
Ray Jui, Rob Herring, Sascha Hauer, Scott Branden, Shawn Guo,
kernel, bcm-kernel-feedback-list, netdev, devicetree,
linux-kernel, linux-usb, linux-rpi-kernel, linux-arm-kernel,
linux-samsung-soc, linux-omap, linux-tegra
In-Reply-To: <20220216074927.3619425-8-o.rempel@pengutronix.de>
* Oleksij Rempel <o.rempel@pengutronix.de> [220216 09:49]:
> The node name of Ethernet controller should be "ethernet" instead of
> "usbether" as required by Ethernet controller devicetree schema:
> Documentation/devicetree/bindings/net/ethernet-controller.yaml
>
> This patch can potentially affect boot loaders patching against full
> node path instead of using device aliases.
Picking up this patch into omap-for-v5.19/dt branch.
Thanks,
Tony
^ permalink raw reply
* Re: linux-next: build failure after merge of the bpf-next tree
From: Maciej Fijalkowski @ 2022-04-21 10:40 UTC (permalink / raw)
To: Daniel Borkmann
Cc: Stephen Rothwell, Alexei Starovoitov, Andrii Nakryiko, bpf,
Networking, Linux Kernel Mailing List, Linux Next Mailing List
In-Reply-To: <ac093b0a-dba7-b8b8-8a70-fccbed8fee76@iogearbox.net>
On Thu, Apr 21, 2022 at 11:45:46AM +0200, Daniel Borkmann wrote:
> On 4/21/22 2:32 AM, Stephen Rothwell wrote:
> > Hi all,
>
> Maciej, I presume you are already working on a follow-up for the below?
Yikes! I missed that, let's blame easter break for that.
I'm on it.
>
> > On Tue, 19 Apr 2022 11:56:20 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > After merging the bpf-next tree, today's linux-next build
> > > (x86_64 allmodconfig) failed like this:
> > >
> > > In file included from include/linux/compiler_types.h:73,
> > > from <command-line>:
> > > drivers/net/ethernet/intel/i40e/i40e_xsk.c: In function 'i40e_run_xdp_zc':
> > > include/linux/compiler_attributes.h:222:41: error: attribute 'fallthrough' not preceding a case label or default label [-Werror]
> > > 222 | # define fallthrough __attribute__((__fallthrough__))
> > > | ^~~~~~~~~~~~~
> > > drivers/net/ethernet/intel/i40e/i40e_xsk.c:192:17: note: in expansion of macro 'fallthrough'
> > > 192 | fallthrough; /* handle aborts by dropping packet */
> > > | ^~~~~~~~~~~
> > > cc1: all warnings being treated as errors
> > > In file included from include/linux/compiler_types.h:73,
> > > from <command-line>:
> > > drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c: In function 'ixgbe_run_xdp_zc':
> > > include/linux/compiler_attributes.h:222:41: error: attribute 'fallthrough' not preceding a case label or default label [-Werror]
> > > 222 | # define fallthrough __attribute__((__fallthrough__))
> > > | ^~~~~~~~~~~~~
> > > drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c:147:17: note: in expansion of macro 'fallthrough'
> > > 147 | fallthrough; /* handle aborts by dropping packet */
> > > | ^~~~~~~~~~~
> > > cc1: all warnings being treated as errors
> > >
> > > Caused by commits
> > >
> > > b8aef650e549 ("i40e, xsk: Terminate Rx side of NAPI when XSK Rx queue gets full")
> > > c7dd09fd4628 ("ixgbe, xsk: Terminate Rx side of NAPI when XSK Rx queue gets full")
> > >
> > > I have used the bpf-next tree from next-20220414 for today.
> >
> > I am still getting these failures ...
> >
>
^ permalink raw reply
* Re: 9p EBADF with cache enabled (Was: 9p fs-cache tests/benchmark (was: 9p fscache Duplicate cookie detected))
From: David Howells @ 2022-04-21 10:36 UTC (permalink / raw)
To: asmadeus
Cc: dhowells, Christian Schoenebeck, David Kahurani, davem, ericvh,
kuba, linux-kernel, lucho, netdev, v9fs-developer, Greg Kurz
In-Reply-To: <YlySEa6QGmIHlrdG@codewreck.org>
asmadeus@codewreck.org wrote:
> int fd = open(argv[1], O_WRONLY|O_APPEND);
> if (fd < 0)
> return 1;
> if (write(fd, "test\n", 5) < 0)
I think I need to implement the ability to store writes in non-uptodate pages
without needing to read from the server as NFS does. This may fix the
performance drop also.
David
^ permalink raw reply
* [PATCH V2] net: mscc: ocelot: Remove useless code
From: Haowen Bai @ 2022-04-21 10:34 UTC (permalink / raw)
To: baihaowen
Cc: UNGLinuxDriver, alexandre.belloni, claudiu.manoil, davem, kuba,
linux-kernel, netdev, pabeni, vladimir.oltean
In-Reply-To: <1650537117-14450-1-git-send-email-baihaowen@meizu.com>
payload only memset but no use at all, so we drop them.
Signed-off-by: Haowen Bai <baihaowen@meizu.com>
---
V1->V2: change correct title
drivers/net/ethernet/mscc/ocelot_vcap.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/drivers/net/ethernet/mscc/ocelot_vcap.c b/drivers/net/ethernet/mscc/ocelot_vcap.c
index c8701ac955a8..1e74bdb215ec 100644
--- a/drivers/net/ethernet/mscc/ocelot_vcap.c
+++ b/drivers/net/ethernet/mscc/ocelot_vcap.c
@@ -672,12 +672,10 @@ static void is1_entry_set(struct ocelot *ocelot, int ix,
{
const struct vcap_props *vcap = &ocelot->vcap[VCAP_IS1];
struct ocelot_vcap_key_vlan *tag = &filter->vlan;
- struct ocelot_vcap_u64 payload;
struct vcap_data data;
int row = ix / 2;
u32 type;
- memset(&payload, 0, sizeof(payload));
memset(&data, 0, sizeof(data));
/* Read row */
@@ -813,11 +811,9 @@ static void es0_entry_set(struct ocelot *ocelot, int ix,
{
const struct vcap_props *vcap = &ocelot->vcap[VCAP_ES0];
struct ocelot_vcap_key_vlan *tag = &filter->vlan;
- struct ocelot_vcap_u64 payload;
struct vcap_data data;
int row = ix;
- memset(&payload, 0, sizeof(payload));
memset(&data, 0, sizeof(data));
/* Read row */
--
2.7.4
^ permalink raw reply related
* [PATCH] drm/amd/display: Remove useless code
From: Haowen Bai @ 2022-04-21 10:31 UTC (permalink / raw)
To: Vladimir Oltean, Claudiu Manoil, Alexandre Belloni,
UNGLinuxDriver, David S. Miller, Jakub Kicinski, Paolo Abeni
Cc: Haowen Bai, netdev, linux-kernel
payload only memset but no use at all, so we drop them.
Signed-off-by: Haowen Bai <baihaowen@meizu.com>
---
drivers/net/ethernet/mscc/ocelot_vcap.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/drivers/net/ethernet/mscc/ocelot_vcap.c b/drivers/net/ethernet/mscc/ocelot_vcap.c
index c8701ac955a8..1e74bdb215ec 100644
--- a/drivers/net/ethernet/mscc/ocelot_vcap.c
+++ b/drivers/net/ethernet/mscc/ocelot_vcap.c
@@ -672,12 +672,10 @@ static void is1_entry_set(struct ocelot *ocelot, int ix,
{
const struct vcap_props *vcap = &ocelot->vcap[VCAP_IS1];
struct ocelot_vcap_key_vlan *tag = &filter->vlan;
- struct ocelot_vcap_u64 payload;
struct vcap_data data;
int row = ix / 2;
u32 type;
- memset(&payload, 0, sizeof(payload));
memset(&data, 0, sizeof(data));
/* Read row */
@@ -813,11 +811,9 @@ static void es0_entry_set(struct ocelot *ocelot, int ix,
{
const struct vcap_props *vcap = &ocelot->vcap[VCAP_ES0];
struct ocelot_vcap_key_vlan *tag = &filter->vlan;
- struct ocelot_vcap_u64 payload;
struct vcap_data data;
int row = ix;
- memset(&payload, 0, sizeof(payload));
memset(&data, 0, sizeof(data));
/* Read row */
--
2.7.4
^ permalink raw reply related
* Re: [PATCH net-next] net: bridge: switchdev: check br_vlan_group() return value
From: Nikolay Aleksandrov @ 2022-04-21 10:17 UTC (permalink / raw)
To: Clément Léger, Roopa Prabhu, David S. Miller,
Jakub Kicinski, Paolo Abeni, Tobias Waldekranz
Cc: bridge, netdev, linux-kernel
In-Reply-To: <20220421101247.121896-1-clement.leger@bootlin.com>
On 21/04/2022 13:12, Clément Léger wrote:
> br_vlan_group() can return NULL and thus return value must be checked
> to avoid dereferencing a NULL pointer.
>
> Fixes: 6284c723d9b9 ("net: bridge: mst: Notify switchdev drivers of VLAN MSTI migrations")
> Signed-off-by: Clément Léger <clement.leger@bootlin.com>
> ---
> net/bridge/br_switchdev.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/net/bridge/br_switchdev.c b/net/bridge/br_switchdev.c
> index 81400e0b26ac..8f3d76c751dd 100644
> --- a/net/bridge/br_switchdev.c
> +++ b/net/bridge/br_switchdev.c
> @@ -354,6 +354,8 @@ static int br_switchdev_vlan_attr_replay(struct net_device *br_dev,
> attr.orig_dev = br_dev;
>
> vg = br_vlan_group(br);
> + if (!vg)
> + return 0;
>
> list_for_each_entry(v, &vg->vlan_list, vlist) {
> if (v->msti) {
Good catch.
Acked-by: Nikolay Aleksandrov <razor@blackwall.org>
^ permalink raw reply
* Re: [PATCH net] sctp: check asoc strreset_chunk in sctp_generate_reconf_event
From: David Miller @ 2022-04-21 10:18 UTC (permalink / raw)
To: lucien.xin; +Cc: netdev, linux-sctp, kuba, marcelo.leitner, nhorman
In-Reply-To: <3000f8b12920ae81b84dceead6dcc90bb00c0403.1650487961.git.lucien.xin@gmail.com>
From: Xin Long <lucien.xin@gmail.com>
Date: Wed, 20 Apr 2022 16:52:41 -0400
> diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c
> index b3815b568e8e..463c4a58d2c3 100644
> --- a/net/sctp/sm_sideeffect.c
> +++ b/net/sctp/sm_sideeffect.c
> @@ -458,6 +458,10 @@ void sctp_generate_reconf_event(struct timer_list *t)
> goto out_unlock;
> }
>
> + /* This happens when the response arrives after the timer is triggered. */
> + if (!asoc->strreset_chunk)
> + goto out_unlock;
> +
This will return 0 because that is error's value right there, intentional?
Thanks.
^ permalink raw reply
* [PATCH net-next] net: bridge: switchdev: check br_vlan_group() return value
From: Clément Léger @ 2022-04-21 10:12 UTC (permalink / raw)
To: Roopa Prabhu, Nikolay Aleksandrov, David S. Miller,
Jakub Kicinski, Paolo Abeni, Tobias Waldekranz
Cc: bridge, netdev, linux-kernel, Clément Léger
br_vlan_group() can return NULL and thus return value must be checked
to avoid dereferencing a NULL pointer.
Fixes: 6284c723d9b9 ("net: bridge: mst: Notify switchdev drivers of VLAN MSTI migrations")
Signed-off-by: Clément Léger <clement.leger@bootlin.com>
---
net/bridge/br_switchdev.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/net/bridge/br_switchdev.c b/net/bridge/br_switchdev.c
index 81400e0b26ac..8f3d76c751dd 100644
--- a/net/bridge/br_switchdev.c
+++ b/net/bridge/br_switchdev.c
@@ -354,6 +354,8 @@ static int br_switchdev_vlan_attr_replay(struct net_device *br_dev,
attr.orig_dev = br_dev;
vg = br_vlan_group(br);
+ if (!vg)
+ return 0;
list_for_each_entry(v, &vg->vlan_list, vlist) {
if (v->msti) {
--
2.34.1
^ permalink raw reply related
* [PATCH net] net/smc: sync err code when tcp connection was refused
From: liuyacan @ 2022-04-21 9:40 UTC (permalink / raw)
To: kgraul, davem, kuba, pabeni
Cc: linux-s390, netdev, linux-kernel, liuyacan, Tony Lu
From: liuyacan <liuyacan@corp.netease.com>
In the current implementation, when TCP initiates a connection
to an unavailable [ip,port], ECONNREFUSED will be stored in the
TCP socket, but SMC will not. However, some apps (like curl) use
getsockopt(,,SO_ERROR,,) to get the error information, which makes
them miss the error message and behave strangely.
Fixes: 50717a37db03 ("net/smc: nonblocking connect rework")
Signed-off-by: liuyacan <liuyacan@corp.netease.com>
Reviewed-by: Tony Lu <tonylu@linux.alibaba.com>
Acked-by: Karsten Graul <kgraul@linux.ibm.com>
---
net/smc/af_smc.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c
index fc7b6eb22..bbb1a4ce5 100644
--- a/net/smc/af_smc.c
+++ b/net/smc/af_smc.c
@@ -1475,6 +1475,8 @@ static void smc_connect_work(struct work_struct *work)
smc->sk.sk_state = SMC_CLOSED;
if (rc == -EPIPE || rc == -EAGAIN)
smc->sk.sk_err = EPIPE;
+ else if (rc == -ECONNREFUSED)
+ smc->sk.sk_err = ECONNREFUSED;
else if (signal_pending(current))
smc->sk.sk_err = -sock_intr_errno(timeo);
sock_put(&smc->sk); /* passive closing */
--
2.20.1
^ permalink raw reply related
* Re: [PATCH 4.14 0/1] can: usb_8dev: backport fix for CVE-2022-28388
From: Greg KH @ 2022-04-21 9:55 UTC (permalink / raw)
To: Dragos-Marian Panait
Cc: stable, wg, mkl, davem, paskripkin, hbh25y, linux-can, netdev,
linux-kernel
In-Reply-To: <20220419113834.3116927-1-dragos.panait@windriver.com>
On Tue, Apr 19, 2022 at 02:38:33PM +0300, Dragos-Marian Panait wrote:
> The following commit is needed to fix CVE-2022-28388:
> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=3d3925ff6433f98992685a9679613a2cc97f3ce2
>
> Hangyu Hua (1):
> can: usb_8dev: usb_8dev_start_xmit(): fix double dev_kfree_skb() in
> error path
>
> drivers/net/can/usb/usb_8dev.c | 30 ++++++++++++++----------------
> 1 file changed, 14 insertions(+), 16 deletions(-)
>
>
> base-commit: 74766a973637a02c32c04c1c6496e114e4855239
> --
> 2.17.1
>
All now queued up, thanks.
greg k-h
^ permalink raw reply
* Re: [PATCH net] tls: Skip tls_append_frag on zero copy size
From: Maxim Mikityanskiy @ 2022-04-21 9:47 UTC (permalink / raw)
To: Jakub Kicinski
Cc: Boris Pismenny, John Fastabend, Daniel Borkmann, David S. Miller,
Paolo Abeni, Tariq Toukan, Aviad Yehezkel, Ilya Lesokhin, netdev
In-Reply-To: <3c90d3cd-5224-4224-e9d9-e45546ce51c6@nvidia.com>
On 2022-04-18 17:56, Maxim Mikityanskiy wrote:
> On 2022-04-14 13:28, Jakub Kicinski wrote:
>> On Wed, 13 Apr 2022 16:49:56 +0300 Maxim Mikityanskiy wrote:
>>> Calling tls_append_frag when max_open_record_len == record->len might
>>> add an empty fragment to the TLS record if the call happens to be on the
>>> page boundary. Normally tls_append_frag coalesces the zero-sized
>>> fragment to the previous one, but not if it's on page boundary.
>>>
>>> If a resync happens then, the mlx5 driver posts dump WQEs in
>>> tx_post_resync_dump, and the empty fragment may become a data segment
>>> with byte_count == 0, which will confuse the NIC and lead to a CQE
>>> error.
>>>
>>> This commit fixes the described issue by skipping tls_append_frag on
>>> zero size to avoid adding empty fragments. The fix is not in the driver,
>>> because an empty fragment is hardly the desired behavior.
>>>
>>> Fixes: e8f69799810c ("net/tls: Add generic NIC offload infrastructure")
>>> Signed-off-by: Maxim Mikityanskiy <maximmi@nvidia.com>
>>> Reviewed-by: Tariq Toukan <tariqt@nvidia.com>
>>> ---
>>> net/tls/tls_device.c | 12 +++++++-----
>>> 1 file changed, 7 insertions(+), 5 deletions(-)
>>>
>>> diff --git a/net/tls/tls_device.c b/net/tls/tls_device.c
>>> index 12f7b56771d9..af875ad4a822 100644
>>> --- a/net/tls/tls_device.c
>>> +++ b/net/tls/tls_device.c
>>> @@ -483,11 +483,13 @@ static int tls_push_data(struct sock *sk,
>>> copy = min_t(size_t, size, (pfrag->size - pfrag->offset));
>>> copy = min_t(size_t, copy, (max_open_record_len -
>>> record->len));
>>> - rc = tls_device_copy_data(page_address(pfrag->page) +
>>> - pfrag->offset, copy, msg_iter);
>>> - if (rc)
>>> - goto handle_error;
>>> - tls_append_frag(record, pfrag, copy);
>>> + if (copy) {
>>> + rc = tls_device_copy_data(page_address(pfrag->page) +
>>> + pfrag->offset, copy, msg_iter);
>>> + if (rc)
>>> + goto handle_error;
>>> + tls_append_frag(record, pfrag, copy);
>>> + }
>>
>> I appreciate you're likely trying to keep the fix minimal but Greg
>> always says "fix it right, worry about backports later".
>>
>> I think we should skip more, we can reorder the mins and if
>> min(size, rec space) == 0 then we can skip the allocation as well.
>
> Sorry, I didn't get the idea. Could you elaborate?
>
> Reordering the mins:
>
> copy = min_t(size_t, size, max_open_record_len - record->len);
> copy = min_t(size_t, copy, pfrag->size - pfrag->offset);
>
> I assume by skipping the allocation you mean skipping
> tls_do_allocation(), right? Do you suggest to skip it if the result of
> the first min_t() is 0?
>
> record->len used in the first min_t() comes from ctx->open_record, which
> either exists or is allocated by tls_do_allocation(). If we move the
> copy == 0 check above the tls_do_allocation() call, first we'll have to
> check whether ctx->open_record is NULL, which is currently checked by
> tls_do_allocation() itself.
>
> If open_record is not NULL, there isn't much to skip in
> tls_do_allocation on copy == 0, the main part is already skipped,
> regardless of the value of copy. If open_record is NULL, we can't skip
> tls_do_allocation, and copy won't be 0 afterwards.
>
> To compare, before (pseudocode):
>
> tls_do_allocation {
> if (!ctx->open_record)
> ALLOCATE RECORD
> Now ctx->open_record is not NULL
> if (!sk_page_frag_refill(sk, pfrag))
> return -ENOMEM
> }
> handle errors from tls_do_allocation
> copy = min(size, pfrag->size - pfrag->offset)
> copy = min(copy, max_open_record_len - ctx->open_record->len)
> if (copy)
> copy data and append frag
>
> After:
>
> if (ctx->open_record) {
> copy = min(size, max_open_record_len - ctx->open_record->len)
> if (copy) {
> // You want to put this part of tls_do_allocation under if (copy)?
> if (!sk_page_frag_refill(sk, pfrag))
> handle errors
> copy = min(copy, pfrag->size - pfrag->offset)
> if (copy)
> copy data and append frag
> }
> } else {
> ALLOCATE RECORD
> if (!sk_page_frag_refill(sk, pfrag))
> handle errors
> // Have to do this after the allocation anyway.
> copy = min(size, max_open_record_len - ctx->open_record->len)
> copy = min(copy, pfrag->size - pfrag->offset)
> if (copy)
> copy data and append frag
> }
>
> Either I totally don't get what you suggested, or it doesn't make sense
> to me, because we have +1 branch in the common path when a record is
> open and copy is not 0, no changes when there is no record, and more
> repeating code hard to compress.
>
> If I missed your idea, please explain in more details.
Jakub, is your comment still relevant after my response? If not, can the
patch be merged?
>> Maybe some application wants to do zero-length sends to flush the
>> MSG_MORE and would benefit that way?
>
> If it's a zero-length send, it means that size is 0 initially, and
> max_open_record_len - ctx->open_record->len isn't 0 (otherwise the
> record would have been closed at a previous iteration). That doesn't
> sound related to swapping the mins and skipping tls_do_allocation on
> copy == 0.
>
> Thanks,
> Max
>
>>> size -= copy;
>>> if (!size) {
>>
>
^ permalink raw reply
* Re: linux-next: build failure after merge of the bpf-next tree
From: Daniel Borkmann @ 2022-04-21 9:45 UTC (permalink / raw)
To: Stephen Rothwell, Alexei Starovoitov, Andrii Nakryiko
Cc: bpf, Networking, Maciej Fijalkowski, Linux Kernel Mailing List,
Linux Next Mailing List
In-Reply-To: <20220421103200.2b4e8424@canb.auug.org.au>
On 4/21/22 2:32 AM, Stephen Rothwell wrote:
> Hi all,
Maciej, I presume you are already working on a follow-up for the below?
> On Tue, 19 Apr 2022 11:56:20 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> After merging the bpf-next tree, today's linux-next build
>> (x86_64 allmodconfig) failed like this:
>>
>> In file included from include/linux/compiler_types.h:73,
>> from <command-line>:
>> drivers/net/ethernet/intel/i40e/i40e_xsk.c: In function 'i40e_run_xdp_zc':
>> include/linux/compiler_attributes.h:222:41: error: attribute 'fallthrough' not preceding a case label or default label [-Werror]
>> 222 | # define fallthrough __attribute__((__fallthrough__))
>> | ^~~~~~~~~~~~~
>> drivers/net/ethernet/intel/i40e/i40e_xsk.c:192:17: note: in expansion of macro 'fallthrough'
>> 192 | fallthrough; /* handle aborts by dropping packet */
>> | ^~~~~~~~~~~
>> cc1: all warnings being treated as errors
>> In file included from include/linux/compiler_types.h:73,
>> from <command-line>:
>> drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c: In function 'ixgbe_run_xdp_zc':
>> include/linux/compiler_attributes.h:222:41: error: attribute 'fallthrough' not preceding a case label or default label [-Werror]
>> 222 | # define fallthrough __attribute__((__fallthrough__))
>> | ^~~~~~~~~~~~~
>> drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c:147:17: note: in expansion of macro 'fallthrough'
>> 147 | fallthrough; /* handle aborts by dropping packet */
>> | ^~~~~~~~~~~
>> cc1: all warnings being treated as errors
>>
>> Caused by commits
>>
>> b8aef650e549 ("i40e, xsk: Terminate Rx side of NAPI when XSK Rx queue gets full")
>> c7dd09fd4628 ("ixgbe, xsk: Terminate Rx side of NAPI when XSK Rx queue gets full")
>>
>> I have used the bpf-next tree from next-20220414 for today.
>
> I am still getting these failures ...
>
^ permalink raw reply
* [PATCH bpf-next] selftests/bpf: fix map tests errno checks
From: Artem Savkov @ 2022-04-21 9:43 UTC (permalink / raw)
To: Yafang Shao
Cc: Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko, bpf, netdev,
linux-kernel, linux-kselftest, Artem Savkov
Switching to libbpf 1.0 API broke test_lpm_map and test_lru_map as error
reporting changed. Instead of setting errno and returning -1 bpf calls
now return -Exxx directly.
Drop errno checks and look at return code directly.
Fixes: b858ba8c52b6 ("selftests/bpf: Use libbpf 1.0 API mode instead of RLIMIT_MEMLOCK")
Signed-off-by: Artem Savkov <asavkov@redhat.com>
---
tools/testing/selftests/bpf/test_lpm_map.c | 39 +++++--------
tools/testing/selftests/bpf/test_lru_map.c | 66 ++++++++--------------
2 files changed, 37 insertions(+), 68 deletions(-)
diff --git a/tools/testing/selftests/bpf/test_lpm_map.c b/tools/testing/selftests/bpf/test_lpm_map.c
index 789c9748d241..c028d621c744 100644
--- a/tools/testing/selftests/bpf/test_lpm_map.c
+++ b/tools/testing/selftests/bpf/test_lpm_map.c
@@ -408,16 +408,13 @@ static void test_lpm_ipaddr(void)
/* Test some lookups that should not match any entry */
inet_pton(AF_INET, "10.0.0.1", key_ipv4->data);
- assert(bpf_map_lookup_elem(map_fd_ipv4, key_ipv4, &value) == -1 &&
- errno == ENOENT);
+ assert(bpf_map_lookup_elem(map_fd_ipv4, key_ipv4, &value) == -ENOENT);
inet_pton(AF_INET, "11.11.11.11", key_ipv4->data);
- assert(bpf_map_lookup_elem(map_fd_ipv4, key_ipv4, &value) == -1 &&
- errno == ENOENT);
+ assert(bpf_map_lookup_elem(map_fd_ipv4, key_ipv4, &value) == -ENOENT);
inet_pton(AF_INET6, "2a00:ffff::", key_ipv6->data);
- assert(bpf_map_lookup_elem(map_fd_ipv6, key_ipv6, &value) == -1 &&
- errno == ENOENT);
+ assert(bpf_map_lookup_elem(map_fd_ipv6, key_ipv6, &value) == -ENOENT);
close(map_fd_ipv4);
close(map_fd_ipv6);
@@ -474,18 +471,15 @@ static void test_lpm_delete(void)
/* remove non-existent node */
key->prefixlen = 32;
inet_pton(AF_INET, "10.0.0.1", key->data);
- assert(bpf_map_lookup_elem(map_fd, key, &value) == -1 &&
- errno == ENOENT);
+ assert(bpf_map_lookup_elem(map_fd, key, &value) == -ENOENT);
key->prefixlen = 30; // unused prefix so far
inet_pton(AF_INET, "192.255.0.0", key->data);
- assert(bpf_map_delete_elem(map_fd, key) == -1 &&
- errno == ENOENT);
+ assert(bpf_map_delete_elem(map_fd, key) == -ENOENT);
key->prefixlen = 16; // same prefix as the root node
inet_pton(AF_INET, "192.255.0.0", key->data);
- assert(bpf_map_delete_elem(map_fd, key) == -1 &&
- errno == ENOENT);
+ assert(bpf_map_delete_elem(map_fd, key) == -ENOENT);
/* assert initial lookup */
key->prefixlen = 32;
@@ -530,8 +524,7 @@ static void test_lpm_delete(void)
key->prefixlen = 32;
inet_pton(AF_INET, "192.168.128.1", key->data);
- assert(bpf_map_lookup_elem(map_fd, key, &value) == -1 &&
- errno == ENOENT);
+ assert(bpf_map_lookup_elem(map_fd, key, &value) == -ENOENT);
close(map_fd);
}
@@ -552,8 +545,7 @@ static void test_lpm_get_next_key(void)
assert(map_fd >= 0);
/* empty tree. get_next_key should return ENOENT */
- assert(bpf_map_get_next_key(map_fd, NULL, key_p) == -1 &&
- errno == ENOENT);
+ assert(bpf_map_get_next_key(map_fd, NULL, key_p) == -ENOENT);
/* get and verify the first key, get the second one should fail. */
key_p->prefixlen = 16;
@@ -565,8 +557,7 @@ static void test_lpm_get_next_key(void)
assert(key_p->prefixlen == 16 && key_p->data[0] == 192 &&
key_p->data[1] == 168);
- assert(bpf_map_get_next_key(map_fd, key_p, next_key_p) == -1 &&
- errno == ENOENT);
+ assert(bpf_map_get_next_key(map_fd, key_p, next_key_p) == -ENOENT);
/* no exact matching key should get the first one in post order. */
key_p->prefixlen = 8;
@@ -590,8 +581,7 @@ static void test_lpm_get_next_key(void)
next_key_p->data[1] == 168);
memcpy(key_p, next_key_p, key_size);
- assert(bpf_map_get_next_key(map_fd, key_p, next_key_p) == -1 &&
- errno == ENOENT);
+ assert(bpf_map_get_next_key(map_fd, key_p, next_key_p) == -ENOENT);
/* Add one more element (total three) */
key_p->prefixlen = 24;
@@ -614,8 +604,7 @@ static void test_lpm_get_next_key(void)
next_key_p->data[1] == 168);
memcpy(key_p, next_key_p, key_size);
- assert(bpf_map_get_next_key(map_fd, key_p, next_key_p) == -1 &&
- errno == ENOENT);
+ assert(bpf_map_get_next_key(map_fd, key_p, next_key_p) == -ENOENT);
/* Add one more element (total four) */
key_p->prefixlen = 24;
@@ -643,8 +632,7 @@ static void test_lpm_get_next_key(void)
next_key_p->data[1] == 168);
memcpy(key_p, next_key_p, key_size);
- assert(bpf_map_get_next_key(map_fd, key_p, next_key_p) == -1 &&
- errno == ENOENT);
+ assert(bpf_map_get_next_key(map_fd, key_p, next_key_p) == -ENOENT);
/* Add one more element (total five) */
key_p->prefixlen = 28;
@@ -678,8 +666,7 @@ static void test_lpm_get_next_key(void)
next_key_p->data[1] == 168);
memcpy(key_p, next_key_p, key_size);
- assert(bpf_map_get_next_key(map_fd, key_p, next_key_p) == -1 &&
- errno == ENOENT);
+ assert(bpf_map_get_next_key(map_fd, key_p, next_key_p) == -ENOENT);
/* no exact matching key should return the first one in post order */
key_p->prefixlen = 22;
diff --git a/tools/testing/selftests/bpf/test_lru_map.c b/tools/testing/selftests/bpf/test_lru_map.c
index a6aa2d121955..4d0650cfb5cd 100644
--- a/tools/testing/selftests/bpf/test_lru_map.c
+++ b/tools/testing/selftests/bpf/test_lru_map.c
@@ -175,24 +175,20 @@ static void test_lru_sanity0(int map_type, int map_flags)
BPF_NOEXIST));
/* BPF_NOEXIST means: add new element if it doesn't exist */
- assert(bpf_map_update_elem(lru_map_fd, &key, value, BPF_NOEXIST) == -1
- /* key=1 already exists */
- && errno == EEXIST);
+ assert(bpf_map_update_elem(lru_map_fd, &key, value, BPF_NOEXIST) == -EEXIST);
+ /* key=1 already exists */
- assert(bpf_map_update_elem(lru_map_fd, &key, value, -1) == -1 &&
- errno == EINVAL);
+ assert(bpf_map_update_elem(lru_map_fd, &key, value, -1) == -EINVAL);
/* insert key=2 element */
/* check that key=2 is not found */
key = 2;
- assert(bpf_map_lookup_elem(lru_map_fd, &key, value) == -1 &&
- errno == ENOENT);
+ assert(bpf_map_lookup_elem(lru_map_fd, &key, value) == -ENOENT);
/* BPF_EXIST means: update existing element */
- assert(bpf_map_update_elem(lru_map_fd, &key, value, BPF_EXIST) == -1 &&
- /* key=2 is not there */
- errno == ENOENT);
+ assert(bpf_map_update_elem(lru_map_fd, &key, value, BPF_EXIST) == -ENOENT);
+ /* key=2 is not there */
assert(!bpf_map_update_elem(lru_map_fd, &key, value, BPF_NOEXIST));
@@ -200,8 +196,7 @@ static void test_lru_sanity0(int map_type, int map_flags)
/* check that key=3 is not found */
key = 3;
- assert(bpf_map_lookup_elem(lru_map_fd, &key, value) == -1 &&
- errno == ENOENT);
+ assert(bpf_map_lookup_elem(lru_map_fd, &key, value) == -ENOENT);
/* check that key=1 can be found and mark the ref bit to
* stop LRU from removing key=1
@@ -217,8 +212,7 @@ static void test_lru_sanity0(int map_type, int map_flags)
/* key=2 has been removed from the LRU */
key = 2;
- assert(bpf_map_lookup_elem(lru_map_fd, &key, value) == -1 &&
- errno == ENOENT);
+ assert(bpf_map_lookup_elem(lru_map_fd, &key, value) == -ENOENT);
/* lookup elem key=1 and delete it, then check it doesn't exist */
key = 1;
@@ -381,8 +375,7 @@ static void test_lru_sanity2(int map_type, int map_flags, unsigned int tgt_free)
end_key = 1 + batch_size;
value[0] = 4321;
for (key = 1; key < end_key; key++) {
- assert(bpf_map_lookup_elem(lru_map_fd, &key, value) == -1 &&
- errno == ENOENT);
+ assert(bpf_map_lookup_elem(lru_map_fd, &key, value) == -ENOENT);
assert(!bpf_map_update_elem(lru_map_fd, &key, value,
BPF_NOEXIST));
assert(!bpf_map_lookup_elem_with_ref_bit(lru_map_fd, key, value));
@@ -562,8 +555,7 @@ static void do_test_lru_sanity5(unsigned long long last_key, int map_fd)
assert(!bpf_map_lookup_elem_with_ref_bit(map_fd, key, value));
/* Cannot find the last key because it was removed by LRU */
- assert(bpf_map_lookup_elem(map_fd, &last_key, value) == -1 &&
- errno == ENOENT);
+ assert(bpf_map_lookup_elem(map_fd, &last_key, value) == -ENOENT);
}
/* Test map with only one element */
@@ -711,21 +703,18 @@ static void test_lru_sanity7(int map_type, int map_flags)
BPF_NOEXIST));
/* BPF_NOEXIST means: add new element if it doesn't exist */
- assert(bpf_map_update_elem(lru_map_fd, &key, value, BPF_NOEXIST) == -1
- /* key=1 already exists */
- && errno == EEXIST);
+ assert(bpf_map_update_elem(lru_map_fd, &key, value, BPF_NOEXIST) == -EEXIST);
+ /* key=1 already exists */
/* insert key=2 element */
/* check that key=2 is not found */
key = 2;
- assert(bpf_map_lookup_elem(lru_map_fd, &key, value) == -1 &&
- errno == ENOENT);
+ assert(bpf_map_lookup_elem(lru_map_fd, &key, value) == -ENOENT);
/* BPF_EXIST means: update existing element */
- assert(bpf_map_update_elem(lru_map_fd, &key, value, BPF_EXIST) == -1 &&
- /* key=2 is not there */
- errno == ENOENT);
+ assert(bpf_map_update_elem(lru_map_fd, &key, value, BPF_EXIST) == -ENOENT);
+ /* key=2 is not there */
assert(!bpf_map_update_elem(lru_map_fd, &key, value, BPF_NOEXIST));
@@ -733,8 +722,7 @@ static void test_lru_sanity7(int map_type, int map_flags)
/* check that key=3 is not found */
key = 3;
- assert(bpf_map_lookup_elem(lru_map_fd, &key, value) == -1 &&
- errno == ENOENT);
+ assert(bpf_map_lookup_elem(lru_map_fd, &key, value) == -ENOENT);
/* check that key=1 can be found and mark the ref bit to
* stop LRU from removing key=1
@@ -757,8 +745,7 @@ static void test_lru_sanity7(int map_type, int map_flags)
/* key=2 has been removed from the LRU */
key = 2;
- assert(bpf_map_lookup_elem(lru_map_fd, &key, value) == -1 &&
- errno == ENOENT);
+ assert(bpf_map_lookup_elem(lru_map_fd, &key, value) == -ENOENT);
assert(map_equal(lru_map_fd, expected_map_fd));
@@ -805,21 +792,18 @@ static void test_lru_sanity8(int map_type, int map_flags)
assert(!bpf_map_update_elem(lru_map_fd, &key, value, BPF_NOEXIST));
/* BPF_NOEXIST means: add new element if it doesn't exist */
- assert(bpf_map_update_elem(lru_map_fd, &key, value, BPF_NOEXIST) == -1
- /* key=1 already exists */
- && errno == EEXIST);
+ assert(bpf_map_update_elem(lru_map_fd, &key, value, BPF_NOEXIST) == -EEXIST);
+ /* key=1 already exists */
/* insert key=2 element */
/* check that key=2 is not found */
key = 2;
- assert(bpf_map_lookup_elem(lru_map_fd, &key, value) == -1 &&
- errno == ENOENT);
+ assert(bpf_map_lookup_elem(lru_map_fd, &key, value) == -ENOENT);
/* BPF_EXIST means: update existing element */
- assert(bpf_map_update_elem(lru_map_fd, &key, value, BPF_EXIST) == -1 &&
- /* key=2 is not there */
- errno == ENOENT);
+ assert(bpf_map_update_elem(lru_map_fd, &key, value, BPF_EXIST) == -ENOENT);
+ /* key=2 is not there */
assert(!bpf_map_update_elem(lru_map_fd, &key, value, BPF_NOEXIST));
assert(!bpf_map_update_elem(expected_map_fd, &key, value,
@@ -829,8 +813,7 @@ static void test_lru_sanity8(int map_type, int map_flags)
/* check that key=3 is not found */
key = 3;
- assert(bpf_map_lookup_elem(lru_map_fd, &key, value) == -1 &&
- errno == ENOENT);
+ assert(bpf_map_lookup_elem(lru_map_fd, &key, value) == -ENOENT);
/* check that key=1 can be found and do _not_ mark ref bit.
* this will be evicted on next update.
@@ -853,8 +836,7 @@ static void test_lru_sanity8(int map_type, int map_flags)
/* key=1 has been removed from the LRU */
key = 1;
- assert(bpf_map_lookup_elem(lru_map_fd, &key, value) == -1 &&
- errno == ENOENT);
+ assert(bpf_map_lookup_elem(lru_map_fd, &key, value) == -ENOENT);
assert(map_equal(lru_map_fd, expected_map_fd));
--
2.35.1
^ permalink raw reply related
* Re: [PATCH net-next 11/12] ARM: dts: r9a06g032: describe switch
From: Geert Uytterhoeven @ 2022-04-21 9:34 UTC (permalink / raw)
To: Clément Léger
Cc: Andrew Lunn, Vivien Didelot, Florian Fainelli, Vladimir Oltean,
David S . Miller, Jakub Kicinski, Paolo Abeni, Rob Herring,
Krzysztof Kozlowski, Geert Uytterhoeven, Magnus Damm,
Heiner Kallweit, Russell King, Thomas Petazzoni, Herve Codina,
Miquèl Raynal, Milan Stevanovic, Jimmy Lalande,
Linux Kernel Mailing List,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
Linux-Renesas, netdev
In-Reply-To: <20220414122250.158113-12-clement.leger@bootlin.com>
Hi Clément,
On Thu, Apr 14, 2022 at 2:25 PM Clément Léger <clement.leger@bootlin.com> wrote:
> Add description of the switch that is present on the RZ/N1 SoC.
>
> Signed-off-by: Clément Léger <clement.leger@bootlin.com>
Thanks for your patch!
> --- a/arch/arm/boot/dts/r9a06g032.dtsi
> +++ b/arch/arm/boot/dts/r9a06g032.dtsi
> @@ -250,6 +250,17 @@ mii_conv4: mii-conv@4 {
> };
> };
>
> + switch: switch@44050000 {
> + compatible = "renesas,rzn1-a5psw";
> + #address-cells = <1>;
> + #size-cells = <0>;
> + reg = <0x44050000 0x10000>;
> + clocks = <&sysctrl R9A06G032_HCLK_SWITCH>,
> + <&sysctrl R9A06G032_CLK_SWITCH>;
> + clock-names = "hclk_switch", "clk_switch";
"make dtbs_check":
arch/arm/boot/dts/r9a06g032-rzn1d400-db.dtb: switch@44050000:
clock-names:0: 'hclk' was expected
arch/arm/boot/dts/r9a06g032-rzn1d400-db.dtb: switch@44050000:
clock-names:1: 'clk' was expected
From schema:
Documentation/devicetree/bindings/net/dsa/renesas,rzn1-a5psw.yaml
> + status = "disabled";
> + };
> +
> gic: interrupt-controller@44101000 {
> compatible = "arm,gic-400", "arm,cortex-a7-gic";
> interrupt-controller;
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply
* Re: [PATCH net-next 10/12] ARM: dts: r9a06g032: describe GMAC2
From: Geert Uytterhoeven @ 2022-04-21 9:31 UTC (permalink / raw)
To: Clément Léger
Cc: Andrew Lunn, Vivien Didelot, Florian Fainelli, Vladimir Oltean,
David S . Miller, Jakub Kicinski, Paolo Abeni, Rob Herring,
Krzysztof Kozlowski, Magnus Damm, Heiner Kallweit, Russell King,
Thomas Petazzoni, Herve Codina, Miquèl Raynal,
Milan Stevanovic, Jimmy Lalande, Linux Kernel Mailing List,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
Linux-Renesas, netdev
In-Reply-To: <20220414122250.158113-11-clement.leger@bootlin.com>
Hi Clément,
On Thu, Apr 14, 2022 at 2:24 PM Clément Léger <clement.leger@bootlin.com> wrote:
> RZ/N1 SoC includes two MAC named GMACx that are compatible with the
> "snps,dwmac" driver. GMAC1 is connected directly to the MII converter
> port 1. GMAC2 however can be used as the MAC for the switch CPU
> management port or can be muxed to be connected directly to the MII
> converter port 2. This commit add description for the GMAC2 which will
> be used by the switch description.
>
> Signed-off-by: Clément Léger <clement.leger@bootlin.com>
Thanks for your patch!
> --- a/arch/arm/boot/dts/r9a06g032.dtsi
> +++ b/arch/arm/boot/dts/r9a06g032.dtsi
> @@ -200,6 +200,23 @@ nand_controller: nand-controller@40102000 {
> status = "disabled";
> };
>
> + gmac2: ethernet@44002000 {
> + compatible = "snps,dwmac-3.72a", "snps,dwmac";
"make dtbs_check":
arch/arm/boot/dts/r9a06g032-rzn1d400-db.dtb:0:0:
/soc/ethernet@44002000: failed to match any schema with compatible:
['snps,dwmac-3.72a', 'snps,dwmac']
> + reg = <0x44002000 0x2000>;
> + interrupt-parent = <&gic>;
> + interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>,
> + <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>,
> + <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>;
> + interrupt-names = "macirq", "eth_lpi", "eth_wake_irq";
arch/arm/boot/dts/r9a06g032-rzn1d400-db.dtb: ethernet@44002000:
interrupt-names:1: 'eth_wake_irq' was expected
arch/arm/boot/dts/r9a06g032-rzn1d400-db.dtb: ethernet@44002000:
interrupt-names:2: 'eth_lpi' was expected
From schema: Documentation/devicetree/bindings/net/snps,dwmac.yaml
> + clock-names = "stmmaceth";
> + clocks = <&sysctrl R9A06G032_HCLK_GMAC1>;
> + snps,multicast-filter-bins = <256>;
> + snps,perfect-filter-entries = <128>;
> + tx-fifo-depth = <2048>;
> + rx-fifo-depth = <4096>;
> + status = "disabled";
> + };
> +
> eth_miic: eth-miic@44030000 {
> compatible = "renesas,rzn1-miic";
> #address-cells = <1>;
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply
* Re: IPv6 multicast with VRF
From: Vladimir Oltean @ 2022-04-21 9:24 UTC (permalink / raw)
To: David Ahern; +Cc: netdev
In-Reply-To: <a5fdf1dc-61ef-29ba-91c3-5339c4086ec8@gmail.com>
On Wed, Apr 20, 2022 at 02:40:53PM -0600, David Ahern wrote:
> On 4/20/22 1:18 PM, Vladimir Oltean wrote:
> > On Wed, Apr 20, 2022 at 12:59:45PM -0600, David Ahern wrote:
> >> Did you adjust the FIB rules? See the documentation in the kernel repo.
> >
> > Sorry, I don't understand what you mean by "adjusting". I tried various
> > forms of adding an IPv6 multicast route on eth0, to multiple tables,
> > some routes more generic and some more specific, and none seem to match
> > when eth0 is under a VRF, for a reason I don't really know. This does
> > not occur with IPv4 multicast, by the way.
> >
> > By documentation I think you mean Documentation/networking/vrf.rst.
> > I went through it but I didn't notice something that would make me
> > realize what the issue is.
>
> try this:
> https://static.sched.com/hosted_files/ossna2017/fe/vrf-tutorial-oss.pdf
> slide 79 and on
Yeah, that worked. Well, now I know what vrf_prepare() and vrf_cleanup()
from tools/testing/selfteste/net/forwarding/lib.sh are for, I guess..
Thanks for helping and for sharing the presentation.
> >> And add a device scope to the `get`. e.g.,
> >>
> >> ip -6 route get ff02::1%eth0
> >
> > I'm probably not understanding this, because:
> >
> > ip -6 route get ff02::1%eth0
> > Error: inet6 prefix is expected rather than "ff02::1%eth0".
>
> ip -6 ro get oif eth0 ff02::1
>
> (too many syntax differences between tools)
Could you explain why specifying the oif is needed here? If I don't do
it, I still can't find the route. Either that, or what would an
application need to do to find the route from the VRF FIB?
ip -6 route get vrf vrf0 ff02::1
RTNETLINK answers: Network is unreachable
ip -6 route get vrf vrf0 ff02::1 oif eth0
multicast ff02::1 dev eth0 table 3 proto kernel src 2001:db8:1::1 metric 256 pref medium
For some context, the multicast application I'm trying to get running in
a VRF is mcjoin (https://github.com/troglobit/mcjoin). It will send
packets as long as the interface only has a link-local IPv6 address.
As long as I add a global IPv6 address *and* the netdev is in the VRF
(basically the circumstances from the forwarding selftests), sendto()
fails with -ENETUNREACH.
ip vrf exec vrf0 mcjoin -s -o -i eth0 ff0e::1 -c 1
Sending IPv6 multicast on eth0 addr, fe80::201:2ff:fe03:401 ifindex: 10, sd: 6
*,ff0e::1: invalid 0 delay 0 gaps 0 reorder 0 dupes 0 bytes 100 packets 1
Total: 1 packets
vs:
ip addr add 2001:db8:1::1/64 dev eth0
ip vrf exec vrf0 mcjoin -s -o -i eth0 ff0e::1 -c 1
Sending IPv6 multicast on eth0 addr, 2001:db8:1::1 ifindex: 10, sd: 6
Failed sending mcast to ff2e::1: Network is unreachable
*,ff2e::1: invalid 0 delay 0 gaps 1 reorder 0 dupes 0 bytes 0 packets 0
Total: 0 packets
^ permalink raw reply
* Re: [PATCH] drivers: net: hippi: Fix deadlock in rr_close()
From: patchwork-bot+netdevbpf @ 2022-04-21 9:00 UTC (permalink / raw)
To: Duoming Zhou; +Cc: linux-kernel, jes, netdev, linux-hippi, pabeni, kuba, davem
In-Reply-To: <20220417125519.82618-1-duoming@zju.edu.cn>
Hello:
This patch was applied to netdev/net.git (master)
by Paolo Abeni <pabeni@redhat.com>:
On Sun, 17 Apr 2022 20:55:19 +0800 you wrote:
> There is a deadlock in rr_close(), which is shown below:
>
> (Thread 1) | (Thread 2)
> | rr_open()
> rr_close() | add_timer()
> spin_lock_irqsave() //(1) | (wait a time)
> ... | rr_timer()
> del_timer_sync() | spin_lock_irqsave() //(2)
> (wait timer to stop) | ...
>
> [...]
Here is the summary with links:
- drivers: net: hippi: Fix deadlock in rr_close()
https://git.kernel.org/netdev/net/c/bc6de2878429
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply
* [PATCH][next] net: hns3: Fix spelling mistake "actvie" -> "active"
From: Colin Ian King @ 2022-04-21 8:55 UTC (permalink / raw)
To: Yisen Zhuang, Salil Mehta, David S . Miller, Jakub Kicinski,
Paolo Abeni, netdev
Cc: kernel-janitors, linux-kernel
There is a spelling mistake in a netdev_info message. Fix it.
Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
---
drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
index bb001f597857..1db8a86f046d 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
@@ -1915,7 +1915,7 @@ static int hns3_set_tunable(struct net_device *netdev,
return ret;
}
- netdev_info(netdev, "the actvie tx spare buf size is %u, due to page order\n",
+ netdev_info(netdev, "the active tx spare buf size is %u, due to page order\n",
priv->ring->tx_spare->len);
break;
--
2.35.1
^ permalink raw reply related
* [PATCH ethtool-next v2 1/2] update UAPI header copies
From: Guangbin Huang @ 2022-04-21 8:46 UTC (permalink / raw)
To: mkubecek, davem, kuba; +Cc: netdev, lipeng321, huangguangbin2
In-Reply-To: <20220421084646.15458-1-huangguangbin2@huawei.com>
From: Jie Wang <wangjie125@huawei.com>
Update to kernel commit cc4bdef26ecd.
Signed-off-by: Jie Wang <wangjie125@huawei.com>
---
uapi/linux/ethtool_netlink.h | 9 ++++
uapi/linux/if_link.h | 97 ++++++++++++++++++++++++++++++++++++
uapi/linux/net_tstamp.h | 17 ++++++-
uapi/linux/netlink.h | 1 +
uapi/linux/rtnetlink.h | 16 ++++++
5 files changed, 139 insertions(+), 1 deletion(-)
diff --git a/uapi/linux/ethtool_netlink.h b/uapi/linux/ethtool_netlink.h
index d8b19cf..378ad7d 100644
--- a/uapi/linux/ethtool_netlink.h
+++ b/uapi/linux/ethtool_netlink.h
@@ -318,6 +318,12 @@ enum {
/* RINGS */
+enum {
+ ETHTOOL_TCP_DATA_SPLIT_UNKNOWN = 0,
+ ETHTOOL_TCP_DATA_SPLIT_DISABLED,
+ ETHTOOL_TCP_DATA_SPLIT_ENABLED,
+};
+
enum {
ETHTOOL_A_RINGS_UNSPEC,
ETHTOOL_A_RINGS_HEADER, /* nest - _A_HEADER_* */
@@ -330,6 +336,9 @@ enum {
ETHTOOL_A_RINGS_RX_JUMBO, /* u32 */
ETHTOOL_A_RINGS_TX, /* u32 */
ETHTOOL_A_RINGS_RX_BUF_LEN, /* u32 */
+ ETHTOOL_A_RINGS_TCP_DATA_SPLIT, /* u8 */
+ ETHTOOL_A_RINGS_CQE_SIZE, /* u32 */
+ ETHTOOL_A_RINGS_TX_PUSH, /* u8 */
/* add new constants above here */
__ETHTOOL_A_RINGS_CNT,
diff --git a/uapi/linux/if_link.h b/uapi/linux/if_link.h
index 9ed264d..34002e7 100644
--- a/uapi/linux/if_link.h
+++ b/uapi/linux/if_link.h
@@ -211,6 +211,9 @@ struct rtnl_link_stats {
* @rx_nohandler: Number of packets received on the interface
* but dropped by the networking stack because the device is
* not designated to receive packets (e.g. backup link in a bond).
+ *
+ * @rx_otherhost_dropped: Number of packets dropped due to mismatch
+ * in destination MAC address.
*/
struct rtnl_link_stats64 {
__u64 rx_packets;
@@ -243,6 +246,23 @@ struct rtnl_link_stats64 {
__u64 rx_compressed;
__u64 tx_compressed;
__u64 rx_nohandler;
+
+ __u64 rx_otherhost_dropped;
+};
+
+/* Subset of link stats useful for in-HW collection. Meaning of the fields is as
+ * for struct rtnl_link_stats64.
+ */
+struct rtnl_hw_stats64 {
+ __u64 rx_packets;
+ __u64 tx_packets;
+ __u64 rx_bytes;
+ __u64 tx_bytes;
+ __u64 rx_errors;
+ __u64 tx_errors;
+ __u64 rx_dropped;
+ __u64 tx_dropped;
+ __u64 multicast;
};
/* The struct should be in sync with struct ifmap */
@@ -347,6 +367,7 @@ enum {
*/
IFLA_PARENT_DEV_NAME,
IFLA_PARENT_DEV_BUS_NAME,
+ IFLA_GRO_MAX_SIZE,
__IFLA_MAX
};
@@ -534,6 +555,7 @@ enum {
IFLA_BRPORT_MRP_IN_OPEN,
IFLA_BRPORT_MCAST_EHT_HOSTS_LIMIT,
IFLA_BRPORT_MCAST_EHT_HOSTS_CNT,
+ IFLA_BRPORT_LOCKED,
__IFLA_BRPORT_MAX
};
#define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)
@@ -709,7 +731,55 @@ enum ipvlan_mode {
#define IPVLAN_F_PRIVATE 0x01
#define IPVLAN_F_VEPA 0x02
+/* Tunnel RTM header */
+struct tunnel_msg {
+ __u8 family;
+ __u8 flags;
+ __u16 reserved2;
+ __u32 ifindex;
+};
+
/* VXLAN section */
+
+/* include statistics in the dump */
+#define TUNNEL_MSG_FLAG_STATS 0x01
+
+#define TUNNEL_MSG_VALID_USER_FLAGS TUNNEL_MSG_FLAG_STATS
+
+/* Embedded inside VXLAN_VNIFILTER_ENTRY_STATS */
+enum {
+ VNIFILTER_ENTRY_STATS_UNSPEC,
+ VNIFILTER_ENTRY_STATS_RX_BYTES,
+ VNIFILTER_ENTRY_STATS_RX_PKTS,
+ VNIFILTER_ENTRY_STATS_RX_DROPS,
+ VNIFILTER_ENTRY_STATS_RX_ERRORS,
+ VNIFILTER_ENTRY_STATS_TX_BYTES,
+ VNIFILTER_ENTRY_STATS_TX_PKTS,
+ VNIFILTER_ENTRY_STATS_TX_DROPS,
+ VNIFILTER_ENTRY_STATS_TX_ERRORS,
+ VNIFILTER_ENTRY_STATS_PAD,
+ __VNIFILTER_ENTRY_STATS_MAX
+};
+#define VNIFILTER_ENTRY_STATS_MAX (__VNIFILTER_ENTRY_STATS_MAX - 1)
+
+enum {
+ VXLAN_VNIFILTER_ENTRY_UNSPEC,
+ VXLAN_VNIFILTER_ENTRY_START,
+ VXLAN_VNIFILTER_ENTRY_END,
+ VXLAN_VNIFILTER_ENTRY_GROUP,
+ VXLAN_VNIFILTER_ENTRY_GROUP6,
+ VXLAN_VNIFILTER_ENTRY_STATS,
+ __VXLAN_VNIFILTER_ENTRY_MAX
+};
+#define VXLAN_VNIFILTER_ENTRY_MAX (__VXLAN_VNIFILTER_ENTRY_MAX - 1)
+
+enum {
+ VXLAN_VNIFILTER_UNSPEC,
+ VXLAN_VNIFILTER_ENTRY,
+ __VXLAN_VNIFILTER_MAX
+};
+#define VXLAN_VNIFILTER_MAX (__VXLAN_VNIFILTER_MAX - 1)
+
enum {
IFLA_VXLAN_UNSPEC,
IFLA_VXLAN_ID,
@@ -741,6 +811,7 @@ enum {
IFLA_VXLAN_GPE,
IFLA_VXLAN_TTL_INHERIT,
IFLA_VXLAN_DF,
+ IFLA_VXLAN_VNIFILTER, /* only applicable with COLLECT_METADATA mode */
__IFLA_VXLAN_MAX
};
#define IFLA_VXLAN_MAX (__IFLA_VXLAN_MAX - 1)
@@ -774,6 +845,7 @@ enum {
IFLA_GENEVE_LABEL,
IFLA_GENEVE_TTL_INHERIT,
IFLA_GENEVE_DF,
+ IFLA_GENEVE_INNER_PROTO_INHERIT,
__IFLA_GENEVE_MAX
};
#define IFLA_GENEVE_MAX (__IFLA_GENEVE_MAX - 1)
@@ -819,6 +891,8 @@ enum {
IFLA_GTP_FD1,
IFLA_GTP_PDP_HASHSIZE,
IFLA_GTP_ROLE,
+ IFLA_GTP_CREATE_SOCKETS,
+ IFLA_GTP_RESTART_COUNT,
__IFLA_GTP_MAX,
};
#define IFLA_GTP_MAX (__IFLA_GTP_MAX - 1)
@@ -857,6 +931,7 @@ enum {
IFLA_BOND_PEER_NOTIF_DELAY,
IFLA_BOND_AD_LACP_ACTIVE,
IFLA_BOND_MISSED_MAX,
+ IFLA_BOND_NS_IP6_TARGET,
__IFLA_BOND_MAX,
};
@@ -1153,6 +1228,17 @@ enum {
#define IFLA_STATS_FILTER_BIT(ATTR) (1 << (ATTR - 1))
+enum {
+ IFLA_STATS_GETSET_UNSPEC,
+ IFLA_STATS_GET_FILTERS, /* Nest of IFLA_STATS_LINK_xxx, each a u32 with
+ * a filter mask for the corresponding group.
+ */
+ IFLA_STATS_SET_OFFLOAD_XSTATS_L3_STATS, /* 0 or 1 as u8 */
+ __IFLA_STATS_GETSET_MAX,
+};
+
+#define IFLA_STATS_GETSET_MAX (__IFLA_STATS_GETSET_MAX - 1)
+
/* These are embedded into IFLA_STATS_LINK_XSTATS:
* [IFLA_STATS_LINK_XSTATS]
* -> [LINK_XSTATS_TYPE_xxx]
@@ -1170,10 +1256,21 @@ enum {
enum {
IFLA_OFFLOAD_XSTATS_UNSPEC,
IFLA_OFFLOAD_XSTATS_CPU_HIT, /* struct rtnl_link_stats64 */
+ IFLA_OFFLOAD_XSTATS_HW_S_INFO, /* HW stats info. A nest */
+ IFLA_OFFLOAD_XSTATS_L3_STATS, /* struct rtnl_hw_stats64 */
__IFLA_OFFLOAD_XSTATS_MAX
};
#define IFLA_OFFLOAD_XSTATS_MAX (__IFLA_OFFLOAD_XSTATS_MAX - 1)
+enum {
+ IFLA_OFFLOAD_XSTATS_HW_S_INFO_UNSPEC,
+ IFLA_OFFLOAD_XSTATS_HW_S_INFO_REQUEST, /* u8 */
+ IFLA_OFFLOAD_XSTATS_HW_S_INFO_USED, /* u8 */
+ __IFLA_OFFLOAD_XSTATS_HW_S_INFO_MAX,
+};
+#define IFLA_OFFLOAD_XSTATS_HW_S_INFO_MAX \
+ (__IFLA_OFFLOAD_XSTATS_HW_S_INFO_MAX - 1)
+
/* XDP section */
#define XDP_FLAGS_UPDATE_IF_NOEXIST (1U << 0)
diff --git a/uapi/linux/net_tstamp.h b/uapi/linux/net_tstamp.h
index fcc61c7..55501e5 100644
--- a/uapi/linux/net_tstamp.h
+++ b/uapi/linux/net_tstamp.h
@@ -62,7 +62,7 @@ struct so_timestamping {
/**
* struct hwtstamp_config - %SIOCGHWTSTAMP and %SIOCSHWTSTAMP parameter
*
- * @flags: no flags defined right now, must be zero for %SIOCSHWTSTAMP
+ * @flags: one of HWTSTAMP_FLAG_*
* @tx_type: one of HWTSTAMP_TX_*
* @rx_filter: one of HWTSTAMP_FILTER_*
*
@@ -78,6 +78,21 @@ struct hwtstamp_config {
int rx_filter;
};
+/* possible values for hwtstamp_config->flags */
+enum hwtstamp_flags {
+ /*
+ * With this flag, the user could get bond active interface's
+ * PHC index. Note this PHC index is not stable as when there
+ * is a failover, the bond active interface will be changed, so
+ * will be the PHC index.
+ */
+ HWTSTAMP_FLAG_BONDED_PHC_INDEX = (1<<0),
+#define HWTSTAMP_FLAG_BONDED_PHC_INDEX HWTSTAMP_FLAG_BONDED_PHC_INDEX
+
+ HWTSTAMP_FLAG_LAST = HWTSTAMP_FLAG_BONDED_PHC_INDEX,
+ HWTSTAMP_FLAG_MASK = (HWTSTAMP_FLAG_LAST - 1) | HWTSTAMP_FLAG_LAST
+};
+
/* possible values for hwtstamp_config->tx_type */
enum hwtstamp_tx_types {
/*
diff --git a/uapi/linux/netlink.h b/uapi/linux/netlink.h
index e83e2e3..105b79f 100644
--- a/uapi/linux/netlink.h
+++ b/uapi/linux/netlink.h
@@ -72,6 +72,7 @@ struct nlmsghdr {
/* Modifiers to DELETE request */
#define NLM_F_NONREC 0x100 /* Do not delete recursively */
+#define NLM_F_BULK 0x200 /* Delete multiple objects */
/* Flags for ACK message */
#define NLM_F_CAPPED 0x100 /* request was capped */
diff --git a/uapi/linux/rtnetlink.h b/uapi/linux/rtnetlink.h
index e01efa2..8f874be 100644
--- a/uapi/linux/rtnetlink.h
+++ b/uapi/linux/rtnetlink.h
@@ -146,6 +146,8 @@ enum {
#define RTM_NEWSTATS RTM_NEWSTATS
RTM_GETSTATS = 94,
#define RTM_GETSTATS RTM_GETSTATS
+ RTM_SETSTATS,
+#define RTM_SETSTATS RTM_SETSTATS
RTM_NEWCACHEREPORT = 96,
#define RTM_NEWCACHEREPORT RTM_NEWCACHEREPORT
@@ -185,6 +187,13 @@ enum {
RTM_GETNEXTHOPBUCKET,
#define RTM_GETNEXTHOPBUCKET RTM_GETNEXTHOPBUCKET
+ RTM_NEWTUNNEL = 120,
+#define RTM_NEWTUNNEL RTM_NEWTUNNEL
+ RTM_DELTUNNEL,
+#define RTM_DELTUNNEL RTM_DELTUNNEL
+ RTM_GETTUNNEL,
+#define RTM_GETTUNNEL RTM_GETTUNNEL
+
__RTM_MAX,
#define RTM_MAX (((__RTM_MAX + 3) & ~3) - 1)
};
@@ -752,6 +761,12 @@ enum rtnetlink_groups {
#define RTNLGRP_NEXTHOP RTNLGRP_NEXTHOP
RTNLGRP_BRVLAN,
#define RTNLGRP_BRVLAN RTNLGRP_BRVLAN
+ RTNLGRP_MCTP_IFADDR,
+#define RTNLGRP_MCTP_IFADDR RTNLGRP_MCTP_IFADDR
+ RTNLGRP_TUNNEL,
+#define RTNLGRP_TUNNEL RTNLGRP_TUNNEL
+ RTNLGRP_STATS,
+#define RTNLGRP_STATS RTNLGRP_STATS
__RTNLGRP_MAX
};
#define RTNLGRP_MAX (__RTNLGRP_MAX - 1)
@@ -800,6 +815,7 @@ enum {
#define RTEXT_FILTER_MRP (1 << 4)
#define RTEXT_FILTER_CFM_CONFIG (1 << 5)
#define RTEXT_FILTER_CFM_STATUS (1 << 6)
+#define RTEXT_FILTER_MST (1 << 7)
/* End of information exported to user level */
--
2.33.0
^ permalink raw reply related
* [PATCH ethtool-next v2 2/2] ethtool: add support to get/set tx push by ethtool -G/g
From: Guangbin Huang @ 2022-04-21 8:46 UTC (permalink / raw)
To: mkubecek, davem, kuba; +Cc: netdev, lipeng321, huangguangbin2
In-Reply-To: <20220421084646.15458-1-huangguangbin2@huawei.com>
From: Jie Wang <wangjie125@huawei.com>
Currently tx push is a standard feature for NICs such as Mellanox, HNS3.
But there is no command to set or get this feature.
So this patch adds support for "ethtool -G <dev> tx-push on|off" and
"ethtool -g <dev>" to set/get tx push mode.
Signed-off-by: Jie Wang <wangjie125@huawei.com>
---
ethtool.8.in | 4 ++++
ethtool.c | 1 +
netlink/rings.c | 7 +++++++
3 files changed, 12 insertions(+)
diff --git a/ethtool.8.in b/ethtool.8.in
index 12940e1..a87f31f 100644
--- a/ethtool.8.in
+++ b/ethtool.8.in
@@ -199,6 +199,7 @@ ethtool \- query or control network driver and hardware settings
.BN rx\-jumbo
.BN tx
.BN rx\-buf\-len
+.BN tx\-push
.HP
.B ethtool \-i|\-\-driver
.I devname
@@ -573,6 +574,9 @@ Changes the number of ring entries for the Tx ring.
.TP
.BI rx\-buf\-len \ N
Changes the size of a buffer in the Rx ring.
+.TP
+.BI tx\-push \ on|off
+Specifies whether TX push should be enabled.
.RE
.TP
.B \-i \-\-driver
diff --git a/ethtool.c b/ethtool.c
index 4f5c234..4d2a475 100644
--- a/ethtool.c
+++ b/ethtool.c
@@ -5733,6 +5733,7 @@ static const struct option args[] = {
" [ rx-jumbo N ]\n"
" [ tx N ]\n"
" [ rx-buf-len N]\n"
+ " [ tx-push on|off]\n"
},
{
.opts = "-k|--show-features|--show-offload",
diff --git a/netlink/rings.c b/netlink/rings.c
index 119178e..a53eed5 100644
--- a/netlink/rings.c
+++ b/netlink/rings.c
@@ -47,6 +47,7 @@ int rings_reply_cb(const struct nlmsghdr *nlhdr, void *data)
show_u32(tb[ETHTOOL_A_RINGS_RX_JUMBO], "RX Jumbo:\t");
show_u32(tb[ETHTOOL_A_RINGS_TX], "TX:\t\t");
show_u32(tb[ETHTOOL_A_RINGS_RX_BUF_LEN], "RX Buf Len:\t\t");
+ show_bool("tx-push", "TX Push:\t%s\n", tb[ETHTOOL_A_RINGS_TX_PUSH]);
return MNL_CB_OK;
}
@@ -105,6 +106,12 @@ static const struct param_parser sring_params[] = {
.handler = nl_parse_direct_u32,
.min_argc = 1,
},
+ {
+ .arg = "tx-push",
+ .type = ETHTOOL_A_RINGS_TX_PUSH,
+ .handler = nl_parse_u8bool,
+ .min_argc = 0,
+ },
{}
};
--
2.33.0
^ permalink raw reply related
* [PATCH ethtool-next v2 0/2] Add support to get/set tx push by ethtool -G/g
From: Guangbin Huang @ 2022-04-21 8:46 UTC (permalink / raw)
To: mkubecek, davem, kuba; +Cc: netdev, lipeng321, huangguangbin2
From: Jie Wang <wangjie125@huawei.com>
These two patches first update uapi headers by using the import shell, then
add support to get/set tx push by ethtool -G/g.
ChangeLog:
v1->v2
1.Update uapi headers by using the import shell scripts.
link:https://lore.kernel.org/netdev/20220419125030.3230-1-huangguangbin2@huawei.com/
Jie Wang (2):
update UAPI header copies
ethtool: add support to get/set tx push by ethtool -G/g
ethtool.8.in | 4 ++
ethtool.c | 1 +
netlink/rings.c | 7 +++
uapi/linux/ethtool_netlink.h | 9 ++++
uapi/linux/if_link.h | 97 ++++++++++++++++++++++++++++++++++++
uapi/linux/net_tstamp.h | 17 ++++++-
uapi/linux/netlink.h | 1 +
uapi/linux/rtnetlink.h | 16 ++++++
8 files changed, 151 insertions(+), 1 deletion(-)
--
2.33.0
^ permalink raw reply
* Re: [PATCH] openvswitch: meter: Remove unnecessary int
From: Paolo Abeni @ 2022-04-21 8:47 UTC (permalink / raw)
To: Solomon Tan, pshelar, davem, kuba, netdev, dev, linux-kernel
In-Reply-To: <Yly1t/mE6QAGPS0e@ArchDesktop>
On Mon, 2022-04-18 at 00:50 +0000, Solomon Tan wrote:
> This patch addresses the checkpatch.pl warning that long long is
> preferred over long long int.
Please don't do that. This kind of changes cause e.g. backporting issue
for any later relevant bugfix touching the same area, for no real
benefit.
Documentation/process/2.Process.rst
explicltly states to avoid this kind of patches.
>
> Signed-off-by: Solomon Tan <solomonbstoner@protonmail.ch>
> ---
> net/openvswitch/meter.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/net/openvswitch/meter.c b/net/openvswitch/meter.c
> index 04a060ac7fdf..a790920c11d6 100644
> --- a/net/openvswitch/meter.c
> +++ b/net/openvswitch/meter.c
> @@ -592,8 +592,8 @@ static int ovs_meter_cmd_del(struct sk_buff *skb, struct genl_info *info)
> bool ovs_meter_execute(struct datapath *dp, struct sk_buff *skb,
> struct sw_flow_key *key, u32 meter_id)
> {
> - long long int now_ms = div_u64(ktime_get_ns(), 1000 * 1000);
> - long long int long_delta_ms;
> + long long now_ms = div_u64(ktime_get_ns(), 1000 * 1000);
> + long long long_delta_ms;
> struct dp_meter_band *band;
> struct dp_meter *meter;
> int i, band_exceeded_max = -1;
Additionally the patch is mangled by non plain-text encoding.
For any later submissions (regarding some other different topic) please
ensure that your client/mailer send purely plain-text messages,
Thanks,
Paolo
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox