From patchwork Thu Aug 29 16:50:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denis Efremov X-Patchwork-Id: 1155380 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46K7sY0WsJz9sBp for ; Fri, 30 Aug 2019 02:50:57 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727751AbfH2Quy (ORCPT ); Thu, 29 Aug 2019 12:50:54 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:38855 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726973AbfH2Qux (ORCPT ); Thu, 29 Aug 2019 12:50:53 -0400 Received: by mail-wm1-f67.google.com with SMTP id o184so4553699wme.3; Thu, 29 Aug 2019 09:50:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=EAPNXwtNcvomkAv43HK7BcSQSi3ID9bH+hr63tWVdSI=; b=B5HGm8Y0d+BC3TOmZ23uuf+WqGqYOV7ombVlzG70cKlsV5JRtEvvNhzfPX4mECWFhx u5j/9cXAx5IqdKYxp7N//EOr02YdCxMO9TImOTBYGSfNXGWuDvoj6pJX11SgB//Tt5im yYal4ni8RQu92gT5EGlqUSz2C0ZgmGFTTf+a6stQq6hqSBqIOsB4/FaV7WQu1kPe6C3X +xLocX36sKRkLLs3x2PB2D+myD7iamK/wRKiMKBKp2+VCm7/qCDUbUDyTARThORMu67E QuOMPvFXZtlfAMMmQxgNFbLz16ewEqahiYYT8vzew1IHcjJ1Y165M5UTbENb5n3dJ24k kxqA== X-Gm-Message-State: APjAAAX+kGHw6qYwNcIPCIAbgM17lyiHVPh/qD8mC15U8cFFX3Ij61QJ D4+f5ZSeYUoFEP3fmz575wgwXYvwuHo= X-Google-Smtp-Source: APXvYqyG8Uv9qqAEzfuwRYVShx38vJV1pUSPq3W7ZBAlPx5+N1oEiU4zijmswr1WDwZJj2S7mhEW8w== X-Received: by 2002:a1c:f704:: with SMTP id v4mr361727wmh.90.1567097450438; Thu, 29 Aug 2019 09:50:50 -0700 (PDT) Received: from green.intra.ispras.ru (bran.ispras.ru. [83.149.199.196]) by smtp.googlemail.com with ESMTPSA id o14sm8340770wrg.64.2019.08.29.09.50.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Aug 2019 09:50:49 -0700 (PDT) From: Denis Efremov To: linux-kernel@vger.kernel.org Cc: Denis Efremov , Alexander Viro , Anton Altaparmakov , Boris Ostrovsky , Boris Pismenny , "Darrick J. Wong" , "David S. Miller" , Dennis Dalessandro , Dmitry Torokhov , Inaky Perez-Gonzalez , Juergen Gross , Leon Romanovsky , Mike Marciniszyn , =?utf-8?q?Pali_Roh=C3=A1r?= , Rob Clark , Saeed Mahameed , Sean Paul , linux-arm-msm@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-input@vger.kernel.org, linux-ntfs-dev@lists.sourceforge.net, linux-rdma@vger.kernel.org, linux-wimax@intel.com, linux-xfs@vger.kernel.org, xen-devel@lists.xenproject.org, netdev@vger.kernel.org, dri-devel@lists.freedesktop.org, Joe Perches , Andrew Morton , Andy Whitcroft Subject: [PATCH v3 01/11] checkpatch: check for nested (un)?likely() calls Date: Thu, 29 Aug 2019 19:50:15 +0300 Message-Id: <20190829165025.15750-1-efremov@linux.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org IS_ERR(), IS_ERR_OR_NULL(), IS_ERR_VALUE() and WARN*() already contain unlikely() optimization internally. Thus, there is no point in calling these functions and defines under likely()/unlikely(). This check is based on the coccinelle rule developed by Enrico Weigelt https://lore.kernel.org/lkml/1559767582-11081-1-git-send-email-info@metux.net/ Signed-off-by: Denis Efremov Cc: Joe Perches Cc: Andrew Morton Cc: Andy Whitcroft --- scripts/checkpatch.pl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 93a7edfe0f05..56969ce06df4 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -6480,6 +6480,12 @@ sub process { "Using $1 should generally have parentheses around the comparison\n" . $herecurr); } +# nested likely/unlikely calls + if ($line =~ /\b(?:(?:un)?likely)\s*\(\s*!?\s*(IS_ERR(?:_OR_NULL|_VALUE)?|WARN)/) { + WARN("LIKELY_MISUSE", + "nested (un)?likely() calls, $1 already uses unlikely() internally\n" . $herecurr); + } + # whine mightly about in_atomic if ($line =~ /\bin_atomic\s*\(/) { if ($realfile =~ m@^drivers/@) { From patchwork Thu Aug 29 16:50:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denis Efremov X-Patchwork-Id: 1155381 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46K7t035cpz9sBp for ; Fri, 30 Aug 2019 02:51:20 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727967AbfH2QvT (ORCPT ); Thu, 29 Aug 2019 12:51:19 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:56141 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726973AbfH2QvR (ORCPT ); Thu, 29 Aug 2019 12:51:17 -0400 Received: by mail-wm1-f67.google.com with SMTP id g207so482116wmg.5; Thu, 29 Aug 2019 09:51:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1ieTbADRtT05Y0/VomMmER6T0zXu2SWOP6oz60FuDLI=; b=WNhqjvEGtJaeN/iWXP29s40EtlnDjloZPkf1Weo6yv2cDZA9uDgY0gLS5G5cDrZTie 4TMjwFlS459MEVkb2W+rWT3O5koqUvY+yx32o7RaM3sWejRH/GpvXxmkwGxcsH4XaPd3 pf8YW3nTfd5ANAtUbd734/N7b9uJ1Bi1Q9bPUdwHkvoXJ5Kq7Tr2upWaTVFiqJquLA58 PaCmvG/5TY/KznZ1x5zLWpR4+Nmcb6EPv/NMr2R0pEGF9d5Mha2PnZdLdIUij4gvwmtk 1Yt19Hz0rRxK3PxJ2ovNN+wp9RhwycU0IvQKE5l8Pa1d5Dvm7WmPWR+fYgft2KVXt7Ix Y0TQ== X-Gm-Message-State: APjAAAWfnJaeUvhdHTOdgyoleB8p/F9xa9hq6N3G5hVwxNsmkrNsfixp PtRUlDJSdKX4R5CgmZTlmeLlB965 X-Google-Smtp-Source: APXvYqxstFjJ2jreH9Jsr5CvMiR/nmCdhiN/2IkdgDDXP2+2wBUQdtca9USjmS7vdn5kKVx5n4VjlQ== X-Received: by 2002:a1c:4b0a:: with SMTP id y10mr11658200wma.78.1567097475563; Thu, 29 Aug 2019 09:51:15 -0700 (PDT) Received: from green.intra.ispras.ru (bran.ispras.ru. [83.149.199.196]) by smtp.googlemail.com with ESMTPSA id o14sm8340770wrg.64.2019.08.29.09.51.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Aug 2019 09:51:15 -0700 (PDT) From: Denis Efremov To: linux-kernel@vger.kernel.org Cc: Denis Efremov , Boris Pismenny , Saeed Mahameed , Leon Romanovsky , Joe Perches , Andrew Morton , netdev@vger.kernel.org Subject: [PATCH v3 03/11] net/mlx5e: Remove unlikely() from WARN*() condition Date: Thu, 29 Aug 2019 19:50:17 +0300 Message-Id: <20190829165025.15750-3-efremov@linux.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190829165025.15750-1-efremov@linux.com> References: <20190829165025.15750-1-efremov@linux.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org "unlikely(WARN_ON_ONCE(x))" is excessive. WARN_ON_ONCE() already uses unlikely() internally. Signed-off-by: Denis Efremov Cc: Boris Pismenny Cc: Saeed Mahameed Cc: Leon Romanovsky Cc: Joe Perches Cc: Andrew Morton Cc: netdev@vger.kernel.org Acked-by: Saeed Mahameed --- drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c index 7833ddef0427..e5222d17df35 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c @@ -408,7 +408,7 @@ struct sk_buff *mlx5e_ktls_handle_tx_skb(struct net_device *netdev, goto out; tls_ctx = tls_get_ctx(skb->sk); - if (unlikely(WARN_ON_ONCE(tls_ctx->netdev != netdev))) + if (WARN_ON_ONCE(tls_ctx->netdev != netdev)) goto err_out; priv_tx = mlx5e_get_ktls_tx_priv_ctx(tls_ctx); From patchwork Thu Aug 29 16:50:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denis Efremov X-Patchwork-Id: 1155383 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46K7tj4LDjz9sMr for ; Fri, 30 Aug 2019 02:51:57 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728249AbfH2Qvt (ORCPT ); Thu, 29 Aug 2019 12:51:49 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:54951 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727415AbfH2Qvp (ORCPT ); Thu, 29 Aug 2019 12:51:45 -0400 Received: by mail-wm1-f66.google.com with SMTP id k2so3019151wmj.4; Thu, 29 Aug 2019 09:51:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=R7bQjRL07IuVsHCtVeRWC7Ozbw5wqGaVAOPZV3WXpeY=; b=H26Dsc71O5Ve/OWoye0L/8NyxvJKumkUvMSCymGEha1PnFP69RgehYppLxtnbD1SIp iBPQQuH6PCj9Ja6MPhcl1Dyh8uc0qjtsK3kODhfggfgnpb6y6XqgynkmJbHmUtbg+k/t t8E2rZQVDYA6bC9021rP3kJutev+J71c7y364GXcP3kaFXc35pXVpJQqXjKD1JnUO/nG JflEJmGqWLPLKHAGH0WAH5QHMt/MyvRXQTuo1/thFpAADSMPz4mtp3UVyNkZpR/Vl1JE riMhLrdzaqACHtLejND/H5FejP9e+/eq/SYZMD39FpgPPjDjPEOctKIf1AMNGZxee9Tf JU/w== X-Gm-Message-State: APjAAAUWLl3yyAcPOsrXeoBkrGs1XBr2aq1in37ARZtVC8V6mMXKg0Fw YIzGhXvTgpMhlLV5RFg8/rgmbsRlApA= X-Google-Smtp-Source: APXvYqzTmh2+e2leEekpXmNMpY4aP3o8KTvYfQbZV2OZbD3uqcbnn3dsLHg/snrcTlKH8UIZSfw2HA== X-Received: by 2002:a1c:7a14:: with SMTP id v20mr13537744wmc.75.1567097503479; Thu, 29 Aug 2019 09:51:43 -0700 (PDT) Received: from green.intra.ispras.ru (bran.ispras.ru. [83.149.199.196]) by smtp.googlemail.com with ESMTPSA id o14sm8340770wrg.64.2019.08.29.09.51.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Aug 2019 09:51:43 -0700 (PDT) From: Denis Efremov To: linux-kernel@vger.kernel.org Cc: Denis Efremov , "David S. Miller" , Joe Perches , Andrew Morton , netdev@vger.kernel.org Subject: [PATCH v3 10/11] udp: Remove unlikely() from IS_ERR*() condition Date: Thu, 29 Aug 2019 19:50:24 +0300 Message-Id: <20190829165025.15750-10-efremov@linux.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190829165025.15750-1-efremov@linux.com> References: <20190829165025.15750-1-efremov@linux.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org "unlikely(IS_ERR_OR_NULL(x))" is excessive. IS_ERR_OR_NULL() already uses unlikely() internally. Signed-off-by: Denis Efremov Cc: "David S. Miller" Cc: Joe Perches Cc: Andrew Morton Cc: netdev@vger.kernel.org --- include/net/udp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/net/udp.h b/include/net/udp.h index 79d141d2103b..bad74f780831 100644 --- a/include/net/udp.h +++ b/include/net/udp.h @@ -480,7 +480,7 @@ static inline struct sk_buff *udp_rcv_segment(struct sock *sk, * CB fragment */ segs = __skb_gso_segment(skb, features, false); - if (unlikely(IS_ERR_OR_NULL(segs))) { + if (IS_ERR_OR_NULL(segs)) { int segs_nr = skb_shinfo(skb)->gso_segs; atomic_add(segs_nr, &sk->sk_drops);