{"id":815097,"url":"http://patchwork.ozlabs.org/api/1.2/patches/815097/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170918190733.26272-2-edumazet@google.com/","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":"<20170918190733.26272-2-edumazet@google.com>","list_archive_url":null,"date":"2017-09-18T19:07:27","name":"[net-next,1/7] kobject: add kobject_uevent_net_broadcast()","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":true,"hash":"eebb3f337963583fb07d252729485026c1942bcb","submitter":{"id":13357,"url":"http://patchwork.ozlabs.org/api/1.2/people/13357/?format=json","name":"Eric Dumazet","email":"edumazet@google.com"},"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/20170918190733.26272-2-edumazet@google.com/mbox/","series":[{"id":3713,"url":"http://patchwork.ozlabs.org/api/1.2/series/3713/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=3713","date":"2017-09-18T19:07:26","name":"net: speedup netns create/delete time","version":1,"mbox":"http://patchwork.ozlabs.org/series/3713/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/815097/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/815097/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 (2048-bit key;\n\tunprotected) header.d=google.com header.i=@google.com\n\theader.b=\"rISb69E2\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xwwW71Zjzz9s81\n\tfor ;\n\tTue, 19 Sep 2017 05:07:46 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751057AbdIRTHo (ORCPT );\n\tMon, 18 Sep 2017 15:07:44 -0400","from mail-pf0-f174.google.com ([209.85.192.174]:48102 \"EHLO\n\tmail-pf0-f174.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1750772AbdIRTHk (ORCPT\n\t); Mon, 18 Sep 2017 15:07:40 -0400","by mail-pf0-f174.google.com with SMTP id u12so712311pfl.4\n\tfor ; Mon, 18 Sep 2017 12:07:40 -0700 (PDT)","from localhost ([2620:15c:2cb:201:1d19:43e0:8828:6785])\n\tby smtp.gmail.com with ESMTPSA id\n\tp71sm212133pfl.56.2017.09.18.12.07.39\n\t(version=TLS1_2 cipher=AES128-SHA bits=128/128);\n\tMon, 18 Sep 2017 12:07:39 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=google.com; s=20161025;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=A+W+MxjCGvwoNvoq9Q64BcxGblbEQJeISuX0casX8Cc=;\n\tb=rISb69E2Hc00Dqg/hP+IjA4kqKotLcJAM0WfrYePe10uDr6jKsRZap7FnNSCegF3BS\n\t+iAWppxnA6+jxXlWrwDIW2nWe1tpx0dWieZCNeqM8kKCxqrj7uJeQLMb86p9L8cXge6x\n\tyAly6YCUet3cikatebKLYwgKRWUOOHoXyqFS05tKfnVhw68h22g8KNXHiasNvSizArhs\n\tU/NkaKA7dWnxWGBuw9fa/pAbgkBAHbkn3rHW6nlC99fkLotzBihDZ0r67W2+0scEFFFW\n\tR9pjvvC1PmiTRH9W8U5L/EDv8Y1EQg9vnRNHhRWz9GWKmdYC5CW1hIt0hxOTMt45frML\n\tscPA==","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=A+W+MxjCGvwoNvoq9Q64BcxGblbEQJeISuX0casX8Cc=;\n\tb=G+kQAEVYf8GhbAMIy7xt1Uq1C6+CGEOU0IrdHAq1YoGVezRX9kpmI48j4gP4OtvSdU\n\tJc9/HhNQzYxeWCND5BqYK949JHhC9Fq5uyLl2PX7mR5gu+bjycswo7aYWesxut3z4HlE\n\txP2nHp0YbHeeYrPage1Pbt+kFqaXYyOSTzZO5dqFQmFXCvgiypphJDCGnSZqFcM9wu/d\n\t/BGNh4nPiEgYDEEdelnJVUJdBaHgruXQRfh3Gqs+/plRjyxyQKmGv/QiWrNNQMRadyrX\n\taaaTJoIyAa4hj1CucVlAf1tqR/KcGRQfGZbrUWSQ/y6HvmiNKWuE3ijKZgIFfjdtmnGu\n\t3NGA==","X-Gm-Message-State":"AHPjjUgA71+C9Qt4TaoYR2GKxPOa17qfOL0SDzQ6I4oXqqSyKDr+AaBx\n\tiVr+CxB+9WM+QbFg","X-Google-Smtp-Source":"ADKCNb46lajwm74VFS5q+lv+YA8VANFdFl2Naxjkxh8lMTX1WrkOXKvx5VSdBn9IX0F3qYfftHNvsw==","X-Received":"by 10.101.74.129 with SMTP id b1mr32844474pgu.272.1505761660284; \n\tMon, 18 Sep 2017 12:07:40 -0700 (PDT)","From":"Eric Dumazet ","To":"\"David S . Miller\" ","Cc":"netdev ,\n\t\"Eric W . Biederman\" ,\n\tEric Dumazet , Eric Dumazet ","Subject":"[PATCH net-next 1/7] kobject: add kobject_uevent_net_broadcast()","Date":"Mon, 18 Sep 2017 12:07:27 -0700","Message-Id":"<20170918190733.26272-2-edumazet@google.com>","X-Mailer":"git-send-email 2.14.1.690.gbb1197296e-goog","In-Reply-To":"<20170918190733.26272-1-edumazet@google.com>","References":"<20170918190733.26272-1-edumazet@google.com>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"This removes some #ifdef pollution and will ease follow up patches.\n\nSigned-off-by: Eric Dumazet \n---\n lib/kobject_uevent.c | 96 +++++++++++++++++++++++++++++-----------------------\n 1 file changed, 53 insertions(+), 43 deletions(-)","diff":"diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c\nindex e590523ea4761425df5e112a2c2aab873dbaa90d..4f48cc3b11d566e44c4115cc7716bc3b1cdf96df 100644\n--- a/lib/kobject_uevent.c\n+++ b/lib/kobject_uevent.c\n@@ -294,6 +294,57 @@ static void cleanup_uevent_env(struct subprocess_info *info)\n }\n #endif\n \n+static int kobject_uevent_net_broadcast(struct kobject *kobj,\n+\t\t\t\t\tstruct kobj_uevent_env *env,\n+\t\t\t\t\tconst char *action_string,\n+\t\t\t\t\tconst char *devpath)\n+{\n+\tint retval = 0;\n+#if defined(CONFIG_NET)\n+\tstruct uevent_sock *ue_sk;\n+\n+\t/* send netlink message */\n+\tlist_for_each_entry(ue_sk, &uevent_sock_list, list) {\n+\t\tstruct sock *uevent_sock = ue_sk->sk;\n+\t\tstruct sk_buff *skb;\n+\t\tsize_t len;\n+\n+\t\tif (!netlink_has_listeners(uevent_sock, 1))\n+\t\t\tcontinue;\n+\n+\t\t/* allocate message with the maximum possible size */\n+\t\tlen = strlen(action_string) + strlen(devpath) + 2;\n+\t\tskb = alloc_skb(len + env->buflen, GFP_KERNEL);\n+\t\tif (skb) {\n+\t\t\tchar *scratch;\n+\t\t\tint i;\n+\n+\t\t\t/* add header */\n+\t\t\tscratch = skb_put(skb, len);\n+\t\t\tsprintf(scratch, \"%s@%s\", action_string, devpath);\n+\n+\t\t\t/* copy keys to our continuous event payload buffer */\n+\t\t\tfor (i = 0; i < env->envp_idx; i++) {\n+\t\t\t\tlen = strlen(env->envp[i]) + 1;\n+\t\t\t\tscratch = skb_put(skb, len);\n+\t\t\t\tstrcpy(scratch, env->envp[i]);\n+\t\t\t}\n+\n+\t\t\tNETLINK_CB(skb).dst_group = 1;\n+\t\t\tretval = netlink_broadcast_filtered(uevent_sock, skb,\n+\t\t\t\t\t\t\t 0, 1, GFP_KERNEL,\n+\t\t\t\t\t\t\t kobj_bcast_filter,\n+\t\t\t\t\t\t\t kobj);\n+\t\t\t/* ENOBUFS should be handled in userspace */\n+\t\t\tif (retval == -ENOBUFS || retval == -ESRCH)\n+\t\t\t\tretval = 0;\n+\t\t} else\n+\t\t\tretval = -ENOMEM;\n+\t}\n+#endif\n+\treturn retval;\n+}\n+\n /**\n * kobject_uevent_env - send an uevent with environmental data\n *\n@@ -316,9 +367,6 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,\n \tconst struct kset_uevent_ops *uevent_ops;\n \tint i = 0;\n \tint retval = 0;\n-#ifdef CONFIG_NET\n-\tstruct uevent_sock *ue_sk;\n-#endif\n \n \tpr_debug(\"kobject: '%s' (%p): %s\\n\",\n \t\t kobject_name(kobj), kobj, __func__);\n@@ -427,46 +475,8 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,\n \t\tmutex_unlock(&uevent_sock_mutex);\n \t\tgoto exit;\n \t}\n-\n-#if defined(CONFIG_NET)\n-\t/* send netlink message */\n-\tlist_for_each_entry(ue_sk, &uevent_sock_list, list) {\n-\t\tstruct sock *uevent_sock = ue_sk->sk;\n-\t\tstruct sk_buff *skb;\n-\t\tsize_t len;\n-\n-\t\tif (!netlink_has_listeners(uevent_sock, 1))\n-\t\t\tcontinue;\n-\n-\t\t/* allocate message with the maximum possible size */\n-\t\tlen = strlen(action_string) + strlen(devpath) + 2;\n-\t\tskb = alloc_skb(len + env->buflen, GFP_KERNEL);\n-\t\tif (skb) {\n-\t\t\tchar *scratch;\n-\n-\t\t\t/* add header */\n-\t\t\tscratch = skb_put(skb, len);\n-\t\t\tsprintf(scratch, \"%s@%s\", action_string, devpath);\n-\n-\t\t\t/* copy keys to our continuous event payload buffer */\n-\t\t\tfor (i = 0; i < env->envp_idx; i++) {\n-\t\t\t\tlen = strlen(env->envp[i]) + 1;\n-\t\t\t\tscratch = skb_put(skb, len);\n-\t\t\t\tstrcpy(scratch, env->envp[i]);\n-\t\t\t}\n-\n-\t\t\tNETLINK_CB(skb).dst_group = 1;\n-\t\t\tretval = netlink_broadcast_filtered(uevent_sock, skb,\n-\t\t\t\t\t\t\t 0, 1, GFP_KERNEL,\n-\t\t\t\t\t\t\t kobj_bcast_filter,\n-\t\t\t\t\t\t\t kobj);\n-\t\t\t/* ENOBUFS should be handled in userspace */\n-\t\t\tif (retval == -ENOBUFS || retval == -ESRCH)\n-\t\t\t\tretval = 0;\n-\t\t} else\n-\t\t\tretval = -ENOMEM;\n-\t}\n-#endif\n+\tretval = kobject_uevent_net_broadcast(kobj, env, action_string,\n+\t\t\t\t\t devpath);\n \tmutex_unlock(&uevent_sock_mutex);\n \n #ifdef CONFIG_UEVENT_HELPER\n","prefixes":["net-next","1/7"]}