From patchwork Tue Jun 30 01:06:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jason A. Donenfeld" X-Patchwork-Id: 192038 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp3369509ilg; Mon, 29 Jun 2020 18:06:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzcv9GINArGyy3pnq5fPAPh0ELsb71JCjwdBJ+0vh9cwznZ2yjkQEn8I2yY4D0pQizxxdBd X-Received: by 2002:aa7:db57:: with SMTP id n23mr20160433edt.235.1593479209312; Mon, 29 Jun 2020 18:06:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593479209; cv=none; d=google.com; s=arc-20160816; b=HY0E73lIA6TFp+W3kB+Z9en19mO6e5vVP97+IiYmK5hT66RXWuvvTlTWMOkDa1JuL6 5lpeA2wx1yoTCXtLMxUBmdtrZbnscKqFX4A9+mboCnCUjSSbQgZ74p1zkDZ4akyHmyTX zfIFZ2RGn45ytF73F9nkS3ubilyRC1O/3WLlS8O50qTOLDBcWpdX6rq+uo5apuDMvWBd hoxvsG2QQsT46V5LqyDqVNHsOVH3zoBNRIPuAYQgucf2WDK5ktpdQ0VrMbwLc0lS8qQS MQLh5J09weSFCda+mNaBCNhJ6SCiFl+8EmIeTezcw2gfo/TBBHYCmHD1jnZl4dMYfrp/ WG9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=i4UvncsZdE071auos7vEfpOX7gZUN+28WLtIKzVFUtI=; b=rhyBmVk7DOIM+w6dR+1mtIeveqLd0w3BJyRQV9JVItqtAC7D+WsRxmBHPTp8WOQzlS VhLzA31QdQHTq+Pcx37cmY3mFzxZtMuxRkJD8hrBDbakw9rzRhOrPR9PoXGFK8NlIShr 8jYhP7oFwf6ZFTGUoBw9XQp6GIWhQn0y+7CmQaQllY57pzHUB57PFvRKeBmUitFaZbGk lsMFqcJAnSKCvRb7CfXSdcrKnKidy0CdKFy3R06Vs24EGinhHJN8AO63xopHJH+Pto+y VoE+ZN2AvpgZT1oFTGIo4LspYGoI/PnaG9nEnriKYhSP1MJcVAjaUHsUh30e5rB+VJY8 NkEw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@zx2c4.com header.s=mail header.b=ZLiZhqeF; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=zx2c4.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d17si849269edu.223.2020.06.29.18.06.49; Mon, 29 Jun 2020 18:06:49 -0700 (PDT) Received-SPF: pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@zx2c4.com header.s=mail header.b=ZLiZhqeF; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=zx2c4.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728071AbgF3BGs (ORCPT + 9 others); Mon, 29 Jun 2020 21:06:48 -0400 Received: from mail.zx2c4.com ([192.95.5.64]:60171 "EHLO mail.zx2c4.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728002AbgF3BGo (ORCPT ); Mon, 29 Jun 2020 21:06:44 -0400 Received: by mail.zx2c4.com (ZX2C4 Mail Server) with ESMTP id bef50b85; Tue, 30 Jun 2020 00:46:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=zx2c4.com; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=mail; bh=wplZDiGCa+tCNFlT7tJltU1KK XA=; b=ZLiZhqeFSg8qWscgoLPL/k+jTUteh5vV7+UPEnqrHZr7uz/OrMHHQQ4on GR8XUG3avxiLesNm797RrjS96R3lpLOMoUVEqoEJb6H1QoFolyXZaD/jUPqI1SQA dAtH3J89EV00cHIiUiHAfJIGG+lwTMBNcLCWQpEn2f0v8N54tfgXQ1jCtVYIXvVD aN5HsSvj3z1c4y9N7i8FIx1iBaUWOxrQDTtANB0Ty/BFxdRyTfPHnmR/yAsH5MQj 4SMvDTqwcwqf854fca8SO6hG9jrD6F4uwsdfMmGo6ExUQu4FeiF6oFUD9SmUfmk5 6fVP/KI6RO+kfoOMpZqoLGbQhUzSQ== Received: by mail.zx2c4.com (ZX2C4 Mail Server) with ESMTPSA id 1ffb52d8 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Tue, 30 Jun 2020 00:46:58 +0000 (UTC) From: "Jason A. Donenfeld" To: netdev@vger.kernel.org, davem@davemloft.net Cc: "Jason A. Donenfeld" , Hans Wippel Subject: [PATCH net v2 4/8] wireguard: queueing: make use of ip_tunnel_parse_protocol Date: Mon, 29 Jun 2020 19:06:21 -0600 Message-Id: <20200630010625.469202-5-Jason@zx2c4.com> In-Reply-To: <20200630010625.469202-1-Jason@zx2c4.com> References: <20200630010625.469202-1-Jason@zx2c4.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Now that wg_examine_packet_protocol has been added for general consumption as ip_tunnel_parse_protocol, it's possible to remove wg_examine_packet_protocol and simply use the new ip_tunnel_parse_protocol function directly. Signed-off-by: Jason A. Donenfeld --- drivers/net/wireguard/queueing.h | 19 ++----------------- drivers/net/wireguard/receive.c | 2 +- 2 files changed, 3 insertions(+), 18 deletions(-) -- 2.27.0 diff --git a/drivers/net/wireguard/queueing.h b/drivers/net/wireguard/queueing.h index c58df439dbbe..dfb674e03076 100644 --- a/drivers/net/wireguard/queueing.h +++ b/drivers/net/wireguard/queueing.h @@ -11,6 +11,7 @@ #include #include #include +#include struct wg_device; struct wg_peer; @@ -65,25 +66,9 @@ struct packet_cb { #define PACKET_CB(skb) ((struct packet_cb *)((skb)->cb)) #define PACKET_PEER(skb) (PACKET_CB(skb)->keypair->entry.peer) -/* Returns either the correct skb->protocol value, or 0 if invalid. */ -static inline __be16 wg_examine_packet_protocol(struct sk_buff *skb) -{ - if (skb_network_header(skb) >= skb->head && - (skb_network_header(skb) + sizeof(struct iphdr)) <= - skb_tail_pointer(skb) && - ip_hdr(skb)->version == 4) - return htons(ETH_P_IP); - if (skb_network_header(skb) >= skb->head && - (skb_network_header(skb) + sizeof(struct ipv6hdr)) <= - skb_tail_pointer(skb) && - ipv6_hdr(skb)->version == 6) - return htons(ETH_P_IPV6); - return 0; -} - static inline bool wg_check_packet_protocol(struct sk_buff *skb) { - __be16 real_protocol = wg_examine_packet_protocol(skb); + __be16 real_protocol = ip_tunnel_parse_protocol(skb); return real_protocol && skb->protocol == real_protocol; } diff --git a/drivers/net/wireguard/receive.c b/drivers/net/wireguard/receive.c index 9b2ab6fc91cd..2c9551ea6dc7 100644 --- a/drivers/net/wireguard/receive.c +++ b/drivers/net/wireguard/receive.c @@ -387,7 +387,7 @@ static void wg_packet_consume_data_done(struct wg_peer *peer, */ skb->ip_summed = CHECKSUM_UNNECESSARY; skb->csum_level = ~0; /* All levels */ - skb->protocol = wg_examine_packet_protocol(skb); + skb->protocol = ip_tunnel_parse_protocol(skb); if (skb->protocol == htons(ETH_P_IP)) { len = ntohs(ip_hdr(skb)->tot_len); if (unlikely(len < sizeof(struct iphdr)))