From patchwork Fri Nov 9 23:10:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 995783 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=rasmusvillemoes.dk Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=rasmusvillemoes.dk header.i=@rasmusvillemoes.dk header.b="ROfAT1QD"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42sGCx0WW8z9sB7 for ; Sat, 10 Nov 2018 10:13:17 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729059AbeKJIz6 (ORCPT ); Sat, 10 Nov 2018 03:55:58 -0500 Received: from mail-lf1-f66.google.com ([209.85.167.66]:38150 "EHLO mail-lf1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728656AbeKJIxt (ORCPT ); Sat, 10 Nov 2018 03:53:49 -0500 Received: by mail-lf1-f66.google.com with SMTP id p86so2499727lfg.5 for ; Fri, 09 Nov 2018 15:11:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rasmusvillemoes.dk; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5H/2BQHGZLrKM6jSLCP6CQFWR47Yx/RzZKSAa86TREo=; b=ROfAT1QDitdlouUzw9O+xCIpRb8UnESgKrD4Jmpq8YtwSo0o7Tnc3CCjw4VbFKI0Ot yMiK5zyqU3DR5RPrI1q0aEVPTzU/rCJKDS4+/7dbYDZdPOL9A4+OI+58SBqp3pqJ6rgJ s4VmWmN9R8pLOOj/UMaPV9XTPhr+GB3ITBqUc= 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=5H/2BQHGZLrKM6jSLCP6CQFWR47Yx/RzZKSAa86TREo=; b=jis1z5ACGmN4Iat111xAbqGqRJvHD7xHVASJyCWSJSGwcZ0Dzfb+0sma6D4jzCLnn7 /4Zak9KxyuOhfEG0bZfT3bh+/n10ILs+/TaHWiCBYJ/mK19lGQ+73HAEwXw9QiFriCTg h+uTStQ7Hn8EBP1QF1pEmnSTWXnE0bQmzuOCDxDKMV0fQ6pONrlnuMg9EdGUanOuGZuN xAexxrLN/v0pt5UwlMgA7DRneH0DEOsZRmmXcDqWfJRnpsY7WTsIxV88NzHkDkR9KSqc Sdh7N3QpPjUjp8/XUNEKOgSLwK2uE2FZ4ZfOJ/iojI6sJ99AA+GXIiKu+WeHlB8si5zf EjyA== X-Gm-Message-State: AGRZ1gL/+EnIJbFSsA++qfE5uMDHaM0yCtmSGQXg9JXpE1wOmE+ysEdD mGqqYnQCtZmYyWpxOOTYc8CSZw== X-Google-Smtp-Source: AJdET5f3Bn9Fv4uatOCunOWQx1Ji8eQq6PNf7NUpZLY0TgHri7ESjGrBugn1K6xyb6yZiCqZx8ppDw== X-Received: by 2002:a19:cec8:: with SMTP id e191mr6344662lfg.13.1541805063367; Fri, 09 Nov 2018 15:11:03 -0800 (PST) Received: from prevas-ravi.prevas.se (dhcp-5-186-114-252.cgn.ip.fibianet.dk. [5.186.114.252]) by smtp.gmail.com with ESMTPSA id x16sm1584012lff.26.2018.11.09.15.11.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 09 Nov 2018 15:11:02 -0800 (PST) From: Rasmus Villemoes To: Andrew Morton , Jason Baron Cc: linux-kernel@vger.kernel.org, Rasmus Villemoes , netdev@vger.kernel.org Subject: [PATCH v3 03/23] linux/net.h: use DYNAMIC_DEBUG_BRANCH in net_dbg_ratelimited Date: Sat, 10 Nov 2018 00:10:01 +0100 Message-Id: <20181109231021.11658-4-linux@rasmusvillemoes.dk> X-Mailer: git-send-email 2.19.1.6.gbde171bbf5 In-Reply-To: <20181109231021.11658-1-linux@rasmusvillemoes.dk> References: <20181009112013.14238-1-linux@rasmusvillemoes.dk> <20181109231021.11658-1-linux@rasmusvillemoes.dk> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org net_dbg_ratelimited tests the dynamic debug descriptor the old-fashioned way, and doesn't utilize the static key/jump label implementation on architectures that HAVE_JUMP_LABEL. Use the DYNAMIC_DEBUG_BRANCH which is defined appropriately. Cc: netdev@vger.kernel.org Acked-by: Jason Baron Signed-off-by: Rasmus Villemoes --- include/linux/net.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/net.h b/include/linux/net.h index e0930678c8bf..651fca72286c 100644 --- a/include/linux/net.h +++ b/include/linux/net.h @@ -263,7 +263,7 @@ do { \ #define net_dbg_ratelimited(fmt, ...) \ do { \ DEFINE_DYNAMIC_DEBUG_METADATA(descriptor, fmt); \ - if (unlikely(descriptor.flags & _DPRINTK_FLAGS_PRINT) && \ + if (DYNAMIC_DEBUG_BRANCH(descriptor) && \ net_ratelimit()) \ __dynamic_pr_debug(&descriptor, pr_fmt(fmt), \ ##__VA_ARGS__); \