From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8644E653
	for <netdev@vger.kernel.org>; Sat, 19 Aug 2023 03:02:55 +0000 (UTC)
Received: by smtp.kernel.org (Postfix) with ESMTPSA id 66F5AC433C8;
	Sat, 19 Aug 2023 03:02:54 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
	s=k20201202; t=1692414175;
	bh=4Mp3u6LMy61z+v290yHzzI8KmbqFO+7XDpQP/RnnSSk=;
	h=Date:From:To:Cc:Subject:In-Reply-To:References:From;
	b=IfnAzvNaVSySms6rMDMsU+CaA5rykzLxrIJ2mzfL5QMa62WkRlTe7l5E2bV83TgfB
	 DAoJlVFv5xM2JlGLmK+rfGyPqNqgLScCg4mWZ0uj+oLwv6ob0ucb+xFPLB7LbwaPby
	 B24iwf36RCOpNsZOEJ/b14F7Hxak2IO6JA7p2CZLTW1VB+T0fAMJnntmf/YCP4Kh+s
	 hyUYQjcULDXjSY5T+KcmLH6i/SWuPyVN6idOXJ6sh/WW2ixYHJmq/HWB5nwCUOtgw6
	 n2a7pZXa+lc0rWkTEFXkkhNRJZ7Zzelw/araDrduuhcDugpDLCzTUaY+ShQcOy4oVC
	 4IlpGPFqRH9rA==
Date: Fri, 18 Aug 2023 20:02:53 -0700
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
Message-ID: <20230818200253.0901a66d@kernel.org>
In-Reply-To: <20230813064703.574082-1-leon@kernel.org>
References: <20230813064703.574082-1-leon@kernel.org>
Precedence: bulk
X-Mailing-List: netdev@vger.kernel.org
List-Id: <netdev.vger.kernel.org>
List-Subscribe: <mailto:netdev+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:netdev+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit

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