2 files changed, 89 insertions, 0 deletions
diff --git a/include/linux/padata.h b/include/linux/padata.h
new file mode 100644
index 000000000000..51611da9c498
--- /dev/null
+++ b/include/linux/padata.h
@@ -0,0 +1,88 @@
+/*
+ * padata.h - header for the padata parallelization interface
+ *
+ * Copyright (C) 2008, 2009 secunet Security Networks AG
+ * Copyright (C) 2008, 2009 Steffen Klassert <steffen.klassert@secunet.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+#ifndef PADATA_H
+#define PADATA_H
+#include <linux/workqueue.h>
+#include <linux/spinlock.h>
+#include <linux/list.h>
+struct padata_priv {
+        struct list_head        list;
+        struct parallel_data    *pd;
+        int                     cb_cpu;
+        int                     seq_nr;
+        int                     info;
+        void                    (*parallel)(struct padata_priv *padata);
+        void                    (*serial)(struct padata_priv *padata);
+};
+struct padata_list {
+        struct list_head        list;
+        spinlock_t              lock;
+};
+struct padata_queue {
+        struct padata_list      parallel;
+        struct padata_list      reorder;
+        struct padata_list      serial;
+        struct work_struct      pwork;
+        struct work_struct      swork;
+        struct parallel_data    *pd;
+        atomic_t                num_obj;
+        int                     cpu_index;
+};
+struct parallel_data {
+        struct padata_instance  *pinst;
+        struct padata_queue     *queue;
+        atomic_t                seq_nr;
+        atomic_t                reorder_objects;
+        atomic_t                refcnt;
+        unsigned int            max_seq_nr;
+        cpumask_var_t           cpumask;
+        spinlock_t              lock;
+};
+struct padata_instance {
+        struct notifier_block   cpu_notifier;
+        struct workqueue_struct *wq;
+        struct parallel_data    *pd;
+        cpumask_var_t           cpumask;
+        struct mutex            lock;
+        u8                      flags;
+#define PADATA_INIT             1
+#define PADATA_RESET            2
+};
+extern struct padata_instance *padata_alloc(const struct cpumask *cpumask,
+                                            struct workqueue_struct *wq);
+extern void padata_free(struct padata_instance *pinst);
+extern int padata_do_parallel(struct padata_instance *pinst,
+                              struct padata_priv *padata, int cb_cpu);
+extern void padata_do_serial(struct padata_priv *padata);
+extern int padata_set_cpumask(struct padata_instance *pinst,
+                              cpumask_var_t cpumask);
+extern int padata_add_cpu(struct padata_instance *pinst, int cpu);
+extern int padata_remove_cpu(struct padata_instance *pinst, int cpu);
+extern void padata_start(struct padata_instance *pinst);
+extern void padata_stop(struct padata_instance *pinst);
+#endif
diff --git a/include/linux/pfkeyv2.h b/include/linux/pfkeyv2.h
index 228b0b6306b0..0b80c806631f 100644
--- a/include/linux/pfkeyv2.h
+++ b/include/linux/pfkeyv2.h
@@ -315,6 +315,7 @@ struct sadb_x_kmaddress {
 #define SADB_X_EALG_AES_GCM_ICV12       19
 #define SADB_X_EALG_AES_GCM_ICV16       20
 #define SADB_X_EALG_CAMELLIACBC         22
+#define SADB_X_EALG_NULL_AES_GMAC       23
 #define SADB_EALG_MAX                   253 /* last EALG */
 /* private allocations should use 249-255 (RFC2407) */
 #define SADB_X_EALG_SERPENTCBC  252     /* draft-ietf-ipsec-ciph-aes-cbc-00 */

diff --git a/include/linux/padata.h b/include/linux/padata.h new file mode 100644 index 000000000000..51611da9c498 --- /dev/null +++ b/include/linux/padata.h
@@ -0,0 +1,88 @@
		1	/*
		2	* padata.h - header for the padata parallelization interface
		3	*
		4	* Copyright (C) 2008, 2009 secunet Security Networks AG
		5	* Copyright (C) 2008, 2009 Steffen Klassert <steffen.klassert@secunet.com>
		6	*
		7	* This program is free software; you can redistribute it and/or modify it
		8	* under the terms and conditions of the GNU General Public License,
		9	* version 2, as published by the Free Software Foundation.
		10	*
		11	* This program is distributed in the hope it will be useful, but WITHOUT
		12	* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
		13	* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
		14	* more details.
		15	*
		16	* You should have received a copy of the GNU General Public License along with
		17	* this program; if not, write to the Free Software Foundation, Inc.,
		18	* 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
		19	*/
		20
		21	#ifndef PADATA_H
		22	#define PADATA_H
		23
		24	#include <linux/workqueue.h>
		25	#include <linux/spinlock.h>
		26	#include <linux/list.h>
		27
		28	struct padata_priv {
		29	struct list_head list;
		30	struct parallel_data *pd;
		31	int cb_cpu;
		32	int seq_nr;
		33	int info;
		34	void (parallel)(struct padata_priv padata);
		35	void (serial)(struct padata_priv padata);
		36	};
		37
		38	struct padata_list {
		39	struct list_head list;
		40	spinlock_t lock;
		41	};
		42
		43	struct padata_queue {
		44	struct padata_list parallel;
		45	struct padata_list reorder;
		46	struct padata_list serial;
		47	struct work_struct pwork;
		48	struct work_struct swork;
		49	struct parallel_data *pd;
		50	atomic_t num_obj;
		51	int cpu_index;
		52	};
		53
		54	struct parallel_data {
		55	struct padata_instance *pinst;
		56	struct padata_queue *queue;
		57	atomic_t seq_nr;
		58	atomic_t reorder_objects;
		59	atomic_t refcnt;
		60	unsigned int max_seq_nr;
		61	cpumask_var_t cpumask;
		62	spinlock_t lock;
		63	};
		64
		65	struct padata_instance {
		66	struct notifier_block cpu_notifier;
		67	struct workqueue_struct *wq;
		68	struct parallel_data *pd;
		69	cpumask_var_t cpumask;
		70	struct mutex lock;
		71	u8 flags;
		72	#define PADATA_INIT 1
		73	#define PADATA_RESET 2
		74	};
		75
		76	extern struct padata_instance padata_alloc(const struct cpumask cpumask,
		77	struct workqueue_struct *wq);
		78	extern void padata_free(struct padata_instance *pinst);
		79	extern int padata_do_parallel(struct padata_instance *pinst,
		80	struct padata_priv *padata, int cb_cpu);
		81	extern void padata_do_serial(struct padata_priv *padata);
		82	extern int padata_set_cpumask(struct padata_instance *pinst,
		83	cpumask_var_t cpumask);
		84	extern int padata_add_cpu(struct padata_instance *pinst, int cpu);
		85	extern int padata_remove_cpu(struct padata_instance *pinst, int cpu);
		86	extern void padata_start(struct padata_instance *pinst);
		87	extern void padata_stop(struct padata_instance *pinst);
		88	#endif


diff --git a/include/linux/pfkeyv2.h b/include/linux/pfkeyv2.h index 228b0b6306b0..0b80c806631f 100644 --- a/include/linux/pfkeyv2.h +++ b/include/linux/pfkeyv2.h
@@ -315,6 +315,7 @@ struct sadb_x_kmaddress {
315	#define SADB_X_EALG_AES_GCM_ICV12 19	315	#define SADB_X_EALG_AES_GCM_ICV12 19
316	#define SADB_X_EALG_AES_GCM_ICV16 20	316	#define SADB_X_EALG_AES_GCM_ICV16 20
317	#define SADB_X_EALG_CAMELLIACBC 22	317	#define SADB_X_EALG_CAMELLIACBC 22
		318	#define SADB_X_EALG_NULL_AES_GMAC 23
318	#define SADB_EALG_MAX 253 /* last EALG */	319	#define SADB_EALG_MAX 253 /* last EALG */
319	/* private allocations should use 249-255 (RFC2407) */	320	/* private allocations should use 249-255 (RFC2407) */
320	#define SADB_X_EALG_SERPENTCBC 252 /* draft-ietf-ipsec-ciph-aes-cbc-00 */	321	#define SADB_X_EALG_SERPENTCBC 252 /* draft-ietf-ipsec-ciph-aes-cbc-00 */