* Re: [PATCH net] net: via-velocity: replace dev_kfree_skb_irq by dev_consume_skb_irq for drop profiles
From: David Miller @ 2019-02-07 1:43 UTC (permalink / raw)
To: albin_yang; +Cc: netdev, romieu, yang.wei9
In-Reply-To: <1549383774-5726-1-git-send-email-albin_yang@163.com>
From: Yang Wei <albin_yang@163.com>
Date: Wed, 6 Feb 2019 00:22:54 +0800
> From: Yang Wei <yang.wei9@zte.com.cn>
>
> dev_consume_skb_irq() should be called in velocity_free_tx_buf()
> when skb xmit done. It makes drop profiles(dropwatch, perf) more
> friendly.
>
> Signed-off-by: Yang Wei <yang.wei9@zte.com.cn>
Applied.
^ permalink raw reply
* Re: [PATCH net] net: tehuti: replace dev_kfree_skb_irq by dev_consume_skb_irq for drop profiles
From: David Miller @ 2019-02-07 1:43 UTC (permalink / raw)
To: albin_yang; +Cc: netdev, andy, yang.wei9
In-Reply-To: <1549383691-5672-1-git-send-email-albin_yang@163.com>
From: Yang Wei <albin_yang@163.com>
Date: Wed, 6 Feb 2019 00:21:31 +0800
> From: Yang Wei <yang.wei9@zte.com.cn>
>
> dev_consume_skb_irq() should be called in bdx_tx_cleanup() when skb
> xmit done. It makes drop profiles(dropwatch, perf) more friendly.
>
> Signed-off-by: Yang Wei <yang.wei9@zte.com.cn>
Applied.
^ permalink raw reply
* Re: [PATCH net] net: sun: replace dev_kfree_skb_irq by dev_consume_skb_irq for drop profiles
From: David Miller @ 2019-02-07 1:43 UTC (permalink / raw)
To: albin_yang; +Cc: netdev, yanjun.zhu, shannon.nelson, robh, yang.wei9
In-Reply-To: <1549383584-5605-1-git-send-email-albin_yang@163.com>
From: Yang Wei <albin_yang@163.com>
Date: Wed, 6 Feb 2019 00:19:44 +0800
> From: Yang Wei <yang.wei9@zte.com.cn>
>
> dev_consume_skb_irq() should be called when skb xmit done. It makes
> drop profiles(dropwatch, perf) more friendly.
>
> Signed-off-by: Yang Wei <yang.wei9@zte.com.cn>
Applied.
^ permalink raw reply
* Re: [PATCH net] net: fsl_ucc_hdlc: replace dev_kfree_skb_irq by dev_consume_skb_irq for drop profiles
From: David Miller @ 2019-02-07 1:43 UTC (permalink / raw)
To: albin_yang; +Cc: netdev, linuxppc-dev, qiang.zhao, yang.wei9
In-Reply-To: <1549383291-5511-1-git-send-email-albin_yang@163.com>
From: Yang Wei <albin_yang@163.com>
Date: Wed, 6 Feb 2019 00:14:51 +0800
> From: Yang Wei <yang.wei9@zte.com.cn>
>
> dev_consume_skb_irq() should be called in hdlc_tx_done() when skb
> xmit done. It makes drop profiles(dropwatch, perf) more friendly.
>
> Signed-off-by: Yang Wei <yang.wei9@zte.com.cn>
Applied.
^ permalink raw reply
* Re: [PATCH net] net: fec_mpc52xx: replace dev_kfree_skb_irq by dev_consume_skb_irq for drop profiles
From: David Miller @ 2019-02-07 1:42 UTC (permalink / raw)
To: albin_yang; +Cc: netdev, yang.wei9
In-Reply-To: <1549383124-5443-1-git-send-email-albin_yang@163.com>
From: Yang Wei <albin_yang@163.com>
Date: Wed, 6 Feb 2019 00:12:04 +0800
> From: Yang Wei <yang.wei9@zte.com.cn>
>
> dev_consume_skb_irq() should be called in mpc52xx_fec_tx_interrupt()
> when skb xmit done. It makes drop profiles(dropwatch, perf) more
> friendly.
>
> Signed-off-by: Yang Wei <yang.wei9@zte.com.cn>
Applied.
^ permalink raw reply
* Re: [PATCH net] net: smsc: epic100: replace dev_kfree_skb_irq by dev_consume_skb_irq for drop profiles
From: David Miller @ 2019-02-07 1:42 UTC (permalink / raw)
To: albin_yang; +Cc: netdev, colin.king, yang.wei9
In-Reply-To: <1549382981-5372-1-git-send-email-albin_yang@163.com>
From: Yang Wei <albin_yang@163.com>
Date: Wed, 6 Feb 2019 00:09:41 +0800
> From: Yang Wei <yang.wei9@zte.com.cn>
>
> dev_consume_skb_irq() should be called in epic_tx() when skb xmit
> done. It makes drop profiles(dropwatch, perf) more friendly.
>
> Signed-off-by: Yang Wei <yang.wei9@zte.com.cn>
Applied.
^ permalink raw reply
* Re: [PATCH net] net: dscc4: replace dev_kfree_skb_irq by dev_consume_skb_irq for drop profiles
From: David Miller @ 2019-02-07 1:42 UTC (permalink / raw)
To: albin_yang; +Cc: netdev, romieu, yang.wei9
In-Reply-To: <1549382823-5298-1-git-send-email-albin_yang@163.com>
From: Yang Wei <albin_yang@163.com>
Date: Wed, 6 Feb 2019 00:07:03 +0800
> From: Yang Wei <yang.wei9@zte.com.cn>
>
> dev_consume_skb_irq() should be called in dscc4_tx_irq() when skb
> xmit done. It makes drop profiles(dropwatch, perf) more friendly.
>
> Signed-off-by: Yang Wei <yang.wei9@zte.com.cn>
Applied.
^ permalink raw reply
* Re: [PATCH net] net: tulip: de2104x: replace dev_kfree_skb_irq by dev_consume_skb_irq for drop profiles
From: David Miller @ 2019-02-07 1:42 UTC (permalink / raw)
To: albin_yang; +Cc: netdev, linux-parisc, yang.wei9
In-Reply-To: <1549382631-5211-1-git-send-email-albin_yang@163.com>
From: Yang Wei <albin_yang@163.com>
Date: Wed, 6 Feb 2019 00:03:51 +0800
> From: Yang Wei <yang.wei9@zte.com.cn>
>
> dev_consume_skb_irq() should be called in de_tx() when skb xmit
> done. It makes drop profiles(dropwatch, perf) more friendly.
>
> Signed-off-by: Yang Wei <yang.wei9@zte.com.cn>
Applied.
^ permalink raw reply
* Re: [PATCH net] net: defxx: replace dev_kfree_skb_irq by dev_consume_skb_irq for drop profiles
From: David Miller @ 2019-02-07 1:42 UTC (permalink / raw)
To: albin_yang; +Cc: netdev, macro, yang.wei9
In-Reply-To: <1549382464-5138-1-git-send-email-albin_yang@163.com>
From: Yang Wei <albin_yang@163.com>
Date: Wed, 6 Feb 2019 00:01:04 +0800
> From: Yang Wei <yang.wei9@zte.com.cn>
>
> dev_consume_skb_irq() should be called in dfx_xmt_done() when skb
> xmit done. It makes drop profiles(dropwatch, perf) more friendly.
>
> Signed-off-by: Yang Wei <yang.wei9@zte.com.cn>
Applied.
^ permalink raw reply
* Re: [PATCH 1/2] net: phylink: update mac_config() documentation
From: David Miller @ 2019-02-07 1:30 UTC (permalink / raw)
To: rmk+kernel; +Cc: linux-doc, netdev
In-Reply-To: <E1gr371-0007eK-Gd@rmk-PC.armlinux.org.uk>
These two patches do not apply cleanly to net nor net-next.
Please send me something that does apply, and please always
clearly indicate which tree your changes are targetting.
^ permalink raw reply
* Re: [net-next, PATCH] net: stmmac: fix ptp timestamping on Rx on gmac4
From: David Miller @ 2019-02-07 1:28 UTC (permalink / raw)
To: ilias.apalodimas
Cc: alexandre.torgue, peppe.cavallaro, mcoquelin.stm32, netdev,
joabreu
In-Reply-To: <1549368920-1989-1-git-send-email-ilias.apalodimas@linaro.org>
From: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Date: Tue, 5 Feb 2019 14:15:20 +0200
> The current driver only enables Pdelay_Req and Pdelay_Resp when
> HWTSTAMP_FILTER_PTP_V2_EVENT, HWTSTAMP_FILTER_PTP_V1_L4_EVENT or
> HWTSTAMP_FILTER_PTP_V2_L4_EVENT is requested. This results in ptp sync on
> slave mode to report 'received SYNC without timestamp' when using ptp4l.
>
> Although the hardware can support Sync, Pdelay_Req and Pdelay_resp by
> setting bit14 annd bits 17/16 to 01 this leaves Delay_Req timestamps out.
>
> Fix this by enabling all event and general messages timestamps.
> This includes SYNC, Follow_Up, Delay_Req, Delay_Resp, Pdelay_Req,
> Pdelay_Resp and Pdelay_Resp_Follow_Up messages.
>
> Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Applied to net-next, thanks.
^ permalink raw reply
* Re: [PATCH v3 net-next 00/11] Devlink health reporting and recovery system
From: David Miller @ 2019-02-07 1:21 UTC (permalink / raw)
To: eranbe; +Cc: netdev, saeedm, jiri, moshe, ayal
In-Reply-To: <1549368532-17089-1-git-send-email-eranbe@mellanox.com>
This no longer applies cleanly to net-next, please respin.
Thank you.
^ permalink raw reply
* Re: [PATCH net-next v3] net: dsa: mv88e6xxx: Prevent suspend to RAM
From: David Miller @ 2019-02-07 1:16 UTC (permalink / raw)
To: miquel.raynal
Cc: andrew, vivien.didelot, f.fainelli, netdev, linux-kernel,
thomas.petazzoni, gregory.clement, antoine.tenart,
maxime.chevallier, nadavh
In-Reply-To: <20190205110728.11451-1-miquel.raynal@bootlin.com>
From: Miquel Raynal <miquel.raynal@bootlin.com>
Date: Tue, 5 Feb 2019 12:07:28 +0100
> On one hand, the mv88e6xxx driver has a work queue called in loop
> which will attempt register accesses after MDIO bus suspension, that
> entirely freezes the platform during suspend.
>
> On the other hand, the DSA core is not ready yet to support suspend to
> RAM operation because so far there is no way to recover reliably the
> switch configuration.
>
> To avoid the kernel to freeze when suspending with a switch driven by
> the mv88e6xxx driver, we choose to prevent the driver suspension and
> in the same way, the whole platform.
>
> Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Applied to net-next, thanks.
^ permalink raw reply
* Re: [PATCH net v5 1/2] net/mlx5e: Update hw flows when encap source mac changed
From: David Miller @ 2019-02-07 1:11 UTC (permalink / raw)
To: gerlitz.or; +Cc: xiangxia.m.yue, netdev, hadarh, saeedm
In-Reply-To: <CAJ3xEMgb0MnO8O2_0cQQkjmwe2PcjXb5PeOexRPfejpsyX98zg@mail.gmail.com>
From: Or Gerlitz <gerlitz.or@gmail.com>
Date: Tue, 5 Feb 2019 11:03:01 +0200
> Dave, I see a copy of the patch on patchworks [1] with status being
> not applicable, what is missing here? the patch should apply AFAIK.
> There was also another patch reviewed here by me and Saeed [2], not
> sure where it stands from your side.
>
> [1] https://patchwork.ozlabs.org/patch/1023844/
> [2] https://marc.info/?l=linux-netdev&m=154878514916414&w=2
More precisely, it's marked "Awaiting Upstream" which means I for some reason
expected Saeed to send it to me in his next pull request.
I'll apply these now.
^ permalink raw reply
* Re: [ISSUE][4.20.6] mlx5 and checksum failures
From: Saeed Mahameed @ 2019-02-07 1:00 UTC (permalink / raw)
To: Ian Kumlien
Cc: Cong Wang, David Miller, Saeed Mahameed,
Linux Kernel Network Developers
In-Reply-To: <CAA85sZup2UHbCX1KZ5bJNv=f=aoXrTz_0sjDUQ0fRRfU+fVSeA@mail.gmail.com>
On Wed, Feb 6, 2019 at 3:00 PM Ian Kumlien <ian.kumlien@gmail.com> wrote:
>
> On Wed, Feb 6, 2019 at 11:49 PM Cong Wang <xiyou.wangcong@gmail.com> wrote:
> >
> > On Wed, Feb 6, 2019 at 2:41 PM Ian Kumlien <ian.kumlien@gmail.com> wrote:
> > >
> > > On Wed, Feb 6, 2019 at 11:38 PM Cong Wang <xiyou.wangcong@gmail.com> wrote:
> > > > On Wed, Feb 6, 2019 at 2:15 PM Ian Kumlien <ian.kumlien@gmail.com> wrote:
> > > > > Could we please schedule this for 4.19 and 4.20 - it's kinda breaking things
> > > >
> > > > It doesn't break anything, packets are _not_ dropped, only that the
> > > > warning itself is noisy.
> > >
> > > Not my experience, to me it slows the machine down and looses packets,
> > > I don't however know
> > > if this is the only culprit
> >
> > The packet process could be slow down because of printing
> > out this kernel warning. Packet should be still delivered to upper
> > stack, at least I didn't see any packet drops because of this.
>
> I have several machines pushing the same errors currently, while on this
> one I was logged in on the serial console and not over ssh like the others.
>
> On the other machines, typing is slow, looses characters and drops the
> connection
>
> But, again, I don't know if this is the only culprit, it sure does
> fill dmesg though =)
> (which suddenly takes minutes to show over a 100gig connection)
>
> > > You can actually see it on ping where it start out with 0.0xyx and
> > > ends up at ~10ms
> >
> > I don't understand how it could affect ICMP, it is purely TCP
> > from my point of view, even the stack trace from you says so. ;)
>
> It changes directly after the first hw checksum failure, I don't know why =/
weird, Maybe a real check-summing issue/corruption on the PCI ?!
can you try turning off checksum offloads
ethtool -K ethX rx off
^ permalink raw reply
* Re: [net-next][PATCH 0/5] rds: add tos support
From: David Miller @ 2019-02-07 1:01 UTC (permalink / raw)
To: santosh.shilimkar; +Cc: netdev, yanjun.zhu
In-Reply-To: <1549325089-16572-1-git-send-email-santosh.shilimkar@oracle.com>
From: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Date: Mon, 4 Feb 2019 16:04:44 -0800
> RDS applications make use of tos to classify database traffic.
> This feature has been used in shipping products from 2.6.32 based
> kernels. Its tied with RDS v4.1 protocol version and the compatibility
> gets negotiated as part of connections setup.
...
> Patchset is also available on below git tree.
>
> The following changes since commit cc7335786f7278d66bdcf96d3d411edfcb01be51:
>
> socket: fix for Add SO_TIMESTAMP[NS]_NEW (2019-02-03 20:36:11 -0800)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux.git for_net-next-5.1/rds-tos-v4
Pulled, thanks.
^ permalink raw reply
* Re: pull-request: bpf-next 2019-02-07
From: David Miller @ 2019-02-07 0:56 UTC (permalink / raw)
To: daniel; +Cc: ast, netdev, bpf
In-Reply-To: <20190207004230.29010-1-daniel@iogearbox.net>
From: Daniel Borkmann <daniel@iogearbox.net>
Date: Thu, 7 Feb 2019 01:42:30 +0100
> The following pull-request contains BPF updates for your *net-next* tree.
>
> The main changes are:
>
> 1) Add a riscv64 JIT for BPF, from Björn.
Awesome.
> 2) Implement BTF deduplication algorithm for libbpf which takes BTF type
> information containing duplicate per-compilation unit information and
> reduces it to an equivalent set of BTF types with no duplication and
> without loss of information, from Andrii.
>
> 3) Offloaded and native BPF XDP programs can coexist today, enable also
> offloaded and generic ones as well, from Jakub.
>
> 4) Expose various BTF related helper functions in libbpf as API which
> are in particular helpful for JITed programs, from Yonghong.
>
> 5) Fix the recently added JMP32 code emission in s390x JIT, from Heiko.
>
> 6) Fix BPF kselftests' tcp_{server,client}.py to be able to run inside
> a network namespace, also add a fix for libbpf to get libbpf_print()
> working, from Stanislav.
>
> 7) Fixes for bpftool documentation, from Prashant.
>
> 8) Type cleanup in BPF kselftests' test_maps.c to silence a gcc8 warning,
> from Breno.
>
> Please consider pulling these changes from:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git
Pulled, thanks Daniel.
I'll push this back out after my build tests complete.
^ permalink raw reply
* Re: [Patch net-next v2] mlx5: use RCU lock in mlx5_eq_cq_get()
From: Saeed Mahameed @ 2019-02-07 0:56 UTC (permalink / raw)
To: Cong Wang
Cc: Eric Dumazet, Linux Kernel Network Developers, Saeed Mahameed,
Tariq Toukan
In-Reply-To: <CAM_iQpVF-71uQtybZLqLDWZQS=JxjD_23fAjxyfy7oLBzw-BoA@mail.gmail.com>
On Wed, Feb 6, 2019 at 4:53 PM Cong Wang <xiyou.wangcong@gmail.com> wrote:
>
> On Wed, Feb 6, 2019 at 4:28 PM Eric Dumazet <eric.dumazet@gmail.com> wrote:
> >
> >
> >
> > On 02/06/2019 04:04 PM, Cong Wang wrote:
> >
> > > synchronize_irq() is called before mlx5_cq_put(), so I don't
> > > see why readers could get 0 refcnt.
> >
> > Then the more reasons to get rid of the refcount increment/decrement completely ...
> >
> > Technically, even the rcu_read_lock() and rcu_read_unlock() are not needed,
> > since synchronize_irq() is enough.
>
> Excellent point.
>
> For the refcnt, I am afraid we still have to hold refcnt for the tasklet,
> mlx5_cq_tasklet_cb. But yeah, should be safe to remove from IRQ
> path.
the tasklet path is for rdma CQs only, netdev cqs handling will be refcnt free.
^ permalink raw reply
* Re: [PATCH net 1/2] geneve: should not call rt6_lookup() when ipv6 was disabled
From: kbuild test robot @ 2019-02-07 0:55 UTC (permalink / raw)
To: Hangbin Liu; +Cc: kbuild-all, netdev, Stefano Brivio, David Miller, Hangbin Liu
In-Reply-To: <20190206125111.5286-2-liuhangbin@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 4504 bytes --]
Hi Hangbin,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on net/master]
url: https://github.com/0day-ci/linux/commits/Hangbin-Liu/fix-two-kernel-panics-when-disabled-IPv6-on-boot-up/20190207-071954
config: m68k-sun3_defconfig (attached as .config)
compiler: m68k-linux-gnu-gcc (Debian 8.2.0-11) 8.2.0
reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
GCC_VERSION=8.2.0 make.cross ARCH=m68k
All warnings (new ones prefixed by >>):
drivers/net/geneve.c: In function 'geneve_link_config':
>> drivers/net/geneve.c:1519:3: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]
struct rt6_info *rt = rt6_lookup(geneve->net,
^~~~~~
vim +1519 drivers/net/geneve.c
abe492b4f5 Tom Herbert 2015-12-10 1490
c40e89fd35 Alexey Kodanev 2018-04-19 1491 static void geneve_link_config(struct net_device *dev,
c40e89fd35 Alexey Kodanev 2018-04-19 1492 struct ip_tunnel_info *info, struct nlattr *tb[])
c40e89fd35 Alexey Kodanev 2018-04-19 1493 {
c40e89fd35 Alexey Kodanev 2018-04-19 1494 struct geneve_dev *geneve = netdev_priv(dev);
c40e89fd35 Alexey Kodanev 2018-04-19 1495 int ldev_mtu = 0;
c40e89fd35 Alexey Kodanev 2018-04-19 1496
c40e89fd35 Alexey Kodanev 2018-04-19 1497 if (tb[IFLA_MTU]) {
c40e89fd35 Alexey Kodanev 2018-04-19 1498 geneve_change_mtu(dev, nla_get_u32(tb[IFLA_MTU]));
c40e89fd35 Alexey Kodanev 2018-04-19 1499 return;
c40e89fd35 Alexey Kodanev 2018-04-19 1500 }
c40e89fd35 Alexey Kodanev 2018-04-19 1501
c40e89fd35 Alexey Kodanev 2018-04-19 1502 switch (ip_tunnel_info_af(info)) {
c40e89fd35 Alexey Kodanev 2018-04-19 1503 case AF_INET: {
c40e89fd35 Alexey Kodanev 2018-04-19 1504 struct flowi4 fl4 = { .daddr = info->key.u.ipv4.dst };
c40e89fd35 Alexey Kodanev 2018-04-19 1505 struct rtable *rt = ip_route_output_key(geneve->net, &fl4);
c40e89fd35 Alexey Kodanev 2018-04-19 1506
c40e89fd35 Alexey Kodanev 2018-04-19 1507 if (!IS_ERR(rt) && rt->dst.dev) {
c40e89fd35 Alexey Kodanev 2018-04-19 1508 ldev_mtu = rt->dst.dev->mtu - GENEVE_IPV4_HLEN;
c40e89fd35 Alexey Kodanev 2018-04-19 1509 ip_rt_put(rt);
c40e89fd35 Alexey Kodanev 2018-04-19 1510 }
c40e89fd35 Alexey Kodanev 2018-04-19 1511 break;
c40e89fd35 Alexey Kodanev 2018-04-19 1512 }
c40e89fd35 Alexey Kodanev 2018-04-19 1513 #if IS_ENABLED(CONFIG_IPV6)
c40e89fd35 Alexey Kodanev 2018-04-19 1514 case AF_INET6: {
55e942d018 Hangbin Liu 2019-02-06 1515 struct inet6_dev *idev = in6_dev_get(dev);
55e942d018 Hangbin Liu 2019-02-06 1516 if (!idev)
55e942d018 Hangbin Liu 2019-02-06 1517 break;
55e942d018 Hangbin Liu 2019-02-06 1518
c40e89fd35 Alexey Kodanev 2018-04-19 @1519 struct rt6_info *rt = rt6_lookup(geneve->net,
c40e89fd35 Alexey Kodanev 2018-04-19 1520 &info->key.u.ipv6.dst, NULL, 0,
c40e89fd35 Alexey Kodanev 2018-04-19 1521 NULL, 0);
c40e89fd35 Alexey Kodanev 2018-04-19 1522
c40e89fd35 Alexey Kodanev 2018-04-19 1523 if (rt && rt->dst.dev)
c40e89fd35 Alexey Kodanev 2018-04-19 1524 ldev_mtu = rt->dst.dev->mtu - GENEVE_IPV6_HLEN;
c40e89fd35 Alexey Kodanev 2018-04-19 1525 ip6_rt_put(rt);
55e942d018 Hangbin Liu 2019-02-06 1526
55e942d018 Hangbin Liu 2019-02-06 1527 in6_dev_put(idev);
c40e89fd35 Alexey Kodanev 2018-04-19 1528 break;
c40e89fd35 Alexey Kodanev 2018-04-19 1529 }
c40e89fd35 Alexey Kodanev 2018-04-19 1530 #endif
c40e89fd35 Alexey Kodanev 2018-04-19 1531 }
c40e89fd35 Alexey Kodanev 2018-04-19 1532
c40e89fd35 Alexey Kodanev 2018-04-19 1533 if (ldev_mtu <= 0)
c40e89fd35 Alexey Kodanev 2018-04-19 1534 return;
c40e89fd35 Alexey Kodanev 2018-04-19 1535
c40e89fd35 Alexey Kodanev 2018-04-19 1536 geneve_change_mtu(dev, ldev_mtu - info->options_len);
c40e89fd35 Alexey Kodanev 2018-04-19 1537 }
c40e89fd35 Alexey Kodanev 2018-04-19 1538
:::::: The code at line 1519 was first introduced by commit
:::::: c40e89fd358e94a55d6c1475afbea17b5580f601 geneve: configure MTU based on a lower device
:::::: TO: Alexey Kodanev <alexey.kodanev@oracle.com>
:::::: CC: David S. Miller <davem@davemloft.net>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 12117 bytes --]
^ permalink raw reply
* linux-next: manual merge of the net-next tree with the net tree
From: Stephen Rothwell @ 2019-02-07 0:54 UTC (permalink / raw)
To: David Miller, Networking
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Guy Shattah,
Saeed Mahameed, Pablo Neira Ayuso
[-- Attachment #1: Type: text/plain, Size: 4365 bytes --]
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
between commit:
1651925d403e ("net/mlx5e: Use the inner headers to determine tc/pedit offload limitation on decap flows")
from the net tree and commit:
738678817573 ("drivers: net: use flow action infrastructure")
from the net-next tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
index 1c3c9fa26b55,83522c926d7c..000000000000
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
@@@ -1309,15 -1309,12 +1309,12 @@@ static int parse_tunnel_attr(struct mlx
outer_headers);
void *headers_v = MLX5_ADDR_OF(fte_match_param, spec->match_value,
outer_headers);
-
- struct flow_dissector_key_control *enc_control =
- skb_flow_dissector_target(f->dissector,
- FLOW_DISSECTOR_KEY_ENC_CONTROL,
- f->key);
- int err = 0;
+ struct flow_rule *rule = tc_cls_flower_offload_flow_rule(f);
+ struct flow_match_control enc_control;
+ int err;
err = mlx5e_tc_tun_parse(filter_dev, priv, spec, f,
- headers_c, headers_v);
+ headers_c, headers_v, match_level);
if (err) {
NL_SET_ERR_MSG_MOD(extack,
"failed to parse tunnel attributes");
@@@ -1465,19 -1455,17 +1455,17 @@@ static int __parse_cls_flower(struct ml
return -EOPNOTSUPP;
}
- if ((dissector_uses_key(f->dissector,
- FLOW_DISSECTOR_KEY_ENC_IPV4_ADDRS) ||
- dissector_uses_key(f->dissector, FLOW_DISSECTOR_KEY_ENC_KEYID) ||
- dissector_uses_key(f->dissector, FLOW_DISSECTOR_KEY_ENC_PORTS)) &&
- dissector_uses_key(f->dissector, FLOW_DISSECTOR_KEY_ENC_CONTROL)) {
- struct flow_dissector_key_control *key =
- skb_flow_dissector_target(f->dissector,
- FLOW_DISSECTOR_KEY_ENC_CONTROL,
- f->key);
- switch (key->addr_type) {
+ if ((flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_ENC_IPV4_ADDRS) ||
+ flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_ENC_KEYID) ||
+ flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_ENC_PORTS)) &&
+ flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_ENC_CONTROL)) {
+ struct flow_match_control match;
+
+ flow_rule_match_enc_control(rule, &match);
+ switch (match.key->addr_type) {
case FLOW_DISSECTOR_KEY_IPV4_ADDRS:
case FLOW_DISSECTOR_KEY_IPV6_ADDRS:
- if (parse_tunnel_attr(priv, spec, f, filter_dev))
+ if (parse_tunnel_attr(priv, spec, f, filter_dev, tunnel_match_level))
return -EOPNOTSUPP;
break;
default:
@@@ -2180,22 -2129,17 +2131,22 @@@ static bool csum_offload_supported(stru
}
static bool modify_header_match_supported(struct mlx5_flow_spec *spec,
- struct tcf_exts *exts,
+ struct flow_action *flow_action,
+ u32 actions,
struct netlink_ext_ack *extack)
{
- const struct tc_action *a;
+ const struct flow_action_entry *act;
bool modify_ip_header;
u8 htype, ip_proto;
void *headers_v;
u16 ethertype;
- int nkeys, i;
+ int i;
- headers_v = MLX5_ADDR_OF(fte_match_param, spec->match_value, outer_headers);
+ if (actions & MLX5_FLOW_CONTEXT_ACTION_DECAP)
+ headers_v = MLX5_ADDR_OF(fte_match_param, spec->match_value, inner_headers);
+ else
+ headers_v = MLX5_ADDR_OF(fte_match_param, spec->match_value, outer_headers);
+
ethertype = MLX5_GET(fte_match_set_lyr_2_4, headers_v, ethertype);
/* for non-IP we only re-write MACs, so we're okay */
@@@ -2251,8 -2191,9 +2198,9 @@@ static bool actions_match_supported(str
return false;
if (actions & MLX5_FLOW_CONTEXT_ACTION_MOD_HDR)
- return modify_header_match_supported(&parse_attr->spec, exts,
+ return modify_header_match_supported(&parse_attr->spec,
+ flow_action,
- extack);
+ actions, extack);
return true;
}
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 484 bytes --]
^ permalink raw reply
* Re: [PATCH net 0/6] qed*: Bug fixes.
From: David Miller @ 2019-02-07 0:53 UTC (permalink / raw)
To: manishc; +Cc: netdev, aelior, mkalderon
In-Reply-To: <20190206224347.17054-1-manishc@marvell.com>
From: Manish Chopra <manishc@marvell.com>
Date: Wed, 6 Feb 2019 14:43:41 -0800
> This series contains general qed/qede fixes.
> Please consider applying this to "net"
Series applied, thanks Manish.
^ permalink raw reply
* Re: [Patch net-next v2] mlx5: use RCU lock in mlx5_eq_cq_get()
From: Cong Wang @ 2019-02-07 0:53 UTC (permalink / raw)
To: Eric Dumazet
Cc: Linux Kernel Network Developers, Saeed Mahameed, Tariq Toukan
In-Reply-To: <c35f67d1-0190-cb64-74d9-54889eb1aef7@gmail.com>
On Wed, Feb 6, 2019 at 4:28 PM Eric Dumazet <eric.dumazet@gmail.com> wrote:
>
>
>
> On 02/06/2019 04:04 PM, Cong Wang wrote:
>
> > synchronize_irq() is called before mlx5_cq_put(), so I don't
> > see why readers could get 0 refcnt.
>
> Then the more reasons to get rid of the refcount increment/decrement completely ...
>
> Technically, even the rcu_read_lock() and rcu_read_unlock() are not needed,
> since synchronize_irq() is enough.
Excellent point.
For the refcnt, I am afraid we still have to hold refcnt for the tasklet,
mlx5_cq_tasklet_cb. But yeah, should be safe to remove from IRQ
path.
^ permalink raw reply
* Re: [Patch net-next v2] mlx5: use RCU lock in mlx5_eq_cq_get()
From: Saeed Mahameed @ 2019-02-07 0:51 UTC (permalink / raw)
To: Eric Dumazet
Cc: Cong Wang, Linux Kernel Network Developers, Saeed Mahameed,
Tariq Toukan
In-Reply-To: <c35f67d1-0190-cb64-74d9-54889eb1aef7@gmail.com>
On Wed, Feb 6, 2019 at 4:28 PM Eric Dumazet <eric.dumazet@gmail.com> wrote:
>
>
>
> On 02/06/2019 04:04 PM, Cong Wang wrote:
>
> > synchronize_irq() is called before mlx5_cq_put(), so I don't
> > see why readers could get 0 refcnt.
>
> Then the more reasons to get rid of the refcount increment/decrement completely ...
>
> Technically, even the rcu_read_lock() and rcu_read_unlock() are not needed,
> since synchronize_irq() is enough.
>
I already suggested this, quoting myself from my first reply to this patch V0:
"another way to do it is not to do any refcounting in the irq handler
and fence cq removal via synchronize_irq(eq->irqn) on mlx5_eq_del_cq."
I already have a patch I was just waiting for Cong to push V2.
^ permalink raw reply
* Re: [PATCH v1] net: dsa: qca8k: implement DT-based ports <-> phy translation
From: Christian Lamparter @ 2019-02-07 0:43 UTC (permalink / raw)
To: Florian Fainelli; +Cc: Andrew Lunn, netdev, Vivien Didelot
In-Reply-To: <14f73250-4255-6f4e-336a-9bf289539b75@gmail.com>
On Wednesday, February 6, 2019 11:29:18 PM CET Florian Fainelli wrote:
> On 2/6/19 1:57 PM, Christian Lamparter wrote:
> > On Tuesday, February 5, 2019 11:29:36 PM CET Florian Fainelli wrote:
> >> On 2/5/19 2:12 PM, Christian Lamparter wrote:
> >>> On Tuesday, February 5, 2019 10:29:34 PM CET Andrew Lunn wrote:
> >>>>> For now, I added the DT binding update to the patch as well.
> >>>>> But if this is indeed the way to go, it'll get a separate patch.
> >>>>
> >>>> Hi Christian
> >>>>
> >>>> You need to be careful with the DT binding. You need to keep backwards
> >>>> compatible with it. An old DT blob needs to keep working. I don't
> >>>> think this is true with this change.
> >>>
> >>> Do you mean because of the
> >>>
> >>> - switch0@0 {
> >>> + switch@10 {
> >>> compatible = "qca,qca8337";
> >>> #address-cells = <1>;
> >>> #size-cells = <0>;
> >>>
> >>> - reg = <0>;
> >>> + reg = <0x10>;
> >>>
> >>> change?
> >>>
> >>> or because I removed the phy-handles?>
> >>> The reg = <0x10>; will be necessary regardless. Because this
> >>> is really a bug in the existing binding example and if it is
> >>> copied it will prevent the qca8k driver from loading.
> >>> This is due to a resource conflict, because there will be
> >>> already a "phy_port1: phy@0" registered at reg = <0>;
> >>> So this never worked would have worked.
> >>
> >> That part is fine, it is the removal of the phy-handle properties that
> >> is possibly a problem, but in hindsight, I do not believe it will be a
> >> compatibility issue. Lack of "phy-handle" property within the core DSA
> >> layer means: utilize the switch's internal MDIO bus (ds->slave_mii_bus)
> >> instance, which you are not removing, you are just changing how the PHYs
> >> map to port numbers.
> >>
> > Ok, thanks.
> >
> > I think I'm almost ready for v2. I have fully addressed the compatibility
> > issue by forking off the qca8k_switch_ops depending on whenever a phy-handle
> > property on one of the ports was found or not. If there was no phy-handle the
> > driver adds the slave-bus accessors to the ops which tells DSA to allocate
> > the slave bus and allows the phys can be enumerated. If the phy-handles are
> > found the driver will not have the accessors and DSA will not setup a
> > redundant/fake bus and this prevents the second/double/duplicated discovery
> > and enumeration of the same PHYs again.
>
> The logic you have sounds a little too broad since it stops as soon as
> one port is found with a 'phy-handle' property and assumes that the
> parent MDIO bus from which qca8k itself is a child device, is the MDIO
> bus to be used. There are possibly 3 cases:
>
> 1) All ports using internal/build-in PHYs. In that case, you can either
> not specify a 'phy-handle' property and DSA assumes that they are part
> of the switch's internal MDIO bus. You can also specify a 'phy-handle'
> property that references the internal MDIO bus, although then we also
> expect qca8k to register its internal MDIO bus (ala mv88e6xxx)
>
> 2) Some ports using internal PHYs, some using external PHYs. Similar
> situation again, ports may, or may not specify a 'phy-handle' property,
> so without a 'phy-handle' property that means the port connects to an
> internal PHY, with a 'phy-handle' it could connect to either internal
> PHY or external PHY
>
> 3) All ports using external PHYs, in that case, we must have a
> 'phy-handle' for each port to specify where and how they connect to
> their external PHYs.
Oh, sadly the mixed configuration you have envisioned will not work really.
The QCA8K_MDIO_MASTER_EN Bit,which grants access to PHYs through the
MDIO_MASTER register also _disconnects_ the external MDC passthrough to
the internal PHYs. So you get garbage like:
[ 17.036963] Generic PHY 37000000.mdio-mii:01: Master/Slave resolution failed, maybe conflicting manual settings?
[ 17.116927] Generic PHY 37000000.mdio-mii:02: Master/Slave resolution failed, maybe conflicting manual settings?
[ 17.196894] Generic PHY 37000000.mdio-mii:03: Master/Slave resolution failed, maybe conflicting manual settings?
(the PHY reads/write get seemingly stuck/do nothing/strange things).
To pull this partially (so it works for the kernel) off, would require
at least a custom phy driver on top of the dsa switch which would
syncronize the phy register access between the external and internal source.
(I think this would still leave access from userspace in a broken though?!
unless the mdiobus between the qca8k and the SoC can be syncronized as well)
> With respect to your patch, what I would do is register QCA8k's internal
> MDIO bus as a proper mdio bus and use ds->slave_mii_bus as a storage for
> that bus, such that tell the DSA layer: look, here is the internal MDIO
> bus, would you ever find a port that needs to use a PHY in there.
>
> Then you can still scan each enabled port device, and for each of them,
> populate ds->phys_mii_mask, thus telling DSA exacly which ports are
> using an internal PHY because that would be the ports that do not have a
> 'phy-handle' property. Ports that have a 'phy-handle' property.
>
> Hope this helps and is clear, if not, I can try to cook a patch for you
> to try, though I don't have you hardware.
Yes, I think I understood, I also tested it (see the implementation below).
But as said it's not that easy.
> Tangential, since you are working on qca8k, it would be great to give
> this driver some TLC and make sure that:
>
> - bridge w/ and w/o VLAN filtering enabled works
> - multicast snooping works etc.
the driver/switch has much bigger problems :(. For example, my existing
configuration broke (I see RX and TX, but fails to get address by dhcp) due to:
net: dsa: qca8k: disable delay for RGMII mode
In RGMII mode we should not have any delay in port MAC, so disable
the delay.
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
It would have been great if a proper .phylink_mac_config() was implemented
at that time. But oh well.
Cheers
Christian
---
commit 9db6f01c864494ebf1308e2f001ece92b5e1ae57
Author: Christian Lamparter <chunkeey@gmail.com>
Date: Fri Feb 1 22:54:32 2019 +0100
net: dsa: qca8k: extend slave-bus implementations
This patch implements accessors for the QCA8337 MDIO access
through the MDIO_MASTER register, which makes it possible to
access the PHYs on slave-bus through the switch. In cases
where the switch ports are already mapped via external
"phy-phandles", the internal mdio-bus is disabled in order to
prevent a duplicated discovery and enumeration of the same
PHYs.
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
---
Changes from v2:
- Make it compatible with existing configurations
Changes from v1:
- drop DT port <-> phy mapping
- added register definitions for the MDIO control register
- implemented new slave-mdio bus accessors
- DT-binding: fix switch's PSEUDO_PHY address. It's 0x10 not 0.
diff --git a/drivers/net/dsa/qca8k.c b/drivers/net/dsa/qca8k.c
index a4b6cda38016..8d7ee4449d13 100644
--- a/drivers/net/dsa/qca8k.c
+++ b/drivers/net/dsa/qca8k.c
@@ -469,6 +469,131 @@ qca8k_port_set_status(struct qca8k_priv *priv, int port, int enable)
qca8k_reg_clear(priv, QCA8K_REG_PORT_STATUS(port), mask);
}
+static int
+qca8k_port_to_phy(int port)
+{
+ if (port < 1 || port > QCA8K_MDIO_MASTER_MAX_PORTS)
+ return -EINVAL;
+
+ return port - 1;
+}
+
+static int
+qca8k_mdio_write(struct qca8k_priv *priv, int port, int regnum, u16 data)
+{
+ u32 val, phy;
+ int ret;
+
+ phy = qca8k_port_to_phy(port);
+ if (phy < 0 || (regnum < 0 || regnum >= QCA8K_MDIO_MASTER_MAX_REG))
+ return -EINVAL;
+
+ val = QCA8K_MDIO_MASTER_BUSY | QCA8K_MDIO_MASTER_EN |
+ QCA8K_MDIO_MASTER_WRITE | QCA8K_MDIO_MASTER_PHY_ADDR(phy) |
+ QCA8K_MDIO_MASTER_REG_ADDR(regnum) |
+ QCA8K_MDIO_MASTER_DATA(data);
+
+ qca8k_write(priv, QCA8K_MDIO_MASTER_CTRL, val);
+
+ return qca8k_busy_wait(priv, QCA8K_MDIO_MASTER_CTRL,
+ QCA8K_MDIO_MASTER_BUSY);
+}
+
+static int
+qca8k_mdio_read(struct qca8k_priv *priv, int port, int regnum)
+{
+ u32 val, phy;
+
+ phy = qca8k_port_to_phy(port);
+ if (phy < 0 || (regnum < 0 || regnum >= QCA8K_MDIO_MASTER_MAX_REG))
+ return -EINVAL;
+
+ val = QCA8K_MDIO_MASTER_BUSY | QCA8K_MDIO_MASTER_EN |
+ QCA8K_MDIO_MASTER_READ | QCA8K_MDIO_MASTER_PHY_ADDR(phy) |
+ QCA8K_MDIO_MASTER_REG_ADDR(regnum);
+
+ qca8k_write(priv, QCA8K_MDIO_MASTER_CTRL, val);
+
+ if (qca8k_busy_wait(priv, QCA8K_MDIO_MASTER_CTRL,
+ QCA8K_MDIO_MASTER_BUSY)) {
+ return -ETIMEDOUT;
+ }
+
+ val = (qca8k_read(priv, QCA8K_MDIO_MASTER_CTRL) &
+ QCA8K_MDIO_MASTER_DATA_MASK);
+
+ return val;
+}
+
+static int
+qca8k_slave_phy_read(struct mii_bus *bus, int addr, int reg)
+{
+ struct qca8k_priv *priv = bus->priv;
+
+ if (priv->ds->phys_mii_mask & BIT(addr)) {
+ int ret = qca8k_mdio_read(priv, addr, reg);
+
+ if (ret >= 0)
+ return ret;
+ }
+
+ return 0xffff;
+}
+
+static int
+qca8k_slave_phy_write(struct mii_bus *bus, int addr, int reg, u16 val)
+{
+ struct qca8k_priv *priv = bus->priv;
+
+ if (priv->ds->phys_mii_mask & BIT(addr))
+ qca8k_mdio_write(priv, addr, reg, val);
+
+ return 0;
+}
+
+static int
+qca8k_setup_mdio_bus(struct qca8k_priv *priv)
+{
+ struct device_node *ports, *port;
+ struct mii_bus *bus;
+ u32 reg, mask = 0;
+ int err;
+
+ bus = devm_mdiobus_alloc_size(priv->dev, sizeof(priv));
+ if (!bus)
+ return -ENOMEM;
+ bus->priv = (void *)priv;
+
+ bus->name = priv->dev->of_node->full_name;
+ snprintf(bus->id, MII_BUS_ID_SIZE, "%pOF", priv->dev->of_node);
+
+ bus->read = qca8k_slave_phy_read;
+ bus->write = qca8k_slave_phy_write;
+ bus->parent = priv->dev;
+
+ ports = of_get_child_by_name(priv->dev->of_node, "ports");
+ if (!ports) {
+ dev_err(priv->dev, "no ports child node found.\n");
+ return -EINVAL;
+ }
+
+ for_each_available_child_of_node(ports, port) {
+ if (of_property_read_bool(port, "phy-handle"))
+ continue;
+
+ err = of_property_read_u32(port, "reg", ®);
+ if (err)
+ return err;
+
+ if (dsa_is_user_port(priv->ds, reg))
+ mask |= BIT(reg);
+ }
+ bus->phy_mask = ~mask;
+ priv->ds->slave_mii_bus = bus;
+
+ return mdiobus_register(bus);
+}
+
static int
qca8k_setup(struct dsa_switch *ds)
{
@@ -490,6 +615,10 @@ qca8k_setup(struct dsa_switch *ds)
if (IS_ERR(priv->regmap))
pr_warn("regmap initialization failed");
+ ret = qca8k_setup_mdio_bus(priv);
+ if (ret)
+ return ret;
+
/* Initialize CPU port pad mode (xMII type, delays...) */
phy_mode = of_get_phy_mode(ds->ports[QCA8K_CPU_PORT].dn);
if (phy_mode < 0) {
@@ -613,19 +742,27 @@ qca8k_adjust_link(struct dsa_switch *ds, int port, struct phy_device *phy)
}
static int
-qca8k_phy_read(struct dsa_switch *ds, int phy, int regnum)
+qca8k_phy_write(struct dsa_switch *ds, int port, int regnum, u16 data)
{
- struct qca8k_priv *priv = (struct qca8k_priv *)ds->priv;
+ struct qca8k_priv *priv = ds->priv;
+ int ret = -EIO;
- return mdiobus_read(priv->bus, phy, regnum);
+ if (ds->slave_mii_bus->phy_mask & BIT(port))
+ ret = qca8k_mdio_write(priv, port, regnum, data);
+
+ return ret;
}
static int
-qca8k_phy_write(struct dsa_switch *ds, int phy, int regnum, u16 val)
+qca8k_phy_read(struct dsa_switch *ds, int port, int regnum)
{
- struct qca8k_priv *priv = (struct qca8k_priv *)ds->priv;
+ struct qca8k_priv *priv = ds->priv;
+ int ret = -EIO;
- return mdiobus_write(priv->bus, phy, regnum, val);
+ if (ds->slave_mii_bus->phy_mask & BIT(port))
+ ret = qca8k_mdio_read(priv, port, regnum);
+
+ return ret;
}
static void
diff --git a/drivers/net/dsa/qca8k.h b/drivers/net/dsa/qca8k.h
index 613fe5c50236..09a1d76b8037 100644
--- a/drivers/net/dsa/qca8k.h
+++ b/drivers/net/dsa/qca8k.h
@@ -48,6 +48,18 @@
#define QCA8K_MIB_FLUSH BIT(24)
#define QCA8K_MIB_CPU_KEEP BIT(20)
#define QCA8K_MIB_BUSY BIT(17)
+#define QCA8K_MDIO_MASTER_CTRL 0x3c
+#define QCA8K_MDIO_MASTER_BUSY BIT(31)
+#define QCA8K_MDIO_MASTER_EN BIT(30)
+#define QCA8K_MDIO_MASTER_READ BIT(27)
+#define QCA8K_MDIO_MASTER_WRITE 0
+#define QCA8K_MDIO_MASTER_SUP_PRE BIT(26)
+#define QCA8K_MDIO_MASTER_PHY_ADDR(x) ((x) << 21)
+#define QCA8K_MDIO_MASTER_REG_ADDR(x) ((x) << 16)
+#define QCA8K_MDIO_MASTER_DATA(x) (x)
+#define QCA8K_MDIO_MASTER_DATA_MASK GENMASK(15, 0)
+#define QCA8K_MDIO_MASTER_MAX_PORTS 5
+#define QCA8K_MDIO_MASTER_MAX_REG 32
#define QCA8K_GOL_MAC_ADDR0 0x60
#define QCA8K_GOL_MAC_ADDR1 0x64
#define QCA8K_REG_PORT_STATUS(_i) (0x07c + (_i) * 4)
^ permalink raw reply related
* pull-request: bpf-next 2019-02-07
From: Daniel Borkmann @ 2019-02-07 0:42 UTC (permalink / raw)
To: davem; +Cc: daniel, ast, netdev, bpf
Hi David,
The following pull-request contains BPF updates for your *net-next* tree.
The main changes are:
1) Add a riscv64 JIT for BPF, from Björn.
2) Implement BTF deduplication algorithm for libbpf which takes BTF type
information containing duplicate per-compilation unit information and
reduces it to an equivalent set of BTF types with no duplication and
without loss of information, from Andrii.
3) Offloaded and native BPF XDP programs can coexist today, enable also
offloaded and generic ones as well, from Jakub.
4) Expose various BTF related helper functions in libbpf as API which
are in particular helpful for JITed programs, from Yonghong.
5) Fix the recently added JMP32 code emission in s390x JIT, from Heiko.
6) Fix BPF kselftests' tcp_{server,client}.py to be able to run inside
a network namespace, also add a fix for libbpf to get libbpf_print()
working, from Stanislav.
7) Fixes for bpftool documentation, from Prashant.
8) Type cleanup in BPF kselftests' test_maps.c to silence a gcc8 warning,
from Breno.
Please consider pulling these changes from:
git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git
Thanks a lot!
----------------------------------------------------------------
The following changes since commit cc7335786f7278d66bdcf96d3d411edfcb01be51:
socket: fix for Add SO_TIMESTAMP[NS]_NEW (2019-02-03 20:36:11 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git
for you to fetch changes up to dd9cef43c222df7c0d76d34451808e789952379d:
bpf: test_maps: fix possible out of bound access warning (2019-02-06 15:48:43 +0100)
----------------------------------------------------------------
Alexei Starovoitov (2):
Merge branch 'change-libbpf-print-api'
Merge branch 'libbpf-btf_ext'
Andrii Nakryiko (3):
btf: extract BTF type size calculation
btf: add BTF types deduplication algorithm
selftests/btf: add initial BTF dedup tests
Björn Töpel (4):
bpf, riscv: add BPF JIT for RV64G
MAINTAINERS: add RISC-V BPF JIT maintainer
bpf, doc: add RISC-V JIT to BPF documentation
selftests/bpf: add "any alignment" annotation for some tests
Breno Leitao (1):
bpf: test_maps: fix possible out of bound access warning
Daniel Borkmann (3):
Merge branch 'bpf-btf-dedup'
Merge branch 'bpf-riscv-jit'
Merge branch 'bpf-xdp-hw-plus-generic'
Heiko Carstens (1):
s390: bpf: fix JMP32 code-gen
Jakub Kicinski (5):
selftests/bpf: fix the expected messages
net: xdp: allow generic and driver XDP on one interface
selftests/bpf: print traceback when test fails
selftests/bpf: add test for mixing generic and offload XDP
selftests/bpf: test reading the offloaded program
Prashant Bhole (1):
tools: bpftool: doc, fix incorrect text
Stanislav Fomichev (2):
selftests/bpf: use localhost in tcp_{server,client}.py
libbpf: fix libbpf_print
Yonghong Song (8):
tools/bpf: move libbpf pr_* debug print functions to headers
tools/bpf: print out btf log at LIBBPF_WARN level
tools/bpf: simplify libbpf API function libbpf_set_print()
tools/bpf: expose functions btf_ext__* as API functions
tools/bpf: implement libbpf btf__get_map_kv_tids() API function
tools/bpf: fix a selftest test_btf failure
tools/bpf: add const qualifier to btf__get_map_kv_tids() map_name parameter
tools/bpf: silence a libbpf unnecessary warning
Documentation/networking/filter.txt | 16 +-
Documentation/sysctl/net.txt | 1 +
MAINTAINERS | 6 +
arch/riscv/Kconfig | 1 +
arch/riscv/Makefile | 2 +-
arch/riscv/net/Makefile | 1 +
arch/riscv/net/bpf_jit_comp.c | 1602 +++++++++++++++
arch/s390/net/bpf_jit_comp.c | 6 +-
net/core/dev.c | 10 +-
tools/bpf/bpftool/Documentation/bpftool-cgroup.rst | 4 +-
.../bpf/bpftool/Documentation/bpftool-feature.rst | 4 +-
tools/bpf/bpftool/Documentation/bpftool-prog.rst | 2 +-
tools/lib/bpf/btf.c | 2032 ++++++++++++++++++--
tools/lib/bpf/btf.h | 43 +-
tools/lib/bpf/libbpf.c | 125 +-
tools/lib/bpf/libbpf.h | 19 +-
tools/lib/bpf/libbpf.map | 10 +
tools/lib/bpf/libbpf_util.h | 30 +
tools/lib/bpf/test_libbpf.cpp | 4 +-
tools/perf/util/bpf-loader.c | 26 +-
tools/testing/selftests/bpf/tcp_client.py | 3 +-
tools/testing/selftests/bpf/tcp_server.py | 5 +-
tools/testing/selftests/bpf/test_btf.c | 553 +++++-
tools/testing/selftests/bpf/test_libbpf_open.c | 30 +-
tools/testing/selftests/bpf/test_maps.c | 27 +-
tools/testing/selftests/bpf/test_offload.py | 135 +-
tools/testing/selftests/bpf/test_progs.c | 14 +-
tools/testing/selftests/bpf/verifier/ctx_sk_msg.c | 1 +
tools/testing/selftests/bpf/verifier/ctx_skb.c | 1 +
tools/testing/selftests/bpf/verifier/jmp32.c | 22 +
tools/testing/selftests/bpf/verifier/jset.c | 2 +
tools/testing/selftests/bpf/verifier/spill_fill.c | 1 +
tools/testing/selftests/bpf/verifier/spin_lock.c | 2 +
.../selftests/bpf/verifier/value_ptr_arith.c | 4 +
34 files changed, 4353 insertions(+), 391 deletions(-)
create mode 100644 arch/riscv/net/Makefile
create mode 100644 arch/riscv/net/bpf_jit_comp.c
create mode 100644 tools/lib/bpf/libbpf_util.h
^ 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