{"id":815941,"url":"http://patchwork.ozlabs.org/api/patches/815941/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170919232709.14690-2-edumazet@google.com/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/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":"<20170919232709.14690-2-edumazet@google.com>","list_archive_url":null,"date":"2017-09-19T23:27:03","name":"[v2,net-next,1/7] kobject: add kobject_uevent_net_broadcast()","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"eebb3f337963583fb07d252729485026c1942bcb","submitter":{"id":13357,"url":"http://patchwork.ozlabs.org/api/people/13357/?format=json","name":"Eric Dumazet","email":"edumazet@google.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20170919232709.14690-2-edumazet@google.com/mbox/","series":[{"id":3987,"url":"http://patchwork.ozlabs.org/api/series/3987/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=3987","date":"2017-09-19T23:27:02","name":"net: speedup netns create/delete time","version":2,"mbox":"http://patchwork.ozlabs.org/series/3987/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/815941/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/815941/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=\"Pg1zShrl\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xxfDG2qc2z9sPr\n\tfor ;\n\tWed, 20 Sep 2017 09:27:26 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751714AbdISX1T (ORCPT );\n\tTue, 19 Sep 2017 19:27:19 -0400","from mail-pg0-f43.google.com ([74.125.83.43]:48569 \"EHLO\n\tmail-pg0-f43.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751578AbdISX1P (ORCPT\n\t); Tue, 19 Sep 2017 19:27:15 -0400","by mail-pg0-f43.google.com with SMTP id v23so675261pgc.5\n\tfor ; Tue, 19 Sep 2017 16:27:15 -0700 (PDT)","from localhost ([2620:15c:2cb:201:58bc:17b0:6372:1d5f])\n\tby smtp.gmail.com with ESMTPSA id\n\te69sm4861368pfc.79.2017.09.19.16.27.14\n\t(version=TLS1_2 cipher=AES128-SHA bits=128/128);\n\tTue, 19 Sep 2017 16:27:14 -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=Pg1zShrlljAv2ZT6RGSkWEhD+5+K6eXmkxNKt7a663qvvNlEJJ/rd6TrUcSzg7K77l\n\tak9AQ1wqcD3Ckr9rSRGpUbEsMmODQgXW3i03cjws9aIkBiyDcympA56mO6ikMoRadtgO\n\tM/2TwmX5aRee4910yGow7HdIrx4a6CDp+rxrq0KFW9sfcdoZg76ZIDJhmVwqc43n8GfF\n\tn1tbgIOxOG/mXjwkGzAFGgx355owIIboSOjYbthmol4gHdkavuCzNm3nDmckEGQSuhaD\n\tYVBGv/t0azR84Y/c5BO8K9f23ewp9cLHHoxiJb+9glQ+uJxr+uiYV+xYrDF2RYArd5Oy\n\td/zw==","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=rcCiLwKCv8e/f4kw0WxLvdN3hdVFBYFTGw6dtkfJlZJm0r1ZMoA1Z8JFvq0ZXMi4Jo\n\tOH2v6ALCznbY/T5fsaJJWmGKaVQ57HmLEAZryoO48wMJ2eHWSL/l9QCrCuJF3aVHd2zO\n\tKzsXD3uSgQ2TkuzRUYCPa/3h4TwS2QJKJaxwf2LhgCb+gxC2A5weh1MUL4s8PqfZWHu9\n\t5t8byySu0d0vDQ6Oq505yohhdEbN09gK55KeFW5jQG3Ktns5bA0/b+Mu32ewX3Pto2uB\n\tnLt20G6q944EPysWUDScMDyyKdkiPn1XKKy9vwsbFny6EDv+UUWrctlLGC66XEaw2rQn\n\tlEAg==","X-Gm-Message-State":"AHPjjUjqz13M8N/SiF8PeXRoMcabCdeSCZNpF53x2bE2RIn/H8txMzZv\n\t5FkRzgdV9Rc3dxdkW1B8u1ejDjLMkew=","X-Google-Smtp-Source":"AOwi7QD7MnptT4KGF5ZTDUEs/IflUyonVTvKsl3zrF/oIzV0YdExOZNwrd1Zu9yh6/zG5kl9huLOZA==","X-Received":"by 10.98.223.88 with SMTP id u85mr225826pfg.219.1505863634989;\n\tTue, 19 Sep 2017 16:27:14 -0700 (PDT)","From":"Eric Dumazet ","To":"\"David S . Miller\" ","Cc":"netdev ,\n\t\"Eric W . Biederman\" ,\n\tEric Dumazet , Eric Dumazet ","Subject":"[PATCH v2 net-next 1/7] kobject: add kobject_uevent_net_broadcast()","Date":"Tue, 19 Sep 2017 16:27:03 -0700","Message-Id":"<20170919232709.14690-2-edumazet@google.com>","X-Mailer":"git-send-email 2.14.1.690.gbb1197296e-goog","In-Reply-To":"<20170919232709.14690-1-edumazet@google.com>","References":"<20170919232709.14690-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":["v2","net-next","1/7"]}