{"id":808474,"url":"http://patchwork.ozlabs.org/api/1.2/patches/808474/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/1504222183-61202-21-git-send-email-keescook@chromium.org/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.2/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1504222183-61202-21-git-send-email-keescook@chromium.org>","list_archive_url":null,"date":"2017-08-31T23:29:32","name":"[20/31] net/core: Collapse redundant sk_timer callback data assignments","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":true,"hash":"b0dd7740d267c87d2814e9f4ba3b03f6aa23c7ce","submitter":{"id":10641,"url":"http://patchwork.ozlabs.org/api/1.2/people/10641/?format=json","name":"Kees Cook","email":"keescook@chromium.org"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.2/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/1504222183-61202-21-git-send-email-keescook@chromium.org/mbox/","series":[{"id":923,"url":"http://patchwork.ozlabs.org/api/1.2/series/923/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=923","date":"2017-08-31T23:29:25","name":null,"version":1,"mbox":"http://patchwork.ozlabs.org/series/923/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/808474/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/808474/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","ozlabs.org; dkim=pass (1024-bit key;\n\tunprotected) header.d=chromium.org header.i=@chromium.org\n\theader.b=\"hhlxdM0a\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xjzSR53t6z9s8J\n\tfor ;\n\tFri, 1 Sep 2017 09:42:31 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1752007AbdHaXm2 (ORCPT );\n\tThu, 31 Aug 2017 19:42:28 -0400","from mail-pg0-f51.google.com ([74.125.83.51]:35421 \"EHLO\n\tmail-pg0-f51.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751345AbdHaXjU (ORCPT\n\t); Thu, 31 Aug 2017 19:39:20 -0400","by mail-pg0-f51.google.com with SMTP id 63so3209662pgc.2\n\tfor ; Thu, 31 Aug 2017 16:39:19 -0700 (PDT)","from www.outflux.net\n\t(173-164-112-133-Oregon.hfc.comcastbusiness.net. [173.164.112.133])\n\tby smtp.gmail.com with ESMTPSA id\n\t9sm894349pfq.127.2017.08.31.16.39.17\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tThu, 31 Aug 2017 16:39:17 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=chromium.org; s=google;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=7Ws0SrovvoTs9a/Wn2s6JtcLCwHn1178wN/01Hz8rdk=;\n\tb=hhlxdM0aruQZpGE1+bCGMLGbEo0/ebj/3BkJzOlglPLgusgZcydx87JtnsTCJ/zI9r\n\tfsFARSkKv8eUiFLhLGkHcjB+zKFrcqqqNRcBqegS4cKoX69QcbWDhORvBrcUFYyAqqLl\n\tj2vG7OrgzV7Kv8gC9yLDvhCDsjx/h3l3y79Gk=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=7Ws0SrovvoTs9a/Wn2s6JtcLCwHn1178wN/01Hz8rdk=;\n\tb=PkFrE6F+7JUt4QHo8h31L+G277od1KPEvvj0AhtVPrpCysM/hgjS9vnGimiYbkjBAr\n\t2hliQkeJ6aUI58NYSIZ75IBcFrn1+sndWJ2OpIShyPSrp9VGMHtMDtjwZaK8sDQAPmSA\n\tK18h6zgBDuPJXoEN5vJRboIXueiTtyfatnQtHR+YKI0DWtVMYZNwuBpIJyJvTMdcXoLd\n\t3SK6iFMG61z2BW7YNnOYf07R8YwpXpK9Bxh2TaFZMatHOp7MyMhBcOSHysTl1/uBiubB\n\tqIOaCdBBSs2o0Ji84yaXP6EdVNKdbT0R9/NTUe+phWrStKfGT/qFy+UNM1Qq3I/vKbq9\n\tAWQA==","X-Gm-Message-State":"AHPjjUiP89Eh6sQ4e/KYTLTQCslanNHRAwlrE4umgi1QYxxYug5kFVPY\n\tfsJ9gU5hfBccbRIf","X-Google-Smtp-Source":"ADKCNb7RoBTxsnKYeJzfRaNvCO92X+9lu0XzJVnm21od+KCHtWHaakK6WDL1HKQ3iCQsdtS3vGNyjg==","X-Received":"by 10.84.217.148 with SMTP id p20mr118090pli.293.1504222759504; \n\tThu, 31 Aug 2017 16:39:19 -0700 (PDT)","From":"Kees Cook ","To":"Thomas Gleixner ","Cc":"Kees Cook ,\n\t\"David S. Miller\" ,\n\tRalf Baechle ,\n\tAndrew Hendry ,\n\tEric Dumazet , Paolo Abeni ,\n\tDavid Howells ,\n\tColin Ian King ,\n\tIngo Molnar ,\n\tlinzhang , netdev@vger.kernel.org,\n\tlinux-hams@vger.kernel.org, linux-x25@vger.kernel.org,\n\tlinux-kernel@vger.kernel.org","Subject":"[PATCH 20/31] net/core: Collapse redundant sk_timer callback data\n\tassignments","Date":"Thu, 31 Aug 2017 16:29:32 -0700","Message-Id":"<1504222183-61202-21-git-send-email-keescook@chromium.org>","X-Mailer":"git-send-email 2.7.4","In-Reply-To":"<1504222183-61202-1-git-send-email-keescook@chromium.org>","References":"<1504222183-61202-1-git-send-email-keescook@chromium.org>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"The core sk_timer initializer can provide the common .data assignment\ninstead of it being set separately in users.\n\nCc: \"David S. Miller\" \nCc: Ralf Baechle \nCc: Andrew Hendry \nCc: Eric Dumazet \nCc: Paolo Abeni \nCc: David Howells \nCc: Colin Ian King \nCc: Ingo Molnar \nCc: linzhang \nCc: netdev@vger.kernel.org\nCc: linux-hams@vger.kernel.org\nCc: linux-x25@vger.kernel.org\nSigned-off-by: Kees Cook \n---\n net/core/sock.c | 2 +-\n net/netrom/nr_timer.c | 1 -\n net/rose/rose_timer.c | 1 -\n net/x25/af_x25.c | 1 -\n net/x25/x25_timer.c | 1 -\n 5 files changed, 1 insertion(+), 5 deletions(-)","diff":"diff --git a/net/core/sock.c b/net/core/sock.c\nindex ac2a404c73eb..5281a998ab32 100644\n--- a/net/core/sock.c\n+++ b/net/core/sock.c\n@@ -2623,7 +2623,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)\n \tsk_init_common(sk);\n \tsk->sk_send_head\t=\tNULL;\n \n-\tinit_timer(&sk->sk_timer);\n+\tsetup_timer(&sk->sk_timer, NULL, (unsigned long)sk);\n \n \tsk->sk_allocation\t=\tGFP_KERNEL;\n \tsk->sk_rcvbuf\t\t=\tsysctl_rmem_default;\ndiff --git a/net/netrom/nr_timer.c b/net/netrom/nr_timer.c\nindex 94d05806a9a2..f84ce71f1f5f 100644\n--- a/net/netrom/nr_timer.c\n+++ b/net/netrom/nr_timer.c\n@@ -45,7 +45,6 @@ void nr_init_timers(struct sock *sk)\n \tsetup_timer(&nr->idletimer, nr_idletimer_expiry, (unsigned long)sk);\n \n \t/* initialized by sock_init_data */\n-\tsk->sk_timer.data = (unsigned long)sk;\n \tsk->sk_timer.function = &nr_heartbeat_expiry;\n }\n \ndiff --git a/net/rose/rose_timer.c b/net/rose/rose_timer.c\nindex bc5469d6d9cb..6baa415b199a 100644\n--- a/net/rose/rose_timer.c\n+++ b/net/rose/rose_timer.c\n@@ -36,7 +36,6 @@ void rose_start_heartbeat(struct sock *sk)\n {\n \tdel_timer(&sk->sk_timer);\n \n-\tsk->sk_timer.data = (unsigned long)sk;\n \tsk->sk_timer.function = &rose_heartbeat_expiry;\n \tsk->sk_timer.expires = jiffies + 5 * HZ;\n \ndiff --git a/net/x25/af_x25.c b/net/x25/af_x25.c\nindex 5a1a98df3499..a5ac385b9120 100644\n--- a/net/x25/af_x25.c\n+++ b/net/x25/af_x25.c\n@@ -414,7 +414,6 @@ static void __x25_destroy_socket(struct sock *sk)\n \t\t/* Defer: outstanding buffers */\n \t\tsk->sk_timer.expires = jiffies + 10 * HZ;\n \t\tsk->sk_timer.function = x25_destroy_timer;\n-\t\tsk->sk_timer.data = (unsigned long)sk;\n \t\tadd_timer(&sk->sk_timer);\n \t} else {\n \t\t/* drop last reference so sock_put will free */\ndiff --git a/net/x25/x25_timer.c b/net/x25/x25_timer.c\nindex 5c5db1a36399..de5cec41d100 100644\n--- a/net/x25/x25_timer.c\n+++ b/net/x25/x25_timer.c\n@@ -36,7 +36,6 @@ void x25_init_timers(struct sock *sk)\n \tsetup_timer(&x25->timer, x25_timer_expiry, (unsigned long)sk);\n \n \t/* initialized by sock_init_data */\n-\tsk->sk_timer.data = (unsigned long)sk;\n \tsk->sk_timer.function = &x25_heartbeat_expiry;\n }\n \n","prefixes":["20/31"]}