netdev - Re: pull-request: bpf-next 2023-02-17

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20230220161255.79d9bc6b@kernel.org>
Date:   Mon, 20 Feb 2023 16:12:55 -0800
From:   Jakub Kicinski <kuba@...nel.org>
To:     Daniel Borkmann <daniel@...earbox.net>
Cc:     davem@...emloft.net, pabeni@...hat.com, edumazet@...gle.com,
        ast@...nel.org, andrii@...nel.org, martin.lau@...ux.dev,
        netdev@...r.kernel.org, bpf@...r.kernel.org,
        aleksander.lobakin@...el.com, maciej.fijalkowski@...el.com
Subject: Re: pull-request: bpf-next 2023-02-17

On Fri, 17 Feb 2023 23:17:37 +0100 Daniel Borkmann wrote:
> There is a small merge conflict between aa1d3faf71a6 ("ice: Robustify
> cleaning/completing XDP Tx buffers") from bpf-next and recent merge in
> 675f176b4dcc ("Merge ra.kernel.org:/pub/scm/linux/kernel/git/netdev/net"),
> result should look like the following (CC'ing Alexander & Maciej just in
> case):
> 
>   [...]
>                 if (tx_buf->type == ICE_TX_BUF_XSK_TX) {
>                         tx_buf->type = ICE_TX_BUF_EMPTY;
>                         ice_clean_xdp_tx_buf(xdp_ring, tx_buf);
>                 } else {
>   [...]

FWIW Olek provided a different resolution here:

https://lore.kernel.org/all/a472728a-a4eb-391a-c517-06133e6bbc8c@intel.com/

I took his, it's different.