denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chapoly: Add an SSSE3 based driver

Browse Source 
We always build the driver on x86/x64, but enable it only if SSSE3 support
is detected during runtime.

Poly1305 uses parallel 32-bit multiplication operands yielding a 64-bit result,
for which two can be done in parallel in SSE. This is minimally faster than
multiplication with 64-bit operands, and also works on 32-bit builds not having
a __int128 result type.

On a 32-bit architecture, this is more than twice as fast as the portable
driver, and on 64-bit it is ~30% faster.
This commit is contained in:
Martin Willi
2015-06-29 17:32:14 +02:00
parent 42459b41f0
commit 755dadcfda
4 changed files with 514 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/plugins/chapoly/Makefile.am
+11 -1
View File
@@ -4,8 +4,9 @@ AM_CPPFLAGS = \
AM_CFLAGS = \
$(PLUGIN_CFLAGS)
noinst_LTLIBRARIES =
if MONOLITHIC
noinst_LTLIBRARIES = libstrongswan-chapoly.la
noinst_LTLIBRARIES += libstrongswan-chapoly.la
else
plugin_LTLIBRARIES = libstrongswan-chapoly.la
endif
@@ -16,4 +17,13 @@ libstrongswan_chapoly_la_SOURCES = \
chapoly_drv_portable.h chapoly_drv_portable.c \
chapoly_aead.h chapoly_aead.c
noinst_LTLIBRARIES += libchapoly-drv-ssse3.la
libchapoly_drv_ssse3_la_SOURCES = chapoly_drv_ssse3.h chapoly_drv_ssse3.c
if USE_X86X64
libchapoly_drv_ssse3_la_CFLAGS = $(PLUGIN_CFLAGS) -mssse3
endif
libstrongswan_chapoly_la_LIBADD = \
libchapoly-drv-ssse3.la
libstrongswan_chapoly_la_LDFLAGS = -module -avoid-version
src/libstrongswan/plugins/chapoly/chapoly_drv.c
+2
View File
@@ -15,6 +15,7 @@
#include "chapoly_drv.h"
#include "chapoly_drv_portable.h"
#include "chapoly_drv_ssse3.h"
typedef chapoly_drv_t*(*chapoly_drv_create)();
@@ -24,6 +25,7 @@ typedef chapoly_drv_t*(*chapoly_drv_create)();
chapoly_drv_t *chapoly_drv_probe()
{
chapoly_drv_create drivers[] = {
chapoly_drv_ssse3_create,
chapoly_drv_portable_create,
};
chapoly_drv_t *driver;
src/libstrongswan/plugins/chapoly/chapoly_drv_ssse3.c
+470
View File
@@ -0,0 +1,470 @@
/*
* Copyright (C) 2015 Martin Willi
* Copyright (C) 2015 revosec AG
*
* Based on public domain code by Andrew Moon and Daniel J. Bernstein.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
*
* This program is distributed in the hope that 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.
*/
#include "chapoly_drv_ssse3.h"
#ifdef __SSSE3__
#include <utils/cpu_feature.h>
#include <tmmintrin.h>
#define CHACHA_DOUBLEROUNDS 10
typedef struct private_chapoly_drv_ssse3_t private_chapoly_drv_ssse3_t;
/**
* Private data of an chapoly_drv_ssse3_t object.
*/
struct private_chapoly_drv_ssse3_t {
/**
* Public chapoly_drv_ssse3_t interface.
*/
chapoly_drv_t public;
/**
* ChaCha20 state matrix, as 128-bit vectors
*/
__m128i m[4];
/**
* Poly1305 update key
*/
u_int32_t r[5];
/**
* Poly1305 state
*/
u_int32_t h[5];
/**
* Poly1305 finalize key
*/
u_int32_t s[4];
};
/**
* Read a 32-bit integer from an unaligned address
*/
static inline u_int32_t ru32(void *p)
{
u_int32_t ret;
memcpy(&ret, p, sizeof(ret));
return ret;
}
/**
* Write a 32-bit word to an unaligned address
*/
static inline void wu32(void *p, u_int32_t v)
{
memcpy(p, &v, sizeof(v));
}
/**
* Shift a 64-bit unsigned integer v right by n bits, clamp to 32 bit
*/
static inline u_int32_t sr(u_int64_t v, u_char n)
{
return v >> n;
}
/**
* AND two values, using a native integer size >= sizeof(u_int32_t)
*/
static inline u_long and(u_long v, u_long mask)
{
return v & mask;
}
/**
* XOR a Chacha20 keystream block into data, increment counter
*/
static void chacha_block_xor(private_chapoly_drv_ssse3_t *this, void *data)
{
__m128i x0, x1, x2, x3, r8, r16, *out = data;
u_int i;
r8 = _mm_set_epi8(14, 13, 12, 15, 10, 9, 8, 11, 6, 5, 4, 7, 2, 1, 0, 3);
r16 = _mm_set_epi8(13, 12, 15, 14, 9, 8, 11, 10, 5, 4, 7, 6, 1, 0, 3, 2);
x0 = this->m[0];
x1 = this->m[1];
x2 = this->m[2];
x3 = this->m[3];
for (i = 0 ; i < CHACHA_DOUBLEROUNDS; i++)
{
x0 = _mm_add_epi32(x0, x1);
x3 = _mm_xor_si128(x3, x0);
x3 = _mm_shuffle_epi8(x3, r16);
x2 = _mm_add_epi32(x2, x3);
x1 = _mm_xor_si128(x1, x2);
x1 = _mm_xor_si128(_mm_slli_epi32(x1, 12), _mm_srli_epi32(x1, 20));
x0 = _mm_add_epi32(x0, x1);
x3 = _mm_xor_si128(x3, x0);
x3 = _mm_shuffle_epi8(x3, r8);
x2 = _mm_add_epi32(x2, x3);
x1 = _mm_xor_si128(x1, x2);
x1 = _mm_xor_si128(_mm_slli_epi32(x1, 7), _mm_srli_epi32(x1, 25));
x1 = _mm_shuffle_epi32(x1, _MM_SHUFFLE(0, 3, 2, 1));
x2 = _mm_shuffle_epi32(x2, _MM_SHUFFLE(1, 0, 3, 2));
x3 = _mm_shuffle_epi32(x3, _MM_SHUFFLE(2, 1, 0, 3));
x0 = _mm_add_epi32(x0, x1);
x3 = _mm_xor_si128(x3, x0);
x3 = _mm_shuffle_epi8(x3, r16);
x2 = _mm_add_epi32(x2, x3);
x1 = _mm_xor_si128(x1, x2);
x1 = _mm_xor_si128(_mm_slli_epi32(x1, 12), _mm_srli_epi32(x1, 20));
x0 = _mm_add_epi32(x0, x1);
x3 = _mm_xor_si128(x3, x0);
x3 = _mm_shuffle_epi8(x3, r8);
x2 = _mm_add_epi32(x2, x3);
x1 = _mm_xor_si128(x1, x2);
x1 = _mm_xor_si128(_mm_slli_epi32(x1, 7), _mm_srli_epi32(x1, 25));
x1 = _mm_shuffle_epi32(x1, _MM_SHUFFLE(2, 1, 0, 3));
x2 = _mm_shuffle_epi32(x2, _MM_SHUFFLE(1, 0, 3, 2));
x3 = _mm_shuffle_epi32(x3, _MM_SHUFFLE(0, 3, 2, 1));
}
x0 = _mm_add_epi32(x0, this->m[0]);
x1 = _mm_add_epi32(x1, this->m[1]);
x2 = _mm_add_epi32(x2, this->m[2]);
x3 = _mm_add_epi32(x3, this->m[3]);
x0 = _mm_xor_si128(x0, _mm_loadu_si128(out + 0));
x1 = _mm_xor_si128(x1, _mm_loadu_si128(out + 1));
x2 = _mm_xor_si128(x2, _mm_loadu_si128(out + 2));
x3 = _mm_xor_si128(x3, _mm_loadu_si128(out + 3));
_mm_storeu_si128(out + 0, x0);
_mm_storeu_si128(out + 1, x1);
_mm_storeu_si128(out + 2, x2);
_mm_storeu_si128(out + 3, x3);
this->m[3] = _mm_add_epi32(this->m[3], _mm_set_epi32(0, 0, 0, 1));
}
METHOD(chapoly_drv_t, set_key, bool,
private_chapoly_drv_ssse3_t *this, u_char *constant, u_char *key,
u_char *salt)
{
this->m[0] = _mm_loadu_si128((__m128i*)constant);
this->m[1] = _mm_loadu_si128((__m128i*)key + 0);
this->m[2] = _mm_loadu_si128((__m128i*)key + 1);
this->m[3] = _mm_set_epi32(0, 0, ru32(salt), 0);
return TRUE;
}
METHOD(chapoly_drv_t, init, bool,
private_chapoly_drv_ssse3_t *this, u_char *iv)
{
u_char key[CHACHA_BLOCK_SIZE];
this->m[3] = _mm_or_si128(
_mm_set_epi32(ru32(iv + 4), ru32(iv + 0), 0, 0),
_mm_and_si128(this->m[3], _mm_set_epi32(0, 0, ~0, 0)));
memset(key, 0, CHACHA_BLOCK_SIZE);
chacha_block_xor(this, key);
/* r &= 0xffffffc0ffffffc0ffffffc0fffffff */
this->r[0] = (ru32(key + 0) >> 0) & 0x3ffffff;
this->r[1] = (ru32(key + 3) >> 2) & 0x3ffff03;
this->r[2] = (ru32(key + 6) >> 4) & 0x3ffc0ff;
this->r[3] = (ru32(key + 9) >> 6) & 0x3f03fff;
this->r[4] = (ru32(key + 12) >> 8) & 0x00fffff;
/* h = 0 */
memwipe(this->h, sizeof(this->h));
this->s[0] = ru32(key + 16);
this->s[1] = ru32(key + 20);
this->s[2] = ru32(key + 24);
this->s[3] = ru32(key + 28);
return TRUE;
}
/**
* r[127:64] = h[95:64] * a, r[63:0] = h[31:0] * b
*/
static inline __m128i mul2(__m128i h, u_int32_t a, u_int32_t b)
{
return _mm_mul_epu32(h, _mm_set_epi32(0, a, 0, b));
}
/**
* c = a[127:64] + a[63:0] + b[127:64] + b[63:0]
* z = x[127:64] + x[63:0] + y[127:64] + y[63:0]
*/
static inline void sum2(__m128i a, __m128i b, __m128i x, __m128i y,
u_int64_t *c, u_int64_t *z)
{
__m128i r, s;
a = _mm_add_epi64(a, b);
x = _mm_add_epi64(x, y);
r = _mm_unpacklo_epi64(x, a);
s = _mm_unpackhi_epi64(x, a);
r = _mm_add_epi64(r, s);
_mm_storel_epi64((__m128i*)z, r);
_mm_storel_epi64((__m128i*)c, _mm_srli_si128(r, 8));
}
METHOD(chapoly_drv_t, poly, bool,
private_chapoly_drv_ssse3_t *this, u_char *data, u_int blocks)
{
u_int32_t r0, r1, r2, r3, r4;
u_int32_t s1, s2, s3, s4;
u_int32_t h0, h1, h2, h3, h4;
u_int64_t d0, d1, d2, d3, d4;
__m128i h01, h23, h44;
__m128i x0, x1, y0, y1, z0;
u_int32_t t0, t1;
r0 = this->r[0];
r1 = this->r[1];
r2 = this->r[2];
r3 = this->r[3];
r4 = this->r[4];
s1 = r1 * 5;
s2 = r2 * 5;
s3 = r3 * 5;
s4 = r4 * 5;
h0 = this->h[0];
h1 = this->h[1];
h2 = this->h[2];
h3 = this->h[3];
h4 = this->h[4];
while (blocks--)
{
h01 = _mm_set_epi32(0, h0, 0, h1);
h23 = _mm_set_epi32(0, h2, 0, h3);
h44 = _mm_set_epi32(0, h4, 0, h4);
/* h += m[i] */
t0 = (ru32(data + 0) >> 0) & 0x3ffffff;
t1 = (ru32(data + 3) >> 2) & 0x3ffffff;
h01 = _mm_add_epi32(h01, _mm_set_epi32(0, t0, 0, t1));
t0 = (ru32(data + 6) >> 4) & 0x3ffffff;
t1 = (ru32(data + 9) >> 6) & 0x3ffffff;
h23 = _mm_add_epi32(h23, _mm_set_epi32(0, t0, 0, t1));
t0 = (ru32(data + 12) >> 8) | (1 << 24);
h44 = _mm_add_epi32(h44, _mm_set_epi32(0, t0, 0, t0));
/* h *= r */
x0 = mul2(h01, r0, s4);
x1 = mul2(h01, r1, r0);
y0 = mul2(h23, s3, s2);
y1 = mul2(h23, s4, s3);
z0 = mul2(h44, s1, s2);
y0 = _mm_add_epi64(y0, _mm_srli_si128(z0, 8));
y1 = _mm_add_epi64(y1, _mm_slli_si128(z0, 8));
sum2(x0, y0, x1, y1, &d0, &d1);
x0 = mul2(h01, r2, r1);
x1 = mul2(h01, r3, r2);
y0 = mul2(h23, r0, s4);
y1 = mul2(h23, r1, r0);
z0 = mul2(h44, s3, s4);
y0 = _mm_add_epi64(y0, _mm_srli_si128(z0, 8));
y1 = _mm_add_epi64(y1, _mm_slli_si128(z0, 8));
sum2(x0, y0, x1, y1, &d2, &d3);
x0 = mul2(h01, r4, r3);
y0 = mul2(h23, r2, r1);
z0 = mul2(h44, r0, 0);
y0 = _mm_add_epi64(y0, z0);
x0 = _mm_add_epi64(x0, y0);
x0 = _mm_add_epi64(x0, _mm_srli_si128(x0, 8));
_mm_storel_epi64((__m128i*)&d4, x0);
/* (partial) h %= p */
d1 += sr(d0, 26); h0 = and(d0, 0x3ffffff);
d2 += sr(d1, 26); h1 = and(d1, 0x3ffffff);
d3 += sr(d2, 26); h2 = and(d2, 0x3ffffff);
d4 += sr(d3, 26); h3 = and(d3, 0x3ffffff);
h0 += sr(d4, 26) * 5; h4 = and(d4, 0x3ffffff);
h1 += h0 >> 26; h0 = h0 & 0x3ffffff;
data += POLY_BLOCK_SIZE;
}
this->h[0] = h0;
this->h[1] = h1;
this->h[2] = h2;
this->h[3] = h3;
this->h[4] = h4;
return TRUE;
}
METHOD(chapoly_drv_t, chacha, bool,
private_chapoly_drv_ssse3_t *this, u_char *stream)
{
memset(stream, 0, CHACHA_BLOCK_SIZE);
chacha_block_xor(this, stream);
return TRUE;
}
METHOD(chapoly_drv_t, encrypt, bool,
private_chapoly_drv_ssse3_t *this, u_char *data, u_int blocks)
{
u_int i;
for (i = 0; i < blocks; i++)
{
chacha_block_xor(this, data);
poly(this, data, 4);
data += CHACHA_BLOCK_SIZE;
}
return TRUE;
}
METHOD(chapoly_drv_t, decrypt, bool,
private_chapoly_drv_ssse3_t *this, u_char *data, u_int blocks)
{
u_int i;
for (i = 0; i < blocks; i++)
{
poly(this, data, 4);
chacha_block_xor(this, data);
data += CHACHA_BLOCK_SIZE;
}
return TRUE;
}
METHOD(chapoly_drv_t, finish, bool,
private_chapoly_drv_ssse3_t *this, u_char *mac)
{
u_int32_t h0, h1, h2, h3, h4;
u_int32_t g0, g1, g2, g3, g4;
u_int32_t mask;
u_int64_t f = 0;
/* fully carry h */
h0 = this->h[0];
h1 = this->h[1];
h2 = this->h[2];
h3 = this->h[3];
h4 = this->h[4];
h2 += (h1 >> 26); h1 = h1 & 0x3ffffff;
h3 += (h2 >> 26); h2 = h2 & 0x3ffffff;
h4 += (h3 >> 26); h3 = h3 & 0x3ffffff;
h0 += (h4 >> 26) * 5; h4 = h4 & 0x3ffffff;
h1 += (h0 >> 26); h0 = h0 & 0x3ffffff;
/* compute h + -p */
g0 = h0 + 5;
g1 = h1 + (g0 >> 26); g0 &= 0x3ffffff;
g2 = h2 + (g1 >> 26); g1 &= 0x3ffffff;
g3 = h3 + (g2 >> 26); g2 &= 0x3ffffff;
g4 = h4 + (g3 >> 26) - (1 << 26); g3 &= 0x3ffffff;
/* select h if h < p, or h + -p if h >= p */
mask = (g4 >> ((sizeof(u_int32_t) * 8) - 1)) - 1;
g0 &= mask;
g1 &= mask;
g2 &= mask;
g3 &= mask;
g4 &= mask;
mask = ~mask;
h0 = (h0 & mask) | g0;
h1 = (h1 & mask) | g1;
h2 = (h2 & mask) | g2;
h3 = (h3 & mask) | g3;
h4 = (h4 & mask) | g4;
/* h = h % (2^128) */
h0 = (h0 >> 0) | (h1 << 26);
h1 = (h1 >> 6) | (h2 << 20);
h2 = (h2 >> 12) | (h3 << 14);
h3 = (h3 >> 18) | (h4 << 8);
/* mac = (h + s) % (2^128) */
f = (f >> 32) + h0 + this->s[0]; wu32(mac + 0, f);
f = (f >> 32) + h1 + this->s[1]; wu32(mac + 4, f);
f = (f >> 32) + h2 + this->s[2]; wu32(mac + 8, f);
f = (f >> 32) + h3 + this->s[3]; wu32(mac + 12, f);
return TRUE;
}
METHOD(chapoly_drv_t, destroy, void,
private_chapoly_drv_ssse3_t *this)
{
memwipe(this->m, sizeof(this->m));
memwipe(this->h, sizeof(this->h));
memwipe(this->r, sizeof(this->r));
memwipe(this->s, sizeof(this->s));
free_align(this);
}
/**
* See header
*/
chapoly_drv_t *chapoly_drv_ssse3_create()
{
private_chapoly_drv_ssse3_t *this;
if (!cpu_feature_available(CPU_FEATURE_SSSE3))
{
return FALSE;
}
INIT_ALIGN(this, sizeof(__m128i),
.public = {
.set_key = _set_key,
.init = _init,
.poly = _poly,
.chacha = _chacha,
.encrypt = _encrypt,
.decrypt = _decrypt,
.finish = _finish,
.destroy = _destroy,
},
);
return &this->public;
}
#else /* !__SSSE3__ */
chapoly_drv_t *chapoly_drv_ssse3_create()
{
return NULL;
}
#endif /* !__SSSE3__ */
src/libstrongswan/plugins/chapoly/chapoly_drv_ssse3.h
+31
View File
@@ -0,0 +1,31 @@
/*
* Copyright (C) 2015 Martin Willi
* Copyright (C) 2015 revosec AG
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
*
* This program is distributed in the hope that 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.
*/
/**
* @defgroup chapoly_drv_ssse3 chapoly_drv_ssse3
* @{ @ingroup chapoly
*/
#include "chapoly_drv.h"
#ifndef CHAPOLY_DRV_SSSE3_H_
#define CHAPOLY_DRV_SSSE3_H_
/**
* Create a chapoly_drv_ssse3 instance.
*/
chapoly_drv_t *chapoly_drv_ssse3_create();
#endif /** CHAPOLY_DRV_SSSE3_H_ @}*/