* Re: [PATCH] sctp: Make "Invalid Stream Identifier" ERROR follows SACK when bundling
From: xufeng zhang @ 2012-07-23 5:16 UTC (permalink / raw)
To: vyasevich, sri, davem; +Cc: xufengzhang.main, linux-sctp, netdev, linux-kernel
In-Reply-To: <1342677450-21810-1-git-send-email-xufengzhang.main@gmail.com>
On 07/19/2012 01:57 PM, xufengzhang.main@gmail.com wrote:
> When "Invalid Stream Identifier" ERROR happens after process the
> received DATA chunks, this ERROR chunk is enqueued into outqueue
> before SACK chunk, so when bundling ERROR chunk with SACK chunk,
> the ERROR chunk is always placed first in the packet because of
> the chunk's position in the outqueue.
> This violates sctp specification:
> RFC 4960 6.5. Stream Identifier and Stream Sequence Number
> ...The endpoint may bundle the ERROR chunk in the same
> packet as the SACK as long as the ERROR follows the SACK.
> So we must place SACK first when bundling "Invalid Stream Identifier"
> ERROR and SACK in one packet.
> Although we can do that by enqueue SACK chunk into outqueue before
> ERROR chunk, it will violate the side-effect interpreter processing.
> It's easy to do this job when dequeue chunks from the outqueue,
> by this way, we introduce a flag 'has_isi_err' which indicate
> whether or not the "Invalid Stream Identifier" ERROR happens.
>
> Signed-off-by: Xufeng Zhang<xufeng.zhang@windriver.com>
> ---
> include/net/sctp/structs.h | 2 ++
> net/sctp/output.c | 26 ++++++++++++++++++++++++++
> 2 files changed, 28 insertions(+), 0 deletions(-)
>
> diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
> index 88949a9..5adf4de 100644
> --- a/include/net/sctp/structs.h
> +++ b/include/net/sctp/structs.h
> @@ -842,6 +842,8 @@ struct sctp_packet {
> has_sack:1, /* This packet contains a SACK chunk. */
> has_auth:1, /* This packet contains an AUTH chunk */
> has_data:1, /* This packet contains at least 1 DATA chunk */
> + has_isi_err:1, /* This packet contains a "Invalid Stream
> + * Identifier" ERROR chunk */
> ipfragok:1, /* So let ip fragment this packet */
> malloced:1; /* Is it malloced? */
> };
> diff --git a/net/sctp/output.c b/net/sctp/output.c
> index 817174e..77fb1ae 100644
> --- a/net/sctp/output.c
> +++ b/net/sctp/output.c
> @@ -79,6 +79,7 @@ static void sctp_packet_reset(struct sctp_packet *packet)
> packet->has_sack = 0;
> packet->has_data = 0;
> packet->has_auth = 0;
> + packet->has_isi_err = 0;
> packet->ipfragok = 0;
> packet->auth = NULL;
> }
> @@ -267,6 +268,7 @@ static sctp_xmit_t sctp_packet_bundle_sack(struct sctp_packet *pkt,
> sctp_xmit_t sctp_packet_append_chunk(struct sctp_packet *packet,
> struct sctp_chunk *chunk)
> {
> + struct sctp_chunk *lchunk;
> sctp_xmit_t retval = SCTP_XMIT_OK;
> __u16 chunk_len = WORD_ROUND(ntohs(chunk->chunk_hdr->length));
>
> @@ -316,7 +318,31 @@ sctp_xmit_t sctp_packet_append_chunk(struct sctp_packet *packet,
> packet->has_cookie_echo = 1;
> break;
>
> + case SCTP_CID_ERROR:
> + if (chunk->subh.err_hdr->cause& SCTP_ERROR_INV_STRM)
> + packet->has_isi_err = 1;
> + break;
> +
> case SCTP_CID_SACK:
> + /* RFC 4960
> + * 6.5 Stream Identifier and Stream Sequence Number
> + * The endpoint may bundle the ERROR chunk in the same
> + * packet as the SACK as long as the ERROR follows the SACK.
> + */
> + if (packet->has_isi_err) {
> + if (list_is_singular(&packet->chunk_list))
> + list_add(&chunk->list,&packet->chunk_list);
> + else {
> + lchunk = list_first_entry(&packet->chunk_list,
> + struct sctp_chunk, list);
> + list_add(&chunk->list,&lchunk->list);
> + }
>
And I should clarify the above judgment code.
AFAIK, there should be two cases for the bundling when invalid stream
identifier error happens:
1). COOKIE_ACK ERROR SACK
2). ERROR SACK
So I need to deal with the two cases differently.
Thanks,
Xufeng Zhang
> + packet->size += chunk_len;
> + chunk->transport = packet->transport;
> + packet->has_sack = 1;
> + goto finish;
> + }
> +
> packet->has_sack = 1;
> break;
>
>
^ permalink raw reply
* Re: [PATCH] ppp: add 64 bit stats
From: Eric Dumazet @ 2012-07-23 5:16 UTC (permalink / raw)
To: Kevin Groeneveld; +Cc: netdev
In-Reply-To: <1342988397-3077-1-git-send-email-kgroeneveld@gmail.com>
On Sun, 2012-07-22 at 16:19 -0400, Kevin Groeneveld wrote:
> Add 64 bit stats to ppp driver. The 64 bit stats include tx_bytes,
> rx_bytes, tx_packets and rx_packets. Other stats are still 32 bit.
> The 64 bit stats can be retrieved via the ndo_get_stats operation. The
> SIOCGPPPSTATS ioctl is still 32 bit stats only.
>
> Signed-off-by: Kevin Groeneveld <kgroeneveld@gmail.com>
> ---
> drivers/net/ppp/ppp_generic.c | 110 +++++++++++++++++++++++++++++++++++------
> 1 file changed, 95 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
> index 5c05572..210238c 100644
> --- a/drivers/net/ppp/ppp_generic.c
> +++ b/drivers/net/ppp/ppp_generic.c
> @@ -94,6 +94,19 @@ struct ppp_file {
> #define PF_TO_CHANNEL(pf) PF_TO_X(pf, struct channel)
>
> /*
> + * Data structure to hold primary network stats for which
> + * we want to use 64 bit storage. Other network stats
> + * are stored in dev->stats of the ppp strucute.
> + */
> +struct ppp_link_stats {
> + struct u64_stats_sync syncp;
> + u64 tx_bytes;
> + u64 tx_packets;
> + u64 rx_bytes;
> + u64 rx_packets;
> +};
Hmm. This patches adds races, but also adds a good amount of memory on
these servers with thousand of ppp devices, and 64 cpus.
I really doubt ppp is performance sensitive, it so doesnt need percpu
counter.
If you really want 64bits stats on ppp, use proper synchronization
around u64 counters (but shared ones)
^ permalink raw reply
* Re: [net-next RFC V5 5/5] virtio_net: support negotiating the number of queues through ctrl vq
From: Jason Wang @ 2012-07-23 5:32 UTC (permalink / raw)
To: Michael S. Tsirkin
Cc: krkumar2, habanero, mashirle, kvm, netdev, linux-kernel,
virtualization, edumazet, tahm, jwhan, davem, sri
In-Reply-To: <20120720123320.GC16550@redhat.com>
On 07/20/2012 08:33 PM, Michael S. Tsirkin wrote:
> On Thu, Jul 05, 2012 at 06:29:54PM +0800, Jason Wang wrote:
>> This patch let the virtio_net driver can negotiate the number of queues it
>> wishes to use through control virtqueue and export an ethtool interface to let
>> use tweak it.
>>
>> As current multiqueue virtio-net implementation has optimizations on per-cpu
>> virtuqueues, so only two modes were support:
>>
>> - single queue pair mode
>> - multiple queue paris mode, the number of queues matches the number of vcpus
>>
>> The single queue mode were used by default currently due to regression of
>> multiqueue mode in some test (especially in stream test).
>>
>> Since virtio core does not support paritially deleting virtqueues, so during
>> mode switching the whole virtqueue were deleted and the driver would re-create
>> the virtqueues it would used.
>>
>> btw. The queue number negotiating were defered to .ndo_open(), this is because
>> only after feature negotitaion could we send the command to control virtqueue
>> (as it may also use event index).
>>
>> Signed-off-by: Jason Wang<jasowang@redhat.com>
>> ---
>> drivers/net/virtio_net.c | 171 ++++++++++++++++++++++++++++++++++---------
>> include/linux/virtio_net.h | 7 ++
>> 2 files changed, 142 insertions(+), 36 deletions(-)
>>
>> diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
>> index 7410187..3339eeb 100644
>> --- a/drivers/net/virtio_net.c
>> +++ b/drivers/net/virtio_net.c
>> @@ -88,6 +88,7 @@ struct receive_queue {
>>
>> struct virtnet_info {
>> u16 num_queue_pairs; /* # of RX/TX vq pairs */
>> + u16 total_queue_pairs;
>>
>> struct send_queue *sq[MAX_QUEUES] ____cacheline_aligned_in_smp;
>> struct receive_queue *rq[MAX_QUEUES] ____cacheline_aligned_in_smp;
>> @@ -137,6 +138,8 @@ struct padded_vnet_hdr {
>> char padding[6];
>> };
>>
>> +static const struct ethtool_ops virtnet_ethtool_ops;
>> +
>> static inline int txq_get_qnum(struct virtnet_info *vi, struct virtqueue *vq)
>> {
>> int ret = virtqueue_get_queue_index(vq);
>> @@ -802,22 +805,6 @@ static void virtnet_netpoll(struct net_device *dev)
>> }
>> #endif
>>
>> -static int virtnet_open(struct net_device *dev)
>> -{
>> - struct virtnet_info *vi = netdev_priv(dev);
>> - int i;
>> -
>> - for (i = 0; i< vi->num_queue_pairs; i++) {
>> - /* Make sure we have some buffers: if oom use wq. */
>> - if (!try_fill_recv(vi->rq[i], GFP_KERNEL))
>> - queue_delayed_work(system_nrt_wq,
>> - &vi->rq[i]->refill, 0);
>> - virtnet_napi_enable(vi->rq[i]);
>> - }
>> -
>> - return 0;
>> -}
>> -
>> /*
>> * Send command via the control virtqueue and check status. Commands
>> * supported by the hypervisor, as indicated by feature bits, should
>> @@ -873,6 +860,43 @@ static void virtnet_ack_link_announce(struct virtnet_info *vi)
>> rtnl_unlock();
>> }
>>
>> +static int virtnet_set_queues(struct virtnet_info *vi)
>> +{
>> + struct scatterlist sg;
>> + struct net_device *dev = vi->dev;
>> + sg_init_one(&sg,&vi->num_queue_pairs, sizeof(vi->num_queue_pairs));
>> +
>> + if (!vi->has_cvq)
>> + return -EINVAL;
>> +
>> + if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_MULTIQUEUE,
>> + VIRTIO_NET_CTRL_MULTIQUEUE_QNUM,&sg, 1, 0)){
>> + dev_warn(&dev->dev, "Fail to set the number of queue pairs to"
>> + " %d\n", vi->num_queue_pairs);
>> + return -EINVAL;
>> + }
>> +
>> + return 0;
>> +}
>> +
>> +static int virtnet_open(struct net_device *dev)
>> +{
>> + struct virtnet_info *vi = netdev_priv(dev);
>> + int i;
>> +
>> + for (i = 0; i< vi->num_queue_pairs; i++) {
>> + /* Make sure we have some buffers: if oom use wq. */
>> + if (!try_fill_recv(vi->rq[i], GFP_KERNEL))
>> + queue_delayed_work(system_nrt_wq,
>> + &vi->rq[i]->refill, 0);
>> + virtnet_napi_enable(vi->rq[i]);
>> + }
>> +
>> + virtnet_set_queues(vi);
>> +
>> + return 0;
>> +}
>> +
>> static int virtnet_close(struct net_device *dev)
>> {
>> struct virtnet_info *vi = netdev_priv(dev);
>> @@ -1013,12 +1037,6 @@ static void virtnet_get_drvinfo(struct net_device *dev,
>>
>> }
>>
>> -static const struct ethtool_ops virtnet_ethtool_ops = {
>> - .get_drvinfo = virtnet_get_drvinfo,
>> - .get_link = ethtool_op_get_link,
>> - .get_ringparam = virtnet_get_ringparam,
>> -};
>> -
>> #define MIN_MTU 68
>> #define MAX_MTU 65535
>>
>> @@ -1235,7 +1253,7 @@ static int virtnet_find_vqs(struct virtnet_info *vi)
>>
>> err:
>> if (ret&& names)
>> - for (i = 0; i< vi->num_queue_pairs * 2; i++)
>> + for (i = 0; i< total_vqs * 2; i++)
>> kfree(names[i]);
>>
>> kfree(names);
>> @@ -1373,7 +1391,6 @@ static int virtnet_probe(struct virtio_device *vdev)
>> mutex_init(&vi->config_lock);
>> vi->config_enable = true;
>> INIT_WORK(&vi->config_work, virtnet_config_changed_work);
>> - vi->num_queue_pairs = num_queue_pairs;
>>
>> /* If we can receive ANY GSO packets, we must allocate large ones. */
>> if (virtio_has_feature(vdev, VIRTIO_NET_F_GUEST_TSO4) ||
>> @@ -1387,6 +1404,10 @@ static int virtnet_probe(struct virtio_device *vdev)
>> if (virtio_has_feature(vdev, VIRTIO_NET_F_CTRL_VQ))
>> vi->has_cvq = true;
>>
>> + /* Use single tx/rx queue pair as default */
>> + vi->num_queue_pairs = 1;
>> + vi->total_queue_pairs = num_queue_pairs;
>> +
>> /* Allocate/initialize the rx/tx queues, and invoke find_vqs */
>> err = virtnet_setup_vqs(vi);
>> if (err)
>> @@ -1396,6 +1417,9 @@ static int virtnet_probe(struct virtio_device *vdev)
>> virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VLAN))
>> dev->features |= NETIF_F_HW_VLAN_FILTER;
>>
>> + netif_set_real_num_tx_queues(dev, 1);
>> + netif_set_real_num_rx_queues(dev, 1);
>> +
>> err = register_netdev(dev);
>> if (err) {
>> pr_debug("virtio_net: registering device failed\n");
>> @@ -1403,7 +1427,7 @@ static int virtnet_probe(struct virtio_device *vdev)
>> }
>>
>> /* Last of all, set up some receive buffers. */
>> - for (i = 0; i< num_queue_pairs; i++) {
>> + for (i = 0; i< vi->num_queue_pairs; i++) {
>> try_fill_recv(vi->rq[i], GFP_KERNEL);
>>
>> /* If we didn't even get one input buffer, we're useless. */
>> @@ -1474,10 +1498,8 @@ static void __devexit virtnet_remove(struct virtio_device *vdev)
>> free_netdev(vi->dev);
>> }
>>
>> -#ifdef CONFIG_PM
>> -static int virtnet_freeze(struct virtio_device *vdev)
>> +static void virtnet_stop(struct virtnet_info *vi)
>> {
>> - struct virtnet_info *vi = vdev->priv;
>> int i;
>>
>> /* Prevent config work handler from accessing the device */
>> @@ -1493,17 +1515,10 @@ static int virtnet_freeze(struct virtio_device *vdev)
>> for (i = 0; i< vi->num_queue_pairs; i++)
>> napi_disable(&vi->rq[i]->napi);
>>
>> -
>> - remove_vq_common(vi);
>> -
>> - flush_work(&vi->config_work);
>> -
>> - return 0;
>> }
>>
>> -static int virtnet_restore(struct virtio_device *vdev)
>> +static int virtnet_start(struct virtnet_info *vi)
>> {
>> - struct virtnet_info *vi = vdev->priv;
>> int err, i;
>>
>> err = virtnet_setup_vqs(vi);
>> @@ -1527,6 +1542,29 @@ static int virtnet_restore(struct virtio_device *vdev)
>>
>> return 0;
>> }
>> +
>> +#ifdef CONFIG_PM
>> +static int virtnet_freeze(struct virtio_device *vdev)
>> +{
>> + struct virtnet_info *vi = vdev->priv;
>> +
>> + virtnet_stop(vi);
>> +
>> + remove_vq_common(vi);
>> +
>> + flush_work(&vi->config_work);
>> +
>> + return 0;
>> +}
>> +
>> +static int virtnet_restore(struct virtio_device *vdev)
>> +{
>> + struct virtnet_info *vi = vdev->priv;
>> +
>> + virtnet_start(vi);
>> +
>> + return 0;
>> +}
>> #endif
>>
>> static struct virtio_device_id id_table[] = {
>> @@ -1560,6 +1598,67 @@ static struct virtio_driver virtio_net_driver = {
>> #endif
>> };
>>
>> +static int virtnet_set_channels(struct net_device *dev,
>> + struct ethtool_channels *channels)
>> +{
>> + struct virtnet_info *vi = netdev_priv(dev);
>> + u16 queues = channels->rx_count;
>> + unsigned status = VIRTIO_CONFIG_S_ACKNOWLEDGE | VIRTIO_CONFIG_S_DRIVER;
>> +
>> + if (channels->rx_count != channels->tx_count)
>> + return -EINVAL;
>> + /* Only two modes were support currently */
> s/were/are/ ?
Ok.
>
>> + if (queues != vi->total_queue_pairs&& queues != 1)
>> + return -EINVAL;
> So userspace has to get queue number right. How does it know
> what the valid value is?
Usespace could query the number through ethtool -l (virtnet_get_channels()).
>
>> + if (!vi->has_cvq)
>> + return -EINVAL;
>> +
>> + virtnet_stop(vi);
>> +
>> + netif_set_real_num_tx_queues(dev, queues);
>> + netif_set_real_num_rx_queues(dev, queues);
>> +
>> + remove_vq_common(vi);
>> + flush_work(&vi->config_work);
>> +
>> + vi->num_queue_pairs = queues;
>> + virtnet_start(vi);
>> +
>> + vi->vdev->config->finalize_features(vi->vdev);
>> +
>> + if (virtnet_set_queues(vi))
>> + status |= VIRTIO_CONFIG_S_FAILED;
>> + else
>> + status |= VIRTIO_CONFIG_S_DRIVER_OK;
>> +
>> + vi->vdev->config->set_status(vi->vdev, status);
>> +
> Why do we need to tweak status like that?
Because remove_vq_common() reset the device. Since virtio core api does
not support remove a specified number of virtqueues, it's the only
method when we change the number of queues.
> Can we maybe just roll changes back on error?
Not easy, we reset and detroy previous virtqueues and create new ones.
>> + return 0;
>> +}
>> +
>> +static void virtnet_get_channels(struct net_device *dev,
>> + struct ethtool_channels *channels)
>> +{
>> + struct virtnet_info *vi = netdev_priv(dev);
>> +
>> + channels->max_rx = vi->total_queue_pairs;
>> + channels->max_tx = vi->total_queue_pairs;
>> + channels->max_other = 0;
>> + channels->max_combined = 0;
>> + channels->rx_count = vi->num_queue_pairs;
>> + channels->tx_count = vi->num_queue_pairs;
>> + channels->other_count = 0;
>> + channels->combined_count = 0;
>> +}
>> +
>> +static const struct ethtool_ops virtnet_ethtool_ops = {
>> + .get_drvinfo = virtnet_get_drvinfo,
>> + .get_link = ethtool_op_get_link,
>> + .get_ringparam = virtnet_get_ringparam,
>> + .set_channels = virtnet_set_channels,
>> + .get_channels = virtnet_get_channels,
>> +};
>> +
>> static int __init init(void)
>> {
>> return register_virtio_driver(&virtio_net_driver);
>> diff --git a/include/linux/virtio_net.h b/include/linux/virtio_net.h
>> index 60f09ff..0d21e08 100644
>> --- a/include/linux/virtio_net.h
>> +++ b/include/linux/virtio_net.h
>> @@ -169,4 +169,11 @@ struct virtio_net_ctrl_mac {
>> #define VIRTIO_NET_CTRL_ANNOUNCE 3
>> #define VIRTIO_NET_CTRL_ANNOUNCE_ACK 0
>>
>> +/*
>> + * Control multiqueue
>> + *
>> + */
>> +#define VIRTIO_NET_CTRL_MULTIQUEUE 4
>> + #define VIRTIO_NET_CTRL_MULTIQUEUE_QNUM 0
>> +
>> #endif /* _LINUX_VIRTIO_NET_H */
>> --
>> 1.7.1
> --
> To unsubscribe from this list: send the line "unsubscribe kvm" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* Re: [net-next RFC V5 4/5] virtio_net: multiqueue support
From: Jason Wang @ 2012-07-23 5:48 UTC (permalink / raw)
To: Michael S. Tsirkin
Cc: krkumar2, habanero, mashirle, kvm, netdev, linux-kernel,
virtualization, edumazet, tahm, jwhan, davem, sri
In-Reply-To: <20120720134014.GD16550@redhat.com>
On 07/20/2012 09:40 PM, Michael S. Tsirkin wrote:
> On Thu, Jul 05, 2012 at 06:29:53PM +0800, Jason Wang wrote:
>> This patch converts virtio_net to a multi queue device. After negotiated
>> VIRTIO_NET_F_MULTIQUEUE feature, the virtio device has many tx/rx queue pairs,
>> and driver could read the number from config space.
>>
>> The driver expects the number of rx/tx queue paris is equal to the number of
>> vcpus. To maximize the performance under this per-cpu rx/tx queue pairs, some
>> optimization were introduced:
>>
>> - Txq selection is based on the processor id in order to avoid contending a lock
>> whose owner may exits to host.
>> - Since the txq/txq were per-cpu, affinity hint were set to the cpu that owns
>> the queue pairs.
>>
>> Signed-off-by: Krishna Kumar<krkumar2@in.ibm.com>
>> Signed-off-by: Jason Wang<jasowang@redhat.com>
> Overall fine. I think it is best to smash the following patch
> into this one, so that default behavior does not
> jump to mq then back. some comments below: mostly nits, and a minor bug.
Sure, thanks for the reviewing.
>
> If you are worried the patch is too big, it can be split
> differently
> - rework to use send_queue/receive_queue structures, no
> functional changes.
> - add multiqueue
>
> but this is not a must.
>
>> ---
>> drivers/net/virtio_net.c | 645 ++++++++++++++++++++++++++++++-------------
>> include/linux/virtio_net.h | 2 +
>> 2 files changed, 452 insertions(+), 195 deletions(-)
>>
>> diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
>> index 1db445b..7410187 100644
>> --- a/drivers/net/virtio_net.c
>> +++ b/drivers/net/virtio_net.c
>> @@ -26,6 +26,7 @@
>> #include<linux/scatterlist.h>
>> #include<linux/if_vlan.h>
>> #include<linux/slab.h>
>> +#include<linux/interrupt.h>
>>
>> static int napi_weight = 128;
>> module_param(napi_weight, int, 0444);
>> @@ -41,6 +42,8 @@ module_param(gso, bool, 0444);
>> #define VIRTNET_SEND_COMMAND_SG_MAX 2
>> #define VIRTNET_DRIVER_VERSION "1.0.0"
>>
>> +#define MAX_QUEUES 256
>> +
>> struct virtnet_stats {
>> struct u64_stats_sync tx_syncp;
>> struct u64_stats_sync rx_syncp;
> Would be a bit better not to have artificial limits like that.
> Maybe allocate arrays at probe time, then we can
> take whatever the device gives us?
Sure.
>> @@ -51,43 +54,69 @@ struct virtnet_stats {
>> u64 rx_packets;
>> };
>>
>> -struct virtnet_info {
>> - struct virtio_device *vdev;
>> - struct virtqueue *rvq, *svq, *cvq;
>> - struct net_device *dev;
>> +/* Internal representation of a send virtqueue */
>> +struct send_queue {
>> + /* Virtqueue associated with this send _queue */
>> + struct virtqueue *vq;
>> +
>> + /* TX: fragments + linear part + virtio header */
>> + struct scatterlist sg[MAX_SKB_FRAGS + 2];
>> +};
>> +
>> +/* Internal representation of a receive virtqueue */
>> +struct receive_queue {
>> + /* Virtqueue associated with this receive_queue */
>> + struct virtqueue *vq;
>> +
>> + /* Back pointer to the virtnet_info */
>> + struct virtnet_info *vi;
>> +
>> struct napi_struct napi;
>> - unsigned int status;
>>
>> /* Number of input buffers, and max we've ever had. */
>> unsigned int num, max;
>>
>> + /* Work struct for refilling if we run low on memory. */
>> + struct delayed_work refill;
>> +
>> + /* Chain pages by the private ptr. */
>> + struct page *pages;
>> +
>> + /* RX: fragments + linear part + virtio header */
>> + struct scatterlist sg[MAX_SKB_FRAGS + 2];
>> +};
>> +
>> +struct virtnet_info {
>> + u16 num_queue_pairs; /* # of RX/TX vq pairs */
>> +
>> + struct send_queue *sq[MAX_QUEUES] ____cacheline_aligned_in_smp;
>> + struct receive_queue *rq[MAX_QUEUES] ____cacheline_aligned_in_smp;
> The assumption is a tx/rx pair is handled on the same cpu, yes?
> If yes maybe make it a single array to improve cache locality
> a bit?
> struct queue_pair {
> struct send_queue sq;
> struct receive_queue rq;
> };
Ok.
>> + struct virtqueue *cvq;
>> +
>> + struct virtio_device *vdev;
>> + struct net_device *dev;
>> + unsigned int status;
>> +
>> /* I like... big packets and I cannot lie! */
>> bool big_packets;
>>
>> /* Host will merge rx buffers for big packets (shake it! shake it!) */
>> bool mergeable_rx_bufs;
>>
>> + /* Has control virtqueue */
>> + bool has_cvq;
>> +
> won't checking (cvq != NULL) be enough?
Enough, so has_cvq is dupliated with vi->cvq. I will remove it in next
version.
>
>> /* enable config space updates */
>> bool config_enable;
>>
>> /* Active statistics */
>> struct virtnet_stats __percpu *stats;
>>
>> - /* Work struct for refilling if we run low on memory. */
>> - struct delayed_work refill;
>> -
>> /* Work struct for config space updates */
>> struct work_struct config_work;
>>
>> /* Lock for config space updates */
>> struct mutex config_lock;
>> -
>> - /* Chain pages by the private ptr. */
>> - struct page *pages;
>> -
>> - /* fragments + linear part + virtio header */
>> - struct scatterlist rx_sg[MAX_SKB_FRAGS + 2];
>> - struct scatterlist tx_sg[MAX_SKB_FRAGS + 2];
>> };
>>
>> struct skb_vnet_hdr {
>> @@ -108,6 +137,22 @@ struct padded_vnet_hdr {
>> char padding[6];
>> };
>>
>> +static inline int txq_get_qnum(struct virtnet_info *vi, struct virtqueue *vq)
>> +{
>> + int ret = virtqueue_get_queue_index(vq);
>> +
>> + /* skip ctrl vq */
>> + if (vi->has_cvq)
>> + return (ret - 1) / 2;
>> + else
>> + return ret / 2;
>> +}
>> +
>> +static inline int rxq_get_qnum(struct virtnet_info *vi, struct virtqueue *vq)
>> +{
>> + return virtqueue_get_queue_index(vq) / 2;
>> +}
>> +
>> static inline struct skb_vnet_hdr *skb_vnet_hdr(struct sk_buff *skb)
>> {
>> return (struct skb_vnet_hdr *)skb->cb;
>> @@ -117,22 +162,22 @@ static inline struct skb_vnet_hdr *skb_vnet_hdr(struct sk_buff *skb)
>> * private is used to chain pages for big packets, put the whole
>> * most recent used list in the beginning for reuse
>> */
>> -static void give_pages(struct virtnet_info *vi, struct page *page)
>> +static void give_pages(struct receive_queue *rq, struct page *page)
>> {
>> struct page *end;
>>
>> /* Find end of list, sew whole thing into vi->pages. */
>> for (end = page; end->private; end = (struct page *)end->private);
>> - end->private = (unsigned long)vi->pages;
>> - vi->pages = page;
>> + end->private = (unsigned long)rq->pages;
>> + rq->pages = page;
>> }
>>
>> -static struct page *get_a_page(struct virtnet_info *vi, gfp_t gfp_mask)
>> +static struct page *get_a_page(struct receive_queue *rq, gfp_t gfp_mask)
>> {
>> - struct page *p = vi->pages;
>> + struct page *p = rq->pages;
>>
>> if (p) {
>> - vi->pages = (struct page *)p->private;
>> + rq->pages = (struct page *)p->private;
>> /* clear private here, it is used to chain pages */
>> p->private = 0;
>> } else
>> @@ -140,15 +185,15 @@ static struct page *get_a_page(struct virtnet_info *vi, gfp_t gfp_mask)
>> return p;
>> }
>>
>> -static void skb_xmit_done(struct virtqueue *svq)
>> +static void skb_xmit_done(struct virtqueue *vq)
>> {
>> - struct virtnet_info *vi = svq->vdev->priv;
>> + struct virtnet_info *vi = vq->vdev->priv;
>>
>> /* Suppress further interrupts. */
>> - virtqueue_disable_cb(svq);
>> + virtqueue_disable_cb(vq);
>>
>> /* We were probably waiting for more output buffers. */
>> - netif_wake_queue(vi->dev);
>> + netif_wake_subqueue(vi->dev, txq_get_qnum(vi, vq));
>> }
>>
>> static void set_skb_frag(struct sk_buff *skb, struct page *page,
>> @@ -167,9 +212,10 @@ static void set_skb_frag(struct sk_buff *skb, struct page *page,
>> }
>>
>> /* Called from bottom half context */
>> -static struct sk_buff *page_to_skb(struct virtnet_info *vi,
>> +static struct sk_buff *page_to_skb(struct receive_queue *rq,
>> struct page *page, unsigned int len)
>> {
>> + struct virtnet_info *vi = rq->vi;
>> struct sk_buff *skb;
>> struct skb_vnet_hdr *hdr;
>> unsigned int copy, hdr_len, offset;
>> @@ -225,12 +271,12 @@ static struct sk_buff *page_to_skb(struct virtnet_info *vi,
>> }
>>
>> if (page)
>> - give_pages(vi, page);
>> + give_pages(rq, page);
>>
>> return skb;
>> }
>>
>> -static int receive_mergeable(struct virtnet_info *vi, struct sk_buff *skb)
>> +static int receive_mergeable(struct receive_queue *rq, struct sk_buff *skb)
>> {
>> struct skb_vnet_hdr *hdr = skb_vnet_hdr(skb);
>> struct page *page;
>> @@ -244,7 +290,7 @@ static int receive_mergeable(struct virtnet_info *vi, struct sk_buff *skb)
>> skb->dev->stats.rx_length_errors++;
>> return -EINVAL;
>> }
>> - page = virtqueue_get_buf(vi->rvq,&len);
>> + page = virtqueue_get_buf(rq->vq,&len);
>> if (!page) {
>> pr_debug("%s: rx error: %d buffers missing\n",
>> skb->dev->name, hdr->mhdr.num_buffers);
>> @@ -257,13 +303,14 @@ static int receive_mergeable(struct virtnet_info *vi, struct sk_buff *skb)
>>
>> set_skb_frag(skb, page, 0,&len);
>>
>> - --vi->num;
>> + --rq->num;
>> }
>> return 0;
>> }
>>
>> -static void receive_buf(struct net_device *dev, void *buf, unsigned int len)
>> +static void receive_buf(struct receive_queue *rq, void *buf, unsigned int len)
>> {
>> + struct net_device *dev = rq->vi->dev;
>> struct virtnet_info *vi = netdev_priv(dev);
>> struct virtnet_stats *stats = this_cpu_ptr(vi->stats);
>> struct sk_buff *skb;
>> @@ -274,7 +321,7 @@ static void receive_buf(struct net_device *dev, void *buf, unsigned int len)
>> pr_debug("%s: short packet %i\n", dev->name, len);
>> dev->stats.rx_length_errors++;
>> if (vi->mergeable_rx_bufs || vi->big_packets)
>> - give_pages(vi, buf);
>> + give_pages(rq, buf);
>> else
>> dev_kfree_skb(buf);
>> return;
>> @@ -286,14 +333,14 @@ static void receive_buf(struct net_device *dev, void *buf, unsigned int len)
>> skb_trim(skb, len);
>> } else {
>> page = buf;
>> - skb = page_to_skb(vi, page, len);
>> + skb = page_to_skb(rq, page, len);
>> if (unlikely(!skb)) {
>> dev->stats.rx_dropped++;
>> - give_pages(vi, page);
>> + give_pages(rq, page);
>> return;
>> }
>> if (vi->mergeable_rx_bufs)
>> - if (receive_mergeable(vi, skb)) {
>> + if (receive_mergeable(rq, skb)) {
>> dev_kfree_skb(skb);
>> return;
>> }
>> @@ -363,90 +410,91 @@ frame_err:
>> dev_kfree_skb(skb);
>> }
>>
>> -static int add_recvbuf_small(struct virtnet_info *vi, gfp_t gfp)
>> +static int add_recvbuf_small(struct receive_queue *rq, gfp_t gfp)
>> {
>> struct sk_buff *skb;
>> struct skb_vnet_hdr *hdr;
>> int err;
>>
>> - skb = __netdev_alloc_skb_ip_align(vi->dev, MAX_PACKET_LEN, gfp);
>> + skb = __netdev_alloc_skb_ip_align(rq->vi->dev, MAX_PACKET_LEN, gfp);
>> if (unlikely(!skb))
>> return -ENOMEM;
>>
>> skb_put(skb, MAX_PACKET_LEN);
>>
>> hdr = skb_vnet_hdr(skb);
>> - sg_set_buf(vi->rx_sg,&hdr->hdr, sizeof hdr->hdr);
>> + sg_set_buf(rq->sg,&hdr->hdr, sizeof hdr->hdr);
>> +
>> + skb_to_sgvec(skb, rq->sg + 1, 0, skb->len);
>>
>> - skb_to_sgvec(skb, vi->rx_sg + 1, 0, skb->len);
>> + err = virtqueue_add_buf(rq->vq, rq->sg, 0, 2, skb, gfp);
>>
>> - err = virtqueue_add_buf(vi->rvq, vi->rx_sg, 0, 2, skb, gfp);
>> if (err< 0)
>> dev_kfree_skb(skb);
>>
>> return err;
>> }
>>
>> -static int add_recvbuf_big(struct virtnet_info *vi, gfp_t gfp)
>> +static int add_recvbuf_big(struct receive_queue *rq, gfp_t gfp)
>> {
>> struct page *first, *list = NULL;
>> char *p;
>> int i, err, offset;
>>
>> - /* page in vi->rx_sg[MAX_SKB_FRAGS + 1] is list tail */
>> + /* page in rq->sg[MAX_SKB_FRAGS + 1] is list tail */
>> for (i = MAX_SKB_FRAGS + 1; i> 1; --i) {
>> - first = get_a_page(vi, gfp);
>> + first = get_a_page(rq, gfp);
>> if (!first) {
>> if (list)
>> - give_pages(vi, list);
>> + give_pages(rq, list);
>> return -ENOMEM;
>> }
>> - sg_set_buf(&vi->rx_sg[i], page_address(first), PAGE_SIZE);
>> + sg_set_buf(&rq->sg[i], page_address(first), PAGE_SIZE);
>>
>> /* chain new page in list head to match sg */
>> first->private = (unsigned long)list;
>> list = first;
>> }
>>
>> - first = get_a_page(vi, gfp);
>> + first = get_a_page(rq, gfp);
>> if (!first) {
>> - give_pages(vi, list);
>> + give_pages(rq, list);
>> return -ENOMEM;
>> }
>> p = page_address(first);
>>
>> - /* vi->rx_sg[0], vi->rx_sg[1] share the same page */
>> - /* a separated vi->rx_sg[0] for virtio_net_hdr only due to QEMU bug */
>> - sg_set_buf(&vi->rx_sg[0], p, sizeof(struct virtio_net_hdr));
>> + /* rq->sg[0], rq->sg[1] share the same page */
>> + /* a separated rq->sg[0] for virtio_net_hdr only due to QEMU bug */
>> + sg_set_buf(&rq->sg[0], p, sizeof(struct virtio_net_hdr));
>>
>> - /* vi->rx_sg[1] for data packet, from offset */
>> + /* rq->sg[1] for data packet, from offset */
>> offset = sizeof(struct padded_vnet_hdr);
>> - sg_set_buf(&vi->rx_sg[1], p + offset, PAGE_SIZE - offset);
>> + sg_set_buf(&rq->sg[1], p + offset, PAGE_SIZE - offset);
>>
>> /* chain first in list head */
>> first->private = (unsigned long)list;
>> - err = virtqueue_add_buf(vi->rvq, vi->rx_sg, 0, MAX_SKB_FRAGS + 2,
>> + err = virtqueue_add_buf(rq->vq, rq->sg, 0, MAX_SKB_FRAGS + 2,
>> first, gfp);
>> if (err< 0)
>> - give_pages(vi, first);
>> + give_pages(rq, first);
>>
>> return err;
>> }
>>
>> -static int add_recvbuf_mergeable(struct virtnet_info *vi, gfp_t gfp)
>> +static int add_recvbuf_mergeable(struct receive_queue *rq, gfp_t gfp)
>> {
>> struct page *page;
>> int err;
>>
>> - page = get_a_page(vi, gfp);
>> + page = get_a_page(rq, gfp);
>> if (!page)
>> return -ENOMEM;
>>
>> - sg_init_one(vi->rx_sg, page_address(page), PAGE_SIZE);
>> + sg_init_one(rq->sg, page_address(page), PAGE_SIZE);
>>
>> - err = virtqueue_add_buf(vi->rvq, vi->rx_sg, 0, 1, page, gfp);
>> + err = virtqueue_add_buf(rq->vq, rq->sg, 0, 1, page, gfp);
>> if (err< 0)
>> - give_pages(vi, page);
>> + give_pages(rq, page);
>>
>> return err;
>> }
>> @@ -458,97 +506,104 @@ static int add_recvbuf_mergeable(struct virtnet_info *vi, gfp_t gfp)
>> * before we're receiving packets, or from refill_work which is
>> * careful to disable receiving (using napi_disable).
>> */
>> -static bool try_fill_recv(struct virtnet_info *vi, gfp_t gfp)
>> +static bool try_fill_recv(struct receive_queue *rq, gfp_t gfp)
>> {
>> + struct virtnet_info *vi = rq->vi;
>> int err;
>> bool oom;
>>
>> do {
>> if (vi->mergeable_rx_bufs)
>> - err = add_recvbuf_mergeable(vi, gfp);
>> + err = add_recvbuf_mergeable(rq, gfp);
>> else if (vi->big_packets)
>> - err = add_recvbuf_big(vi, gfp);
>> + err = add_recvbuf_big(rq, gfp);
>> else
>> - err = add_recvbuf_small(vi, gfp);
>> + err = add_recvbuf_small(rq, gfp);
>>
>> oom = err == -ENOMEM;
>> if (err< 0)
>> break;
>> - ++vi->num;
>> + ++rq->num;
>> } while (err> 0);
>> - if (unlikely(vi->num> vi->max))
>> - vi->max = vi->num;
>> - virtqueue_kick(vi->rvq);
>> + if (unlikely(rq->num> rq->max))
>> + rq->max = rq->num;
>> + virtqueue_kick(rq->vq);
>> return !oom;
>> }
>>
>> -static void skb_recv_done(struct virtqueue *rvq)
>> +static void skb_recv_done(struct virtqueue *vq)
>> {
>> - struct virtnet_info *vi = rvq->vdev->priv;
>> + struct virtnet_info *vi = vq->vdev->priv;
>> + struct napi_struct *napi =&vi->rq[rxq_get_qnum(vi, vq)]->napi;
>> +
>> /* Schedule NAPI, Suppress further interrupts if successful. */
>> - if (napi_schedule_prep(&vi->napi)) {
>> - virtqueue_disable_cb(rvq);
>> - __napi_schedule(&vi->napi);
>> + if (napi_schedule_prep(napi)) {
>> + virtqueue_disable_cb(vq);
>> + __napi_schedule(napi);
>> }
>> }
>>
>> -static void virtnet_napi_enable(struct virtnet_info *vi)
>> +static void virtnet_napi_enable(struct receive_queue *rq)
>> {
>> - napi_enable(&vi->napi);
>> + napi_enable(&rq->napi);
>>
>> /* If all buffers were filled by other side before we napi_enabled, we
>> * won't get another interrupt, so process any outstanding packets
>> * now. virtnet_poll wants re-enable the queue, so we disable here.
>> * We synchronize against interrupts via NAPI_STATE_SCHED */
>> - if (napi_schedule_prep(&vi->napi)) {
>> - virtqueue_disable_cb(vi->rvq);
>> + if (napi_schedule_prep(&rq->napi)) {
>> + virtqueue_disable_cb(rq->vq);
>> local_bh_disable();
>> - __napi_schedule(&vi->napi);
>> + __napi_schedule(&rq->napi);
>> local_bh_enable();
>> }
>> }
>>
>> static void refill_work(struct work_struct *work)
>> {
>> - struct virtnet_info *vi;
>> + struct napi_struct *napi;
>> + struct receive_queue *rq;
>> bool still_empty;
>>
>> - vi = container_of(work, struct virtnet_info, refill.work);
>> - napi_disable(&vi->napi);
>> - still_empty = !try_fill_recv(vi, GFP_KERNEL);
>> - virtnet_napi_enable(vi);
>> + rq = container_of(work, struct receive_queue, refill.work);
>> + napi =&rq->napi;
>> +
>> + napi_disable(napi);
>> + still_empty = !try_fill_recv(rq, GFP_KERNEL);
>> + virtnet_napi_enable(rq);
>>
>> /* In theory, this can happen: if we don't get any buffers in
>> * we will *never* try to fill again. */
>> if (still_empty)
>> - queue_delayed_work(system_nrt_wq,&vi->refill, HZ/2);
>> + queue_delayed_work(system_nrt_wq,&rq->refill, HZ/2);
>> }
>>
>> static int virtnet_poll(struct napi_struct *napi, int budget)
>> {
>> - struct virtnet_info *vi = container_of(napi, struct virtnet_info, napi);
>> + struct receive_queue *rq = container_of(napi, struct receive_queue,
>> + napi);
>> void *buf;
>> unsigned int len, received = 0;
>>
>> again:
>> while (received< budget&&
>> - (buf = virtqueue_get_buf(vi->rvq,&len)) != NULL) {
>> - receive_buf(vi->dev, buf, len);
>> - --vi->num;
>> + (buf = virtqueue_get_buf(rq->vq,&len)) != NULL) {
>> + receive_buf(rq, buf, len);
>> + --rq->num;
>> received++;
>> }
>>
>> - if (vi->num< vi->max / 2) {
>> - if (!try_fill_recv(vi, GFP_ATOMIC))
>> - queue_delayed_work(system_nrt_wq,&vi->refill, 0);
>> + if (rq->num< rq->max / 2) {
>> + if (!try_fill_recv(rq, GFP_ATOMIC))
>> + queue_delayed_work(system_nrt_wq,&rq->refill, 0);
>> }
>>
>> /* Out of packets? */
>> if (received< budget) {
>> napi_complete(napi);
>> - if (unlikely(!virtqueue_enable_cb(vi->rvq))&&
>> + if (unlikely(!virtqueue_enable_cb(rq->vq))&&
>> napi_schedule_prep(napi)) {
>> - virtqueue_disable_cb(vi->rvq);
>> + virtqueue_disable_cb(rq->vq);
>> __napi_schedule(napi);
>> goto again;
>> }
>> @@ -557,13 +612,14 @@ again:
>> return received;
>> }
>>
>> -static unsigned int free_old_xmit_skbs(struct virtnet_info *vi)
>> +static unsigned int free_old_xmit_skbs(struct virtnet_info *vi,
>> + struct virtqueue *vq)
>> {
>> struct sk_buff *skb;
>> unsigned int len, tot_sgs = 0;
>> struct virtnet_stats *stats = this_cpu_ptr(vi->stats);
>>
>> - while ((skb = virtqueue_get_buf(vi->svq,&len)) != NULL) {
>> + while ((skb = virtqueue_get_buf(vq,&len)) != NULL) {
>> pr_debug("Sent skb %p\n", skb);
>>
>> u64_stats_update_begin(&stats->tx_syncp);
>> @@ -577,7 +633,8 @@ static unsigned int free_old_xmit_skbs(struct virtnet_info *vi)
>> return tot_sgs;
>> }
>>
>> -static int xmit_skb(struct virtnet_info *vi, struct sk_buff *skb)
>> +static int xmit_skb(struct virtnet_info *vi, struct sk_buff *skb,
>> + struct virtqueue *vq, struct scatterlist *sg)
>> {
>> struct skb_vnet_hdr *hdr = skb_vnet_hdr(skb);
>> const unsigned char *dest = ((struct ethhdr *)skb->data)->h_dest;
>> @@ -615,44 +672,47 @@ static int xmit_skb(struct virtnet_info *vi, struct sk_buff *skb)
>>
>> /* Encode metadata header at front. */
>> if (vi->mergeable_rx_bufs)
>> - sg_set_buf(vi->tx_sg,&hdr->mhdr, sizeof hdr->mhdr);
>> + sg_set_buf(sg,&hdr->mhdr, sizeof hdr->mhdr);
>> else
>> - sg_set_buf(vi->tx_sg,&hdr->hdr, sizeof hdr->hdr);
>> + sg_set_buf(sg,&hdr->hdr, sizeof hdr->hdr);
>>
>> - hdr->num_sg = skb_to_sgvec(skb, vi->tx_sg + 1, 0, skb->len) + 1;
>> - return virtqueue_add_buf(vi->svq, vi->tx_sg, hdr->num_sg,
>> + hdr->num_sg = skb_to_sgvec(skb, sg + 1, 0, skb->len) + 1;
>> + return virtqueue_add_buf(vq, sg, hdr->num_sg,
>> 0, skb, GFP_ATOMIC);
>> }
>>
>> static netdev_tx_t start_xmit(struct sk_buff *skb, struct net_device *dev)
>> {
>> struct virtnet_info *vi = netdev_priv(dev);
>> + int qnum = skb_get_queue_mapping(skb);
>> + struct virtqueue *vq = vi->sq[qnum]->vq;
>> int capacity;
>>
>> /* Free up any pending old buffers before queueing new ones. */
>> - free_old_xmit_skbs(vi);
>> + free_old_xmit_skbs(vi, vq);
>>
>> /* Try to transmit */
>> - capacity = xmit_skb(vi, skb);
>> + capacity = xmit_skb(vi, skb, vq, vi->sq[qnum]->sg);
>>
>> /* This can happen with OOM and indirect buffers. */
>> if (unlikely(capacity< 0)) {
>> if (likely(capacity == -ENOMEM)) {
>> if (net_ratelimit())
>> dev_warn(&dev->dev,
>> - "TX queue failure: out of memory\n");
>> + "TXQ (%d) failure: out of memory\n",
>> + qnum);
>> } else {
>> dev->stats.tx_fifo_errors++;
>> if (net_ratelimit())
>> dev_warn(&dev->dev,
>> - "Unexpected TX queue failure: %d\n",
>> - capacity);
>> + "Unexpected TXQ (%d) failure: %d\n",
>> + qnum, capacity);
>> }
>> dev->stats.tx_dropped++;
>> kfree_skb(skb);
>> return NETDEV_TX_OK;
>> }
>> - virtqueue_kick(vi->svq);
>> + virtqueue_kick(vq);
>>
>> /* Don't wait up for transmitted skbs to be freed. */
>> skb_orphan(skb);
>> @@ -661,13 +721,13 @@ static netdev_tx_t start_xmit(struct sk_buff *skb, struct net_device *dev)
>> /* Apparently nice girls don't return TX_BUSY; stop the queue
>> * before it gets out of hand. Naturally, this wastes entries. */
>> if (capacity< 2+MAX_SKB_FRAGS) {
>> - netif_stop_queue(dev);
>> - if (unlikely(!virtqueue_enable_cb_delayed(vi->svq))) {
>> + netif_stop_subqueue(dev, qnum);
>> + if (unlikely(!virtqueue_enable_cb_delayed(vq))) {
>> /* More just got used, free them then recheck. */
>> - capacity += free_old_xmit_skbs(vi);
>> + capacity += free_old_xmit_skbs(vi, vq);
>> if (capacity>= 2+MAX_SKB_FRAGS) {
>> - netif_start_queue(dev);
>> - virtqueue_disable_cb(vi->svq);
>> + netif_start_subqueue(dev, qnum);
>> + virtqueue_disable_cb(vq);
>> }
>> }
>> }
>> @@ -700,7 +760,8 @@ static struct rtnl_link_stats64 *virtnet_stats(struct net_device *dev,
>> unsigned int start;
>>
>> for_each_possible_cpu(cpu) {
>> - struct virtnet_stats *stats = per_cpu_ptr(vi->stats, cpu);
>> + struct virtnet_stats __percpu *stats
>> + = per_cpu_ptr(vi->stats, cpu);
>> u64 tpackets, tbytes, rpackets, rbytes;
>>
>> do {
>> @@ -734,20 +795,26 @@ static struct rtnl_link_stats64 *virtnet_stats(struct net_device *dev,
>> static void virtnet_netpoll(struct net_device *dev)
>> {
>> struct virtnet_info *vi = netdev_priv(dev);
>> + int i;
>>
>> - napi_schedule(&vi->napi);
>> + for (i = 0; i< vi->num_queue_pairs; i++)
>> + napi_schedule(&vi->rq[i]->napi);
>> }
>> #endif
>>
>> static int virtnet_open(struct net_device *dev)
>> {
>> struct virtnet_info *vi = netdev_priv(dev);
>> + int i;
>>
>> - /* Make sure we have some buffers: if oom use wq. */
>> - if (!try_fill_recv(vi, GFP_KERNEL))
>> - queue_delayed_work(system_nrt_wq,&vi->refill, 0);
>> + for (i = 0; i< vi->num_queue_pairs; i++) {
>> + /* Make sure we have some buffers: if oom use wq. */
>> + if (!try_fill_recv(vi->rq[i], GFP_KERNEL))
>> + queue_delayed_work(system_nrt_wq,
>> + &vi->rq[i]->refill, 0);
>> + virtnet_napi_enable(vi->rq[i]);
>> + }
>>
>> - virtnet_napi_enable(vi);
>> return 0;
>> }
>>
>> @@ -809,10 +876,13 @@ static void virtnet_ack_link_announce(struct virtnet_info *vi)
>> static int virtnet_close(struct net_device *dev)
>> {
>> struct virtnet_info *vi = netdev_priv(dev);
>> + int i;
>>
>> /* Make sure refill_work doesn't re-enable napi! */
>> - cancel_delayed_work_sync(&vi->refill);
>> - napi_disable(&vi->napi);
>> + for (i = 0; i< vi->num_queue_pairs; i++) {
>> + cancel_delayed_work_sync(&vi->rq[i]->refill);
>> + napi_disable(&vi->rq[i]->napi);
>> + }
>>
>> return 0;
>> }
>> @@ -924,11 +994,10 @@ static void virtnet_get_ringparam(struct net_device *dev,
>> {
>> struct virtnet_info *vi = netdev_priv(dev);
>>
>> - ring->rx_max_pending = virtqueue_get_vring_size(vi->rvq);
>> - ring->tx_max_pending = virtqueue_get_vring_size(vi->svq);
>> + ring->rx_max_pending = virtqueue_get_vring_size(vi->rq[0]->vq);
>> + ring->tx_max_pending = virtqueue_get_vring_size(vi->sq[0]->vq);
>> ring->rx_pending = ring->rx_max_pending;
>> ring->tx_pending = ring->tx_max_pending;
>> -
>> }
>>
>>
>> @@ -961,6 +1030,19 @@ static int virtnet_change_mtu(struct net_device *dev, int new_mtu)
>> return 0;
>> }
>>
>> +/* To avoid contending a lock hold by a vcpu who would exit to host, select the
>> + * txq based on the processor id.
>> + */
>> +static u16 virtnet_select_queue(struct net_device *dev, struct sk_buff *skb)
>> +{
>> + int txq = skb_rx_queue_recorded(skb) ? skb_get_rx_queue(skb) :
>> + smp_processor_id();
>> +
>> + while (unlikely(txq>= dev->real_num_tx_queues))
>> + txq -= dev->real_num_tx_queues;
>> + return txq;
>> +}
>> +
>> static const struct net_device_ops virtnet_netdev = {
>> .ndo_open = virtnet_open,
>> .ndo_stop = virtnet_close,
>> @@ -972,6 +1054,7 @@ static const struct net_device_ops virtnet_netdev = {
>> .ndo_get_stats64 = virtnet_stats,
>> .ndo_vlan_rx_add_vid = virtnet_vlan_rx_add_vid,
>> .ndo_vlan_rx_kill_vid = virtnet_vlan_rx_kill_vid,
>> + .ndo_select_queue = virtnet_select_queue,
>> #ifdef CONFIG_NET_POLL_CONTROLLER
>> .ndo_poll_controller = virtnet_netpoll,
>> #endif
>> @@ -1007,10 +1090,10 @@ static void virtnet_config_changed_work(struct work_struct *work)
>>
>> if (vi->status& VIRTIO_NET_S_LINK_UP) {
>> netif_carrier_on(vi->dev);
>> - netif_wake_queue(vi->dev);
>> + netif_tx_wake_all_queues(vi->dev);
>> } else {
>> netif_carrier_off(vi->dev);
>> - netif_stop_queue(vi->dev);
>> + netif_tx_stop_all_queues(vi->dev);
>> }
>> done:
>> mutex_unlock(&vi->config_lock);
>> @@ -1023,41 +1106,217 @@ static void virtnet_config_changed(struct virtio_device *vdev)
>> queue_work(system_nrt_wq,&vi->config_work);
>> }
>>
>> -static int init_vqs(struct virtnet_info *vi)
>> +static void free_receive_bufs(struct virtnet_info *vi)
>> +{
>> + int i;
>> +
>> + for (i = 0; i< vi->num_queue_pairs; i++) {
>> + while (vi->rq[i]->pages)
>> + __free_pages(get_a_page(vi->rq[i], GFP_KERNEL), 0);
>> + }
>> +}
>> +
>> +/* Free memory allocated for send and receive queues */
>> +static void virtnet_free_queues(struct virtnet_info *vi)
>> {
>> - struct virtqueue *vqs[3];
>> - vq_callback_t *callbacks[] = { skb_recv_done, skb_xmit_done, NULL};
>> - const char *names[] = { "input", "output", "control" };
>> - int nvqs, err;
>> + int i;
>>
>> - /* We expect two virtqueues, receive then send,
>> - * and optionally control. */
>> - nvqs = virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ) ? 3 : 2;
>> + for (i = 0; i< vi->num_queue_pairs; i++) {
>> + kfree(vi->rq[i]);
>> + vi->rq[i] = NULL;
>> + kfree(vi->sq[i]);
>> + vi->sq[i] = NULL;
>> + }
>> +}
>>
>> - err = vi->vdev->config->find_vqs(vi->vdev, nvqs, vqs, callbacks, names);
>> - if (err)
>> - return err;
>> +static void free_unused_bufs(struct virtnet_info *vi)
>> +{
>> + void *buf;
>> + int i;
>> +
>> + for (i = 0; i< vi->num_queue_pairs; i++) {
>> + struct virtqueue *vq = vi->sq[i]->vq;
>> +
>> + while ((buf = virtqueue_detach_unused_buf(vq)) != NULL)
>> + dev_kfree_skb(buf);
>> + }
>> +
>> + for (i = 0; i< vi->num_queue_pairs; i++) {
>> + struct virtqueue *vq = vi->rq[i]->vq;
>> +
>> + while ((buf = virtqueue_detach_unused_buf(vq)) != NULL) {
>> + if (vi->mergeable_rx_bufs || vi->big_packets)
>> + give_pages(vi->rq[i], buf);
>> + else
>> + dev_kfree_skb(buf);
>> + --vi->rq[i]->num;
>> + }
>> + BUG_ON(vi->rq[i]->num != 0);
>> + }
>> +}
>> +
>> +static void virtnet_set_affinity(struct virtnet_info *vi, bool set)
>> +{
>> + int i;
>> +
>> + if (vi->num_queue_pairs == 1)
>> + return;
>> +
>> + for (i = 0; i< vi->num_queue_pairs; i++) {
>> + int cpu = set ? i : -1;
>> + virtqueue_set_affinity(vi->rq[i]->vq, cpu);
>> + virtqueue_set_affinity(vi->sq[i]->vq, cpu);
>> + }
>> + return;
>> +}
>> +
>> +static void virtnet_del_vqs(struct virtnet_info *vi)
>> +{
>> + struct virtio_device *vdev = vi->vdev;
>> +
>> + virtnet_set_affinity(vi, false);
>> +
>> + vdev->config->del_vqs(vdev);
>> +
>> + virtnet_free_queues(vi);
>> +}
>> +
>> +static int virtnet_find_vqs(struct virtnet_info *vi)
>> +{
>> + vq_callback_t **callbacks;
>> + struct virtqueue **vqs;
>> + int ret = -ENOMEM;
>> + int i, total_vqs;
>> + char **names;
>>
>> - vi->rvq = vqs[0];
>> - vi->svq = vqs[1];
>> + /*
>> + * We expect 1 RX virtqueue followed by 1 TX virtqueue, followd by
>> + * possible control virtqueue and followed by the same
>> + * 'vi->num_queue_pairs-1' more times
>> + */
>> + total_vqs = vi->num_queue_pairs * 2 +
>> + virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ);
>> +
>> + /* Allocate space for find_vqs parameters */
>> + vqs = kmalloc(total_vqs * sizeof(*vqs), GFP_KERNEL);
>> + callbacks = kmalloc(total_vqs * sizeof(*callbacks), GFP_KERNEL);
>> + names = kmalloc(total_vqs * sizeof(*names), GFP_KERNEL);
> so this needs to be kzalloc otherwise on an error cleanup will
> get uninitialized data and crash?
Yes, will change it to use kzalloc.
>
>> + if (!vqs || !callbacks || !names)
>> + goto err;
>> +
>> + /* Parameters for control virtqueue, if any */
>> + if (vi->has_cvq) {
>> + callbacks[2] = NULL;
>> + names[2] = "control";
>> + }
>> +
>> + /* Allocate/initialize parameters for send/receive virtqueues */
>> + for (i = 0; i< vi->num_queue_pairs * 2; i += 2) {
>> + int j = (i == 0 ? i : i + vi->has_cvq);
>> + callbacks[j] = skb_recv_done;
>> + callbacks[j + 1] = skb_xmit_done;
>> + names[j] = kasprintf(GFP_KERNEL, "input.%d", i / 2);
>> + names[j + 1] = kasprintf(GFP_KERNEL, "output.%d", i / 2);
> This needs wrappers. E.g. virtnet_rx_vq(int queue_pair), virtnet_tx_vq(int queue_pair);
> Then you would just scan 0 to num_queue_pairs, and i is queue pair
> number.
Ok.
>> + }
>>
>> - if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ)) {
>> + ret = vi->vdev->config->find_vqs(vi->vdev, total_vqs, vqs, callbacks,
>> + (const char **)names);
>> + if (ret)
>> + goto err;
>> +
>> + if (vi->has_cvq)
>> vi->cvq = vqs[2];
>>
>> - if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VLAN))
>> - vi->dev->features |= NETIF_F_HW_VLAN_FILTER;
>> + for (i = 0; i< vi->num_queue_pairs * 2; i += 2) {
>> + int j = i == 0 ? i : i + vi->has_cvq;
>> + vi->rq[i / 2]->vq = vqs[j];
>> + vi->sq[i / 2]->vq = vqs[j + 1];
> Same here.
Consider the code is really simple, seem no need to use helpers.
>
>> }
>> - return 0;
>> +
>> +err:
>> + if (ret&& names)
> If we are here ret != 0. For names, just add another label, don't
> complicate cleanup.
Ok.
>> + for (i = 0; i< vi->num_queue_pairs * 2; i++)
>> + kfree(names[i]);
>> +
>> + kfree(names);
>> + kfree(callbacks);
>> + kfree(vqs);
>> +
>> + return ret;
>> +}
>> +
>> +static int virtnet_alloc_queues(struct virtnet_info *vi)
>> +{
>> + int ret = -ENOMEM;
>> + int i;
>> +
>> + for (i = 0; i< vi->num_queue_pairs; i++) {
>> + vi->rq[i] = kzalloc(sizeof(*vi->rq[i]), GFP_KERNEL);
>> + vi->sq[i] = kzalloc(sizeof(*vi->sq[i]), GFP_KERNEL);
>> + if (!vi->rq[i] || !vi->sq[i])
>> + goto err;
>> + }
>> +
>> + ret = 0;
>> +
>> + /* setup initial receive and send queue parameters */
>> + for (i = 0; i< vi->num_queue_pairs; i++) {
>> + vi->rq[i]->vi = vi;
>> + vi->rq[i]->pages = NULL;
>> + INIT_DELAYED_WORK(&vi->rq[i]->refill, refill_work);
>> + netif_napi_add(vi->dev,&vi->rq[i]->napi, virtnet_poll,
>> + napi_weight);
>> +
>> + sg_init_table(vi->rq[i]->sg, ARRAY_SIZE(vi->rq[i]->sg));
>> + sg_init_table(vi->sq[i]->sg, ARRAY_SIZE(vi->sq[i]->sg));
>> + }
>> +
> Add return 0 here, then ret = 0 will not be needed
> above and if (ret) below.
>
Ok.
>> +err:
>> + if (ret)
>> + virtnet_free_queues(vi);
>> +
>> + return ret;
>> +}
>> +
>> +static int virtnet_setup_vqs(struct virtnet_info *vi)
>> +{
>> + int ret;
>> +
>> + /* Allocate send& receive queues */
>> + ret = virtnet_alloc_queues(vi);
>> + if (!ret) {
>> + ret = virtnet_find_vqs(vi);
>> + if (ret)
>> + virtnet_free_queues(vi);
>> + else
>> + virtnet_set_affinity(vi, true);
>> + }
>> +
>> + return ret;
> Add some labels for error handling, this if nesting is messy.
Ok.
>> }
>>
>> static int virtnet_probe(struct virtio_device *vdev)
>> {
>> - int err;
>> + int i, err;
>> struct net_device *dev;
>> struct virtnet_info *vi;
>> + u16 num_queues, num_queue_pairs;
>> +
>> + /* Find if host supports multiqueue virtio_net device */
>> + err = virtio_config_val(vdev, VIRTIO_NET_F_MULTIQUEUE,
>> + offsetof(struct virtio_net_config,
>> + num_queues),&num_queues);
>> +
>> + /* We need atleast 2 queue's */
> typo
Will fix this, thanks.
>> + if (err || num_queues< 2)
>> + num_queues = 2;
>> + if (num_queues> MAX_QUEUES * 2)
>> + num_queues = MAX_QUEUES;
>> +
>> + num_queue_pairs = num_queues / 2;
>>
>> /* Allocate ourselves a network device with room for our info */
>> - dev = alloc_etherdev(sizeof(struct virtnet_info));
>> + dev = alloc_etherdev_mq(sizeof(struct virtnet_info), num_queue_pairs);
>> if (!dev)
>> return -ENOMEM;
>>
>> @@ -1103,22 +1362,18 @@ static int virtnet_probe(struct virtio_device *vdev)
>>
>> /* Set up our device-specific information */
>> vi = netdev_priv(dev);
>> - netif_napi_add(dev,&vi->napi, virtnet_poll, napi_weight);
>> vi->dev = dev;
>> vi->vdev = vdev;
>> vdev->priv = vi;
>> - vi->pages = NULL;
>> vi->stats = alloc_percpu(struct virtnet_stats);
>> err = -ENOMEM;
>> if (vi->stats == NULL)
>> - goto free;
>> + goto free_netdev;
>>
>> - INIT_DELAYED_WORK(&vi->refill, refill_work);
>> mutex_init(&vi->config_lock);
>> vi->config_enable = true;
>> INIT_WORK(&vi->config_work, virtnet_config_changed_work);
>> - sg_init_table(vi->rx_sg, ARRAY_SIZE(vi->rx_sg));
>> - sg_init_table(vi->tx_sg, ARRAY_SIZE(vi->tx_sg));
>> + vi->num_queue_pairs = num_queue_pairs;
>>
>> /* If we can receive ANY GSO packets, we must allocate large ones. */
>> if (virtio_has_feature(vdev, VIRTIO_NET_F_GUEST_TSO4) ||
>> @@ -1129,9 +1384,17 @@ static int virtnet_probe(struct virtio_device *vdev)
>> if (virtio_has_feature(vdev, VIRTIO_NET_F_MRG_RXBUF))
>> vi->mergeable_rx_bufs = true;
>>
>> - err = init_vqs(vi);
>> + if (virtio_has_feature(vdev, VIRTIO_NET_F_CTRL_VQ))
>> + vi->has_cvq = true;
>> +
> How about we disable multiqueue if there's no cvq?
> Will make logic a bit simpler, won't it?
We can, but as you said, just let the logic simpler a bit.
>> + /* Allocate/initialize the rx/tx queues, and invoke find_vqs */
>> + err = virtnet_setup_vqs(vi);
>> if (err)
>> - goto free_stats;
>> + goto free_netdev;
>> +
>> + if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ)&&
>> + virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VLAN))
>> + dev->features |= NETIF_F_HW_VLAN_FILTER;
>>
>> err = register_netdev(dev);
>> if (err) {
>> @@ -1140,12 +1403,15 @@ static int virtnet_probe(struct virtio_device *vdev)
>> }
>>
>> /* Last of all, set up some receive buffers. */
>> - try_fill_recv(vi, GFP_KERNEL);
>> -
>> - /* If we didn't even get one input buffer, we're useless. */
>> - if (vi->num == 0) {
>> - err = -ENOMEM;
>> - goto unregister;
>> + for (i = 0; i< num_queue_pairs; i++) {
>> + try_fill_recv(vi->rq[i], GFP_KERNEL);
>> +
>> + /* If we didn't even get one input buffer, we're useless. */
>> + if (vi->rq[i]->num == 0) {
>> + free_unused_bufs(vi);
>> + err = -ENOMEM;
>> + goto free_recv_bufs;
>> + }
>> }
>>
>> /* Assume link up if device can't report link status,
>> @@ -1158,42 +1424,25 @@ static int virtnet_probe(struct virtio_device *vdev)
>> netif_carrier_on(dev);
>> }
>>
>> - pr_debug("virtnet: registered device %s\n", dev->name);
>> + pr_debug("virtnet: registered device %s with %d RX and TX vq's\n",
>> + dev->name, num_queue_pairs);
>> +
>> return 0;
>>
>> -unregister:
>> +free_recv_bufs:
>> + free_receive_bufs(vi);
>> unregister_netdev(dev);
>> +
>> free_vqs:
>> - vdev->config->del_vqs(vdev);
>> -free_stats:
>> - free_percpu(vi->stats);
>> -free:
>> + for (i = 0; i< num_queue_pairs; i++)
>> + cancel_delayed_work_sync(&vi->rq[i]->refill);
>> + virtnet_del_vqs(vi);
>> +
>> +free_netdev:
>> free_netdev(dev);
>> return err;
>> }
>>
>> -static void free_unused_bufs(struct virtnet_info *vi)
>> -{
>> - void *buf;
>> - while (1) {
>> - buf = virtqueue_detach_unused_buf(vi->svq);
>> - if (!buf)
>> - break;
>> - dev_kfree_skb(buf);
>> - }
>> - while (1) {
>> - buf = virtqueue_detach_unused_buf(vi->rvq);
>> - if (!buf)
>> - break;
>> - if (vi->mergeable_rx_bufs || vi->big_packets)
>> - give_pages(vi, buf);
>> - else
>> - dev_kfree_skb(buf);
>> - --vi->num;
>> - }
>> - BUG_ON(vi->num != 0);
>> -}
>> -
>> static void remove_vq_common(struct virtnet_info *vi)
>> {
>> vi->vdev->config->reset(vi->vdev);
>> @@ -1201,10 +1450,9 @@ static void remove_vq_common(struct virtnet_info *vi)
>> /* Free unused buffers in both send and recv, if any. */
>> free_unused_bufs(vi);
>>
>> - vi->vdev->config->del_vqs(vi->vdev);
>> + free_receive_bufs(vi);
>>
>> - while (vi->pages)
>> - __free_pages(get_a_page(vi, GFP_KERNEL), 0);
>> + virtnet_del_vqs(vi);
>> }
>>
>> static void __devexit virtnet_remove(struct virtio_device *vdev)
>> @@ -1230,6 +1478,7 @@ static void __devexit virtnet_remove(struct virtio_device *vdev)
>> static int virtnet_freeze(struct virtio_device *vdev)
>> {
>> struct virtnet_info *vi = vdev->priv;
>> + int i;
>>
>> /* Prevent config work handler from accessing the device */
>> mutex_lock(&vi->config_lock);
>> @@ -1237,10 +1486,13 @@ static int virtnet_freeze(struct virtio_device *vdev)
>> mutex_unlock(&vi->config_lock);
>>
>> netif_device_detach(vi->dev);
>> - cancel_delayed_work_sync(&vi->refill);
>> + for (i = 0; i< vi->num_queue_pairs; i++)
>> + cancel_delayed_work_sync(&vi->rq[i]->refill);
>>
>> if (netif_running(vi->dev))
>> - napi_disable(&vi->napi);
>> + for (i = 0; i< vi->num_queue_pairs; i++)
>> + napi_disable(&vi->rq[i]->napi);
>> +
>>
>> remove_vq_common(vi);
>>
>> @@ -1252,19 +1504,22 @@ static int virtnet_freeze(struct virtio_device *vdev)
>> static int virtnet_restore(struct virtio_device *vdev)
>> {
>> struct virtnet_info *vi = vdev->priv;
>> - int err;
>> + int err, i;
>>
>> - err = init_vqs(vi);
>> + err = virtnet_setup_vqs(vi);
>> if (err)
>> return err;
>>
>> if (netif_running(vi->dev))
>> - virtnet_napi_enable(vi);
>> + for (i = 0; i< vi->num_queue_pairs; i++)
>> + virtnet_napi_enable(vi->rq[i]);
>>
>> netif_device_attach(vi->dev);
>>
>> - if (!try_fill_recv(vi, GFP_KERNEL))
>> - queue_delayed_work(system_nrt_wq,&vi->refill, 0);
>> + for (i = 0; i< vi->num_queue_pairs; i++)
>> + if (!try_fill_recv(vi->rq[i], GFP_KERNEL))
>> + queue_delayed_work(system_nrt_wq,
>> + &vi->rq[i]->refill, 0);
>>
>> mutex_lock(&vi->config_lock);
>> vi->config_enable = true;
>> @@ -1287,7 +1542,7 @@ static unsigned int features[] = {
>> VIRTIO_NET_F_GUEST_ECN, VIRTIO_NET_F_GUEST_UFO,
>> VIRTIO_NET_F_MRG_RXBUF, VIRTIO_NET_F_STATUS, VIRTIO_NET_F_CTRL_VQ,
>> VIRTIO_NET_F_CTRL_RX, VIRTIO_NET_F_CTRL_VLAN,
>> - VIRTIO_NET_F_GUEST_ANNOUNCE,
>> + VIRTIO_NET_F_GUEST_ANNOUNCE, VIRTIO_NET_F_MULTIQUEUE,
>> };
>>
>> static struct virtio_driver virtio_net_driver = {
>> diff --git a/include/linux/virtio_net.h b/include/linux/virtio_net.h
>> index 1bc7e30..60f09ff 100644
>> --- a/include/linux/virtio_net.h
>> +++ b/include/linux/virtio_net.h
>> @@ -61,6 +61,8 @@ struct virtio_net_config {
>> __u8 mac[6];
>> /* See VIRTIO_NET_F_STATUS and VIRTIO_NET_S_* above */
>> __u16 status;
>> + /* Total number of RX/TX queues */
>> + __u16 num_queues;
>> } __attribute__((packed));
>>
>> /* This is the first element of the scatter-gather list. If you don't
>> --
>> 1.7.1
^ permalink raw reply
* Re: [net-next RFC V5 4/5] virtio_net: multiqueue support
From: Jason Wang @ 2012-07-23 5:54 UTC (permalink / raw)
To: Sasha Levin
Cc: krkumar2, habanero, mashirle, kvm, Michael S. Tsirkin, netdev,
linux-kernel, virtualization, edumazet, tahm, jwhan, davem, sri
In-Reply-To: <500A9A72.20507@gmail.com>
On 07/21/2012 08:02 PM, Sasha Levin wrote:
> On 07/20/2012 03:40 PM, Michael S. Tsirkin wrote:
>>> - err = init_vqs(vi);
>>>> + if (virtio_has_feature(vdev, VIRTIO_NET_F_CTRL_VQ))
>>>> + vi->has_cvq = true;
>>>> +
>> How about we disable multiqueue if there's no cvq?
>> Will make logic a bit simpler, won't it?
> multiqueues don't really depend on cvq. Does this added complexity really justifies adding an artificial limit?
>
Yes, it does not depends on cvq. Cvq were just used to negotiate the
number of queues a guest wishes to use which is really useful (at least
for now). Since multiqueue can not out-perform for single queue in every
kinds of workloads or benchmark, so we want to let guest driver use
single queue by default even when multiqueue were enabled by management
software and let use to enalbe it through ethtool. So user could not
feel regression when it switch to use a multiqueue capable driver and
backend.
So the only difference is the user experiences.
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
^ permalink raw reply
* Re: [PATCH RFT RESEND] net: Fix Neptune ethernet driver to check dma mapping error
From: David Miller @ 2012-07-23 6:34 UTC (permalink / raw)
To: shuah.khan
Cc: mcarlson, bhutchings, eric.dumazet, mchan, netdev, linux-kernel,
shuahkhan, stable
In-Reply-To: <1342821035.5434.60.camel@lorien2>
From: Shuah Khan <shuah.khan@hp.com>
Date: Fri, 20 Jul 2012 15:50:35 -0600
> Fix Neptune ethernet driver to check dma mapping error after map_page()
> interface returns.
>
> Signed-off-by: Shuah Khan <shuah.khan@hp.com>
Applied.
^ permalink raw reply
* Re: [PATCH RFT] net: Change niu_rbr_fill() to use unlikely() to check niu_rbr_add_page() return value
From: David Miller @ 2012-07-23 6:35 UTC (permalink / raw)
To: shuah.khan
Cc: mcarlson, bhutchings, eric.dumazet, mchan, netdev, linux-kernel,
shuahkhan
In-Reply-To: <1342827272.5434.71.camel@lorien2>
From: Shuah Khan <shuah.khan@hp.com>
Date: Fri, 20 Jul 2012 17:34:32 -0600
> Change niu_rbr_fill() to use unlikely() to check niu_rbr_add_page() return
> value to be consistent with the rest of the checks after niu_rbr_add_page()
> calls in this file.
>
> Signed-off-by: Shuah Khan <shuah.khan@hp.com>
Applied.
^ permalink raw reply
* Re: [PATCH 1/2] ipvs: ip_vs_ftp depends on nf_conntrack_ftp helper
From: Simon Horman @ 2012-07-23 6:48 UTC (permalink / raw)
To: Julian Anastasov
Cc: Pablo Neira Ayuso, lvs-devel, netdev, netfilter-devel,
Wensong Zhang, Hans Schillstrom, Jesper Dangaard Brouer
In-Reply-To: <alpine.LFD.2.00.1207122238220.1831@ja.ssi.bg>
On Thu, Jul 12, 2012 at 10:43:22PM +0300, Julian Anastasov wrote:
>
> Hello,
>
> On Thu, 12 Jul 2012, Pablo Neira Ayuso wrote:
>
> > On Wed, Jul 11, 2012 at 09:25:26AM +0900, Simon Horman wrote:
> > > From: Julian Anastasov <ja@ssi.bg>
> > >
> > > The FTP application indirectly depends on the
> > > nf_conntrack_ftp helper for proper NAT support. If the
> > > module is not loaded, IPVS can resize the packets for the
> > > command connection, eg. PASV response but the SEQ adjustment
> > > logic in ipv4_confirm is not called without helper.
> > >
> > > Signed-off-by: Julian Anastasov <ja@ssi.bg>
> > > Signed-off-by: Simon Horman <horms@verge.net.au>
> > > ---
> > > net/netfilter/ipvs/Kconfig | 3 ++-
> > > 1 file changed, 2 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/net/netfilter/ipvs/Kconfig b/net/netfilter/ipvs/Kconfig
> > > index f987138..8b2cffd 100644
> > > --- a/net/netfilter/ipvs/Kconfig
> > > +++ b/net/netfilter/ipvs/Kconfig
> > > @@ -250,7 +250,8 @@ comment 'IPVS application helper'
> > >
> > > config IP_VS_FTP
> > > tristate "FTP protocol helper"
> > > - depends on IP_VS_PROTO_TCP && NF_CONNTRACK && NF_NAT
> > > + depends on IP_VS_PROTO_TCP && NF_CONNTRACK && NF_NAT && \
> > > + NF_CONNTRACK_FTP
> >
> > If you require FTP NAT support, then this depends on NF_NAT_FTP
> > instead of NF_CONNTRACK_FTP.
>
> No, I just checked again, it works without nf_nat_ftp,
> only nf_nat, nf_conntrack_ftp and iptable_nat are needed.
> We use packet mangling part from nf_nat (nf_nat_mangle_tcp_packet).
Is there a consensus on this?
^ permalink raw reply
* [RFC PATCH 0/1] sched: Add a new API to find the prefer idlest cpu
From: Shirley Ma @ 2012-07-23 6:57 UTC (permalink / raw)
To: linux-kernel, netdev; +Cc: Michael S. Tsirkin, vivek, sri
Introduce a new API to choose per-cpu thread from cgroup control cpuset
(allowed) and preferred cpuset (local numa-node).
The receiving cpus of a networking device are not under cgroup controls.
When such a networking device uses per-cpu thread model, the cpu which
is chose to process the packets might not be part of cgroup cpusets
without this API. On numa system, the preferred cpusets would help to
reduce expensive cross memory access to/from the other node.
Signed-off-by: Shirley Ma <xma@us.ibm.com>
---
include/linux/sched.h | 2 ++
kernel/sched/fair.c | 30 ++++++++++++++++++++++++++++++
2 files changed, 32 insertions(+), 0 deletions(-)
Thanks
Shirley
^ permalink raw reply
* [RFC PATCH 1/1] sched: Add a new API to find the prefer idlest cpu
From: Shirley Ma @ 2012-07-23 6:59 UTC (permalink / raw)
To: linux-kernel; +Cc: netdev, Michael S. Tsirkin, vivek, sri
In-Reply-To: <1343026634.13461.15.camel@oc3660625478.ibm.com>
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 64d9df5..46cc4a7 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -2806,4 +2806,6 @@ static inline unsigned long rlimit_max(unsigned int limit)
#endif /* __KERNEL__ */
+extern int find_idlest_prefer_cpu(struct cpumask *prefer,
+ struct cpumask *allowed, int prev_cpu);
#endif
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index c099cc6..7240868 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -26,6 +26,7 @@
#include <linux/slab.h>
#include <linux/profile.h>
#include <linux/interrupt.h>
+#include <linux/export.h>
#include <trace/events/sched.h>
@@ -2809,6 +2810,35 @@ unlock:
return new_cpu;
}
+
+/*
+ * This API is used to find the most idle cpu from both preferred and
+ * allowed cpuset (such as cgroup controls cpuset). It helps per-cpu thread
+ * model to pick up the allowed local cpu to be scheduled.
+ * If these two cpusets have intersects, the cpu is chose from the intersects,
+ * if there is no intersects, then the cpu is chose from the allowed cpuset.
+ * prev_cpu helps to better local cache when prev_cpu is not busy.
+ */
+int find_idlest_prefer_cpu(struct cpumask *prefer, struct cpumask *allowed,
+ int prev_cpu)
+{
+ unsigned long load, min_load = ULONG_MAX;
+ int check, i, idlest = -1;
+
+ check = cpumask_intersects(prefer, allowed);
+ /* Traverse only the allowed CPUs */
+ if (check == 0)
+ prefer = allowed;
+ for_each_cpu_and(i, prefer, allowed) {
+ load = weighted_cpuload(i);
+ if (load < min_load || (load == min_load && i == prev_cpu)) {
+ min_load = load;
+ idlest = i;
+ }
+ }
+ return idlest;
+}
+EXPORT_SYMBOL(find_idlest_prefer_cpu);
#endif /* CONFIG_SMP */
static unsigned long
Shirley
^ permalink raw reply related
* [3.5 regression / bridge] constantly toggeling between disabled and forwarding
From: Michael Leun @ 2012-07-23 7:15 UTC (permalink / raw)
To: bridge, netdev; +Cc: linux-kernel, shemminger
Hi,
when I use my usb ethernet adapter
# > lsusb
[...]
Bus 002 Device 009: ID 9710:7830 MosChip Semiconductor MCS7830 10/100 Mbps Ethernet adapter
[...]
as port of an bridge
> # brctl addbr br0
> # brctl addif br0 eth0
> # brctl addif br0 ue5
> # ifconfig ue5 up
> # ifconfig br0 up
(Also does happen when eth0 is not part of the bridge, but the logs I
had available were from that situation...)
I constantly get messages showing the interface toggeling between
disabled and forwarding state:
Jul 23 07:40:50 elektra kernel: [ 1539.497337] br0: port 2(ue5) entered disabled state
Jul 23 07:40:50 elektra kernel: [ 1539.554992] br0: port 2(ue5) entered forwarding state
Jul 23 07:40:50 elektra kernel: [ 1539.555005] br0: port 2(ue5) entered forwarding state
Jul 23 07:40:51 elektra kernel: [ 1540.496242] br0: port 2(ue5) entered disabled state
Jul 23 07:40:51 elektra kernel: [ 1540.552534] br0: port 2(ue5) entered forwarding state
Jul 23 07:40:51 elektra kernel: [ 1540.552548] br0: port 2(ue5) entered forwarding state
Jul 23 07:40:52 elektra kernel: [ 1541.550413] br0: port 2(ue5) entered forwarding state
Jul 23 07:40:53 elektra kernel: [ 1542.529672] br0: port 2(ue5) entered disabled state
Jul 23 07:40:53 elektra kernel: [ 1542.587162] br0: port 2(ue5) entered forwarding state
Jul 23 07:40:53 elektra kernel: [ 1542.587175] br0: port 2(ue5) entered forwarding state
Jul 23 07:40:54 elektra kernel: [ 1543.585309] br0: port 2(ue5) entered forwarding state
Jul 23 07:41:00 elektra kernel: [ 1549.360600] br0: port 2(ue5) entered disabled state
Jul 23 07:41:00 elektra kernel: [ 1549.442998] br0: port 2(ue5) entered forwarding state
Jul 23 07:41:00 elektra kernel: [ 1549.443011] br0: port 2(ue5) entered forwarding state
Jul 23 07:41:01 elektra kernel: [ 1550.357686] br0: port 2(ue5) entered disabled state
Jul 23 07:41:01 elektra kernel: [ 1550.408208] br0: port 2(ue5) entered forwarding state
Jul 23 07:41:01 elektra kernel: [ 1550.408222] br0: port 2(ue5) entered forwarding state
Jul 23 07:41:02 elektra kernel: [ 1551.407656] br0: port 2(ue5) entered forwarding state
Jul 23 07:41:03 elektra kernel: [ 1552.401578] br0: port 2(ue5) entered disabled state
Jul 23 07:41:03 elektra kernel: [ 1552.474773] br0: port 2(ue5) entered forwarding state
Jul 23 07:41:03 elektra kernel: [ 1552.474786] br0: port 2(ue5) entered forwarding state
Jul 23 07:41:04 elektra kernel: [ 1553.472487] br0: port 2(ue5) entered forwarding state
Jul 23 07:41:05 elektra kernel: [ 1554.356138] br0: port 2(ue5) entered disabled state
[...]
This does (in the same situation, nothing else than the kernel changed)
not happen with 3.4.5.
Does anybody have an idea what the issue might be or do I need to bisect?
--
MfG,
Michael Leun
^ permalink raw reply
* Re: [PATCH 00/16] Remove the ipv4 routing cache
From: Eric Dumazet @ 2012-07-23 7:15 UTC (permalink / raw)
To: David Miller; +Cc: netdev
In-Reply-To: <20120722.173951.1794347789063177131.davem@davemloft.net>
On Sun, 2012-07-22 at 17:39 -0700, David Miller wrote:
> Just FYI, I'm pushing this work out to net-next now.
> --
Excellent !
Thanks a lot David
^ permalink raw reply
* [net-next PATCH 1/1] bnx2x: Add new 57840 device IDs
From: Yuval Mintz @ 2012-07-23 7:25 UTC (permalink / raw)
To: davem, netdev; +Cc: Yuval Mintz, Eilon Greenstein
The 57840 boards come in two flavours: 2 x 20G and 4 x 10G.
To better differentiate between the two flavours, a separate device ID
was assigned to each.
The silicon default value is still the currently supported 57840 device ID
(0x168d), and since a user can damage the nvram (e.g., 'ethtool -E')
the driver will still support this device ID to allow the user to amend the
nvram back into a supported configuration.
Notice this patch contains lines longer than 80 characters (strings).
Signed-off-by: Yuval Mintz <yuvalmin@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
---
Hi Dave,
Please consider applying this patch to 'net-next'.
Thanks,
---
drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 15 ++++++++---
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 2 +-
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 31 ++++++++++++++++++---
3 files changed, 38 insertions(+), 10 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
index dbe9791..77bcd4c 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
@@ -819,8 +819,11 @@ struct bnx2x_common {
#define CHIP_NUM_57810_MF 0x16ae
#define CHIP_NUM_57811 0x163d
#define CHIP_NUM_57811_MF 0x163e
-#define CHIP_NUM_57840 0x168d
-#define CHIP_NUM_57840_MF 0x16ab
+#define CHIP_NUM_57840_OBSOLETE 0x168d
+#define CHIP_NUM_57840_MF_OBSOLETE 0x16ab
+#define CHIP_NUM_57840_4_10 0x16a1
+#define CHIP_NUM_57840_2_20 0x16a2
+#define CHIP_NUM_57840_MF 0x16a4
#define CHIP_IS_E1(bp) (CHIP_NUM(bp) == CHIP_NUM_57710)
#define CHIP_IS_57711(bp) (CHIP_NUM(bp) == CHIP_NUM_57711)
#define CHIP_IS_57711E(bp) (CHIP_NUM(bp) == CHIP_NUM_57711E)
@@ -832,8 +835,12 @@ struct bnx2x_common {
#define CHIP_IS_57810_MF(bp) (CHIP_NUM(bp) == CHIP_NUM_57810_MF)
#define CHIP_IS_57811(bp) (CHIP_NUM(bp) == CHIP_NUM_57811)
#define CHIP_IS_57811_MF(bp) (CHIP_NUM(bp) == CHIP_NUM_57811_MF)
-#define CHIP_IS_57840(bp) (CHIP_NUM(bp) == CHIP_NUM_57840)
-#define CHIP_IS_57840_MF(bp) (CHIP_NUM(bp) == CHIP_NUM_57840_MF)
+#define CHIP_IS_57840(bp) \
+ ((CHIP_NUM(bp) == CHIP_NUM_57840_4_10) || \
+ (CHIP_NUM(bp) == CHIP_NUM_57840_2_20) || \
+ (CHIP_NUM(bp) == CHIP_NUM_57840_OBSOLETE))
+#define CHIP_IS_57840_MF(bp) ((CHIP_NUM(bp) == CHIP_NUM_57840_MF) || \
+ (CHIP_NUM(bp) == CHIP_NUM_57840_MF_OBSOLETE))
#define CHIP_IS_E1H(bp) (CHIP_IS_57711(bp) || \
CHIP_IS_57711E(bp))
#define CHIP_IS_E2(bp) (CHIP_IS_57712(bp) || \
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
index e04b282..f4beb46 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
@@ -1718,7 +1718,7 @@ static void bnx2x_xmac_init(struct link_params *params, u32 max_speed)
* ports of the path
*/
- if ((CHIP_NUM(bp) == CHIP_NUM_57840) &&
+ if ((CHIP_NUM(bp) == CHIP_NUM_57840_4_10) &&
(REG_RD(bp, MISC_REG_RESET_REG_2) &
MISC_REGISTERS_RESET_REG_2_XMAC)) {
DP(NETIF_MSG_LINK,
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index 08eca3f..9aaf863 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -137,7 +137,10 @@ enum bnx2x_board_type {
BCM57800_MF,
BCM57810,
BCM57810_MF,
- BCM57840,
+ BCM57840_O,
+ BCM57840_4_10,
+ BCM57840_2_20,
+ BCM57840_MFO,
BCM57840_MF,
BCM57811,
BCM57811_MF
@@ -157,6 +160,9 @@ static struct {
{ "Broadcom NetXtreme II BCM57810 10 Gigabit Ethernet" },
{ "Broadcom NetXtreme II BCM57810 10 Gigabit Ethernet Multi Function" },
{ "Broadcom NetXtreme II BCM57840 10/20 Gigabit Ethernet" },
+ { "Broadcom NetXtreme II BCM57840 10 Gigabit Ethernet" },
+ { "Broadcom NetXtreme II BCM57840 20 Gigabit Ethernet" },
+ { "Broadcom NetXtreme II BCM57840 10/20 Gigabit Ethernet Multi Function"},
{ "Broadcom NetXtreme II BCM57840 10/20 Gigabit Ethernet Multi Function"},
{ "Broadcom NetXtreme II BCM57811 10 Gigabit Ethernet"},
{ "Broadcom NetXtreme II BCM57811 10 Gigabit Ethernet Multi Function"},
@@ -189,8 +195,17 @@ static struct {
#ifndef PCI_DEVICE_ID_NX2_57810_MF
#define PCI_DEVICE_ID_NX2_57810_MF CHIP_NUM_57810_MF
#endif
-#ifndef PCI_DEVICE_ID_NX2_57840
-#define PCI_DEVICE_ID_NX2_57840 CHIP_NUM_57840
+#ifndef PCI_DEVICE_ID_NX2_57840_O
+#define PCI_DEVICE_ID_NX2_57840_O CHIP_NUM_57840_OBSOLETE
+#endif
+#ifndef PCI_DEVICE_ID_NX2_57840_4_10
+#define PCI_DEVICE_ID_NX2_57840_4_10 CHIP_NUM_57840_4_10
+#endif
+#ifndef PCI_DEVICE_ID_NX2_57840_2_20
+#define PCI_DEVICE_ID_NX2_57840_2_20 CHIP_NUM_57840_2_20
+#endif
+#ifndef PCI_DEVICE_ID_NX2_57840_MFO
+#define PCI_DEVICE_ID_NX2_57840_MFO CHIP_NUM_57840_MF_OBSOLETE
#endif
#ifndef PCI_DEVICE_ID_NX2_57840_MF
#define PCI_DEVICE_ID_NX2_57840_MF CHIP_NUM_57840_MF
@@ -211,7 +226,10 @@ static DEFINE_PCI_DEVICE_TABLE(bnx2x_pci_tbl) = {
{ PCI_VDEVICE(BROADCOM, PCI_DEVICE_ID_NX2_57800_MF), BCM57800_MF },
{ PCI_VDEVICE(BROADCOM, PCI_DEVICE_ID_NX2_57810), BCM57810 },
{ PCI_VDEVICE(BROADCOM, PCI_DEVICE_ID_NX2_57810_MF), BCM57810_MF },
- { PCI_VDEVICE(BROADCOM, PCI_DEVICE_ID_NX2_57840), BCM57840 },
+ { PCI_VDEVICE(BROADCOM, PCI_DEVICE_ID_NX2_57840_O), BCM57840_O },
+ { PCI_VDEVICE(BROADCOM, PCI_DEVICE_ID_NX2_57840_4_10), BCM57840_4_10 },
+ { PCI_VDEVICE(BROADCOM, PCI_DEVICE_ID_NX2_57840_2_20), BCM57840_2_20 },
+ { PCI_VDEVICE(BROADCOM, PCI_DEVICE_ID_NX2_57840_MFO), BCM57840_MFO },
{ PCI_VDEVICE(BROADCOM, PCI_DEVICE_ID_NX2_57840_MF), BCM57840_MF },
{ PCI_VDEVICE(BROADCOM, PCI_DEVICE_ID_NX2_57811), BCM57811 },
{ PCI_VDEVICE(BROADCOM, PCI_DEVICE_ID_NX2_57811_MF), BCM57811_MF },
@@ -11801,7 +11819,10 @@ static int __devinit bnx2x_init_one(struct pci_dev *pdev,
case BCM57800_MF:
case BCM57810:
case BCM57810_MF:
- case BCM57840:
+ case BCM57840_O:
+ case BCM57840_4_10:
+ case BCM57840_2_20:
+ case BCM57840_MFO:
case BCM57840_MF:
case BCM57811:
case BCM57811_MF:
--
1.7.9.rc2
^ permalink raw reply related
* flush cache according to 'preferred life time'
From: BALAKUMARAN KANNAN @ 2012-07-23 7:36 UTC (permalink / raw)
To: netdev@vger.kernel.org
Hello all,
I am running test casees for IPv6 conformation on linux-3.0.26 kernel. Here I am facing a problem in routing advertisement. Once test case sets the 'preferred life time' to 20 seconds for a particular destination. And continuously sending ICMP REQUEST. It is expected that the ICMP_REPLY should stop in 20 seconds. But as because the default gc_interval is 30seconds, even after the timer expiry of the route, it is staying in the router cache. So even after 20 seconds, the nut(node under test) sends ICMP_REPLY. So if I changes gc_interval to 1, the test is getting passed.
But if I changes gc_interval to 1 seconds another test case in pmtu section fails. It expects that the nut should hold pmtu(path mtu) information for different value. So if I flushes the cache, the pmtu value is turning back to default.
So I made the kernel to alter its gc_interval value according to the 'preferred life time' of the path. Here is my path. Kindly tell me whether my idea is correct. Am I missing something?
--------------------------------------------------------------------------------------
--- ../linux-3.0.y-BRANCH_SS-RT.git.fresh/net/ipv6/ndisc.c.bak 2012-07-23 12:50:46.000000000 +0530
+++ ../linux-3.0.y-BRANCH_SS-RT.git.fresh/net/ipv6/ndisc.c 2012-07-23 12:54:17.000000000 +0530
@@ -1160,6 +1160,9 @@
__u8 * opt = (__u8 *)(ra_msg + 1);
+ struct net *net = dev_net(skb->dev);
+ fib6_run_gc(1, net);
+
optlen = (skb->tail - skb->transport_header) - sizeof(struct ra_msg);
if (!(ipv6_addr_type(&ipv6_hdr(skb)->saddr) & IPV6_ADDR_LINKLOCAL)) {
@@ -1200,6 +1203,22 @@
return;
}
+ if (*opt == 3) {
+ printk("<8> IN OPT 3\n");
+ struct net *net = dev_net(skb->dev);
+ fib6_run_gc(1, net);
+ int pref_life_time = ntohl(*((int *) (((char *) (opt)) + 8)));
+ if ((pref_life_time != 0) && (pref_life_time < 50)) {
+ printk("<8> gc_interval CHANGED\n");
+ //init_net.ipv6.sysctl.flush_delay = 1;
+ init_net.ipv6.sysctl.ip6_rt_gc_interval = 1 * HZ;
+ }
+ else {
+ init_net.ipv6.sysctl.ip6_rt_gc_interval = 30 * HZ;
+ }
+
+ }
+
if (!accept_ra(in6_dev))
goto skip_linkparms;
--------------------------------------------------------------------------------------
Note: This is not well structured. I just created it for temparory solution. Just clarify me whether this idea is right.
And Please let me know why pmtu value is not stored in routing table but only in cache.
^ permalink raw reply
* [PATCH] tcp: avoid oops in tcp_metrics and reset tcpm_stamp
From: Julian Anastasov @ 2012-07-23 7:46 UTC (permalink / raw)
To: David Miller; +Cc: netdev
In tcp_tw_remember_stamp we incorrectly checked tw
instead of tm, it can lead to oops if the cached entry is
not found.
tcpm_stamp was not updated in tcpm_check_stamp when
tcpm_suck_dst was called, move the update into tcpm_suck_dst,
so that we do not call it infinitely on every next cache hit
after TCP_METRICS_TIMEOUT.
Signed-off-by: Julian Anastasov <ja@ssi.bg>
---
net/ipv4/tcp_metrics.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/net/ipv4/tcp_metrics.c b/net/ipv4/tcp_metrics.c
index 992f1bf..2288a63 100644
--- a/net/ipv4/tcp_metrics.c
+++ b/net/ipv4/tcp_metrics.c
@@ -107,6 +107,8 @@ static void tcpm_suck_dst(struct tcp_metrics_block *tm, struct dst_entry *dst)
{
u32 val;
+ tm->tcpm_stamp = jiffies;
+
val = 0;
if (dst_metric_locked(dst, RTAX_RTT))
val |= 1 << TCP_METRIC_RTT;
@@ -158,7 +160,6 @@ static struct tcp_metrics_block *tcpm_new(struct dst_entry *dst,
goto out_unlock;
}
tm->tcpm_addr = *addr;
- tm->tcpm_stamp = jiffies;
tcpm_suck_dst(tm, dst);
@@ -621,7 +622,7 @@ bool tcp_tw_remember_stamp(struct inet_timewait_sock *tw)
rcu_read_lock();
tm = __tcp_get_metrics_tw(tw);
- if (tw) {
+ if (tm) {
const struct tcp_timewait_sock *tcptw;
struct sock *sk = (struct sock *) tw;
--
1.7.3.4
^ permalink raw reply related
* [patch] openvswitch: potential NULL deref in sample()
From: Dan Carpenter @ 2012-07-23 7:46 UTC (permalink / raw)
To: Jesse Gross
Cc: dev-yBygre7rU0TnMu66kgdUjQ, netdev-u79uwXL29TY76Z2rM5mHXA,
kernel-janitors-u79uwXL29TY76Z2rM5mHXA, David S. Miller
If there is no OVS_SAMPLE_ATTR_ACTIONS set then "acts_list" is NULL and
it leads to a NULL dereference when we call nla_len(acts_list). This
is a static checker fix, not something I have seen in testing.
Signed-off-by: Dan Carpenter <dan.carpenter-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
---
This applies to Linus's tree.
diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c
index 48badff..c2351d6 100644
--- a/net/openvswitch/actions.c
+++ b/net/openvswitch/actions.c
@@ -325,6 +325,9 @@ static int sample(struct datapath *dp, struct sk_buff *skb,
}
}
+ if (!acts_list)
+ return 0;
+
return do_execute_actions(dp, skb, nla_data(acts_list),
nla_len(acts_list), true);
}
^ permalink raw reply related
* [PATCH net-next] tcp: dont drop MTU reduction indications
From: Eric Dumazet @ 2012-07-23 7:48 UTC (permalink / raw)
To: David Miller
Cc: netdev, Nandita Dukkipati, Neal Cardwell,
Maciej Żenczykowski, Tore Anderson, Tom Herbert
From: Eric Dumazet <edumazet@google.com>
ICMP messages generated in output path if frame length is bigger than
mtu are actually lost because socket is owned by user (doing the xmit)
One example is the ipgre_tunnel_xmit() calling
icmp_send(skb, ICMP_DEST_UNREACH, ICMP_FRAG_NEEDED, htonl(mtu));
We had a similar case fixed in commit a34a101e1e6 (ipv6: disable GSO on
sockets hitting dst_allfrag).
Problem of such fix is that it relied on retransmit timers, so short tcp
sessions paid a too big latency increase price.
This patch uses the tcp_release_cb() infrastructure so that MTU
reduction messages (ICMP messages) are not lost, and no extra delay
is added in TCP transmits.
Reported-by: Maciej Żenczykowski <maze@google.com>
Diagnosed-by: Neal Cardwell <ncardwell@google.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Nandita Dukkipati <nanditad@google.com>
Cc: Tom Herbert <therbert@google.com>
Cc: Tore Anderson <tore@fud.no>
---
include/linux/tcp.h | 6 ++++++
include/net/sock.h | 1 +
net/ipv4/tcp_ipv4.c | 19 +++++++++++++++----
net/ipv4/tcp_output.c | 6 +++++-
net/ipv6/tcp_ipv6.c | 40 ++++++++++++++++++++++++----------------
5 files changed, 51 insertions(+), 21 deletions(-)
diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index 2761856..eb125a4 100644
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -493,6 +493,9 @@ struct tcp_sock {
u32 probe_seq_start;
u32 probe_seq_end;
} mtu_probe;
+ u32 mtu_info; /* We received an ICMP_FRAG_NEEDED / ICMPV6_PKT_TOOBIG
+ * while socket was owned by user.
+ */
#ifdef CONFIG_TCP_MD5SIG
/* TCP AF-Specific parts; only used by MD5 Signature support so far */
@@ -518,6 +521,9 @@ enum tsq_flags {
TCP_TSQ_DEFERRED, /* tcp_tasklet_func() found socket was owned */
TCP_WRITE_TIMER_DEFERRED, /* tcp_write_timer() found socket was owned */
TCP_DELACK_TIMER_DEFERRED, /* tcp_delack_timer() found socket was owned */
+ TCP_MTU_REDUCED_DEFERRED, /* tcp_v{4|6}_err() could not call
+ * tcp_v{4|6}_mtu_reduced()
+ */
};
static inline struct tcp_sock *tcp_sk(const struct sock *sk)
diff --git a/include/net/sock.h b/include/net/sock.h
index 88de092..e067f8c 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -859,6 +859,7 @@ struct proto {
struct sk_buff *skb);
void (*release_cb)(struct sock *sk);
+ void (*mtu_reduced)(struct sock *sk);
/* Keeping track of sk's, looking them up, and port selection methods. */
void (*hash)(struct sock *sk);
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 59110ca..bc5432e 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -275,12 +275,15 @@ failure:
EXPORT_SYMBOL(tcp_v4_connect);
/*
- * This routine does path mtu discovery as defined in RFC1191.
+ * This routine reacts to ICMP_FRAG_NEEDED mtu indications as defined in RFC1191.
+ * It can be called through tcp_release_cb() if socket was owned by user
+ * at the time tcp_v4_err() was called to handle ICMP message.
*/
-static void do_pmtu_discovery(struct sock *sk, const struct iphdr *iph, u32 mtu)
+static void tcp_v4_mtu_reduced(struct sock *sk)
{
struct dst_entry *dst;
struct inet_sock *inet = inet_sk(sk);
+ u32 mtu = tcp_sk(sk)->mtu_info;
/* We are not interested in TCP_LISTEN and open_requests (SYN-ACKs
* send out by Linux are always <576bytes so they should go through
@@ -373,8 +376,12 @@ void tcp_v4_err(struct sk_buff *icmp_skb, u32 info)
bh_lock_sock(sk);
/* If too many ICMPs get dropped on busy
* servers this needs to be solved differently.
+ * We do take care of PMTU discovery (RFC1191) special case :
+ * we can receive locally generated ICMP messages while socket is held.
*/
- if (sock_owned_by_user(sk))
+ if (sock_owned_by_user(sk) &&
+ type != ICMP_DEST_UNREACH &&
+ code != ICMP_FRAG_NEEDED)
NET_INC_STATS_BH(net, LINUX_MIB_LOCKDROPPEDICMPS);
if (sk->sk_state == TCP_CLOSE)
@@ -409,8 +416,11 @@ void tcp_v4_err(struct sk_buff *icmp_skb, u32 info)
goto out;
if (code == ICMP_FRAG_NEEDED) { /* PMTU discovery (RFC1191) */
+ tp->mtu_info = info;
if (!sock_owned_by_user(sk))
- do_pmtu_discovery(sk, iph, info);
+ tcp_v4_mtu_reduced(sk);
+ else
+ set_bit(TCP_MTU_REDUCED_DEFERRED, &tp->tsq_flags);
goto out;
}
@@ -2596,6 +2606,7 @@ struct proto tcp_prot = {
.sendpage = tcp_sendpage,
.backlog_rcv = tcp_v4_do_rcv,
.release_cb = tcp_release_cb,
+ .mtu_reduced = tcp_v4_mtu_reduced,
.hash = inet_hash,
.unhash = inet_unhash,
.get_port = inet_csk_get_port,
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 950aebf..33cd065 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -885,7 +885,8 @@ static void tcp_tasklet_func(unsigned long data)
#define TCP_DEFERRED_ALL ((1UL << TCP_TSQ_DEFERRED) | \
(1UL << TCP_WRITE_TIMER_DEFERRED) | \
- (1UL << TCP_DELACK_TIMER_DEFERRED))
+ (1UL << TCP_DELACK_TIMER_DEFERRED) | \
+ (1UL << TCP_MTU_REDUCED_DEFERRED))
/**
* tcp_release_cb - tcp release_sock() callback
* @sk: socket
@@ -914,6 +915,9 @@ void tcp_release_cb(struct sock *sk)
if (flags & (1UL << TCP_DELACK_TIMER_DEFERRED))
tcp_delack_timer_handler(sk);
+
+ if (flags & (1UL << TCP_MTU_REDUCED_DEFERRED))
+ sk->sk_prot->mtu_reduced(sk);
}
EXPORT_SYMBOL(tcp_release_cb);
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 0302ec3..f49476e 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -315,6 +315,23 @@ failure:
return err;
}
+static void tcp_v6_mtu_reduced(struct sock *sk)
+{
+ struct dst_entry *dst;
+
+ if ((1 << sk->sk_state) & (TCPF_LISTEN | TCPF_CLOSE))
+ return;
+
+ dst = inet6_csk_update_pmtu(sk, tcp_sk(sk)->mtu_info);
+ if (!dst)
+ return;
+
+ if (inet_csk(sk)->icsk_pmtu_cookie > dst_mtu(dst)) {
+ tcp_sync_mss(sk, dst_mtu(dst));
+ tcp_simple_retransmit(sk);
+ }
+}
+
static void tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
u8 type, u8 code, int offset, __be32 info)
{
@@ -342,7 +359,7 @@ static void tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
}
bh_lock_sock(sk);
- if (sock_owned_by_user(sk))
+ if (sock_owned_by_user(sk) && type != ICMPV6_PKT_TOOBIG)
NET_INC_STATS_BH(net, LINUX_MIB_LOCKDROPPEDICMPS);
if (sk->sk_state == TCP_CLOSE)
@@ -371,21 +388,11 @@ static void tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
}
if (type == ICMPV6_PKT_TOOBIG) {
- struct dst_entry *dst;
-
- if (sock_owned_by_user(sk))
- goto out;
- if ((1 << sk->sk_state) & (TCPF_LISTEN | TCPF_CLOSE))
- goto out;
-
- dst = inet6_csk_update_pmtu(sk, ntohl(info));
- if (!dst)
- goto out;
-
- if (inet_csk(sk)->icsk_pmtu_cookie > dst_mtu(dst)) {
- tcp_sync_mss(sk, dst_mtu(dst));
- tcp_simple_retransmit(sk);
- }
+ tp->mtu_info = ntohl(info);
+ if (!sock_owned_by_user(sk))
+ tcp_v6_mtu_reduced(sk);
+ else
+ set_bit(TCP_MTU_REDUCED_DEFERRED, &tp->tsq_flags);
goto out;
}
@@ -1949,6 +1956,7 @@ struct proto tcpv6_prot = {
.sendpage = tcp_sendpage,
.backlog_rcv = tcp_v6_do_rcv,
.release_cb = tcp_release_cb,
+ .mtu_reduced = tcp_v6_mtu_reduced,
.hash = tcp_v6_hash,
.unhash = inet_unhash,
.get_port = inet_csk_get_port,
^ permalink raw reply related
* Re: [PATCH] tcp: avoid oops in tcp_metrics and reset tcpm_stamp
From: David Miller @ 2012-07-23 7:58 UTC (permalink / raw)
To: ja; +Cc: netdev
In-Reply-To: <1343029598-4975-1-git-send-email-ja@ssi.bg>
From: Julian Anastasov <ja@ssi.bg>
Date: Mon, 23 Jul 2012 10:46:38 +0300
> In tcp_tw_remember_stamp we incorrectly checked tw
> instead of tm, it can lead to oops if the cached entry is
> not found.
>
> tcpm_stamp was not updated in tcpm_check_stamp when
> tcpm_suck_dst was called, move the update into tcpm_suck_dst,
> so that we do not call it infinitely on every next cache hit
> after TCP_METRICS_TIMEOUT.
>
> Signed-off-by: Julian Anastasov <ja@ssi.bg>
Applied, thanks Julian.
^ permalink raw reply
* Re: [net-next PATCH 1/1] bnx2x: Add new 57840 device IDs
From: David Miller @ 2012-07-23 7:58 UTC (permalink / raw)
To: yuvalmin; +Cc: netdev, eilong
In-Reply-To: <1343028343-15351-1-git-send-email-yuvalmin@broadcom.com>
From: "Yuval Mintz" <yuvalmin@broadcom.com>
Date: Mon, 23 Jul 2012 10:25:43 +0300
> The 57840 boards come in two flavours: 2 x 20G and 4 x 10G.
> To better differentiate between the two flavours, a separate device ID
> was assigned to each.
> The silicon default value is still the currently supported 57840 device ID
> (0x168d), and since a user can damage the nvram (e.g., 'ethtool -E')
> the driver will still support this device ID to allow the user to amend the
> nvram back into a supported configuration.
>
> Notice this patch contains lines longer than 80 characters (strings).
>
> Signed-off-by: Yuval Mintz <yuvalmin@broadcom.com>
> Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Applied.
^ permalink raw reply
* Re: [PATCH net-next] tcp: dont drop MTU reduction indications
From: David Miller @ 2012-07-23 7:59 UTC (permalink / raw)
To: eric.dumazet; +Cc: netdev, nanditad, ncardwell, maze, tore, therbert
In-Reply-To: <1343029732.2626.10234.camel@edumazet-glaptop>
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Mon, 23 Jul 2012 09:48:52 +0200
> From: Eric Dumazet <edumazet@google.com>
>
> ICMP messages generated in output path if frame length is bigger than
> mtu are actually lost because socket is owned by user (doing the xmit)
>
> One example is the ipgre_tunnel_xmit() calling
> icmp_send(skb, ICMP_DEST_UNREACH, ICMP_FRAG_NEEDED, htonl(mtu));
>
> We had a similar case fixed in commit a34a101e1e6 (ipv6: disable GSO on
> sockets hitting dst_allfrag).
>
> Problem of such fix is that it relied on retransmit timers, so short tcp
> sessions paid a too big latency increase price.
>
> This patch uses the tcp_release_cb() infrastructure so that MTU
> reduction messages (ICMP messages) are not lost, and no extra delay
> is added in TCP transmits.
>
> Reported-by: Maciej Żenczykowski <maze@google.com>
> Diagnosed-by: Neal Cardwell <ncardwell@google.com>
> Signed-off-by: Eric Dumazet <edumazet@google.com>
Applied, thanks Eric.
^ permalink raw reply
* Re: [patch] openvswitch: potential NULL deref in sample()
From: David Miller @ 2012-07-23 8:00 UTC (permalink / raw)
To: dan.carpenter-QHcLZuEGTsvQT0dZR+AlfA
Cc: dev-yBygre7rU0TnMu66kgdUjQ, netdev-u79uwXL29TY76Z2rM5mHXA,
kernel-janitors-u79uwXL29TY76Z2rM5mHXA
In-Reply-To: <20120723074628.GA30892-mgFCXtclrQlZLf2FXnZxJA@public.gmane.org>
From: Dan Carpenter <dan.carpenter-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
Date: Mon, 23 Jul 2012 10:46:28 +0300
> If there is no OVS_SAMPLE_ATTR_ACTIONS set then "acts_list" is NULL and
> it leads to a NULL dereference when we call nla_len(acts_list). This
> is a static checker fix, not something I have seen in testing.
>
> Signed-off-by: Dan Carpenter <dan.carpenter-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
Applied, thanks Dan.
^ permalink raw reply
* Re: [PATCH net] rds: set correct msg_namelen
From: David Miller @ 2012-07-23 8:02 UTC (permalink / raw)
To: wpan; +Cc: netdev, linux-kernel
In-Reply-To: <5181687def9991f9878460d932bd31c64f9ad0cb.1343010976.git.wpan@redhat.com>
From: Weiping Pan <wpan@redhat.com>
Date: Mon, 23 Jul 2012 10:37:48 +0800
> Jay Fenlason (fenlason@redhat.com) found a bug,
> that recvfrom() on an RDS socket can return the contents of random kernel
> memory to userspace if it was called with a address length larger than
> sizeof(struct sockaddr_in).
> rds_recvmsg() also fails to set the addr_len paramater properly before
> returning, but that's just a bug.
> There are also a number of cases wher recvfrom() can return an entirely bogus
> address. Anything in rds_recvmsg() that returns a non-negative value but does
> not go through the "sin = (struct sockaddr_in *)msg->msg_name;" code path
> at the end of the while(1) loop will return up to 128 bytes of kernel memory
> to userspace.
>
> And I write two test programs to reproduce this bug, you will see that in
> rds_server, fromAddr will be overwritten and the following sock_fd will be
> destroyed.
> Yes, it is the programmer's fault to set msg_namelen incorrectly, but it is
> better to make the kernel copy the real length of address to user space in
> such case.
>
> How to run the test programs ?
> I test them on 32bit x86 system, 3.5.0-rc7.
...
> Signed-off-by: Weiping Pan <wpan@redhat.com>
Applied, thanks.
^ permalink raw reply
* Re: flush cache according to 'preferred life time'
From: Gao feng @ 2012-07-23 8:05 UTC (permalink / raw)
To: BALAKUMARAN KANNAN; +Cc: netdev@vger.kernel.org
In-Reply-To: <4A71D24947E78D43BC584A7CD4391A41017DE48F@SIXPRD0410MB359.apcprd04.prod.outlook.com>
于 2012年07月23日 15:36, BALAKUMARAN KANNAN 写道:
> Hello all,
> I am running test casees for IPv6 conformation on linux-3.0.26 kernel. Here I am facing a problem in routing advertisement. Once test case sets the 'preferred life time' to 20 seconds for a particular destination. And continuously sending ICMP REQUEST. It is expected that the ICMP_REPLY should stop in 20 seconds. But as because the default gc_interval is 30seconds, even after the timer expiry of the route, it is staying in the router cache. So even after 20 seconds, the nut(node under test) sends ICMP_REPLY. So if I changes gc_interval to 1, the test is getting passed.
>
> But if I changes gc_interval to 1 seconds another test case in pmtu section fails. It expects that the nut should hold pmtu(path mtu) information for different value. So if I flushes the cache, the pmtu value is turning back to default.
>
> So I made the kernel to alter its gc_interval value according to the 'preferred life time' of the path. Here is my path. Kindly tell me whether my idea is correct. Am I missing something?
>
Is this commit 1716a96101c49186bb0b8491922fd3e69030235f what you need?
> --------------------------------------------------------------------------------------
> --- ../linux-3.0.y-BRANCH_SS-RT.git.fresh/net/ipv6/ndisc.c.bak 2012-07-23 12:50:46.000000000 +0530
> +++ ../linux-3.0.y-BRANCH_SS-RT.git.fresh/net/ipv6/ndisc.c 2012-07-23 12:54:17.000000000 +0530
> @@ -1160,6 +1160,9 @@
>
> __u8 * opt = (__u8 *)(ra_msg + 1);
>
> + struct net *net = dev_net(skb->dev);
> + fib6_run_gc(1, net);
> +
> optlen = (skb->tail - skb->transport_header) - sizeof(struct ra_msg);
>
> if (!(ipv6_addr_type(&ipv6_hdr(skb)->saddr) & IPV6_ADDR_LINKLOCAL)) {
> @@ -1200,6 +1203,22 @@
> return;
> }
>
> + if (*opt == 3) {
> + printk("<8> IN OPT 3\n");
> + struct net *net = dev_net(skb->dev);
> + fib6_run_gc(1, net);
> + int pref_life_time = ntohl(*((int *) (((char *) (opt)) + 8)));
> + if ((pref_life_time != 0) && (pref_life_time < 50)) {
> + printk("<8> gc_interval CHANGED\n");
> + //init_net.ipv6.sysctl.flush_delay = 1;
> + init_net.ipv6.sysctl.ip6_rt_gc_interval = 1 * HZ;
> + }
> + else {
> + init_net.ipv6.sysctl.ip6_rt_gc_interval = 30 * HZ;
> + }
> +
> + }
> +
> if (!accept_ra(in6_dev))
> goto skip_linkparms;
> --------------------------------------------------------------------------------------
>
> Note: This is not well structured. I just created it for temparory solution. Just clarify me whether this idea is right.
>
> And Please let me know why pmtu value is not stored in routing table but only in cache.
I think the pmtu should be belong to destination.the different destinations may have
different pmtu,even they use same route entry.
^ permalink raw reply
* RE: flush cache according to 'preferred life time'
From: BALAKUMARAN KANNAN @ 2012-07-23 8:12 UTC (permalink / raw)
To: Gao feng; +Cc: netdev@vger.kernel.org
In-Reply-To: <500D05D6.7090108@cn.fujitsu.com>
________________________________________
From: netdev-owner@vger.kernel.org [netdev-owner@vger.kernel.org] on behalf of Gao feng [gaofeng@cn.fujitsu.com]
Sent: Monday, July 23, 2012 1:35 PM
To: BALAKUMARAN KANNAN
Cc: netdev@vger.kernel.org
Subject: Re: flush cache according to 'preferred life time'
于 2012年07月23日 15:36, BALAKUMARAN KANNAN 写道:
> Hello all,
> I am running test casees for IPv6 conformation on linux-3.0.26 kernel. Here I am facing a problem in routing advertisement. Once test case sets the 'preferred life time' to 20 seconds for a particular destination. And continuously sending ICMP REQUEST. It is expected that the ICMP_REPLY should stop in 20 seconds. But as because the default gc_interval is 30seconds, even after the timer expiry of the route, it is staying in the router cache. So even after 20 seconds, the nut(node under test) sends ICMP_REPLY. So if I changes gc_interval to 1, the test is getting passed.
>
> But if I changes gc_interval to 1 seconds another test case in pmtu section fails. It expects that the nut should hold pmtu(path mtu) information for different value. So if I flushes the cache, the pmtu value is turning back to default.
>
> So I made the kernel to alter its gc_interval value according to the 'preferred life time' of the path. Here is my path. Kindly tell me whether my idea is correct. Am I missing something?
>
Is this commit 1716a96101c49186bb0b8491922fd3e69030235f what you need?
> --------------------------------------------------------------------------------------
> --- ../linux-3.0.y-BRANCH_SS-RT.git.fresh/net/ipv6/ndisc.c.bak 2012-07-23 12:50:46.000000000 +0530
> +++ ../linux-3.0.y-BRANCH_SS-RT.git.fresh/net/ipv6/ndisc.c 2012-07-23 12:54:17.000000000 +0530
> @@ -1160,6 +1160,9 @@
>
> __u8 * opt = (__u8 *)(ra_msg + 1);
>
> + struct net *net = dev_net(skb->dev);
> + fib6_run_gc(1, net);
> +
> optlen = (skb->tail - skb->transport_header) - sizeof(struct ra_msg);
>
> if (!(ipv6_addr_type(&ipv6_hdr(skb)->saddr) & IPV6_ADDR_LINKLOCAL)) {
> @@ -1200,6 +1203,22 @@
> return;
> }
>
> + if (*opt == 3) {
> + printk("<8> IN OPT 3\n");
> + struct net *net = dev_net(skb->dev);
> + fib6_run_gc(1, net);
> + int pref_life_time = ntohl(*((int *) (((char *) (opt)) + 8)));
> + if ((pref_life_time != 0) && (pref_life_time < 50)) {
> + printk("<8> gc_interval CHANGED\n");
> + //init_net.ipv6.sysctl.flush_delay = 1;
> + init_net.ipv6.sysctl.ip6_rt_gc_interval = 1 * HZ;
> + }
> + else {
> + init_net.ipv6.sysctl.ip6_rt_gc_interval = 30 * HZ;
> + }
> +
> + }
> +
> if (!accept_ra(in6_dev))
> goto skip_linkparms;
> --------------------------------------------------------------------------------------
>
> Note: This is not well structured. I just created it for temparory solution. Just clarify me whether this idea is right.
>
> And Please let me know why pmtu value is not stored in routing table but only in cache.
I think the pmtu should be belong to destination.the different destinations may have
different pmtu,even they use same route entry.
So what you are comming to say, there will not be any entry in routing table for each destination but only in routing cache. So the pmtu value is updated in the cache not in the routing table. thank you. Also I have one more doubt. Is there a way to delete an entry (particular entry) from cache once the corresponding entry in the routing table is expired. As in my case, the routing table entry is expired in 20 seconds. but the cache entry is available till next cache flush. But I want to delete the entry from cache once the entry in routing table is expired. I believe you understand.
Thank you Geo feng-san for Interest.
--Regards,
K.Balakumaran
^ permalink raw reply
* Re: [PATCH net-next 2/4] e1000: advertise transmit time stamping
From: Jeff Kirsher @ 2012-07-23 8:18 UTC (permalink / raw)
To: Richard Cochran; +Cc: netdev, David Miller, Willem de Bruijn, e1000-devel
In-Reply-To: <33885adb6b0e97e6b21fd1903fb6ede3ed7b50ab.1342976654.git.richardcochran@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 572 bytes --]
On Sun, 2012-07-22 at 19:15 +0200, Richard Cochran wrote:
> This driver now offers software transmit time stamping, so it should
> advertise that fact via ethtool. Compile tested only.
>
> Signed-off-by: Richard Cochran <richardcochran@gmail.com>
>
> Cc: Willem de Bruijn <willemb@google.com>
> Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Cc: e1000-devel@lists.sourceforge.net
> ---
> drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
Acked-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox