* [PATCH] Openvswitch: actions.c: Removed line over 80 characters and not necessary braces.
@ 2016-01-12 21:55 Janusz Wolak
[not found] ` <1452635742-8122-1-git-send-email-januszvdm-w2tlkmz97NogbZ1banK5DA@public.gmane.org>
0 siblings, 1 reply; 7+ messages in thread
From: Janusz Wolak @ 2016-01-12 21:55 UTC (permalink / raw)
To: pshelar-l0M0P4e3n4LQT0dZR+AlfA
Cc: dev-yBygre7rU0TnMu66kgdUjQ, netdev-u79uwXL29TY76Z2rM5mHXA,
Janusz Wolak, davem-fT/PcQaiUtIeIZ0/mPfg9Q,
linux-kernel-u79uwXL29TY76Z2rM5mHXA
Fixed a coding style issue.
Signed-off-by: Janusz Wolak <januszvdm@awokados.com.pl>
---
net/openvswitch/actions.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c
index c88d0f2..28bc395 100644
--- a/net/openvswitch/actions.c
+++ b/net/openvswitch/actions.c
@@ -620,7 +620,8 @@ static int set_sctp(struct sk_buff *skb, struct sw_flow_key *flow_key,
return 0;
}
-static int ovs_vport_output(struct net *net, struct sock *sk, struct sk_buff *skb)
+static int ovs_vport_output(struct net *net, struct sock *sk,
+ struct sk_buff *skb)
{
struct ovs_frag_data *data = this_cpu_ptr(&ovs_frag_data_storage);
struct vport *vport = data->vport;
@@ -707,9 +708,8 @@ static void ovs_fragment(struct net *net, struct vport *vport,
unsigned long orig_dst;
struct rt6_info ovs_rt;
- if (!v6ops) {
+ if (!v6ops)
goto err;
- }
prepare_frag(vport, skb);
memset(&ovs_rt, 0, sizeof(ovs_rt));
--
2.5.0
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH] Openvswitch: conntrack.c: Removed multiple blank lines.
[not found] ` <1452635742-8122-1-git-send-email-januszvdm-w2tlkmz97NogbZ1banK5DA@public.gmane.org>
@ 2016-01-12 21:55 ` Janusz Wolak
2016-01-12 21:55 ` [PATCH] Openvswitch: datapath.c: Fixed coding style warnings Janusz Wolak
2016-01-12 22:10 ` [PATCH] Openvswitch: actions.c: Removed line over 80 characters and not necessary braces David Miller
2 siblings, 0 replies; 7+ messages in thread
From: Janusz Wolak @ 2016-01-12 21:55 UTC (permalink / raw)
To: pshelar-l0M0P4e3n4LQT0dZR+AlfA
Cc: dev-yBygre7rU0TnMu66kgdUjQ, netdev-u79uwXL29TY76Z2rM5mHXA,
Janusz Wolak, davem-fT/PcQaiUtIeIZ0/mPfg9Q,
linux-kernel-u79uwXL29TY76Z2rM5mHXA
Fixed a coding style issue.
Signed-off-by: Janusz Wolak <januszvdm@awokados.com.pl>
---
net/openvswitch/conntrack.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c
index e004067..fab7b55 100644
--- a/net/openvswitch/conntrack.c
+++ b/net/openvswitch/conntrack.c
@@ -201,7 +201,6 @@ static int ovs_ct_set_mark(struct sk_buff *skb, struct sw_flow_key *key,
struct nf_conn *ct;
u32 new_mark;
-
/* The connection could be invalid, in which case set_mark is no-op. */
ct = nf_ct_get(skb, &ctinfo);
if (!ct)
--
2.5.0
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH] Openvswitch: datapath.c: Fixed coding style warnings.
[not found] ` <1452635742-8122-1-git-send-email-januszvdm-w2tlkmz97NogbZ1banK5DA@public.gmane.org>
2016-01-12 21:55 ` [PATCH] Openvswitch: conntrack.c: Removed multiple blank lines Janusz Wolak
@ 2016-01-12 21:55 ` Janusz Wolak
[not found] ` <1452635742-8122-3-git-send-email-januszvdm-w2tlkmz97NogbZ1banK5DA@public.gmane.org>
2016-01-12 22:30 ` kbuild test robot
2016-01-12 22:10 ` [PATCH] Openvswitch: actions.c: Removed line over 80 characters and not necessary braces David Miller
2 siblings, 2 replies; 7+ messages in thread
From: Janusz Wolak @ 2016-01-12 21:55 UTC (permalink / raw)
To: pshelar-l0M0P4e3n4LQT0dZR+AlfA
Cc: dev-yBygre7rU0TnMu66kgdUjQ, netdev-u79uwXL29TY76Z2rM5mHXA,
Janusz Wolak, davem-fT/PcQaiUtIeIZ0/mPfg9Q,
linux-kernel-u79uwXL29TY76Z2rM5mHXA
Removed: block comments trailing without separate line,
missing blanks after decarations, comparasion to NULL, assignment in if
condition, not necessary spaces after a casts, multiple assignments, line
over 80 characters, alignment not matched to open parenthesis, kmalloc with
multiplying instead kmalloc_array.
Signed-off-by: Janusz Wolak <januszvdm@awokados.com.pl>
---
net/openvswitch/datapath.c | 75 ++++++++++++++++++++++++++--------------------
1 file changed, 42 insertions(+), 33 deletions(-)
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
index 91a8b00..12ff8c2 100644
--- a/net/openvswitch/datapath.c
+++ b/net/openvswitch/datapath.c
@@ -79,8 +79,8 @@ static const struct genl_multicast_group ovs_dp_vport_multicast_group = {
.name = OVS_VPORT_MCGROUP,
};
-/* Check if need to build a reply message.
- * OVS userspace sets the NLM_F_ECHO flag if it needs the reply. */
+/* Check if need to build a reply message.*/
+/* OVS userspace sets the NLM_F_ECHO flag if it needs the reply. */
static bool ovs_must_notify(struct genl_family *family, struct genl_info *info,
unsigned int group)
{
@@ -149,6 +149,7 @@ static struct datapath *get_dp_rcu(struct net *net, int dp_ifindex)
if (dev) {
struct vport *vport = ovs_internal_dev_get_vport(dev);
+
if (vport)
return vport->dp;
}
@@ -175,6 +176,7 @@ static inline struct datapath *get_dp(struct net *net, int dp_ifindex)
const char *ovs_dp_name(const struct datapath *dp)
{
struct vport *vport = ovs_vport_ovsl_rcu(dp, OVSP_LOCAL);
+
return ovs_vport_name(vport);
}
@@ -344,7 +346,7 @@ static int queue_gso_packets(struct datapath *dp, struct sk_buff *skb,
*OVS_CB(skb) = ovs_cb;
if (IS_ERR(segs))
return PTR_ERR(segs);
- if (segs == NULL)
+ if (!segs)
return -EINVAL;
if (gso_type & SKB_GSO_UDP) {
@@ -455,8 +457,8 @@ static int queue_userspace_packet(struct datapath *dp, struct sk_buff *skb,
}
/* Complete checksum if needed */
- if (skb->ip_summed == CHECKSUM_PARTIAL &&
- (err = skb_checksum_help(skb)))
+ err = skb_checksum_help(skb);
+ if (skb->ip_summed == CHECKSUM_PARTIAL && err)
goto out;
/* Older versions of OVS user space enforce alignment of the last
@@ -516,9 +518,10 @@ static int queue_userspace_packet(struct datapath *dp, struct sk_buff *skb,
pad_packet(dp, user_skb);
}
- /* Only reserve room for attribute header, packet data is added
- * in skb_zerocopy() */
- if (!(nla = nla_reserve(user_skb, OVS_PACKET_ATTR_PACKET, 0))) {
+ /* Only reserve room for attribute header, packet data is addedi */
+ /* in skb_zerocopy() */
+ nla = nla_reserve(user_skb, OVS_PACKET_ATTR_PACKET, 0);
+ if (!nla) {
err = -ENOBUFS;
goto out;
}
@@ -531,7 +534,7 @@ static int queue_userspace_packet(struct datapath *dp, struct sk_buff *skb,
/* Pad OVS_PACKET_ATTR_PACKET if linear copy was performed */
pad_packet(dp, user_skb);
- ((struct nlmsghdr *) user_skb->data)->nlmsg_len = user_skb->len;
+ ((struct nlmsghdr *)user_skb->data)->nlmsg_len = user_skb->len;
err = genlmsg_unicast(ovs_dp_get_net(dp), user_skb, upcall_info->portid);
user_skb = NULL;
@@ -577,9 +580,9 @@ static int ovs_packet_cmd_execute(struct sk_buff *skb, struct genl_info *info)
skb_reset_mac_header(packet);
eth = eth_hdr(packet);
- /* Normally, setting the skb 'protocol' field would be handled by a
- * call to eth_type_trans(), but it assumes there's a sending
- * device, which we may not have. */
+ /* Normally, setting the skb 'protocol' field would be handled by a */
+ /* call to eth_type_trans(), but it assumes there's a sending */
+ /* device, which we may not have. */
if (eth_proto_is_802_3(eth->h_proto))
packet->protocol = eth->h_proto;
else
@@ -685,7 +688,9 @@ static void get_dp_stats(const struct datapath *dp, struct ovs_dp_stats *stats,
stats->n_flows = ovs_flow_tbl_count(&dp->table);
mega_stats->n_masks = ovs_flow_tbl_num_masks(&dp->table);
- stats->n_hit = stats->n_missed = stats->n_lost = 0;
+ stats->n_hit = 0;
+ stats->n_missed = 0;
+ stats->n_lost = 0;
for_each_possible_cpu(i) {
const struct dp_stats_percpu *percpu_stats;
@@ -765,11 +770,12 @@ static int ovs_flow_cmd_fill_stats(const struct sw_flow *flow,
return -EMSGSIZE;
if (stats.n_packets &&
- nla_put(skb, OVS_FLOW_ATTR_STATS, sizeof(struct ovs_flow_stats), &stats))
+ nla_put(skb, OVS_FLOW_ATTR_STATS, sizeof(struct ovs_flow_stats),
+ &stats))
return -EMSGSIZE;
if ((u8)ntohs(tcp_flags) &&
- nla_put_u8(skb, OVS_FLOW_ATTR_TCP_FLAGS, (u8)ntohs(tcp_flags)))
+ nla_put_u8(skb, OVS_FLOW_ATTR_TCP_FLAGS, (u8)ntohs(tcp_flags)))
return -EMSGSIZE;
return 0;
@@ -800,9 +806,9 @@ static int ovs_flow_cmd_fill_actions(const struct sw_flow *flow,
err = ovs_nla_put_actions(sf_acts->actions,
sf_acts->actions_len, skb);
- if (!err)
+ if (!err) {
nla_nest_end(skb, start);
- else {
+ } else {
if (skb_orig_len)
return err;
@@ -1310,8 +1316,9 @@ static int ovs_flow_cmd_del(struct sk_buff *skb, struct genl_info *info)
ovs_flow_tbl_remove(&dp->table, flow);
ovs_unlock();
- reply = ovs_flow_cmd_alloc_info((const struct sw_flow_actions __force *) flow->sf_acts,
- &flow->id, info, false, ufid_flags);
+ reply = ovs_flow_cmd_alloc_info((const struct sw_flow_actions __force *)
+ flow->sf_acts, &flow->id, info,
+ false, ufid_flags);
if (likely(reply)) {
if (likely(!IS_ERR(reply))) {
rcu_read_lock(); /*To keep RCU checker happy. */
@@ -1325,7 +1332,8 @@ static int ovs_flow_cmd_del(struct sk_buff *skb, struct genl_info *info)
ovs_notify(&dp_flow_genl_family, reply, info);
} else {
- netlink_set_err(sock_net(skb->sk)->genl_sock, 0, 0, PTR_ERR(reply));
+ netlink_set_err(sock_net(skb->sk)->genl_sock, 0, 0,
+ PTR_ERR(reply));
}
}
@@ -1452,7 +1460,7 @@ static int ovs_dp_cmd_fill_info(struct datapath *dp, struct sk_buff *skb,
int err;
ovs_header = genlmsg_put(skb, portid, seq, &dp_datapath_genl_family,
- flags, cmd);
+ flags, cmd);
if (!ovs_header)
goto error;
@@ -1464,11 +1472,11 @@ static int ovs_dp_cmd_fill_info(struct datapath *dp, struct sk_buff *skb,
get_dp_stats(dp, &dp_stats, &dp_megaflow_stats);
if (nla_put(skb, OVS_DP_ATTR_STATS, sizeof(struct ovs_dp_stats),
- &dp_stats))
+ &dp_stats))
goto nla_put_failure;
if (nla_put(skb, OVS_DP_ATTR_MEGAFLOW_STATS,
- sizeof(struct ovs_dp_megaflow_stats),
+ sizeof(struct ovs_dp_megaflow_stats),
&dp_megaflow_stats))
goto nla_put_failure;
@@ -1496,9 +1504,9 @@ static struct datapath *lookup_datapath(struct net *net,
{
struct datapath *dp;
- if (!a[OVS_DP_ATTR_NAME])
+ if (!a[OVS_DP_ATTR_NAME]) {
dp = get_dp(net, ovs_header->dp_ifindex);
- else {
+ } else {
struct vport *vport;
vport = ovs_vport_locate(net, nla_data(a[OVS_DP_ATTR_NAME]));
@@ -1507,7 +1515,8 @@ static struct datapath *lookup_datapath(struct net *net,
return dp ? dp : ERR_PTR(-ENODEV);
}
-static void ovs_dp_reset_user_features(struct sk_buff *skb, struct genl_info *info)
+static void ovs_dp_reset_user_features(struct sk_buff *skb,
+ struct genl_info *info)
{
struct datapath *dp;
@@ -1545,7 +1554,7 @@ static int ovs_dp_cmd_new(struct sk_buff *skb, struct genl_info *info)
err = -ENOMEM;
dp = kzalloc(sizeof(*dp), GFP_KERNEL);
- if (dp == NULL)
+ if (!dp)
goto err_free_reply;
ovs_dp_set_net(dp, sock_net(skb->sk));
@@ -1561,8 +1570,8 @@ static int ovs_dp_cmd_new(struct sk_buff *skb, struct genl_info *info)
goto err_destroy_table;
}
- dp->ports = kmalloc(DP_VPORT_HASH_BUCKETS * sizeof(struct hlist_head),
- GFP_KERNEL);
+ dp->ports = kmalloc_array(DP_VPORT_HASH_BUCKETS,
+ sizeof(struct hlist_head), GFP_KERNEL)
if (!dp->ports) {
err = -ENOMEM;
goto err_destroy_percpu;
@@ -1897,7 +1906,8 @@ static struct vport *lookup_vport(struct net *net,
ovs_header->dp_ifindex != get_dpifindex(vport->dp))
return ERR_PTR(-ENODEV);
return vport;
- } else if (a[OVS_VPORT_ATTR_PORT_NO]) {
+ } else {
+ if (a[OVS_VPORT_ATTR_PORT_NO]) {
u32 port_no = nla_get_u32(a[OVS_VPORT_ATTR_PORT_NO]);
if (port_no >= DP_MAX_PORTS)
@@ -1911,8 +1921,9 @@ static struct vport *lookup_vport(struct net *net,
if (!vport)
return ERR_PTR(-ENODEV);
return vport;
- } else
+ } else {
return ERR_PTR(-EINVAL);
+ }
}
static int ovs_vport_cmd_new(struct sk_buff *skb, struct genl_info *info)
@@ -2021,7 +2032,6 @@ static int ovs_vport_cmd_set(struct sk_buff *skb, struct genl_info *info)
goto exit_unlock_free;
}
-
if (a[OVS_VPORT_ATTR_UPCALL_PID]) {
struct nlattr *ids = a[OVS_VPORT_ATTR_UPCALL_PID];
@@ -2218,7 +2228,6 @@ static int dp_register_genl(void)
int i;
for (i = 0; i < ARRAY_SIZE(dp_genl_families); i++) {
-
err = genl_register_family(dp_genl_families[i]);
if (err)
goto error;
--
2.5.0
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] Openvswitch: actions.c: Removed line over 80 characters and not necessary braces.
[not found] ` <1452635742-8122-1-git-send-email-januszvdm-w2tlkmz97NogbZ1banK5DA@public.gmane.org>
2016-01-12 21:55 ` [PATCH] Openvswitch: conntrack.c: Removed multiple blank lines Janusz Wolak
2016-01-12 21:55 ` [PATCH] Openvswitch: datapath.c: Fixed coding style warnings Janusz Wolak
@ 2016-01-12 22:10 ` David Miller
2 siblings, 0 replies; 7+ messages in thread
From: David Miller @ 2016-01-12 22:10 UTC (permalink / raw)
To: januszvdm-w2tlkmz97NogbZ1banK5DA
Cc: dev-yBygre7rU0TnMu66kgdUjQ, netdev-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA
It is not appropriate to submit net-next changes at this time.
If you wish to contribute to the networking kernel code, you should
read the netdev mailing lists, and read important announcements such
as this:
http://marc.info/?l=linux-netdev&m=145248145925834&w=2
THanks.
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] Openvswitch: datapath.c: Fixed coding style warnings.
[not found] ` <1452635742-8122-3-git-send-email-januszvdm-w2tlkmz97NogbZ1banK5DA@public.gmane.org>
@ 2016-01-12 22:19 ` pravin shelar
2016-01-12 22:31 ` kbuild test robot
1 sibling, 0 replies; 7+ messages in thread
From: pravin shelar @ 2016-01-12 22:19 UTC (permalink / raw)
To: Janusz Wolak
Cc: ovs dev, Linux Kernel Network Developers, David S. Miller,
linux-kernel-u79uwXL29TY76Z2rM5mHXA
On Tue, Jan 12, 2016 at 1:55 PM, Janusz Wolak <januszvdm@awokados.com.pl> wrote:
> Removed: block comments trailing without separate line,
> missing blanks after decarations, comparasion to NULL, assignment in if
> condition, not necessary spaces after a casts, multiple assignments, line
> over 80 characters, alignment not matched to open parenthesis, kmalloc with
> multiplying instead kmalloc_array.
>
>
> Signed-off-by: Janusz Wolak <januszvdm@awokados.com.pl>
> ---
> net/openvswitch/datapath.c | 75 ++++++++++++++++++++++++++--------------------
> 1 file changed, 42 insertions(+), 33 deletions(-)
>
> diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
> index 91a8b00..12ff8c2 100644
> --- a/net/openvswitch/datapath.c
> +++ b/net/openvswitch/datapath.c
...
> @@ -455,8 +457,8 @@ static int queue_userspace_packet(struct datapath *dp, struct sk_buff *skb,
> }
>
> /* Complete checksum if needed */
> - if (skb->ip_summed == CHECKSUM_PARTIAL &&
> - (err = skb_checksum_help(skb)))
> + err = skb_checksum_help(skb);
> + if (skb->ip_summed == CHECKSUM_PARTIAL && err)
> goto out;
>
skb checksum help can be expensive in some cases, so it should be
moved inside the if condition block.
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] Openvswitch: datapath.c: Fixed coding style warnings.
2016-01-12 21:55 ` [PATCH] Openvswitch: datapath.c: Fixed coding style warnings Janusz Wolak
[not found] ` <1452635742-8122-3-git-send-email-januszvdm-w2tlkmz97NogbZ1banK5DA@public.gmane.org>
@ 2016-01-12 22:30 ` kbuild test robot
1 sibling, 0 replies; 7+ messages in thread
From: kbuild test robot @ 2016-01-12 22:30 UTC (permalink / raw)
To: Janusz Wolak
Cc: kbuild-all, pshelar, davem, netdev, dev, linux-kernel,
Janusz Wolak
[-- Attachment #1: Type: text/plain, Size: 12781 bytes --]
Hi Janusz,
[auto build test ERROR on net-next/master]
[also build test ERROR on v4.4 next-20160112]
[if your patch is applied to the wrong git tree, please drop us a note to help improving the system]
url: https://github.com/0day-ci/linux/commits/Janusz-Wolak/Openvswitch-datapath-c-Fixed-coding-style-warnings/20160113-060033
config: i386-allmodconfig (attached as .config)
reproduce:
# save the attached .config to linux build tree
make ARCH=i386
All error/warnings (new ones prefixed by >>):
net/openvswitch/datapath.c: In function 'ovs_dp_cmd_new':
>> net/openvswitch/datapath.c:1575:2: error: expected ';' before 'if'
if (!dp->ports) {
^
>> net/openvswitch/datapath.c:1629:1: warning: label 'err_destroy_percpu' defined but not used [-Wunused-label]
err_destroy_percpu:
^
>> net/openvswitch/datapath.c:1545:11: warning: unused variable 'i' [-Wunused-variable]
int err, i;
^
net/openvswitch/datapath.c: In function 'lookup_vport':
>> net/openvswitch/datapath.c:1929:12: error: invalid storage class for function 'ovs_vport_cmd_new'
static int ovs_vport_cmd_new(struct sk_buff *skb, struct genl_info *info)
^
>> net/openvswitch/datapath.c:1929:1: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]
static int ovs_vport_cmd_new(struct sk_buff *skb, struct genl_info *info)
^
>> net/openvswitch/datapath.c:2006:12: error: invalid storage class for function 'ovs_vport_cmd_set'
static int ovs_vport_cmd_set(struct sk_buff *skb, struct genl_info *info)
^
>> net/openvswitch/datapath.c:2057:12: error: invalid storage class for function 'ovs_vport_cmd_del'
static int ovs_vport_cmd_del(struct sk_buff *skb, struct genl_info *info)
^
>> net/openvswitch/datapath.c:2094:12: error: invalid storage class for function 'ovs_vport_cmd_get'
static int ovs_vport_cmd_get(struct sk_buff *skb, struct genl_info *info)
^
>> net/openvswitch/datapath.c:2124:12: error: invalid storage class for function 'ovs_vport_cmd_dump'
static int ovs_vport_cmd_dump(struct sk_buff *skb, struct netlink_callback *cb)
^
>> net/openvswitch/datapath.c:2176:12: error: initializer element is not constant
.doit = ovs_vport_cmd_new
^
net/openvswitch/datapath.c:2176:12: note: (near initialization for 'dp_vport_genl_ops[0].doit')
net/openvswitch/datapath.c:2181:12: error: initializer element is not constant
.doit = ovs_vport_cmd_del
^
net/openvswitch/datapath.c:2181:12: note: (near initialization for 'dp_vport_genl_ops[1].doit')
net/openvswitch/datapath.c:2186:12: error: initializer element is not constant
.doit = ovs_vport_cmd_get,
^
net/openvswitch/datapath.c:2186:12: note: (near initialization for 'dp_vport_genl_ops[2].doit')
net/openvswitch/datapath.c:2187:14: error: initializer element is not constant
.dumpit = ovs_vport_cmd_dump
^
net/openvswitch/datapath.c:2187:14: note: (near initialization for 'dp_vport_genl_ops[2].dumpit')
net/openvswitch/datapath.c:2192:12: error: initializer element is not constant
.doit = ovs_vport_cmd_set,
^
net/openvswitch/datapath.c:2192:12: note: (near initialization for 'dp_vport_genl_ops[3].doit')
net/openvswitch/datapath.c:2212:2: error: initializer element is not constant
&dp_vport_genl_family,
^
net/openvswitch/datapath.c:2212:2: note: (near initialization for 'dp_genl_families[1]')
>> net/openvswitch/datapath.c:2217:13: error: invalid storage class for function 'dp_unregister_genl'
static void dp_unregister_genl(int n_families)
^
>> net/openvswitch/datapath.c:2225:12: error: invalid storage class for function 'dp_register_genl'
static int dp_register_genl(void)
^
>> net/openvswitch/datapath.c:2243:23: error: invalid storage class for function 'ovs_init_net'
static int __net_init ovs_init_net(struct net *net)
^
>> net/openvswitch/datapath.c:2253:24: error: invalid storage class for function 'list_vports_from_net'
static void __net_exit list_vports_from_net(struct net *net, struct net *dnet,
^
>> net/openvswitch/datapath.c:2276:24: error: invalid storage class for function 'ovs_exit_net'
static void __net_exit ovs_exit_net(struct net *dnet)
^
net/openvswitch/datapath.c:2306:10: error: initializer element is not constant
.init = ovs_init_net,
^
net/openvswitch/datapath.c:2306:10: note: (near initialization for 'ovs_net_ops.init')
net/openvswitch/datapath.c:2307:10: error: initializer element is not constant
.exit = ovs_exit_net,
^
net/openvswitch/datapath.c:2307:10: note: (near initialization for 'ovs_net_ops.exit')
>> net/openvswitch/datapath.c:2312:19: error: invalid storage class for function 'dp_init'
static int __init dp_init(void)
^
>> net/openvswitch/datapath.c:2372:13: error: invalid storage class for function 'dp_cleanup'
static void dp_cleanup(void)
^
In file included from net/openvswitch/datapath.c:22:0:
>> include/linux/module.h:128:27: error: invalid storage class for function '__inittest'
static inline initcall_t __inittest(void) \
^
>> net/openvswitch/datapath.c:2385:1: note: in expansion of macro 'module_init'
module_init(dp_init);
^
>> net/openvswitch/datapath.c:2385:1: warning: 'alias' attribute ignored [-Wattributes]
In file included from net/openvswitch/datapath.c:22:0:
vim +1575 net/openvswitch/datapath.c
ccb1352e76 Jesse Gross 2011-10-25 1539 struct nlattr **a = info->attrs;
ccb1352e76 Jesse Gross 2011-10-25 1540 struct vport_parms parms;
ccb1352e76 Jesse Gross 2011-10-25 1541 struct sk_buff *reply;
ccb1352e76 Jesse Gross 2011-10-25 1542 struct datapath *dp;
ccb1352e76 Jesse Gross 2011-10-25 1543 struct vport *vport;
46df7b8145 Pravin B Shelar 2012-02-22 1544 struct ovs_net *ovs_net;
15eac2a742 Pravin B Shelar 2012-08-23 @1545 int err, i;
ccb1352e76 Jesse Gross 2011-10-25 1546
ccb1352e76 Jesse Gross 2011-10-25 1547 err = -EINVAL;
ccb1352e76 Jesse Gross 2011-10-25 1548 if (!a[OVS_DP_ATTR_NAME] || !a[OVS_DP_ATTR_UPCALL_PID])
ccb1352e76 Jesse Gross 2011-10-25 1549 goto err;
ccb1352e76 Jesse Gross 2011-10-25 1550
6093ae9aba Jarno Rajahalme 2014-05-05 1551 reply = ovs_dp_cmd_alloc_info(info);
6093ae9aba Jarno Rajahalme 2014-05-05 1552 if (!reply)
6093ae9aba Jarno Rajahalme 2014-05-05 1553 return -ENOMEM;
ccb1352e76 Jesse Gross 2011-10-25 1554
ccb1352e76 Jesse Gross 2011-10-25 1555 err = -ENOMEM;
ccb1352e76 Jesse Gross 2011-10-25 1556 dp = kzalloc(sizeof(*dp), GFP_KERNEL);
a8ec87f63f Janusz Wolak 2016-01-12 1557 if (!dp)
6093ae9aba Jarno Rajahalme 2014-05-05 1558 goto err_free_reply;
46df7b8145 Pravin B Shelar 2012-02-22 1559
efd7ef1c19 Eric W. Biederman 2015-03-11 1560 ovs_dp_set_net(dp, sock_net(skb->sk));
ccb1352e76 Jesse Gross 2011-10-25 1561
ccb1352e76 Jesse Gross 2011-10-25 1562 /* Allocate table. */
b637e4988c Pravin B Shelar 2013-10-04 1563 err = ovs_flow_tbl_init(&dp->table);
b637e4988c Pravin B Shelar 2013-10-04 1564 if (err)
ccb1352e76 Jesse Gross 2011-10-25 1565 goto err_free_dp;
ccb1352e76 Jesse Gross 2011-10-25 1566
1c213bd24a WANG Cong 2014-02-13 1567 dp->stats_percpu = netdev_alloc_pcpu_stats(struct dp_stats_percpu);
ccb1352e76 Jesse Gross 2011-10-25 1568 if (!dp->stats_percpu) {
ccb1352e76 Jesse Gross 2011-10-25 1569 err = -ENOMEM;
ccb1352e76 Jesse Gross 2011-10-25 1570 goto err_destroy_table;
ccb1352e76 Jesse Gross 2011-10-25 1571 }
ccb1352e76 Jesse Gross 2011-10-25 1572
a8ec87f63f Janusz Wolak 2016-01-12 1573 dp->ports = kmalloc_array(DP_VPORT_HASH_BUCKETS,
a8ec87f63f Janusz Wolak 2016-01-12 1574 sizeof(struct hlist_head), GFP_KERNEL)
15eac2a742 Pravin B Shelar 2012-08-23 @1575 if (!dp->ports) {
15eac2a742 Pravin B Shelar 2012-08-23 1576 err = -ENOMEM;
15eac2a742 Pravin B Shelar 2012-08-23 1577 goto err_destroy_percpu;
15eac2a742 Pravin B Shelar 2012-08-23 1578 }
15eac2a742 Pravin B Shelar 2012-08-23 1579
15eac2a742 Pravin B Shelar 2012-08-23 1580 for (i = 0; i < DP_VPORT_HASH_BUCKETS; i++)
15eac2a742 Pravin B Shelar 2012-08-23 1581 INIT_HLIST_HEAD(&dp->ports[i]);
15eac2a742 Pravin B Shelar 2012-08-23 1582
ccb1352e76 Jesse Gross 2011-10-25 1583 /* Set up our datapath device. */
ccb1352e76 Jesse Gross 2011-10-25 1584 parms.name = nla_data(a[OVS_DP_ATTR_NAME]);
ccb1352e76 Jesse Gross 2011-10-25 1585 parms.type = OVS_VPORT_TYPE_INTERNAL;
ccb1352e76 Jesse Gross 2011-10-25 1586 parms.options = NULL;
ccb1352e76 Jesse Gross 2011-10-25 1587 parms.dp = dp;
ccb1352e76 Jesse Gross 2011-10-25 1588 parms.port_no = OVSP_LOCAL;
5cd667b0a4 Alex Wang 2014-07-17 1589 parms.upcall_portids = a[OVS_DP_ATTR_UPCALL_PID];
ccb1352e76 Jesse Gross 2011-10-25 1590
43d4be9cb5 Thomas Graf 2013-12-13 1591 ovs_dp_change(dp, a);
43d4be9cb5 Thomas Graf 2013-12-13 1592
6093ae9aba Jarno Rajahalme 2014-05-05 1593 /* So far only local changes have been made, now need the lock. */
6093ae9aba Jarno Rajahalme 2014-05-05 1594 ovs_lock();
6093ae9aba Jarno Rajahalme 2014-05-05 1595
ccb1352e76 Jesse Gross 2011-10-25 1596 vport = new_vport(&parms);
ccb1352e76 Jesse Gross 2011-10-25 1597 if (IS_ERR(vport)) {
ccb1352e76 Jesse Gross 2011-10-25 1598 err = PTR_ERR(vport);
ccb1352e76 Jesse Gross 2011-10-25 1599 if (err == -EBUSY)
ccb1352e76 Jesse Gross 2011-10-25 1600 err = -EEXIST;
ccb1352e76 Jesse Gross 2011-10-25 1601
44da5ae5fb Thomas Graf 2013-12-13 1602 if (err == -EEXIST) {
44da5ae5fb Thomas Graf 2013-12-13 1603 /* An outdated user space instance that does not understand
44da5ae5fb Thomas Graf 2013-12-13 1604 * the concept of user_features has attempted to create a new
44da5ae5fb Thomas Graf 2013-12-13 1605 * datapath and is likely to reuse it. Drop all user features.
44da5ae5fb Thomas Graf 2013-12-13 1606 */
44da5ae5fb Thomas Graf 2013-12-13 1607 if (info->genlhdr->version < OVS_DP_VER_FEATURES)
44da5ae5fb Thomas Graf 2013-12-13 1608 ovs_dp_reset_user_features(skb, info);
44da5ae5fb Thomas Graf 2013-12-13 1609 }
44da5ae5fb Thomas Graf 2013-12-13 1610
15eac2a742 Pravin B Shelar 2012-08-23 1611 goto err_destroy_ports_array;
ccb1352e76 Jesse Gross 2011-10-25 1612 }
ccb1352e76 Jesse Gross 2011-10-25 1613
6093ae9aba Jarno Rajahalme 2014-05-05 1614 err = ovs_dp_cmd_fill_info(dp, reply, info->snd_portid,
6093ae9aba Jarno Rajahalme 2014-05-05 1615 info->snd_seq, 0, OVS_DP_CMD_NEW);
6093ae9aba Jarno Rajahalme 2014-05-05 1616 BUG_ON(err < 0);
ccb1352e76 Jesse Gross 2011-10-25 1617
46df7b8145 Pravin B Shelar 2012-02-22 1618 ovs_net = net_generic(ovs_dp_get_net(dp), ovs_net_id);
59a35d60af Pravin B Shelar 2013-07-30 1619 list_add_tail_rcu(&dp->list_node, &ovs_net->dps);
8e4e1713e4 Pravin B Shelar 2013-04-15 1620
8e4e1713e4 Pravin B Shelar 2013-04-15 1621 ovs_unlock();
ccb1352e76 Jesse Gross 2011-10-25 1622
2a94fe48f3 Johannes Berg 2013-11-19 1623 ovs_notify(&dp_datapath_genl_family, reply, info);
ccb1352e76 Jesse Gross 2011-10-25 1624 return 0;
ccb1352e76 Jesse Gross 2011-10-25 1625
15eac2a742 Pravin B Shelar 2012-08-23 1626 err_destroy_ports_array:
6093ae9aba Jarno Rajahalme 2014-05-05 1627 ovs_unlock();
15eac2a742 Pravin B Shelar 2012-08-23 1628 kfree(dp->ports);
ccb1352e76 Jesse Gross 2011-10-25 @1629 err_destroy_percpu:
ccb1352e76 Jesse Gross 2011-10-25 1630 free_percpu(dp->stats_percpu);
ccb1352e76 Jesse Gross 2011-10-25 1631 err_destroy_table:
9b996e544a Pravin B Shelar 2014-05-06 1632 ovs_flow_tbl_destroy(&dp->table);
:::::: The code at line 1575 was first introduced by commit
:::::: 15eac2a74277bc7de68a7c2a64a7c91b4b6f5961 openvswitch: Increase maximum number of datapath ports.
:::::: TO: Pravin B Shelar <pshelar@nicira.com>
:::::: CC: Jesse Gross <jesse@nicira.com>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
[-- Attachment #2: .config.gz --]
[-- Type: application/octet-stream, Size: 52714 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] Openvswitch: datapath.c: Fixed coding style warnings.
[not found] ` <1452635742-8122-3-git-send-email-januszvdm-w2tlkmz97NogbZ1banK5DA@public.gmane.org>
2016-01-12 22:19 ` pravin shelar
@ 2016-01-12 22:31 ` kbuild test robot
1 sibling, 0 replies; 7+ messages in thread
From: kbuild test robot @ 2016-01-12 22:31 UTC (permalink / raw)
To: Janusz Wolak
Cc: dev-yBygre7rU0TnMu66kgdUjQ, netdev-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA, kbuild-all-JC7UmRfGjtg,
Janusz Wolak, davem-fT/PcQaiUtIeIZ0/mPfg9Q
Hi Janusz,
[auto build test ERROR on net-next/master]
[also build test ERROR on v4.4 next-20160112]
[if your patch is applied to the wrong git tree, please drop us a note to help improving the system]
url: https://github.com/0day-ci/linux/commits/Janusz-Wolak/Openvswitch-datapath-c-Fixed-coding-style-warnings/20160113-060033
config: i386-randconfig-x006-201602 (attached as .config)
reproduce:
# save the attached .config to linux build tree
make ARCH=i386
All error/warnings (new ones prefixed by >>):
net/openvswitch/datapath.c:1545:11: warning: unused variable 'i' [-Wunused-variable]
int err, i;
^
net/openvswitch/datapath.c: In function 'lookup_vport':
net/openvswitch/datapath.c:1929:12: error: invalid storage class for function 'ovs_vport_cmd_new'
static int ovs_vport_cmd_new(struct sk_buff *skb, struct genl_info *info)
^
net/openvswitch/datapath.c:1929:1: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]
static int ovs_vport_cmd_new(struct sk_buff *skb, struct genl_info *info)
^
net/openvswitch/datapath.c:2006:12: error: invalid storage class for function 'ovs_vport_cmd_set'
static int ovs_vport_cmd_set(struct sk_buff *skb, struct genl_info *info)
^
net/openvswitch/datapath.c:2057:12: error: invalid storage class for function 'ovs_vport_cmd_del'
static int ovs_vport_cmd_del(struct sk_buff *skb, struct genl_info *info)
^
net/openvswitch/datapath.c:2094:12: error: invalid storage class for function 'ovs_vport_cmd_get'
static int ovs_vport_cmd_get(struct sk_buff *skb, struct genl_info *info)
^
net/openvswitch/datapath.c:2124:12: error: invalid storage class for function 'ovs_vport_cmd_dump'
static int ovs_vport_cmd_dump(struct sk_buff *skb, struct netlink_callback *cb)
^
net/openvswitch/datapath.c:2176:12: error: initializer element is not constant
.doit = ovs_vport_cmd_new
^
net/openvswitch/datapath.c:2176:12: note: (near initialization for 'dp_vport_genl_ops[0].doit')
net/openvswitch/datapath.c:2181:12: error: initializer element is not constant
.doit = ovs_vport_cmd_del
^
net/openvswitch/datapath.c:2181:12: note: (near initialization for 'dp_vport_genl_ops[1].doit')
net/openvswitch/datapath.c:2186:12: error: initializer element is not constant
.doit = ovs_vport_cmd_get,
^
net/openvswitch/datapath.c:2186:12: note: (near initialization for 'dp_vport_genl_ops[2].doit')
net/openvswitch/datapath.c:2187:14: error: initializer element is not constant
.dumpit = ovs_vport_cmd_dump
^
net/openvswitch/datapath.c:2187:14: note: (near initialization for 'dp_vport_genl_ops[2].dumpit')
net/openvswitch/datapath.c:2192:12: error: initializer element is not constant
.doit = ovs_vport_cmd_set,
^
net/openvswitch/datapath.c:2192:12: note: (near initialization for 'dp_vport_genl_ops[3].doit')
net/openvswitch/datapath.c:2212:2: error: initializer element is not constant
&dp_vport_genl_family,
^
net/openvswitch/datapath.c:2212:2: note: (near initialization for 'dp_genl_families[1]')
net/openvswitch/datapath.c:2217:13: error: invalid storage class for function 'dp_unregister_genl'
static void dp_unregister_genl(int n_families)
^
net/openvswitch/datapath.c:2225:12: error: invalid storage class for function 'dp_register_genl'
static int dp_register_genl(void)
^
net/openvswitch/datapath.c:2243:23: error: invalid storage class for function 'ovs_init_net'
static int __net_init ovs_init_net(struct net *net)
^
net/openvswitch/datapath.c:2253:24: error: invalid storage class for function 'list_vports_from_net'
static void __net_exit list_vports_from_net(struct net *net, struct net *dnet,
^
net/openvswitch/datapath.c:2276:24: error: invalid storage class for function 'ovs_exit_net'
static void __net_exit ovs_exit_net(struct net *dnet)
^
net/openvswitch/datapath.c:2306:10: error: initializer element is not constant
.init = ovs_init_net,
^
net/openvswitch/datapath.c:2306:10: note: (near initialization for 'ovs_net_ops.init')
net/openvswitch/datapath.c:2307:10: error: initializer element is not constant
.exit = ovs_exit_net,
^
net/openvswitch/datapath.c:2307:10: note: (near initialization for 'ovs_net_ops.exit')
net/openvswitch/datapath.c:2312:19: error: invalid storage class for function 'dp_init'
static int __init dp_init(void)
^
net/openvswitch/datapath.c:2372:13: error: invalid storage class for function 'dp_cleanup'
static void dp_cleanup(void)
^
In file included from net/openvswitch/datapath.c:21:0:
net/openvswitch/datapath.c:2385:13: error: initializer element is not constant
module_init(dp_init);
^
include/linux/init.h:184:58: note: in definition of macro '__define_initcall'
__attribute__((__section__(".initcall" #id ".init"))) = fn; \
^
include/linux/init.h:219:24: note: in expansion of macro 'device_initcall'
#define __initcall(fn) device_initcall(fn)
^
include/linux/module.h:84:24: note: in expansion of macro '__initcall'
#define module_init(x) __initcall(x);
^
net/openvswitch/datapath.c:2385:1: note: in expansion of macro 'module_init'
module_init(dp_init);
^
net/openvswitch/datapath.c:2386:13: error: initializer element is not constant
module_exit(dp_cleanup);
^
include/linux/init.h:222:50: note: in definition of macro '__exitcall'
static exitcall_t __exitcall_##fn __exit_call = fn
^
net/openvswitch/datapath.c:2386:1: note: in expansion of macro 'module_exit'
module_exit(dp_cleanup);
^
>> include/linux/init.h:222:2: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]
static exitcall_t __exitcall_##fn __exit_call = fn
^
include/linux/module.h:96:24: note: in expansion of macro '__exitcall'
#define module_exit(x) __exitcall(x);
^
net/openvswitch/datapath.c:2386:1: note: in expansion of macro 'module_exit'
module_exit(dp_cleanup);
^
In file included from include/linux/module.h:18:0,
from net/openvswitch/datapath.c:22:
include/linux/moduleparam.h:27:3: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]
struct __UNIQUE_ID(name) {}
^
include/linux/module.h:171:32: note: in expansion of macro '__MODULE_INFO'
#define MODULE_INFO(tag, info) __MODULE_INFO(tag, tag, info)
^
include/linux/module.h:218:42: note: in expansion of macro 'MODULE_INFO'
#define MODULE_DESCRIPTION(_description) MODULE_INFO(description, _description)
^
net/openvswitch/datapath.c:2388:1: note: in expansion of macro 'MODULE_DESCRIPTION'
MODULE_DESCRIPTION("Open vSwitch switching datapath");
^
In file included from include/linux/init.h:4:0,
from net/openvswitch/datapath.c:21:
>> include/linux/compiler-gcc.h:181:45: error: expected declaration or statement at end of input
#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)
^
include/linux/compiler.h:50:23: note: in definition of macro '___PASTE'
#define ___PASTE(a,b) a##b
^
>> include/linux/compiler-gcc.h:181:29: note: in expansion of macro '__PASTE'
#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)
^
>> include/linux/compiler.h:51:22: note: in expansion of macro '___PASTE'
#define __PASTE(a,b) ___PASTE(a,b)
^
include/linux/compiler-gcc.h:181:37: note: in expansion of macro '__PASTE'
#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)
^
>> include/linux/moduleparam.h:27:10: note: in expansion of macro '__UNIQUE_ID'
struct __UNIQUE_ID(name) {}
^
include/linux/module.h:171:32: note: in expansion of macro '__MODULE_INFO'
#define MODULE_INFO(tag, info) __MODULE_INFO(tag, tag, info)
^
include/linux/module.h:209:34: note: in expansion of macro 'MODULE_INFO'
#define MODULE_LICENSE(_license) MODULE_INFO(license, _license)
^
>> net/openvswitch/datapath.c:2389:1: note: in expansion of macro 'MODULE_LICENSE'
MODULE_LICENSE("GPL");
^
vim +/MODULE_LICENSE +2389 net/openvswitch/datapath.c
ccb1352e76 Jesse Gross 2011-10-25 2373 {
ccb1352e76 Jesse Gross 2011-10-25 2374 dp_unregister_genl(ARRAY_SIZE(dp_genl_families));
62b9c8d037 Thomas Graf 2014-10-22 2375 ovs_netdev_exit();
ccb1352e76 Jesse Gross 2011-10-25 2376 unregister_netdevice_notifier(&ovs_dp_device_notifier);
46df7b8145 Pravin B Shelar 2012-02-22 2377 unregister_pernet_device(&ovs_net_ops);
46df7b8145 Pravin B Shelar 2012-02-22 2378 rcu_barrier();
ccb1352e76 Jesse Gross 2011-10-25 2379 ovs_vport_exit();
ccb1352e76 Jesse Gross 2011-10-25 2380 ovs_flow_exit();
5b9e7e1607 Jiri Pirko 2014-06-26 2381 ovs_internal_dev_rtnl_link_unregister();
971427f353 Andy Zhou 2014-09-15 2382 action_fifos_exit();
ccb1352e76 Jesse Gross 2011-10-25 2383 }
ccb1352e76 Jesse Gross 2011-10-25 2384
ccb1352e76 Jesse Gross 2011-10-25 2385 module_init(dp_init);
ccb1352e76 Jesse Gross 2011-10-25 2386 module_exit(dp_cleanup);
ccb1352e76 Jesse Gross 2011-10-25 2387
ccb1352e76 Jesse Gross 2011-10-25 2388 MODULE_DESCRIPTION("Open vSwitch switching datapath");
ccb1352e76 Jesse Gross 2011-10-25 @2389 MODULE_LICENSE("GPL");
:::::: The code at line 2389 was first introduced by commit
:::::: ccb1352e76cff0524e7ccb2074826a092dd13016 net: Add Open vSwitch kernel components.
:::::: TO: Jesse Gross <jesse@nicira.com>
:::::: CC: Jesse Gross <jesse@nicira.com>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2016-01-12 22:31 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-12 21:55 [PATCH] Openvswitch: actions.c: Removed line over 80 characters and not necessary braces Janusz Wolak
[not found] ` <1452635742-8122-1-git-send-email-januszvdm-w2tlkmz97NogbZ1banK5DA@public.gmane.org>
2016-01-12 21:55 ` [PATCH] Openvswitch: conntrack.c: Removed multiple blank lines Janusz Wolak
2016-01-12 21:55 ` [PATCH] Openvswitch: datapath.c: Fixed coding style warnings Janusz Wolak
[not found] ` <1452635742-8122-3-git-send-email-januszvdm-w2tlkmz97NogbZ1banK5DA@public.gmane.org>
2016-01-12 22:19 ` pravin shelar
2016-01-12 22:31 ` kbuild test robot
2016-01-12 22:30 ` kbuild test robot
2016-01-12 22:10 ` [PATCH] Openvswitch: actions.c: Removed line over 80 characters and not necessary braces David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).