int count[2];
};
-static struct percpu_loop_counter *vport_loop_counter;
+static DEFINE_PER_CPU(struct percpu_loop_counter, vport_loop_counter);
#define VPORT_MAX_LOOPS 5
/* Both RTNL lock and vport_mutex need to be held when updating dev_table.
* Acquire global vport lock. See above comment about locking requirements
* and specific function definitions. May sleep.
*/
-void
-vport_lock(void)
+void vport_lock(void)
{
mutex_lock(&vport_mutex);
}
*
* Release lock acquired with vport_lock.
*/
-void
-vport_unlock(void)
+void vport_unlock(void)
{
mutex_unlock(&vport_mutex);
}
* Called at module load time to initialize the vport subsystem and any
* compiled in vport types.
*/
-int
-vport_init(void)
+int vport_init(void)
{
int err;
int i;
goto error_dev_table;
}
- vport_loop_counter = alloc_percpu(struct percpu_loop_counter);
- if (!vport_loop_counter) {
- err = -ENOMEM;
- goto error_ops_list;
- }
-
for (i = 0; i < ARRAY_SIZE(base_vport_ops_list); i++) {
struct vport_ops *new_ops = base_vport_ops_list[i];
return 0;
-error_ops_list:
- kfree(vport_ops_list);
error_dev_table:
kfree(dev_table);
error:
return err;
}
-static void
-vport_del_all(void)
+static void vport_del_all(void)
{
int i;
* Called at module exit time to shutdown the vport subsystem and any
* initialized vport types.
*/
-void
-vport_exit(void)
+void vport_exit(void)
{
int i;
vport_ops_list[i]->exit();
}
- free_percpu(vport_loop_counter);
kfree(vport_ops_list);
kfree(dev_table);
}
-static int
-do_vport_add(struct odp_vport_add *vport_config)
+static int do_vport_add(struct odp_vport_add *vport_config)
{
struct vport *vport;
int err = 0;
vport = vport_locate(vport_config->devname);
if (vport) {
- err = -EEXIST;
+ err = -EBUSY;
goto out;
}
* on device type). This function is for userspace callers and assumes no
* locks are held.
*/
-int
-vport_user_add(const struct odp_vport_add __user *uvport_config)
+int vport_user_add(const struct odp_vport_add __user *uvport_config)
{
struct odp_vport_add vport_config;
}
#ifdef CONFIG_COMPAT
-int
-compat_vport_user_add(struct compat_odp_vport_add *ucompat)
+int compat_vport_user_add(struct compat_odp_vport_add *ucompat)
{
struct compat_odp_vport_add compat;
struct odp_vport_add vport_config;
}
#endif
-static int
-do_vport_mod(struct odp_vport_mod *vport_config)
+static int do_vport_mod(struct odp_vport_mod *vport_config)
{
struct vport *vport;
int err;
* dependent on device type). This function is for userspace callers and
* assumes no locks are held.
*/
-int
-vport_user_mod(const struct odp_vport_mod __user *uvport_config)
+int vport_user_mod(const struct odp_vport_mod __user *uvport_config)
{
struct odp_vport_mod vport_config;
}
#ifdef CONFIG_COMPAT
-int
-compat_vport_user_mod(struct compat_odp_vport_mod *ucompat)
+int compat_vport_user_mod(struct compat_odp_vport_mod *ucompat)
{
struct compat_odp_vport_mod compat;
struct odp_vport_mod vport_config;
* reasons, such as lack of memory. This function is for userspace callers and
* assumes no locks are held.
*/
-int
-vport_user_del(const char __user *udevname)
+int vport_user_del(const char __user *udevname)
{
char devname[IFNAMSIZ];
struct vport *vport;
* Retrieves transmit, receive, and error stats for the given device. This
* function is for userspace callers and assumes no locks are held.
*/
-int
-vport_user_stats_get(struct odp_vport_stats_req __user *ustats_req)
+int vport_user_stats_get(struct odp_vport_stats_req __user *ustats_req)
{
struct odp_vport_stats_req stats_req;
struct vport *vport;
* -EOPNOTSUPP. This function is for userspace callers and assumes no locks
* are held.
*/
-int
-vport_user_stats_set(struct odp_vport_stats_req __user *ustats_req)
+int vport_user_stats_set(struct odp_vport_stats_req __user *ustats_req)
{
struct odp_vport_stats_req stats_req;
struct vport *vport;
* Retrieves the Ethernet address of the given device. This function is for
* userspace callers and assumes no locks are held.
*/
-int
-vport_user_ether_get(struct odp_vport_ether __user *uvport_ether)
+int vport_user_ether_get(struct odp_vport_ether __user *uvport_ether)
{
struct odp_vport_ether vport_ether;
struct vport *vport;
* -EOPNOTSUPP. This function is for userspace callers and assumes no locks
* are held.
*/
-int
-vport_user_ether_set(struct odp_vport_ether __user *uvport_ether)
+int vport_user_ether_set(struct odp_vport_ether __user *uvport_ether)
{
struct odp_vport_ether vport_ether;
struct vport *vport;
* Retrieves the MTU of the given device. This function is for userspace
* callers and assumes no locks are held.
*/
-int
-vport_user_mtu_get(struct odp_vport_mtu __user *uvport_mtu)
+int vport_user_mtu_get(struct odp_vport_mtu __user *uvport_mtu)
{
struct odp_vport_mtu vport_mtu;
struct vport *vport;
* MTU, in which case the result will always be -EOPNOTSUPP. This function is
* for userspace callers and assumes no locks are held.
*/
-int
-vport_user_mtu_set(struct odp_vport_mtu __user *uvport_mtu)
+int vport_user_mtu_set(struct odp_vport_mtu __user *uvport_mtu)
{
struct odp_vport_mtu vport_mtu;
struct vport *vport;
return err;
}
-static struct hlist_head *
-hash_bucket(const char *name)
+static struct hlist_head *hash_bucket(const char *name)
{
unsigned int hash = full_name_hash(name, strlen(name));
return &dev_table[hash & (VPORT_HASH_BUCKETS - 1)];
* and held while using the found port. See the locking comments at the
* top of the file.
*/
-struct vport *
-vport_locate(const char *name)
+struct vport *vport_locate(const char *name)
{
struct hlist_head *bucket = hash_bucket(name);
struct vport *vport;
return vport;
}
-static void
-register_vport(struct vport *vport)
+static void register_vport(struct vport *vport)
{
hlist_add_head(&vport->hash_node, hash_bucket(vport_get_name(vport)));
}
-static void
-unregister_vport(struct vport *vport)
+static void unregister_vport(struct vport *vport)
{
hlist_del(&vport->hash_node);
}
* vport_priv(). vports that are no longer needed should be released with
* vport_free().
*/
-struct vport *
-vport_alloc(int priv_size, const struct vport_ops *ops)
+struct vport *vport_alloc(int priv_size, const struct vport_ops *ops)
{
struct vport *vport;
size_t alloc_size;
*
* Frees a vport allocated with vport_alloc() when it is no longer needed.
*/
-void
-vport_free(struct vport *vport)
+void vport_free(struct vport *vport)
{
if (vport->ops->flags & VPORT_F_GEN_STATS)
free_percpu(vport->percpu_stats);
* Creates a new vport with the specified configuration (which is dependent
* on device type). Both RTNL and vport locks must be held.
*/
-struct vport *
-vport_add(const char *name, const char *type, const void __user *config)
+struct vport *vport_add(const char *name, const char *type, const void __user *config)
{
struct vport *vport;
int err = 0;
* Modifies an existing device with the specified configuration (which is
* dependent on device type). Both RTNL and vport locks must be held.
*/
-int
-vport_mod(struct vport *vport, const void __user *config)
+int vport_mod(struct vport *vport, const void __user *config)
{
ASSERT_RTNL();
ASSERT_VPORT();
* a datapath. It is possible to fail for reasons such as lack of memory.
* Both RTNL and vport locks must be held.
*/
-int
-vport_del(struct vport *vport)
+int vport_del(struct vport *vport)
{
ASSERT_RTNL();
ASSERT_VPORT();
* attached to a vport before it is connected to a datapath and must not be
* modified while connected. RTNL lock and the appropriate DP mutex must be held.
*/
-int
-vport_attach(struct vport *vport, struct dp_port *dp_port)
+int vport_attach(struct vport *vport, struct dp_port *dp_port)
{
ASSERT_RTNL();
* Detaches a vport from a datapath. May fail for a variety of reasons,
* including lack of memory. RTNL lock and the appropriate DP mutex must be held.
*/
-int
-vport_detach(struct vport *vport)
+int vport_detach(struct vport *vport)
{
struct dp_port *dp_port;
* MTU, in which case the result will always be -EOPNOTSUPP. RTNL lock must
* be held.
*/
-int
-vport_set_mtu(struct vport *vport, int mtu)
+int vport_set_mtu(struct vport *vport, int mtu)
{
ASSERT_RTNL();
* setting the Ethernet address, in which case the result will always be
* -EOPNOTSUPP. RTNL lock must be held.
*/
-int
-vport_set_addr(struct vport *vport, const unsigned char *addr)
+int vport_set_addr(struct vport *vport, const unsigned char *addr)
{
ASSERT_RTNL();
* support setting the stats, in which case the result will always be
* -EOPNOTSUPP. RTNL lock must be held.
*/
-int
-vport_set_stats(struct vport *vport, struct odp_vport_stats *stats)
+int vport_set_stats(struct vport *vport, struct odp_vport_stats *stats)
{
ASSERT_RTNL();
* Retrieves the name of the given device. Either RTNL lock or rcu_read_lock
* must be held for the entire duration that the name is in use.
*/
-const char *
-vport_get_name(const struct vport *vport)
+const char *vport_get_name(const struct vport *vport)
{
return vport->ops->get_name(vport);
}
* Retrieves the type of the given device. Either RTNL lock or rcu_read_lock
* must be held for the entire duration that the type is in use.
*/
-const char *
-vport_get_type(const struct vport *vport)
+const char *vport_get_type(const struct vport *vport)
{
return vport->ops->type;
}
* rcu_read_lock must be held for the entire duration that the Ethernet address
* is in use.
*/
-const unsigned char *
-vport_get_addr(const struct vport *vport)
+const unsigned char *vport_get_addr(const struct vport *vport)
{
return vport->ops->get_addr(vport);
}
* lock or rcu_read_lock must be held for the entire duration that the datapath
* port is being accessed.
*/
-struct dp_port *
-vport_get_dp_port(const struct vport *vport)
+struct dp_port *vport_get_dp_port(const struct vport *vport)
{
return rcu_dereference(vport->dp_port);
}
* Retrieves the associated kobj or null if no kobj. The returned kobj is
* valid for as long as the vport exists.
*/
-struct kobject *
-vport_get_kobj(const struct vport *vport)
+struct kobject *vport_get_kobj(const struct vport *vport)
{
if (vport->ops->get_kobj)
return vport->ops->get_kobj(vport);
*
* Retrieves transmit, receive, and error stats for the given device.
*/
-int
-vport_get_stats(struct vport *vport, struct odp_vport_stats *stats)
+int vport_get_stats(struct vport *vport, struct odp_vport_stats *stats)
{
struct odp_vport_stats dev_stats;
struct odp_vport_stats *dev_statsp = NULL;
* Retrieves the flags of the given device. Either RTNL lock or rcu_read_lock
* must be held.
*/
-unsigned
-vport_get_flags(const struct vport *vport)
+unsigned vport_get_flags(const struct vport *vport)
{
return vport->ops->get_dev_flags(vport);
}
* Checks whether the given device is running. Either RTNL lock or
* rcu_read_lock must be held.
*/
-int
-vport_is_running(const struct vport *vport)
+int vport_is_running(const struct vport *vport)
{
return vport->ops->is_running(vport);
}
* Retrieves the RFC2863 operstate of the given device. Either RTNL lock or
* rcu_read_lock must be held.
*/
-unsigned char
-vport_get_operstate(const struct vport *vport)
+unsigned char vport_get_operstate(const struct vport *vport)
{
return vport->ops->get_operstate(vport);
}
* port is returned. Returns a negative index on error. Either RTNL lock or
* rcu_read_lock must be held.
*/
-int
-vport_get_ifindex(const struct vport *vport)
+int vport_get_ifindex(const struct vport *vport)
{
const struct dp_port *dp_port;
* Returns a negative index on error. Either RTNL lock or rcu_read_lock must
* be held.
*/
-int
-vport_get_iflink(const struct vport *vport)
+int vport_get_iflink(const struct vport *vport)
{
if (vport->ops->get_iflink)
return vport->ops->get_iflink(vport);
* Retrieves the MTU of the given device. Either RTNL lock or rcu_read_lock
* must be held.
*/
-int
-vport_get_mtu(const struct vport *vport)
+int vport_get_mtu(const struct vport *vport)
{
return vport->ops->get_mtu(vport);
}
* skb->data should point to the Ethernet header. The caller must have already
* called compute_ip_summed() to initialize the checksumming fields.
*/
-void
-vport_receive(struct vport *vport, struct sk_buff *skb)
+void vport_receive(struct vport *vport, struct sk_buff *skb)
{
struct dp_port *dp_port = vport_get_dp_port(vport);
dp_process_received_packet(dp_port, skb);
}
-static inline unsigned
-packet_length(const struct sk_buff *skb)
+static inline unsigned packet_length(const struct sk_buff *skb)
{
unsigned length = skb->len - ETH_HLEN;
* Sends the given packet and returns the length of data sent. Either RTNL
* lock or rcu_read_lock must be held.
*/
-int
-vport_send(struct vport *vport, struct sk_buff *skb)
+int vport_send(struct vport *vport, struct sk_buff *skb)
{
int *loop_count;
int mtu;
int sent;
- loop_count = &per_cpu_ptr(vport_loop_counter, get_cpu())->count[!!in_interrupt()];
+ loop_count = &get_cpu_var(vport_loop_counter).count[!!in_interrupt()];
(*loop_count)++;
if (unlikely(*loop_count > VPORT_MAX_LOOPS)) {
vport_record_error(vport, VPORT_E_TX_DROPPED);
out:
(*loop_count)--;
- put_cpu();
+ put_cpu_var(vport_loop_counter);
return sent;
}
* If using the vport generic stats layer indicate that an error of the given
* type has occured.
*/
-void
-vport_record_error(struct vport *vport, enum vport_err_type err_type)
+void vport_record_error(struct vport *vport, enum vport_err_type err_type)
{
if (vport->ops->flags & VPORT_F_GEN_STATS) {
projects / openvswitch / blobdiff