From: Jakub Kicinski <kuba@kernel.org>
To: Leon Romanovsky <leon@kernel.org>
Cc: Jason Gunthorpe <jgg@nvidia.com>,
"David S . Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
linux-rdma@vger.kernel.org, Maor Gottlieb <maorg@nvidia.com>,
Mark Zhang <markzhang@nvidia.com>,
netdev@vger.kernel.org, Paolo Abeni <pabeni@redhat.com>,
Patrisious Haddad <phaddad@nvidia.com>,
Raed Salem <raeds@nvidia.com>, Saeed Mahameed <saeedm@nvidia.com>,
Simon Horman <horms@kernel.org>
Subject: Re: [GIT PULL] Please pull mlx5 MACsec RoCEv2 support
Date: Fri, 18 Aug 2023 20:02:53 -0700 [thread overview]
Message-ID: <20230818200253.0901a66d@kernel.org> (raw)
In-Reply-To: <20230813064703.574082-1-leon@kernel.org>
On Sun, 13 Aug 2023 09:47:03 +0300 Leon Romanovsky wrote:
> This PR is collected from https://lore.kernel.org/all/cover.1691569414.git.leon@kernel.org
> and contains patches to support mlx5 MACsec RoCEv2.
+bool macsec_netdev_is_offloaded(struct net_device *dev)
+{
+ if (!dev)
+ return false;
+
+ return macsec_is_offloaded(macsec_priv(dev));
+}
+EXPORT_SYMBOL_GPL(macsec_netdev_is_offloaded);
No defensive programming, please, why are you checking that dev is NULL?
> It is based on -rc4 and such has minor conflict with net-next due to
> existance of IPsec packet offlosd in eswitch code and the resolution
> is to take both hunks.
>
> diff --cc include/linux/mlx5/driver.h
> index 25d0528f9219,3ec8155c405d..000000000000
> --- a/include/linux/mlx5/driver.h
> +++ b/include/linux/mlx5/driver.h
> @@@ -805,6 -806,11 +805,14 @@@ struct mlx5_core_dev
> u32 vsc_addr;
> struct mlx5_hv_vhca *hv_vhca;
> struct mlx5_thermal *thermal;
> + u64 num_block_tc;
> + u64 num_block_ipsec;
> + #ifdef CONFIG_MLX5_MACSEC
> + struct mlx5_macsec_fs *macsec_fs;
> + #endif
> };
>
> struct mlx5_db {
That's not how the resolution looks. Do the merge yourself, then show
the actual 3-way resolution.
--
pw-bot: cr
next prev parent reply other threads:[~2023-08-19 3:02 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-13 6:47 [GIT PULL] Please pull mlx5 MACsec RoCEv2 support Leon Romanovsky
2023-08-16 22:30 ` Saeed Mahameed
2023-08-17 2:29 ` Jakub Kicinski
2023-08-19 3:02 ` Jakub Kicinski [this message]
2023-08-19 6:25 ` Leon Romanovsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230818200253.0901a66d@kernel.org \
--to=kuba@kernel.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=horms@kernel.org \
--cc=jgg@nvidia.com \
--cc=leon@kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=maorg@nvidia.com \
--cc=markzhang@nvidia.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=phaddad@nvidia.com \
--cc=raeds@nvidia.com \
--cc=saeedm@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).