Commit 6f6dded1 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'WireGuard-CI-and-housekeeping' 



Jason A. Donenfeld says:

====================
WireGuard CI and housekeeping

This is a collection of commits gathered during the last 1.5 weeks since
merging WireGuard. If you'd prefer, I can send tree pull requests
instead, but I figure it might be best for now to just send things as
full patch sets to netdev.

The first part of this adds in the CI test harness that we've been using
for quite some time with success. You can type `make` and get the
selftests running in a fresh VM immediately. This has been an
instrumental tool in developing WireGuard, and I think it'd benefit most
from being in-tree alongside the selftests that are already there. Once
this lands, I plan to get build.wireguard.com building wireguard-
linux.git and net-next.git on every single commit pushed, and do so on a
bunch of different architectures. As this migrates into Linus' tree
eventually and then into net.git, I'll get net.git building there too on
every commit. Future work with this involves generalizing it to include
more networking subsystem tests beyond just WireGuard, but one step at a
time. In the process of porting this to the tree, the builder uncovered
a mistake in the config menu file, which the second commit fixes.

The last three commits are small housekeeping things, fixing spelling
mistakes, replacing call_rcu with kfree_rcu, and removing an unused
include.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c5dea815 d89ee7d5

drivers/net/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -85,6 +85,8 @@ config WIREGUARD 
	select CRYPTO_POLY1305_X86_64 if X86 && 64BIT

	select CRYPTO_BLAKE2S_X86 if X86 && 64BIT

	select CRYPTO_CURVE25519_X86 if X86 && 64BIT

	select ARM_CRYPTO if ARM

	select ARM64_CRYPTO if ARM64

	select CRYPTO_CHACHA20_NEON if (ARM || ARM64) && KERNEL_MODE_NEON

	select CRYPTO_POLY1305_NEON if ARM64 && KERNEL_MODE_NEON

	select CRYPTO_POLY1305_ARM if ARM

drivers/net/wireguard/allowedips.c

+1 −6
Original line number Diff line number Diff line
@@ -31,11 +31,6 @@ static void copy_and_assign_cidr(struct allowedips_node *node, const u8 *src, 
#define CHOOSE_NODE(parent, key) \

	parent->bit[(key[parent->bit_at_a] >> parent->bit_at_b) & 1]



static void node_free_rcu(struct rcu_head *rcu)

{

	kfree(container_of(rcu, struct allowedips_node, rcu));

}



static void push_rcu(struct allowedips_node **stack,

		     struct allowedips_node __rcu *p, unsigned int *len)

{
@@ -112,7 +107,7 @@ static void walk_remove_by_peer(struct allowedips_node __rcu **top, 
				if (!node->bit[0] || !node->bit[1]) {

					rcu_assign_pointer(*nptr, DEREF(

					       &node->bit[!REF(node->bit[0])]));

					call_rcu(&node->rcu, node_free_rcu);

					kfree_rcu(node, rcu);

					node = DEREF(nptr);

				}

			}

drivers/net/wireguard/main.c

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 


#include <uapi/linux/wireguard.h>



#include <linux/version.h>

#include <linux/init.h>

#include <linux/module.h>

#include <linux/genetlink.h>

drivers/net/wireguard/receive.c

+1 −1
Original line number Diff line number Diff line
@@ -380,7 +380,7 @@ static void wg_packet_consume_data_done(struct wg_peer *peer, 
	/* We've already verified the Poly1305 auth tag, which means this packet

	 * was not modified in transit. We can therefore tell the networking

	 * stack that all checksums of every layer of encapsulation have already

	 * been checked "by the hardware" and therefore is unneccessary to check

	 * been checked "by the hardware" and therefore is unnecessary to check

	 * again in software.

	 */

	skb->ip_summed = CHECKSUM_UNNECESSARY;

include/uapi/linux/wireguard.h

+4 −4
Original line number Diff line number Diff line
@@ -18,13 +18,13 @@ 
 * one but not both of:

 *

 *    WGDEVICE_A_IFINDEX: NLA_U32

 *    WGDEVICE_A_IFNAME: NLA_NUL_STRING, maxlen IFNAMESIZ - 1

 *    WGDEVICE_A_IFNAME: NLA_NUL_STRING, maxlen IFNAMSIZ - 1

 *

 * The kernel will then return several messages (NLM_F_MULTI) containing the

 * following tree of nested items:

 *

 *    WGDEVICE_A_IFINDEX: NLA_U32

 *    WGDEVICE_A_IFNAME: NLA_NUL_STRING, maxlen IFNAMESIZ - 1

 *    WGDEVICE_A_IFNAME: NLA_NUL_STRING, maxlen IFNAMSIZ - 1

 *    WGDEVICE_A_PRIVATE_KEY: NLA_EXACT_LEN, len WG_KEY_LEN

 *    WGDEVICE_A_PUBLIC_KEY: NLA_EXACT_LEN, len WG_KEY_LEN

 *    WGDEVICE_A_LISTEN_PORT: NLA_U16
@@ -77,7 +77,7 @@ 
 * WGDEVICE_A_IFINDEX and WGDEVICE_A_IFNAME:

 *

 *    WGDEVICE_A_IFINDEX: NLA_U32

 *    WGDEVICE_A_IFNAME: NLA_NUL_STRING, maxlen IFNAMESIZ - 1

 *    WGDEVICE_A_IFNAME: NLA_NUL_STRING, maxlen IFNAMSIZ - 1

 *    WGDEVICE_A_FLAGS: NLA_U32, 0 or WGDEVICE_F_REPLACE_PEERS if all current

 *                      peers should be removed prior to adding the list below.

 *    WGDEVICE_A_PRIVATE_KEY: len WG_KEY_LEN, all zeros to remove
@@ -121,7 +121,7 @@ 
 * filling in information not contained in the prior. Note that if

 * WGDEVICE_F_REPLACE_PEERS is specified in the first message, it probably

 * should not be specified in fragments that come after, so that the list

 * of peers is only cleared the first time but appened after. Likewise for

 * of peers is only cleared the first time but appended after. Likewise for

 * peers, if WGPEER_F_REPLACE_ALLOWEDIPS is specified in the first message

 * of a peer, it likely should not be specified in subsequent fragments.

 *

CRA Git | Maintained and supported by SUSTech CRA and CCSE