Commit 7e4e8491 authored by Leon Romanovsky's avatar Leon Romanovsky
Browse files

net/mlx5: Remove ipsec vs. ipsec offload file separation 

The IPsec won't be initialized at all if device doesn't support IPsec
offload. It means that we can combine the ipsec.c and ipsec_offload.c
files to one file. Such change will allow us to remove ipsec_ops
indirection.

Link: https://lore.kernel.org/r/d0ac1fb7b14c10ae20a21ae17a393ee860c72ac3.1649232994.git.leonro@nvidia.com


Reviewed-by: default avatarRaed Salem <raeds@nvidia.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@nvidia.com>
parent 32313c6a

drivers/net/ethernet/mellanox/mlx5/core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ mlx5_core-$(CONFIG_MLX5_CORE_IPOIB) += ipoib/ipoib.o ipoib/ethtool.o ipoib/ipoib 
# Accelerations & FPGA

#

mlx5_core-$(CONFIG_MLX5_IPSEC) += accel/ipsec_offload.o

mlx5_core-$(CONFIG_MLX5_ACCEL)      += lib/crypto.o accel/ipsec.o

mlx5_core-$(CONFIG_MLX5_ACCEL) += lib/crypto.o



mlx5_core-$(CONFIG_MLX5_FPGA) += fpga/cmd.o fpga/core.o fpga/conn.o fpga/sdk.o

drivers/net/ethernet/mellanox/mlx5/core/accel/ipsec.c

deleted100644 → 0
+0 −174
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2017 Mellanox Technologies. All rights reserved.

 *

 * This software is available to you under a choice of one of two

 * licenses.  You may choose to be licensed under the terms of the GNU

 * General Public License (GPL) Version 2, available from the file

 * COPYING in the main directory of this source tree, or the

 * OpenIB.org BSD license below:

 *

 *     Redistribution and use in source and binary forms, with or

 *     without modification, are permitted provided that the following

 *     conditions are met:

 *

 *      - Redistributions of source code must retain the above

 *        copyright notice, this list of conditions and the following

 *        disclaimer.

 *

 *      - Redistributions in binary form must reproduce the above

 *        copyright notice, this list of conditions and the following

 *        disclaimer in the documentation and/or other materials

 *        provided with the distribution.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

 * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

 * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

 * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS

 * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

 * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

 * SOFTWARE.

 *

 */



#include <linux/mlx5/device.h>



#include "accel/ipsec.h"

#include "mlx5_core.h"

#include "accel/ipsec_offload.h"



void mlx5_accel_ipsec_init(struct mlx5_core_dev *mdev)

{

	const struct mlx5_accel_ipsec_ops *ipsec_ops;

	int err = 0;



	ipsec_ops = mlx5_ipsec_offload_ops(mdev);

	if (!ipsec_ops || !ipsec_ops->init) {

		mlx5_core_dbg(mdev, "IPsec ops is not supported\n");

		return;

	}



	err = ipsec_ops->init(mdev);

	if (err) {

		mlx5_core_warn_once(mdev, "Failed to start IPsec device, err = %d\n", err);

		return;

	}



	mdev->ipsec_ops = ipsec_ops;

}



void mlx5_accel_ipsec_cleanup(struct mlx5_core_dev *mdev)

{

	const struct mlx5_accel_ipsec_ops *ipsec_ops = mdev->ipsec_ops;



	if (!ipsec_ops || !ipsec_ops->cleanup)

		return;



	ipsec_ops->cleanup(mdev);

}



u32 mlx5_accel_ipsec_device_caps(struct mlx5_core_dev *mdev)

{

	const struct mlx5_accel_ipsec_ops *ipsec_ops = mdev->ipsec_ops;



	if (!ipsec_ops || !ipsec_ops->device_caps)

		return 0;



	return ipsec_ops->device_caps(mdev);

}

EXPORT_SYMBOL_GPL(mlx5_accel_ipsec_device_caps);



unsigned int mlx5_accel_ipsec_counters_count(struct mlx5_core_dev *mdev)

{

	const struct mlx5_accel_ipsec_ops *ipsec_ops = mdev->ipsec_ops;



	if (!ipsec_ops || !ipsec_ops->counters_count)

		return -EOPNOTSUPP;



	return ipsec_ops->counters_count(mdev);

}



int mlx5_accel_ipsec_counters_read(struct mlx5_core_dev *mdev, u64 *counters,

				   unsigned int count)

{

	const struct mlx5_accel_ipsec_ops *ipsec_ops = mdev->ipsec_ops;



	if (!ipsec_ops || !ipsec_ops->counters_read)

		return -EOPNOTSUPP;



	return ipsec_ops->counters_read(mdev, counters, count);

}



void *mlx5_accel_esp_create_hw_context(struct mlx5_core_dev *mdev,

				       struct mlx5_accel_esp_xfrm *xfrm,

				       u32 *sa_handle)

{

	const struct mlx5_accel_ipsec_ops *ipsec_ops = mdev->ipsec_ops;

	__be32 saddr[4] = {}, daddr[4] = {};



	if (!ipsec_ops || !ipsec_ops->create_hw_context)

		return  ERR_PTR(-EOPNOTSUPP);



	if (!xfrm->attrs.is_ipv6) {

		saddr[3] = xfrm->attrs.saddr.a4;

		daddr[3] = xfrm->attrs.daddr.a4;

	} else {

		memcpy(saddr, xfrm->attrs.saddr.a6, sizeof(saddr));

		memcpy(daddr, xfrm->attrs.daddr.a6, sizeof(daddr));

	}



	return ipsec_ops->create_hw_context(mdev, xfrm, saddr, daddr, xfrm->attrs.spi,

					    xfrm->attrs.is_ipv6, sa_handle);

}



void mlx5_accel_esp_free_hw_context(struct mlx5_core_dev *mdev, void *context)

{

	const struct mlx5_accel_ipsec_ops *ipsec_ops = mdev->ipsec_ops;



	if (!ipsec_ops || !ipsec_ops->free_hw_context)

		return;



	ipsec_ops->free_hw_context(context);

}



struct mlx5_accel_esp_xfrm *

mlx5_accel_esp_create_xfrm(struct mlx5_core_dev *mdev,

			   const struct mlx5_accel_esp_xfrm_attrs *attrs)

{

	const struct mlx5_accel_ipsec_ops *ipsec_ops = mdev->ipsec_ops;

	struct mlx5_accel_esp_xfrm *xfrm;



	if (!ipsec_ops || !ipsec_ops->esp_create_xfrm)

		return ERR_PTR(-EOPNOTSUPP);



	xfrm = ipsec_ops->esp_create_xfrm(mdev, attrs, 0);

	if (IS_ERR(xfrm))

		return xfrm;



	xfrm->mdev = mdev;

	return xfrm;

}

EXPORT_SYMBOL_GPL(mlx5_accel_esp_create_xfrm);



void mlx5_accel_esp_destroy_xfrm(struct mlx5_accel_esp_xfrm *xfrm)

{

	const struct mlx5_accel_ipsec_ops *ipsec_ops = xfrm->mdev->ipsec_ops;



	if (!ipsec_ops || !ipsec_ops->esp_destroy_xfrm)

		return;



	ipsec_ops->esp_destroy_xfrm(xfrm);

}

EXPORT_SYMBOL_GPL(mlx5_accel_esp_destroy_xfrm);



int mlx5_accel_esp_modify_xfrm(struct mlx5_accel_esp_xfrm *xfrm,

			       const struct mlx5_accel_esp_xfrm_attrs *attrs)

{

	const struct mlx5_accel_ipsec_ops *ipsec_ops = xfrm->mdev->ipsec_ops;



	if (!ipsec_ops || !ipsec_ops->esp_modify_xfrm)

		return -EOPNOTSUPP;



	return ipsec_ops->esp_modify_xfrm(xfrm, attrs);

}

EXPORT_SYMBOL_GPL(mlx5_accel_esp_modify_xfrm);

drivers/net/ethernet/mellanox/mlx5/core/accel/ipsec.h

deleted100644 → 0
+0 −96
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2017 Mellanox Technologies. All rights reserved.

 *

 * This software is available to you under a choice of one of two

 * licenses.  You may choose to be licensed under the terms of the GNU

 * General Public License (GPL) Version 2, available from the file

 * COPYING in the main directory of this source tree, or the

 * OpenIB.org BSD license below:

 *

 *     Redistribution and use in source and binary forms, with or

 *     without modification, are permitted provided that the following

 *     conditions are met:

 *

 *      - Redistributions of source code must retain the above

 *        copyright notice, this list of conditions and the following

 *        disclaimer.

 *

 *      - Redistributions in binary form must reproduce the above

 *        copyright notice, this list of conditions and the following

 *        disclaimer in the documentation and/or other materials

 *        provided with the distribution.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

 * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

 * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

 * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS

 * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

 * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

 * SOFTWARE.

 *

 */



#ifndef __MLX5_ACCEL_IPSEC_H__

#define __MLX5_ACCEL_IPSEC_H__



#include <linux/mlx5/driver.h>

#include <linux/mlx5/accel.h>



#ifdef CONFIG_MLX5_ACCEL



#define MLX5_IPSEC_DEV(mdev) (mlx5_accel_ipsec_device_caps(mdev) & \

			      MLX5_ACCEL_IPSEC_CAP_DEVICE)



unsigned int mlx5_accel_ipsec_counters_count(struct mlx5_core_dev *mdev);

int mlx5_accel_ipsec_counters_read(struct mlx5_core_dev *mdev, u64 *counters,

				   unsigned int count);



void *mlx5_accel_esp_create_hw_context(struct mlx5_core_dev *mdev,

				       struct mlx5_accel_esp_xfrm *xfrm,

				       u32 *sa_handle);

void mlx5_accel_esp_free_hw_context(struct mlx5_core_dev *mdev, void *context);



void mlx5_accel_ipsec_init(struct mlx5_core_dev *mdev);

void mlx5_accel_ipsec_cleanup(struct mlx5_core_dev *mdev);



struct mlx5_accel_ipsec_ops {

	u32 (*device_caps)(struct mlx5_core_dev *mdev);

	unsigned int (*counters_count)(struct mlx5_core_dev *mdev);

	int (*counters_read)(struct mlx5_core_dev *mdev, u64 *counters, unsigned int count);

	void* (*create_hw_context)(struct mlx5_core_dev *mdev,

				   struct mlx5_accel_esp_xfrm *xfrm,

				   const __be32 saddr[4], const __be32 daddr[4],

				   const __be32 spi, bool is_ipv6, u32 *sa_handle);

	void (*free_hw_context)(void *context);

	int (*init)(struct mlx5_core_dev *mdev);

	void (*cleanup)(struct mlx5_core_dev *mdev);

	struct mlx5_accel_esp_xfrm* (*esp_create_xfrm)(struct mlx5_core_dev *mdev,

						       const struct mlx5_accel_esp_xfrm_attrs *attrs,

						       u32 flags);

	int (*esp_modify_xfrm)(struct mlx5_accel_esp_xfrm *xfrm,

			       const struct mlx5_accel_esp_xfrm_attrs *attrs);

	void (*esp_destroy_xfrm)(struct mlx5_accel_esp_xfrm *xfrm);

};



#else



#define MLX5_IPSEC_DEV(mdev) false



static inline void *

mlx5_accel_esp_create_hw_context(struct mlx5_core_dev *mdev,

				 struct mlx5_accel_esp_xfrm *xfrm,

				 u32 *sa_handle)

{

	return NULL;

}



static inline void mlx5_accel_esp_free_hw_context(struct mlx5_core_dev *mdev, void *context) {}



static inline void mlx5_accel_ipsec_init(struct mlx5_core_dev *mdev) {}



static inline void mlx5_accel_ipsec_cleanup(struct mlx5_core_dev *mdev) {}



#endif /* CONFIG_MLX5_ACCEL */



#endif	/* __MLX5_ACCEL_IPSEC_H__ */

drivers/net/ethernet/mellanox/mlx5/core/accel/ipsec_offload.c

+142 −3
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB

/* Copyright (c) 2020, Mellanox Technologies inc. All rights reserved. */

/* Copyright (c) 2017, Mellanox Technologies inc. All rights reserved. */



#include "mlx5_core.h"

#include "ipsec_offload.h"

#include "accel/ipsec_offload.h"

#include "lib/mlx5.h"

#include "en_accel/ipsec_fs.h"
@@ -376,10 +376,149 @@ static const struct mlx5_accel_ipsec_ops ipsec_offload_ops = { 
	.esp_modify_xfrm = mlx5_ipsec_offload_esp_modify_xfrm,

};



const struct mlx5_accel_ipsec_ops *mlx5_ipsec_offload_ops(struct mlx5_core_dev *mdev)

static const struct mlx5_accel_ipsec_ops *

mlx5_ipsec_offload_ops(struct mlx5_core_dev *mdev)

{

	if (!mlx5_ipsec_offload_device_caps(mdev))

		return NULL;



	return &ipsec_offload_ops;

}



void mlx5_accel_ipsec_init(struct mlx5_core_dev *mdev)

{

	const struct mlx5_accel_ipsec_ops *ipsec_ops;

	int err = 0;



	ipsec_ops = mlx5_ipsec_offload_ops(mdev);

	if (!ipsec_ops || !ipsec_ops->init) {

		mlx5_core_dbg(mdev, "IPsec ops is not supported\n");

		return;

	}



	err = ipsec_ops->init(mdev);

	if (err) {

		mlx5_core_warn_once(

			mdev, "Failed to start IPsec device, err = %d\n", err);

		return;

	}



	mdev->ipsec_ops = ipsec_ops;

}



void mlx5_accel_ipsec_cleanup(struct mlx5_core_dev *mdev)

{

	const struct mlx5_accel_ipsec_ops *ipsec_ops = mdev->ipsec_ops;



	if (!ipsec_ops || !ipsec_ops->cleanup)

		return;



	ipsec_ops->cleanup(mdev);

}



u32 mlx5_accel_ipsec_device_caps(struct mlx5_core_dev *mdev)

{

	const struct mlx5_accel_ipsec_ops *ipsec_ops = mdev->ipsec_ops;



	if (!ipsec_ops || !ipsec_ops->device_caps)

		return 0;



	return ipsec_ops->device_caps(mdev);

}

EXPORT_SYMBOL_GPL(mlx5_accel_ipsec_device_caps);



unsigned int mlx5_accel_ipsec_counters_count(struct mlx5_core_dev *mdev)

{

	const struct mlx5_accel_ipsec_ops *ipsec_ops = mdev->ipsec_ops;



	if (!ipsec_ops || !ipsec_ops->counters_count)

		return -EOPNOTSUPP;



	return ipsec_ops->counters_count(mdev);

}



int mlx5_accel_ipsec_counters_read(struct mlx5_core_dev *mdev, u64 *counters,

				   unsigned int count)

{

	const struct mlx5_accel_ipsec_ops *ipsec_ops = mdev->ipsec_ops;



	if (!ipsec_ops || !ipsec_ops->counters_read)

		return -EOPNOTSUPP;



	return ipsec_ops->counters_read(mdev, counters, count);

}



void *mlx5_accel_esp_create_hw_context(struct mlx5_core_dev *mdev,

				       struct mlx5_accel_esp_xfrm *xfrm,

				       u32 *sa_handle)

{

	const struct mlx5_accel_ipsec_ops *ipsec_ops = mdev->ipsec_ops;

	__be32 saddr[4] = {}, daddr[4] = {};



	if (!ipsec_ops || !ipsec_ops->create_hw_context)

		return  ERR_PTR(-EOPNOTSUPP);



	if (!xfrm->attrs.is_ipv6) {

		saddr[3] = xfrm->attrs.saddr.a4;

		daddr[3] = xfrm->attrs.daddr.a4;

	} else {

		memcpy(saddr, xfrm->attrs.saddr.a6, sizeof(saddr));

		memcpy(daddr, xfrm->attrs.daddr.a6, sizeof(daddr));

	}



	return ipsec_ops->create_hw_context(mdev, xfrm, saddr, daddr,

					    xfrm->attrs.spi,

					    xfrm->attrs.is_ipv6, sa_handle);

}



void mlx5_accel_esp_free_hw_context(struct mlx5_core_dev *mdev, void *context)

{

	const struct mlx5_accel_ipsec_ops *ipsec_ops = mdev->ipsec_ops;



	if (!ipsec_ops || !ipsec_ops->free_hw_context)

		return;



	ipsec_ops->free_hw_context(context);

}



struct mlx5_accel_esp_xfrm *

mlx5_accel_esp_create_xfrm(struct mlx5_core_dev *mdev,

			   const struct mlx5_accel_esp_xfrm_attrs *attrs)

{

	const struct mlx5_accel_ipsec_ops *ipsec_ops = mdev->ipsec_ops;

	struct mlx5_accel_esp_xfrm *xfrm;



	if (!ipsec_ops || !ipsec_ops->esp_create_xfrm)

		return ERR_PTR(-EOPNOTSUPP);



	xfrm = ipsec_ops->esp_create_xfrm(mdev, attrs, 0);

	if (IS_ERR(xfrm))

		return xfrm;



	xfrm->mdev = mdev;

	return xfrm;

}

EXPORT_SYMBOL_GPL(mlx5_accel_esp_create_xfrm);



void mlx5_accel_esp_destroy_xfrm(struct mlx5_accel_esp_xfrm *xfrm)

{

	const struct mlx5_accel_ipsec_ops *ipsec_ops = xfrm->mdev->ipsec_ops;



	if (!ipsec_ops || !ipsec_ops->esp_destroy_xfrm)

		return;



	ipsec_ops->esp_destroy_xfrm(xfrm);

}

EXPORT_SYMBOL_GPL(mlx5_accel_esp_destroy_xfrm);



int mlx5_accel_esp_modify_xfrm(struct mlx5_accel_esp_xfrm *xfrm,

			       const struct mlx5_accel_esp_xfrm_attrs *attrs)

{

	const struct mlx5_accel_ipsec_ops *ipsec_ops = xfrm->mdev->ipsec_ops;



	if (!ipsec_ops || !ipsec_ops->esp_modify_xfrm)

		return -EOPNOTSUPP;



	return ipsec_ops->esp_modify_xfrm(xfrm, attrs);

}

EXPORT_SYMBOL_GPL(mlx5_accel_esp_modify_xfrm);

drivers/net/ethernet/mellanox/mlx5/core/accel/ipsec_offload.h

+56 −5
Original line number Diff line number Diff line
@@ -5,11 +5,46 @@ 
#define __MLX5_IPSEC_OFFLOAD_H__



#include <linux/mlx5/driver.h>

#include "accel/ipsec.h"

#include <linux/mlx5/accel.h>



#ifdef CONFIG_MLX5_IPSEC



const struct mlx5_accel_ipsec_ops *mlx5_ipsec_offload_ops(struct mlx5_core_dev *mdev);

#define MLX5_IPSEC_DEV(mdev) (mlx5_accel_ipsec_device_caps(mdev) & \

			      MLX5_ACCEL_IPSEC_CAP_DEVICE)



unsigned int mlx5_accel_ipsec_counters_count(struct mlx5_core_dev *mdev);

int mlx5_accel_ipsec_counters_read(struct mlx5_core_dev *mdev, u64 *counters,

				   unsigned int count);



void *mlx5_accel_esp_create_hw_context(struct mlx5_core_dev *mdev,

				       struct mlx5_accel_esp_xfrm *xfrm,

				       u32 *sa_handle);

void mlx5_accel_esp_free_hw_context(struct mlx5_core_dev *mdev, void *context);



void mlx5_accel_ipsec_init(struct mlx5_core_dev *mdev);

void mlx5_accel_ipsec_cleanup(struct mlx5_core_dev *mdev);



struct mlx5_accel_ipsec_ops {

	u32 (*device_caps)(struct mlx5_core_dev *mdev);

	unsigned int (*counters_count)(struct mlx5_core_dev *mdev);

	int (*counters_read)(struct mlx5_core_dev *mdev, u64 *counters,

			     unsigned int count);

	void *(*create_hw_context)(struct mlx5_core_dev *mdev,

				   struct mlx5_accel_esp_xfrm *xfrm,

				   const __be32 saddr[4], const __be32 daddr[4],

				   const __be32 spi, bool is_ipv6,

				   u32 *sa_handle);

	void (*free_hw_context)(void *context);

	int (*init)(struct mlx5_core_dev *mdev);

	void (*cleanup)(struct mlx5_core_dev *mdev);

	struct mlx5_accel_esp_xfrm *(*esp_create_xfrm)(

		struct mlx5_core_dev *mdev,

		const struct mlx5_accel_esp_xfrm_attrs *attrs, u32 flags);

	int (*esp_modify_xfrm)(struct mlx5_accel_esp_xfrm *xfrm,

			       const struct mlx5_accel_esp_xfrm_attrs *attrs);

	void (*esp_destroy_xfrm)(struct mlx5_accel_esp_xfrm *xfrm);

};



static inline bool mlx5_is_ipsec_device(struct mlx5_core_dev *mdev)

{

	if (!MLX5_CAP_GEN(mdev, ipsec_offload))
@@ -25,10 +60,26 @@ static inline bool mlx5_is_ipsec_device(struct mlx5_core_dev *mdev) 
	return MLX5_CAP_IPSEC(mdev, ipsec_crypto_offload) &&

		MLX5_CAP_ETH(mdev, insert_trailer);

}



#else

static inline const struct mlx5_accel_ipsec_ops *

mlx5_ipsec_offload_ops(struct mlx5_core_dev *mdev) { return NULL; }



#define MLX5_IPSEC_DEV(mdev) false



static inline void *

mlx5_accel_esp_create_hw_context(struct mlx5_core_dev *mdev,

				 struct mlx5_accel_esp_xfrm *xfrm,

				 u32 *sa_handle)

{

	return NULL;

}



static inline void mlx5_accel_esp_free_hw_context(struct mlx5_core_dev *mdev,

						  void *context)

{

}



static inline void mlx5_accel_ipsec_init(struct mlx5_core_dev *mdev) {}



static inline void mlx5_accel_ipsec_cleanup(struct mlx5_core_dev *mdev) {}

static inline bool mlx5_is_ipsec_device(struct mlx5_core_dev *mdev)

{

	return false;