From patchwork Mon Feb 22 16:25:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jason A. Donenfeld" X-Patchwork-Id: 385809 Delivered-To: patch@linaro.org Received: by 2002:a02:290e:0:0:0:0:0 with SMTP id p14csp1417352jap; Mon, 22 Feb 2021 08:28:15 -0800 (PST) X-Google-Smtp-Source: ABdhPJxNhhKdYhgAZnZ/2fXvjVet9M33HG+HMO4tH1j/KI3r8Zw/u/ejrBrAK9+9AEycBkfitdr+ X-Received: by 2002:a17:906:3285:: with SMTP id 5mr22380438ejw.356.1614011295226; Mon, 22 Feb 2021 08:28:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614011295; cv=none; d=google.com; s=arc-20160816; b=MSZ0Uv3A4IyrTOe1i1fW/rRQWX2h8rrpkipP+mqgautH+EwKr2Uoes+cg5KZi/aDZb G7Ua2W0m+K75yzQmkzmEt9qWIkG2NOMUm6iFRHiW/dB3UTINHE8QdbXT6U7lguK+K/49 EA/nnjruovna1P4yP3QtNf9jfZBg6f3b/riSggdH2gGjDSQdWOI1AXo5IZ4Ekax/Rig5 u/B/x4ufJR62vbQUNzzOZnHN/QKtoHYoZSfmIyZYokXRxgrNRiS/EWu3UDgpY4I4J7+X T8XYV67qIpI1zzuOR9DNvSpJPDfllKONCxvB4zX3n/45/pjMZReBTxNCYfM5Vc4/F5/d 4r/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=N6xDFdEFdQ6jS23xmeafoPQPPFJphZfu48UKYzkjnas=; b=ikaoUcy5tEjwuFbXSzWL7p1d9EcMPf5PTg1ASAAd/moE/74h7aFbmuJvB7cZN8ncrk RsbrzHb57UDmqpPsa31RMiItjX/lqsIOPW04C0RNTVGWjmYUPxcV0yDAjhda+oQaEUJV AH12J4h5yKH2cpfobW+7O56T3FOZ2sdCTCoSBSjieUa5QZ0+pwp530eAQUUf8mtXXwmE PLlv0Jo5BJhhX2YJ6FgWKMHDTtCRBmVUtEqgRTkrC6IvoA5tK6oip17tdp4CSZBU6Tl5 mny48Ss+VClJadyZMzn7VS6w3kUPw4FnVs6BP31XHF5sX/+fvTbFLSmkrWlEfVKq3Wbc 0KSA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@zx2c4.com header.s=20210105 header.b=PxUD1db6; 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 a26si10999342edv.427.2021.02.22.08.28.15; Mon, 22 Feb 2021 08:28:15 -0800 (PST) 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=20210105 header.b=PxUD1db6; 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 S230503AbhBVQ1f (ORCPT + 9 others); Mon, 22 Feb 2021 11:27:35 -0500 Received: from mail.zx2c4.com ([104.131.123.232]:60986 "EHLO mail.zx2c4.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231689AbhBVQ06 (ORCPT ); Mon, 22 Feb 2021 11:26:58 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zx2c4.com; s=20210105; t=1614011154; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=N6xDFdEFdQ6jS23xmeafoPQPPFJphZfu48UKYzkjnas=; b=PxUD1db6wi1mQA0Jjo4rEA9Xpx0eFLOn4CqsQqyN8+zWwv+8+iuEsES8/OP8fLJjhRqlzx c+CGtomqDbYQwYoyEO1p8mlCGkcgQjxAQfnX27Hzv8HL6mQUAkCxENoXJTXkaiDWNWAQr+ ksDXbgE6X7GEca4Tzm4d4NL49U+0958= Received: by mail.zx2c4.com (ZX2C4 Mail Server) with ESMTPSA id 2022fa9a (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO); Mon, 22 Feb 2021 16:25:54 +0000 (UTC) From: "Jason A. Donenfeld" To: netdev@vger.kernel.org, davem@davemloft.net Subject: [PATCH net 1/7] wireguard: avoid double unlikely() notation when using IS_ERR() Date: Mon, 22 Feb 2021 17:25:43 +0100 Message-Id: <20210222162549.3252778-2-Jason@zx2c4.com> In-Reply-To: <20210222162549.3252778-1-Jason@zx2c4.com> References: <20210222162549.3252778-1-Jason@zx2c4.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Antonio Quartulli The definition of IS_ERR() already applies the unlikely() notation when checking the error status of the passed pointer. For this reason there is no need to have the same notation outside of IS_ERR() itself. Clean up code by removing redundant notation. Signed-off-by: Antonio Quartulli Fixes: e7096c131e51 ("net: WireGuard secure network tunnel") Signed-off-by: Jason A. Donenfeld --- drivers/net/wireguard/device.c | 2 +- drivers/net/wireguard/socket.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) -- 2.30.1 diff --git a/drivers/net/wireguard/device.c b/drivers/net/wireguard/device.c index a3ed49cd95c3..cd51a2afa28e 100644 --- a/drivers/net/wireguard/device.c +++ b/drivers/net/wireguard/device.c @@ -157,7 +157,7 @@ static netdev_tx_t wg_xmit(struct sk_buff *skb, struct net_device *dev) } else { struct sk_buff *segs = skb_gso_segment(skb, 0); - if (unlikely(IS_ERR(segs))) { + if (IS_ERR(segs)) { ret = PTR_ERR(segs); goto err_peer; } diff --git a/drivers/net/wireguard/socket.c b/drivers/net/wireguard/socket.c index 410b318e57fb..41430c0e465a 100644 --- a/drivers/net/wireguard/socket.c +++ b/drivers/net/wireguard/socket.c @@ -71,7 +71,7 @@ static int send4(struct wg_device *wg, struct sk_buff *skb, ip_rt_put(rt); rt = ip_route_output_flow(sock_net(sock), &fl, sock); } - if (unlikely(IS_ERR(rt))) { + if (IS_ERR(rt)) { ret = PTR_ERR(rt); net_dbg_ratelimited("%s: No route to %pISpfsc, error %d\n", wg->dev->name, &endpoint->addr, ret); @@ -138,7 +138,7 @@ static int send6(struct wg_device *wg, struct sk_buff *skb, } dst = ipv6_stub->ipv6_dst_lookup_flow(sock_net(sock), sock, &fl, NULL); - if (unlikely(IS_ERR(dst))) { + if (IS_ERR(dst)) { ret = PTR_ERR(dst); net_dbg_ratelimited("%s: No route to %pISpfsc, error %d\n", wg->dev->name, &endpoint->addr, ret);