Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef319d4f authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-sysfs-related-cleanups' 



Stephen Hemminger says:

====================
net: sysfs related cleanups

Network sysfs infrastructure changes. Mostly related to using ro_after_init
to make function tables immutable.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 01d300c5 6648c65e

drivers/net/virtio_net.c

+1 −1
Original line number Diff line number Diff line
@@ -2376,7 +2376,7 @@ static int init_vqs(struct virtnet_info *vi) 


#ifdef CONFIG_SYSFS

static ssize_t mergeable_rx_buffer_size_show(struct netdev_rx_queue *queue,

		struct rx_queue_attribute *attribute, char *buf)

		char *buf)

{

	struct virtnet_info *vi = netdev_priv(queue->dev);

	unsigned int queue_index = get_netdev_rx_queue_index(queue);

include/linux/netdevice.h

+7 −8
Original line number Diff line number Diff line
@@ -694,10 +694,9 @@ struct netdev_rx_queue { 
 */

struct rx_queue_attribute {

	struct attribute attr;

	ssize_t (*show)(struct netdev_rx_queue *queue,

	    struct rx_queue_attribute *attr, char *buf);

	ssize_t (*show)(struct netdev_rx_queue *queue, char *buf);

	ssize_t (*store)(struct netdev_rx_queue *queue,

	    struct rx_queue_attribute *attr, const char *buf, size_t len);

			 const char *buf, size_t len);

};



#ifdef CONFIG_XPS
@@ -4013,22 +4012,22 @@ static inline netdev_tx_t netdev_start_xmit(struct sk_buff *skb, struct net_devi 
	return rc;

}



int netdev_class_create_file_ns(struct class_attribute *class_attr,

int netdev_class_create_file_ns(const struct class_attribute *class_attr,

				const void *ns);

void netdev_class_remove_file_ns(struct class_attribute *class_attr,

void netdev_class_remove_file_ns(const struct class_attribute *class_attr,

				 const void *ns);



static inline int netdev_class_create_file(struct class_attribute *class_attr)

static inline int netdev_class_create_file(const struct class_attribute *class_attr)

{

	return netdev_class_create_file_ns(class_attr, NULL);

}



static inline void netdev_class_remove_file(struct class_attribute *class_attr)

static inline void netdev_class_remove_file(const struct class_attribute *class_attr)

{

	netdev_class_remove_file_ns(class_attr, NULL);

}



extern struct kobj_ns_type_operations net_ns_type_operations;

extern const struct kobj_ns_type_operations net_ns_type_operations;



const char *netdev_drivername(const struct net_device *dev);

net/core/net-sysfs.c

+104 −118
Original line number Diff line number Diff line
@@ -97,7 +97,8 @@ static ssize_t netdev_store(struct device *dev, struct device_attribute *attr, 
		return restart_syscall();



	if (dev_isalive(netdev)) {

		if ((ret = (*set)(netdev, new)) == 0)

		ret = (*set)(netdev, new);

		if (ret == 0)

			ret = len;

	}

	rtnl_unlock();
@@ -160,6 +161,7 @@ static ssize_t broadcast_show(struct device *dev, 
			      struct device_attribute *attr, char *buf)

{

	struct net_device *ndev = to_net_dev(dev);



	if (dev_isalive(ndev))

		return sysfs_format_mac(buf, ndev->broadcast, ndev->addr_len);

	return -EINVAL;
@@ -183,9 +185,10 @@ static ssize_t carrier_show(struct device *dev, 
			    struct device_attribute *attr, char *buf)

{

	struct net_device *netdev = to_net_dev(dev);

	if (netif_running(netdev)) {



	if (netif_running(netdev))

		return sprintf(buf, fmt_dec, !!netif_carrier_ok(netdev));

	}



	return -EINVAL;

}

static DEVICE_ATTR_RW(carrier);
@@ -290,6 +293,7 @@ static ssize_t carrier_changes_show(struct device *dev, 
				    char *buf)

{

	struct net_device *netdev = to_net_dev(dev);



	return sprintf(buf, fmt_dec,

		       atomic_read(&netdev->carrier_changes));

}
@@ -508,7 +512,7 @@ static ssize_t phys_switch_id_show(struct device *dev, 
}

static DEVICE_ATTR_RO(phys_switch_id);



static struct attribute *net_class_attrs[] = {

static struct attribute *net_class_attrs[] __ro_after_init = {

	&dev_attr_netdev_group.attr,

	&dev_attr_type.attr,

	&dev_attr_dev_id.attr,
@@ -597,7 +601,7 @@ NETSTAT_ENTRY(rx_compressed); 
NETSTAT_ENTRY(tx_compressed);

NETSTAT_ENTRY(rx_nohandler);



static struct attribute *netstat_attrs[] = {

static struct attribute *netstat_attrs[] __ro_after_init = {

	&dev_attr_rx_packets.attr,

	&dev_attr_tx_packets.attr,

	&dev_attr_rx_bytes.attr,
@@ -625,7 +629,6 @@ static struct attribute *netstat_attrs[] = { 
	NULL

};





static const struct attribute_group netstat_group = {

	.name  = "statistics",

	.attrs  = netstat_attrs,
@@ -647,33 +650,33 @@ static const struct attribute_group wireless_group = { 
#endif /* CONFIG_SYSFS */



#ifdef CONFIG_SYSFS

#define to_rx_queue_attr(_attr) container_of(_attr,		\

    struct rx_queue_attribute, attr)

#define to_rx_queue_attr(_attr) \

	container_of(_attr, struct rx_queue_attribute, attr)



#define to_rx_queue(obj) container_of(obj, struct netdev_rx_queue, kobj)



static ssize_t rx_queue_attr_show(struct kobject *kobj, struct attribute *attr,

				  char *buf)

{

	struct rx_queue_attribute *attribute = to_rx_queue_attr(attr);

	const struct rx_queue_attribute *attribute = to_rx_queue_attr(attr);

	struct netdev_rx_queue *queue = to_rx_queue(kobj);



	if (!attribute->show)

		return -EIO;



	return attribute->show(queue, attribute, buf);

	return attribute->show(queue, buf);

}



static ssize_t rx_queue_attr_store(struct kobject *kobj, struct attribute *attr,

				   const char *buf, size_t count)

{

	struct rx_queue_attribute *attribute = to_rx_queue_attr(attr);

	const struct rx_queue_attribute *attribute = to_rx_queue_attr(attr);

	struct netdev_rx_queue *queue = to_rx_queue(kobj);



	if (!attribute->store)

		return -EIO;



	return attribute->store(queue, attribute, buf, count);

	return attribute->store(queue, buf, count);

}



static const struct sysfs_ops rx_queue_sysfs_ops = {
@@ -682,8 +685,7 @@ static const struct sysfs_ops rx_queue_sysfs_ops = { 
};



#ifdef CONFIG_RPS

static ssize_t show_rps_map(struct netdev_rx_queue *queue,

			    struct rx_queue_attribute *attribute, char *buf)

static ssize_t show_rps_map(struct netdev_rx_queue *queue, char *buf)

{

	struct rps_map *map;

	cpumask_var_t mask;
@@ -706,7 +708,6 @@ static ssize_t show_rps_map(struct netdev_rx_queue *queue, 
}



static ssize_t store_rps_map(struct netdev_rx_queue *queue,

		      struct rx_queue_attribute *attribute,

			     const char *buf, size_t len)

{

	struct rps_map *old_map, *map;
@@ -738,9 +739,9 @@ static ssize_t store_rps_map(struct netdev_rx_queue *queue, 
	for_each_cpu_and(cpu, mask, cpu_online_mask)

		map->cpus[i++] = cpu;



	if (i)

	if (i) {

		map->len = i;

	else {

	} else {

		kfree(map);

		map = NULL;

	}
@@ -765,7 +766,6 @@ static ssize_t store_rps_map(struct netdev_rx_queue *queue, 
}



static ssize_t show_rps_dev_flow_table_cnt(struct netdev_rx_queue *queue,

					   struct rx_queue_attribute *attr,

					   char *buf)

{

	struct rps_dev_flow_table *flow_table;
@@ -788,7 +788,6 @@ static void rps_dev_flow_table_release(struct rcu_head *rcu) 
}



static ssize_t store_rps_dev_flow_table_cnt(struct netdev_rx_queue *queue,

				     struct rx_queue_attribute *attr,

					    const char *buf, size_t len)

{

	unsigned long mask, count;
@@ -831,8 +830,9 @@ static ssize_t store_rps_dev_flow_table_cnt(struct netdev_rx_queue *queue, 
		table->mask = mask;

		for (count = 0; count <= mask; count++)

			table->flows[count].cpu = RPS_NO_CPU;

	} else

	} else {

		table = NULL;

	}



	spin_lock(&rps_dev_flow_lock);

	old_table = rcu_dereference_protected(queue->rps_flow_table,
@@ -846,16 +846,15 @@ static ssize_t store_rps_dev_flow_table_cnt(struct netdev_rx_queue *queue, 
	return len;

}



static struct rx_queue_attribute rps_cpus_attribute =

	__ATTR(rps_cpus, S_IRUGO | S_IWUSR, show_rps_map, store_rps_map);

static struct rx_queue_attribute rps_cpus_attribute __ro_after_init

	= __ATTR(rps_cpus, S_IRUGO | S_IWUSR, show_rps_map, store_rps_map);





static struct rx_queue_attribute rps_dev_flow_table_cnt_attribute =

	__ATTR(rps_flow_cnt, S_IRUGO | S_IWUSR,

static struct rx_queue_attribute rps_dev_flow_table_cnt_attribute __ro_after_init

	= __ATTR(rps_flow_cnt, S_IRUGO | S_IWUSR,

		 show_rps_dev_flow_table_cnt, store_rps_dev_flow_table_cnt);

#endif /* CONFIG_RPS */



static struct attribute *rx_queue_default_attrs[] = {

static struct attribute *rx_queue_default_attrs[] __ro_after_init = {

#ifdef CONFIG_RPS

	&rps_cpus_attribute.attr,

	&rps_dev_flow_table_cnt_attribute.attr,
@@ -870,7 +869,6 @@ static void rx_queue_release(struct kobject *kobj) 
	struct rps_map *map;

	struct rps_dev_flow_table *flow_table;





	map = rcu_dereference_protected(queue->rps_map, 1);

	if (map) {

		RCU_INIT_POINTER(queue->rps_map, NULL);
@@ -900,7 +898,7 @@ static const void *rx_queue_namespace(struct kobject *kobj) 
	return ns;

}



static struct kobj_type rx_queue_ktype = {

static struct kobj_type rx_queue_ktype __ro_after_init = {

	.sysfs_ops = &rx_queue_sysfs_ops,

	.release = rx_queue_release,

	.default_attrs = rx_queue_default_attrs,
@@ -917,20 +915,19 @@ static int rx_queue_add_kobject(struct net_device *dev, int index) 
	error = kobject_init_and_add(kobj, &rx_queue_ktype, NULL,

				     "rx-%u", index);

	if (error)

		goto exit;

		return error;



	if (dev->sysfs_rx_queue_group) {

		error = sysfs_create_group(kobj, dev->sysfs_rx_queue_group);

		if (error)

			goto exit;

		if (error) {

			kobject_put(kobj);

			return error;

		}

	}



	kobject_uevent(kobj, KOBJ_ADD);

	dev_hold(queue->dev);



	return error;

exit:

	kobject_put(kobj);

	return error;

}

#endif /* CONFIG_SYSFS */
@@ -976,39 +973,40 @@ net_rx_queue_update_kobjects(struct net_device *dev, int old_num, int new_num) 
 */

struct netdev_queue_attribute {

	struct attribute attr;

	ssize_t (*show)(struct netdev_queue *queue,

	    struct netdev_queue_attribute *attr, char *buf);

	ssize_t (*show)(struct netdev_queue *queue, char *buf);

	ssize_t (*store)(struct netdev_queue *queue,

	    struct netdev_queue_attribute *attr, const char *buf, size_t len);

			 const char *buf, size_t len);

};

#define to_netdev_queue_attr(_attr) container_of(_attr,		\

    struct netdev_queue_attribute, attr)

#define to_netdev_queue_attr(_attr) \

	container_of(_attr, struct netdev_queue_attribute, attr)



#define to_netdev_queue(obj) container_of(obj, struct netdev_queue, kobj)



static ssize_t netdev_queue_attr_show(struct kobject *kobj,

				      struct attribute *attr, char *buf)

{

	struct netdev_queue_attribute *attribute = to_netdev_queue_attr(attr);

	const struct netdev_queue_attribute *attribute

		= to_netdev_queue_attr(attr);

	struct netdev_queue *queue = to_netdev_queue(kobj);



	if (!attribute->show)

		return -EIO;



	return attribute->show(queue, attribute, buf);

	return attribute->show(queue, buf);

}



static ssize_t netdev_queue_attr_store(struct kobject *kobj,

				       struct attribute *attr,

				       const char *buf, size_t count)

{

	struct netdev_queue_attribute *attribute = to_netdev_queue_attr(attr);

	const struct netdev_queue_attribute *attribute

		= to_netdev_queue_attr(attr);

	struct netdev_queue *queue = to_netdev_queue(kobj);



	if (!attribute->store)

		return -EIO;



	return attribute->store(queue, attribute, buf, count);

	return attribute->store(queue, buf, count);

}



static const struct sysfs_ops netdev_queue_sysfs_ops = {
@@ -1016,9 +1014,7 @@ static const struct sysfs_ops netdev_queue_sysfs_ops = { 
	.store = netdev_queue_attr_store,

};



static ssize_t show_trans_timeout(struct netdev_queue *queue,

				  struct netdev_queue_attribute *attribute,

				  char *buf)

static ssize_t tx_timeout_show(struct netdev_queue *queue, char *buf)

{

	unsigned long trans_timeout;
@@ -1040,8 +1036,7 @@ static unsigned int get_netdev_queue_index(struct netdev_queue *queue) 
	return i;

}



static ssize_t show_traffic_class(struct netdev_queue *queue,

				  struct netdev_queue_attribute *attribute,

static ssize_t traffic_class_show(struct netdev_queue *queue,

				  char *buf)

{

	struct net_device *dev = queue->dev;
@@ -1055,15 +1050,13 @@ static ssize_t show_traffic_class(struct netdev_queue *queue, 
}



#ifdef CONFIG_XPS

static ssize_t show_tx_maxrate(struct netdev_queue *queue,

			       struct netdev_queue_attribute *attribute,

static ssize_t tx_maxrate_show(struct netdev_queue *queue,

			       char *buf)

{

	return sprintf(buf, "%lu\n", queue->tx_maxrate);

}



static ssize_t set_tx_maxrate(struct netdev_queue *queue,

			      struct netdev_queue_attribute *attribute,

static ssize_t tx_maxrate_store(struct netdev_queue *queue,

				const char *buf, size_t len)

{

	struct net_device *dev = queue->dev;
@@ -1089,16 +1082,15 @@ static ssize_t set_tx_maxrate(struct netdev_queue *queue, 
	return err;

}



static struct netdev_queue_attribute queue_tx_maxrate =

	__ATTR(tx_maxrate, S_IRUGO | S_IWUSR,

	       show_tx_maxrate, set_tx_maxrate);

static struct netdev_queue_attribute queue_tx_maxrate __ro_after_init

	= __ATTR_RW(tx_maxrate);

#endif



static struct netdev_queue_attribute queue_trans_timeout =

	__ATTR(tx_timeout, S_IRUGO, show_trans_timeout, NULL);

static struct netdev_queue_attribute queue_trans_timeout __ro_after_init

	= __ATTR_RO(tx_timeout);



static struct netdev_queue_attribute queue_traffic_class =

	__ATTR(traffic_class, S_IRUGO, show_traffic_class, NULL);

static struct netdev_queue_attribute queue_traffic_class __ro_after_init

	= __ATTR_RO(traffic_class);



#ifdef CONFIG_BQL

/*
@@ -1115,9 +1107,9 @@ static ssize_t bql_set(const char *buf, const size_t count, 
	unsigned int value;

	int err;



	if (!strcmp(buf, "max") || !strcmp(buf, "max\n"))

	if (!strcmp(buf, "max") || !strcmp(buf, "max\n")) {

		value = DQL_MAX_LIMIT;

	else {

	} else {

		err = kstrtouint(buf, 10, &value);

		if (err < 0)

			return err;
@@ -1131,7 +1123,6 @@ static ssize_t bql_set(const char *buf, const size_t count, 
}



static ssize_t bql_show_hold_time(struct netdev_queue *queue,

				  struct netdev_queue_attribute *attr,

				  char *buf)

{

	struct dql *dql = &queue->dql;
@@ -1140,7 +1131,6 @@ static ssize_t bql_show_hold_time(struct netdev_queue *queue, 
}



static ssize_t bql_set_hold_time(struct netdev_queue *queue,

				 struct netdev_queue_attribute *attribute,

				 const char *buf, size_t len)

{

	struct dql *dql = &queue->dql;
@@ -1156,12 +1146,11 @@ static ssize_t bql_set_hold_time(struct netdev_queue *queue, 
	return len;

}



static struct netdev_queue_attribute bql_hold_time_attribute =

	__ATTR(hold_time, S_IRUGO | S_IWUSR, bql_show_hold_time,

	    bql_set_hold_time);

static struct netdev_queue_attribute bql_hold_time_attribute __ro_after_init

	= __ATTR(hold_time, S_IRUGO | S_IWUSR,

		 bql_show_hold_time, bql_set_hold_time);



static ssize_t bql_show_inflight(struct netdev_queue *queue,

				 struct netdev_queue_attribute *attr,

				 char *buf)

{

	struct dql *dql = &queue->dql;
@@ -1169,33 +1158,31 @@ static ssize_t bql_show_inflight(struct netdev_queue *queue, 
	return sprintf(buf, "%u\n", dql->num_queued - dql->num_completed);

}



static struct netdev_queue_attribute bql_inflight_attribute =

static struct netdev_queue_attribute bql_inflight_attribute __ro_after_init =

	__ATTR(inflight, S_IRUGO, bql_show_inflight, NULL);



#define BQL_ATTR(NAME, FIELD)						\

static ssize_t bql_show_ ## NAME(struct netdev_queue *queue,		\

				 struct netdev_queue_attribute *attr,	\

				 char *buf)				\

{									\

	return bql_show(buf, queue->dql.FIELD);				\

}									\

									\

static ssize_t bql_set_ ## NAME(struct netdev_queue *queue,		\

				struct netdev_queue_attribute *attr,	\

				const char *buf, size_t len)		\

{									\

	return bql_set(buf, len, &queue->dql.FIELD);			\

}									\

									\

static struct netdev_queue_attribute bql_ ## NAME ## _attribute =	\

	__ATTR(NAME, S_IRUGO | S_IWUSR, bql_show_ ## NAME,		\

	    bql_set_ ## NAME);

static struct netdev_queue_attribute bql_ ## NAME ## _attribute __ro_after_init \

	= __ATTR(NAME, S_IRUGO | S_IWUSR,				\

		 bql_show_ ## NAME, bql_set_ ## NAME)



BQL_ATTR(limit, limit)

BQL_ATTR(limit_max, max_limit)

BQL_ATTR(limit_min, min_limit)

BQL_ATTR(limit, limit);

BQL_ATTR(limit_max, max_limit);

BQL_ATTR(limit_min, min_limit);



static struct attribute *dql_attrs[] = {

static struct attribute *dql_attrs[] __ro_after_init = {

	&bql_limit_attribute.attr,

	&bql_limit_max_attribute.attr,

	&bql_limit_min_attribute.attr,
@@ -1211,8 +1198,8 @@ static const struct attribute_group dql_group = { 
#endif /* CONFIG_BQL */



#ifdef CONFIG_XPS

static ssize_t show_xps_map(struct netdev_queue *queue,

			    struct netdev_queue_attribute *attribute, char *buf)

static ssize_t xps_cpus_show(struct netdev_queue *queue,

			     char *buf)

{

	struct net_device *dev = queue->dev;

	int cpu, len, num_tc = 1, tc = 0;
@@ -1258,8 +1245,7 @@ static ssize_t show_xps_map(struct netdev_queue *queue, 
	return len < PAGE_SIZE ? len : -EINVAL;

}



static ssize_t store_xps_map(struct netdev_queue *queue,

		      struct netdev_queue_attribute *attribute,

static ssize_t xps_cpus_store(struct netdev_queue *queue,

			      const char *buf, size_t len)

{

	struct net_device *dev = queue->dev;
@@ -1288,11 +1274,11 @@ static ssize_t store_xps_map(struct netdev_queue *queue, 
	return err ? : len;

}



static struct netdev_queue_attribute xps_cpus_attribute =

    __ATTR(xps_cpus, S_IRUGO | S_IWUSR, show_xps_map, store_xps_map);

static struct netdev_queue_attribute xps_cpus_attribute __ro_after_init

	= __ATTR_RW(xps_cpus);

#endif /* CONFIG_XPS */



static struct attribute *netdev_queue_default_attrs[] = {

static struct attribute *netdev_queue_default_attrs[] __ro_after_init = {

	&queue_trans_timeout.attr,

	&queue_traffic_class.attr,

#ifdef CONFIG_XPS
@@ -1322,7 +1308,7 @@ static const void *netdev_queue_namespace(struct kobject *kobj) 
	return ns;

}



static struct kobj_type netdev_queue_ktype = {

static struct kobj_type netdev_queue_ktype __ro_after_init = {

	.sysfs_ops = &netdev_queue_sysfs_ops,

	.release = netdev_queue_release,

	.default_attrs = netdev_queue_default_attrs,
@@ -1339,21 +1325,20 @@ static int netdev_queue_add_kobject(struct net_device *dev, int index) 
	error = kobject_init_and_add(kobj, &netdev_queue_ktype, NULL,

				     "tx-%u", index);

	if (error)

		goto exit;

		return error;



#ifdef CONFIG_BQL

	error = sysfs_create_group(kobj, &dql_group);

	if (error)

		goto exit;

	if (error) {

		kobject_put(kobj);

		return error;

	}

#endif



	kobject_uevent(kobj, KOBJ_ADD);

	dev_hold(queue->dev);



	return 0;

exit:

	kobject_put(kobj);

	return error;

}

#endif /* CONFIG_SYSFS */
@@ -1463,7 +1448,7 @@ static const void *net_netlink_ns(struct sock *sk) 
	return sock_net(sk);

}



struct kobj_ns_type_operations net_ns_type_operations = {

const struct kobj_ns_type_operations net_ns_type_operations = {

	.type = KOBJ_NS_TYPE_NET,

	.current_may_mount = net_current_may_mount,

	.grab_current_ns = net_grab_current_ns,
@@ -1485,7 +1470,8 @@ static int netdev_uevent(struct device *d, struct kobj_uevent_env *env) 


	/* pass ifindex to uevent.

	 * ifindex is useful as it won't change (interface name may change)

	 * and is what RtNetlink uses natively. */

	 * and is what RtNetlink uses natively.

	 */

	retval = add_uevent_var(env, "IFINDEX=%d", dev->ifindex);



exit:
@@ -1513,7 +1499,7 @@ static const void *net_namespace(struct device *d) 
	return dev_net(dev);

}



static struct class net_class = {

static struct class net_class __ro_after_init = {

	.name = "net",

	.dev_release = netdev_release,

	.dev_groups = net_class_groups,
@@ -1560,7 +1546,7 @@ EXPORT_SYMBOL(of_find_net_device_by_node); 
 */

void netdev_unregister_kobject(struct net_device *ndev)

{

	struct device *dev = &(ndev->dev);

	struct device *dev = &ndev->dev;



	if (!atomic_read(&dev_net(ndev)->count))

		dev_set_uevent_suppress(dev, 1);
@@ -1577,7 +1563,7 @@ void netdev_unregister_kobject(struct net_device *ndev) 
/* Create sysfs entries for network device. */

int netdev_register_kobject(struct net_device *ndev)

{

	struct device *dev = &(ndev->dev);

	struct device *dev = &ndev->dev;

	const struct attribute_group **groups = ndev->sysfs_groups;

	int error = 0;
@@ -1620,14 +1606,14 @@ int netdev_register_kobject(struct net_device *ndev) 
	return error;

}



int netdev_class_create_file_ns(struct class_attribute *class_attr,

int netdev_class_create_file_ns(const struct class_attribute *class_attr,

				const void *ns)

{

	return class_create_file_ns(&net_class, class_attr, ns);

}

EXPORT_SYMBOL(netdev_class_create_file_ns);



void netdev_class_remove_file_ns(struct class_attribute *class_attr,

void netdev_class_remove_file_ns(const struct class_attribute *class_attr,

				 const void *ns)

{

	class_remove_file_ns(&net_class, class_attr, ns);