From patchwork Sat Feb 16 16:28:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yafang Shao X-Patchwork-Id: 1043451 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=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="fqTN2VlS"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 441wZD45RJz9s3l for ; Sun, 17 Feb 2019 03:29:24 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731135AbfBPQ3X (ORCPT ); Sat, 16 Feb 2019 11:29:23 -0500 Received: from mail-pg1-f196.google.com ([209.85.215.196]:34787 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726057AbfBPQ3W (ORCPT ); Sat, 16 Feb 2019 11:29:22 -0500 Received: by mail-pg1-f196.google.com with SMTP id i130so6288247pgd.1 for ; Sat, 16 Feb 2019 08:29:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/CZLcxtZRFLjmNzi9qyvYfH+eAcFqUgETj5ynId5HDU=; b=fqTN2VlSqr47uS/Hjy+TG/jPnNu1rQnzm9X7QAFw2eVBevfu7B/w9aZBEubFA0z7TM Zv0BjS7xoCGA47bEdtImr/JvCsDMoxUrw8puYZ9ispH9s4XYgXnWvKS3zt9RibsmDpkq LpJK8X53TWy1TzRkrqP+z8qR4wS/zy7WMO0YjIhuBYoFL/RoLmhzu14+tx38/6bGyRIf wGdB32bPeP9g/EAg6gnWmozOEs+9ZtkO/YhNdyY4ZtbfZgKUhePsvWRXuyjOHQ65SU+e fPabU6IJsRcdA4O5sCec9XcB8eNQr1UVE8uR1nY1roJ+RXhNwj22FyqMWmCqmJLIrur4 wqZg== 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; bh=/CZLcxtZRFLjmNzi9qyvYfH+eAcFqUgETj5ynId5HDU=; b=KSt7JlFh2D4L+H1BTfsGzJjjM1kGnKCVBz8EBwGS/wymTLqMGlzgj3IVWk6HuEZgga yTgS0X6JEU8JH1UYSdg1Mp9MSQ4Wq6vFrvYj4Aee0WH8SoEwKNpqE1EFhv89V8/XAaR/ oYmdZqB7HAT+tZWwhHY8SjjxkQgFm1366WA0dud2O0aTAFxOyAXtREcJ+xSF3DIsnJ3s dSSb41MGgHdmRNUD6nCI+Zqzh492ZrB8SZ2lK9BMJtzRy3aR/9HkiXlcalYK0ovbl+kQ Se1ccqxmQsuIL0hQlUlorUArdZkvCaKcJM4RAiqlroE/hZg1qNCAzNjj32sY++f3syNb 2LBA== X-Gm-Message-State: AHQUAubBODVMLBxuGm2g88/8w4VlXKfI3780Scq63l5Z30NxHoQngAob hMgaiWtbrtkCTsOnzGcgcU0= X-Google-Smtp-Source: AHgI3Ib+/nNlhY380M/DdGS98Ws3PtGrg+5fl/i85g0iu7TKFcqhZm8/0530wk7XDpICUbR1GP9y/g== X-Received: by 2002:a62:109b:: with SMTP id 27mr15288825pfq.227.1550334562029; Sat, 16 Feb 2019 08:29:22 -0800 (PST) Received: from localhost.localdomain ([203.100.54.194]) by smtp.gmail.com with ESMTPSA id g87sm19179201pfe.43.2019.02.16.08.29.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 16 Feb 2019 08:29:21 -0800 (PST) From: Yafang Shao To: davem@davemloft.net Cc: daniel@iogearbox.net, edumazet@google.com, joe@perches.com, xiyou.wangcong@gmail.com, netdev@vger.kernel.org, shaoyafang@didiglobal.com, Yafang Shao Subject: [PATCH v2 net-next 2/2] net: sock: undefine SOCK_DEBUGGING Date: Sun, 17 Feb 2019 00:28:57 +0800 Message-Id: <1550334537-380-3-git-send-email-laoar.shao@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1550334537-380-1-git-send-email-laoar.shao@gmail.com> References: <1550334537-380-1-git-send-email-laoar.shao@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org SOCK_DEBUG() is a old facility for debugging. If the user want to use it for debugging, the user must modify the application first, that doesn't seem like a good way. Now we have more powerful facilities, i.e. bpf or tracepoint, for this kind of debugging purpose. So we'd better disable it by default. The reason why I don't remove it comepletely is that someone may still would like to use it for debugging. Signed-off-by: Yafang Shao Suggested-by: Joe Perches --- include/net/sock.h | 13 ++++++++----- net/core/sock.c | 3 +++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/include/net/sock.h b/include/net/sock.h index 6679f3c..d41e8f4 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -81,14 +81,17 @@ */ /* Define this to get the SOCK_DBG debugging facility. */ -#define SOCK_DEBUGGING +/* #define SOCK_DEBUGGING */ #ifdef SOCK_DEBUGGING -#define SOCK_DEBUG(sk, msg...) do { if ((sk) && sock_flag((sk), SOCK_DBG)) \ - printk(KERN_DEBUG msg); } while (0) +#define SOCK_DEBUG(sk, fmt, ...) \ +do { \ + if ((sk) && sock_flag((sk), SOCK_DBG)) \ + pr_debug(fmt, ##__VA_ARGS__); \ +} while (0) #else /* Validate arguments and do nothing */ -static inline __printf(2, 3) -void SOCK_DEBUG(const struct sock *sk, const char *msg, ...) +__printf(2, 3) +static inline void SOCK_DEBUG(const struct sock *sk, const char *fmt, ...) { } #endif diff --git a/net/core/sock.c b/net/core/sock.c index 71ded4d..7c15835 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -753,6 +753,9 @@ int sock_setsockopt(struct socket *sock, int level, int optname, switch (optname) { case SO_DEBUG: + /* This option takes effect only when SOCK_DEBUGGING + * is defined. + */ if (val && !capable(CAP_NET_ADMIN)) ret = -EACCES; else