Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 290dbd62 authored by Antoine Tenart's avatar Antoine Tenart Committed by Jinesh K. Jayakumar
Browse files

net: macsec: move some definitions in a dedicated header 



This patch moves some structure, type and identifier definitions into a
MACsec specific header. This patch does not modify how the MACsec code
is running and only move things around. This is a preparation for the
future MACsec hardware offloading support, which will re-use those
definitions outside macsec.c.

Change-Id: I01db1957e2cfad38f3c37ab29b1276a9daaa7c6c
Signed-off-by: default avatarAntoine Tenart <antoine.tenart@bootlin.com>
Git-commit: befde3d5a01cb28ca7c5e6d5230557325b112a10
Git-repo: https://github.com/aquantia/linux-4.14-atlantic-forwarding


Signed-off-by: default avatarJinesh K. Jayakumar <jineshk@codeaurora.org>
parent 716e4270

drivers/net/macsec.c

+0 −163
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ 


#include <uapi/linux/if_macsec.h>



typedef u64 __bitwise sci_t;



#define MACSEC_SCI_LEN 8



/* SecTAG length = macsec_eth_header without the optional SCI */
@@ -61,8 +59,6 @@ struct macsec_eth_header { 
#define GCM_AES_IV_LEN 12

#define DEFAULT_ICV_LEN 16



#define MACSEC_NUM_AN 4 /* 2 bits for the association number */



#define for_each_rxsc(secy, sc)			\

	for (sc = rcu_dereference_bh(secy->rx_sc);	\

	     sc;				\
@@ -80,49 +76,6 @@ struct gcm_iv { 
	__be32 pn;

};



/**

 * struct macsec_key - SA key

 * @id: user-provided key identifier

 * @tfm: crypto struct, key storage

 */

struct macsec_key {

	u8 id[MACSEC_KEYID_LEN];

	struct crypto_aead *tfm;

};



struct macsec_rx_sc_stats {

	__u64 InOctetsValidated;

	__u64 InOctetsDecrypted;

	__u64 InPktsUnchecked;

	__u64 InPktsDelayed;

	__u64 InPktsOK;

	__u64 InPktsInvalid;

	__u64 InPktsLate;

	__u64 InPktsNotValid;

	__u64 InPktsNotUsingSA;

	__u64 InPktsUnusedSA;

};



struct macsec_rx_sa_stats {

	__u32 InPktsOK;

	__u32 InPktsInvalid;

	__u32 InPktsNotValid;

	__u32 InPktsNotUsingSA;

	__u32 InPktsUnusedSA;

};



struct macsec_tx_sa_stats {

	__u32 OutPktsProtected;

	__u32 OutPktsEncrypted;

};



struct macsec_tx_sc_stats {

	__u64 OutPktsProtected;

	__u64 OutPktsEncrypted;

	__u64 OutOctetsProtected;

	__u64 OutOctetsEncrypted;

};



struct macsec_dev_stats {

	__u64 OutPktsUntagged;

	__u64 InPktsUntagged;
@@ -134,124 +87,8 @@ struct macsec_dev_stats { 
	__u64 InPktsOverrun;

};



/**

 * struct macsec_rx_sa - receive secure association

 * @active:

 * @next_pn: packet number expected for the next packet

 * @lock: protects next_pn manipulations

 * @key: key structure

 * @stats: per-SA stats

 */

struct macsec_rx_sa {

	struct macsec_key key;

	spinlock_t lock;

	u32 next_pn;

	atomic_t refcnt;

	bool active;

	struct macsec_rx_sa_stats __percpu *stats;

	struct macsec_rx_sc *sc;

	struct rcu_head rcu;

};



struct pcpu_rx_sc_stats {

	struct macsec_rx_sc_stats stats;

	struct u64_stats_sync syncp;

};



/**

 * struct macsec_rx_sc - receive secure channel

 * @sci: secure channel identifier for this SC

 * @active: channel is active

 * @sa: array of secure associations

 * @stats: per-SC stats

 */

struct macsec_rx_sc {

	struct macsec_rx_sc __rcu *next;

	sci_t sci;

	bool active;

	struct macsec_rx_sa __rcu *sa[MACSEC_NUM_AN];

	struct pcpu_rx_sc_stats __percpu *stats;

	atomic_t refcnt;

	struct rcu_head rcu_head;

};



/**

 * struct macsec_tx_sa - transmit secure association

 * @active:

 * @next_pn: packet number to use for the next packet

 * @lock: protects next_pn manipulations

 * @key: key structure

 * @stats: per-SA stats

 */

struct macsec_tx_sa {

	struct macsec_key key;

	spinlock_t lock;

	u32 next_pn;

	atomic_t refcnt;

	bool active;

	struct macsec_tx_sa_stats __percpu *stats;

	struct rcu_head rcu;

};



struct pcpu_tx_sc_stats {

	struct macsec_tx_sc_stats stats;

	struct u64_stats_sync syncp;

};



/**

 * struct macsec_tx_sc - transmit secure channel

 * @active:

 * @encoding_sa: association number of the SA currently in use

 * @encrypt: encrypt packets on transmit, or authenticate only

 * @send_sci: always include the SCI in the SecTAG

 * @end_station:

 * @scb: single copy broadcast flag

 * @sa: array of secure associations

 * @stats: stats for this TXSC

 */

struct macsec_tx_sc {

	bool active;

	u8 encoding_sa;

	bool encrypt;

	bool send_sci;

	bool end_station;

	bool scb;

	struct macsec_tx_sa __rcu *sa[MACSEC_NUM_AN];

	struct pcpu_tx_sc_stats __percpu *stats;

};



#define MACSEC_VALIDATE_DEFAULT MACSEC_VALIDATE_STRICT



/**

 * struct macsec_secy - MACsec Security Entity

 * @netdev: netdevice for this SecY

 * @n_rx_sc: number of receive secure channels configured on this SecY

 * @sci: secure channel identifier used for tx

 * @key_len: length of keys used by the cipher suite

 * @icv_len: length of ICV used by the cipher suite

 * @validate_frames: validation mode

 * @operational: MAC_Operational flag

 * @protect_frames: enable protection for this SecY

 * @replay_protect: enable packet number checks on receive

 * @replay_window: size of the replay window

 * @tx_sc: transmit secure channel

 * @rx_sc: linked list of receive secure channels

 */

struct macsec_secy {

	struct net_device *netdev;

	unsigned int n_rx_sc;

	sci_t sci;

	u16 key_len;

	u16 icv_len;

	enum macsec_validation_type validate_frames;

	bool operational;

	bool protect_frames;

	bool replay_protect;

	u32 replay_window;

	struct macsec_tx_sc tx_sc;

	struct macsec_rx_sc __rcu *rx_sc;

};



struct pcpu_secy_stats {

	struct macsec_dev_stats stats;

	struct u64_stats_sync syncp;

include/net/macsec.h

0 → 100644
+179 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0+ */

/*

 * MACsec netdev header, used for h/w accelerated implementations.

 *

 * Copyright (c) 2015 Sabrina Dubroca <sd@queasysnail.net>

 */

#ifndef _NET_MACSEC_H_

#define _NET_MACSEC_H_



#include <linux/u64_stats_sync.h>

#include <uapi/linux/if_link.h>

#include <uapi/linux/if_macsec.h>



typedef u64 __bitwise sci_t;



#define MACSEC_NUM_AN 4 /* 2 bits for the association number */

#define MACSEC_KEYID_LEN 16



/**

 * struct macsec_key - SA key

 * @id: user-provided key identifier

 * @tfm: crypto struct, key storage

 */

struct macsec_key {

	u8 id[MACSEC_KEYID_LEN];

	struct crypto_aead *tfm;

};



struct macsec_rx_sc_stats {

	__u64 InOctetsValidated;

	__u64 InOctetsDecrypted;

	__u64 InPktsUnchecked;

	__u64 InPktsDelayed;

	__u64 InPktsOK;

	__u64 InPktsInvalid;

	__u64 InPktsLate;

	__u64 InPktsNotValid;

	__u64 InPktsNotUsingSA;

	__u64 InPktsUnusedSA;

};



struct macsec_rx_sa_stats {

	__u32 InPktsOK;

	__u32 InPktsInvalid;

	__u32 InPktsNotValid;

	__u32 InPktsNotUsingSA;

	__u32 InPktsUnusedSA;

};



struct macsec_tx_sa_stats {

	__u32 OutPktsProtected;

	__u32 OutPktsEncrypted;

};



struct macsec_tx_sc_stats {

	__u64 OutPktsProtected;

	__u64 OutPktsEncrypted;

	__u64 OutOctetsProtected;

	__u64 OutOctetsEncrypted;

};



/**

 * struct macsec_rx_sa - receive secure association

 * @active:

 * @next_pn: packet number expected for the next packet

 * @lock: protects next_pn manipulations

 * @key: key structure

 * @stats: per-SA stats

 */

struct macsec_rx_sa {

	struct macsec_key key;

	spinlock_t lock;

	u32 next_pn;

	atomic_t refcnt;

	bool active;

	struct macsec_rx_sa_stats __percpu *stats;

	struct macsec_rx_sc *sc;

	struct rcu_head rcu;

};



struct pcpu_rx_sc_stats {

	struct macsec_rx_sc_stats stats;

	struct u64_stats_sync syncp;

};



struct pcpu_tx_sc_stats {

	struct macsec_tx_sc_stats stats;

	struct u64_stats_sync syncp;

};



/**

 * struct macsec_rx_sc - receive secure channel

 * @sci: secure channel identifier for this SC

 * @active: channel is active

 * @sa: array of secure associations

 * @stats: per-SC stats

 */

struct macsec_rx_sc {

	struct macsec_rx_sc __rcu *next;

	sci_t sci;

	bool active;

	struct macsec_rx_sa __rcu *sa[MACSEC_NUM_AN];

	struct pcpu_rx_sc_stats __percpu *stats;

	atomic_t refcnt;

	struct rcu_head rcu_head;

};



/**

 * struct macsec_tx_sa - transmit secure association

 * @active:

 * @next_pn: packet number to use for the next packet

 * @lock: protects next_pn manipulations

 * @key: key structure

 * @stats: per-SA stats

 */

struct macsec_tx_sa {

	struct macsec_key key;

	spinlock_t lock;

	u32 next_pn;

	atomic_t refcnt;

	bool active;

	bool offloaded;

	struct macsec_tx_sa_stats __percpu *stats;

	struct rcu_head rcu;

};



/**

 * struct macsec_tx_sc - transmit secure channel

 * @active:

 * @encoding_sa: association number of the SA currently in use

 * @encrypt: encrypt packets on transmit, or authenticate only

 * @send_sci: always include the SCI in the SecTAG

 * @end_station:

 * @scb: single copy broadcast flag

 * @sa: array of secure associations

 * @stats: stats for this TXSC

 */

struct macsec_tx_sc {

	bool active;

	u8 encoding_sa;

	bool encrypt;

	bool send_sci;

	bool end_station;

	bool scb;

	struct macsec_tx_sa __rcu *sa[MACSEC_NUM_AN];

	struct pcpu_tx_sc_stats __percpu *stats;

};



/**

 * struct macsec_secy - MACsec Security Entity

 * @netdev: netdevice for this SecY

 * @n_rx_sc: number of receive secure channels configured on this SecY

 * @sci: secure channel identifier used for tx

 * @key_len: length of keys used by the cipher suite

 * @icv_len: length of ICV used by the cipher suite

 * @validate_frames: validation mode

 * @operational: MAC_Operational flag

 * @protect_frames: enable protection for this SecY

 * @replay_protect: enable packet number checks on receive

 * @replay_window: size of the replay window

 * @tx_sc: transmit secure channel

 * @rx_sc: linked list of receive secure channels

 */

struct macsec_secy {

	struct net_device *netdev;

	unsigned int n_rx_sc;

	sci_t sci;

	u16 key_len;

	u16 icv_len;

	enum macsec_validation_type validate_frames;

	bool operational;

	bool protect_frames;

	bool replay_protect;

	u32 replay_window;

	struct macsec_tx_sc tx_sc;

	struct macsec_rx_sc __rcu *rx_sc;

};



#endif /* _NET_MACSEC_H_ */

include/uapi/linux/if_macsec.h

+1 −2
Original line number Diff line number Diff line
@@ -14,14 +14,13 @@ 
#define _UAPI_MACSEC_H



#include <linux/types.h>

#include <net/macsec.h>



#define MACSEC_GENL_NAME "macsec"

#define MACSEC_GENL_VERSION 1



#define MACSEC_MAX_KEY_LEN 128



#define MACSEC_KEYID_LEN 16



#define MACSEC_DEFAULT_CIPHER_ID   0x0080020001000001ULL

#define MACSEC_DEFAULT_CIPHER_ALT  0x0080C20001000001ULL