* Re: [PATCH] net: netfilter: nfnetlink: Fixed warning for nfnl_get_lock
From: Borislav Petkov @ 2013-03-04 21:42 UTC (permalink / raw)
To: Pablo Neira Ayuso
Cc: Alexandru Gheorghiu, Patrick McHardy, David S. Miller, netdev,
linux-kernel
In-Reply-To: <20130304212338.GA3594@localhost>
On Mon, Mar 04, 2013 at 10:23:38PM +0100, Pablo Neira Ayuso wrote:
> Already got a fix for compilation warning in my tree:
>
> http://1984.lsi.us.es/git/nf/commit/?id=9df9e7832391cf699abbf39fc8d95d7e78297462
And it even explains why gcc complains.
Thanks.
--
Regards/Gruss,
Boris.
Sent from a fat crate under my desk. Formatting is fine.
--
^ permalink raw reply
* Re: [PATCHi v2] net: sh_eth: Add support of device tree probe
From: Nobuhiro Iwamatsu @ 2013-03-04 21:37 UTC (permalink / raw)
To: Grant Likely
Cc: Kuninori Morimoto, netdev, devicetree-discuss, magnus.damm, kda,
horms+renesas
In-Reply-To: <20130304080509.EDF323E206B@localhost>
(2013/03/04 17:05), Grant Likely wrote:
> On Thu, 14 Feb 2013 11:56:57 +0900, Nobuhiro Iwamatsu<nobuhiro.iwamatsu.yj@renesas.com> wrote:
>> (2013/02/14 10:24), Kuninori Morimoto wrote:
>>>> +#ifdef CONFIG_OF
>>>> + if (np&& of_device_is_available(np)) {
>>>> + pd = sh_eth_parse_dt(&pdev->dev, ndev);
>>>> + if (pdev->dev.platform_data) {
>>>> + struct sh_eth_plat_data *tmp =
>>>> + pdev->dev.platform_data;
>>>> + pd->set_mdio_gate = tmp->set_mdio_gate;
>>>> + pd->needs_init = tmp->needs_init;
>>>> + }
>>>> + } else
>>>> +#endif
>>>
>>> sh_eth_parse_dt() was defined for both CONFIG_OF and !CONFIG_OF.
>>> But it is called only from CONFIG_OF ?
>>>
>>
>> Because of_device_is_available needs CONFIG_OF.
>> I already send a patch which add empty function of of_device_is_available.
>> If this was apply, this ifdef becomes without need.
>
> Actually, there shouldn't be any reason for a device driver to call
> of_device_is_available() on its own node at all. If the device is not
> available, then a platform_device won't be created. "if (np)" here is
> sufficient.
>
Yes, you are right.
I re-writed code without of_device_is_available(). I will send new patch soon.
Best regards,
Nobuhiro
^ permalink raw reply
* Re: [PATCH 8/8] netfront: split event channels support
From: Konrad Rzeszutek Wilk @ 2013-03-04 21:24 UTC (permalink / raw)
To: Wei Liu; +Cc: xen-devel, netdev, ian.campbell, annie.li
In-Reply-To: <1360944010-15336-9-git-send-email-wei.liu2@citrix.com>
On Fri, Feb 15, 2013 at 04:00:09PM +0000, Wei Liu wrote:
> If this feature is not activated, rx_irq = tx_irq. See corresponding netback
> change log for details.
To make it easier for people that use 'git log --grep' one usually says:
"See xen/netfront: Use .. " for the frontend implementation. That way
you can just copy-n-paste the title of the patch in the search functionality.
You should also include in this patch the description of the protocol.
And explain how it benefits the networking subsystem?
>
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> ---
> drivers/net/xen-netfront.c | 184 ++++++++++++++++++++++++++++++++++++--------
> 1 file changed, 152 insertions(+), 32 deletions(-)
>
> diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
> index de73a71..ea9b656 100644
> --- a/drivers/net/xen-netfront.c
> +++ b/drivers/net/xen-netfront.c
> @@ -100,7 +100,12 @@ struct netfront_info {
>
> struct napi_struct napi;
>
> - unsigned int evtchn;
> + /*
> + * Split event channels support, tx_* == rx_* when using
> + * single event channel.
> + */
> + unsigned int tx_evtchn, rx_evtchn;
> + unsigned int tx_irq, rx_irq;
> struct xenbus_device *xbdev;
>
> spinlock_t tx_lock;
> @@ -344,7 +349,7 @@ no_skb:
> push:
> RING_PUSH_REQUESTS_AND_CHECK_NOTIFY(&np->rx, notify);
> if (notify)
> - notify_remote_via_irq(np->netdev->irq);
> + notify_remote_via_irq(np->rx_irq);
> }
>
> static int xennet_open(struct net_device *dev)
> @@ -633,7 +638,7 @@ static int xennet_start_xmit(struct sk_buff *skb, struct net_device *dev)
>
> RING_PUSH_REQUESTS_AND_CHECK_NOTIFY(&np->tx, notify);
> if (notify)
> - notify_remote_via_irq(np->netdev->irq);
> + notify_remote_via_irq(np->tx_irq);
>
> u64_stats_update_begin(&stats->syncp);
> stats->tx_bytes += skb->len;
> @@ -1263,26 +1268,41 @@ static int xennet_set_features(struct net_device *dev,
> return 0;
> }
>
> -static irqreturn_t xennet_interrupt(int irq, void *dev_id)
> +/* Used for tx completion */
> +static irqreturn_t xennet_tx_interrupt(int tx_irq, void *dev_id)
> {
> - struct net_device *dev = dev_id;
> - struct netfront_info *np = netdev_priv(dev);
> + struct netfront_info *np = dev_id;
> + struct net_device *dev = np->netdev;
> unsigned long flags;
>
> spin_lock_irqsave(&np->tx_lock, flags);
> + xennet_tx_buf_gc(dev);
> + spin_unlock_irqrestore(&np->tx_lock, flags);
>
> - if (likely(netif_carrier_ok(dev))) {
> - xennet_tx_buf_gc(dev);
> - /* Under tx_lock: protects access to rx shared-ring indexes. */
> - if (RING_HAS_UNCONSUMED_RESPONSES(&np->rx))
> - napi_schedule(&np->napi);
> - }
> + return IRQ_HANDLED;
> +}
>
> - spin_unlock_irqrestore(&np->tx_lock, flags);
> +/* Used for rx */
> +static irqreturn_t xennet_rx_interrupt(int rx_irq, void *dev_id)
> +{
> + struct netfront_info *np = dev_id;
> + struct net_device *dev = np->netdev;
> +
> + if (likely(netif_carrier_ok(dev) &&
> + RING_HAS_UNCONSUMED_RESPONSES(&np->rx)))
> + napi_schedule(&np->napi);
>
> return IRQ_HANDLED;
> }
>
> +/* Used for single event channel configuration */
> +static irqreturn_t xennet_interrupt(int irq, void *dev_id)
> +{
> + xennet_tx_interrupt(irq, dev_id);
> + xennet_rx_interrupt(irq, dev_id);
> + return IRQ_HANDLED;
> +}
> +
> #ifdef CONFIG_NET_POLL_CONTROLLER
> static void xennet_poll_controller(struct net_device *dev)
> {
> @@ -1451,9 +1471,14 @@ static void xennet_disconnect_backend(struct netfront_info *info)
> spin_unlock_irq(&info->tx_lock);
> spin_unlock_bh(&info->rx_lock);
>
> - if (info->netdev->irq)
> - unbind_from_irqhandler(info->netdev->irq, info->netdev);
> - info->evtchn = info->netdev->irq = 0;
> + if (info->tx_irq && (info->tx_irq == info->rx_irq))
> + unbind_from_irqhandler(info->tx_irq, info);
> + if (info->tx_irq && (info->tx_irq != info->rx_irq)) {
> + unbind_from_irqhandler(info->tx_irq, info);
> + unbind_from_irqhandler(info->rx_irq, info);
> + }
> + info->tx_evtchn = info->rx_evtchn = 0;
> + info->tx_irq = info->rx_irq = 0;
>
> xenbus_unmap_ring_vfree(info->xbdev, (void *)info->tx.sring);
> free_pages((unsigned long)info->tx.sring, info->tx_ring_page_order);
> @@ -1503,11 +1528,86 @@ static int xen_net_read_mac(struct xenbus_device *dev, u8 mac[])
> return 0;
> }
>
> +static int setup_netfront_single(struct netfront_info *info)
> +{
> + int err;
> +
> + err = xenbus_alloc_evtchn(info->xbdev, &info->tx_evtchn);
> + if (err < 0)
> + goto fail;
> +
> + err = bind_evtchn_to_irqhandler(info->tx_evtchn,
> + xennet_interrupt,
> + 0, info->netdev->name, info);
> + if (err < 0)
> + goto bind_fail;
> + info->rx_evtchn = info->tx_evtchn;
> + info->rx_irq = info->tx_irq = err;
> + dev_info(&info->xbdev->dev,
> + "single event channel, evtchn = %d, irq = %d\n",
> + info->tx_evtchn, info->tx_irq);
> +
> + return 0;
> +
> +bind_fail:
> + xenbus_free_evtchn(info->xbdev, info->tx_evtchn);
> + info->tx_evtchn = 0;
> +fail:
> + return err;
> +}
> +
> +static int setup_netfront_split(struct netfront_info *info)
> +{
> + int err;
> +
> + err = xenbus_alloc_evtchn(info->xbdev, &info->tx_evtchn);
> + if (err)
> + goto fail;
> + err = xenbus_alloc_evtchn(info->xbdev, &info->rx_evtchn);
> + if (err)
> + goto alloc_rx_evtchn_fail;
> +
> + err = bind_evtchn_to_irqhandler(info->tx_evtchn,
> + xennet_tx_interrupt,
> + 0, info->netdev->name, info);
> + if (err < 0)
> + goto bind_tx_fail;
> + info->tx_irq = err;
> +
> + err = bind_evtchn_to_irqhandler(info->rx_evtchn,
> + xennet_rx_interrupt,
> + 0, info->netdev->name, info);
> + if (err < 0)
> + goto bind_rx_fail;
> +
> + info->rx_irq = err;
> +
> + dev_info(&info->xbdev->dev,
> + "split event channels, tx_evtchn/irq = %d/%d, rx_evtchn/irq = %d/%d",
> + info->tx_evtchn, info->tx_irq,
> + info->rx_evtchn, info->rx_irq);
> +
> + return 0;
> +
> +bind_rx_fail:
> + unbind_from_irqhandler(info->tx_irq, info);
> + info->tx_irq = 0;
> +bind_tx_fail:
> + xenbus_free_evtchn(info->xbdev, info->rx_evtchn);
> + info->rx_evtchn = 0;
> +alloc_rx_evtchn_fail:
> + xenbus_free_evtchn(info->xbdev, info->tx_evtchn);
> + info->tx_evtchn = 0;
> +fail:
> + return err;
> +}
> +
> static int setup_netfront(struct xenbus_device *dev, struct netfront_info *info)
> {
> struct xen_netif_tx_sring *txs;
> struct xen_netif_rx_sring *rxs;
> int err;
> + unsigned int feature_split_evtchn;
> struct net_device *netdev = info->netdev;
> unsigned int max_tx_ring_page_order, max_rx_ring_page_order;
> int i;
> @@ -1527,6 +1627,12 @@ static int setup_netfront(struct xenbus_device *dev, struct netfront_info *info)
> }
>
> err = xenbus_scanf(XBT_NIL, info->xbdev->otherend,
> + "feature-split-event-channels", "%u",
> + &feature_split_evtchn);
> + if (err < 0)
> + feature_split_evtchn = 0;
> +
> + err = xenbus_scanf(XBT_NIL, info->xbdev->otherend,
> "max-tx-ring-page-order", "%u",
> &max_tx_ring_page_order);
> if (err < 0) {
> @@ -1598,20 +1704,17 @@ static int setup_netfront(struct xenbus_device *dev, struct netfront_info *info)
> if (err < 0)
> goto grant_rx_ring_fail;
>
> - err = xenbus_alloc_evtchn(dev, &info->evtchn);
> + if (feature_split_evtchn)
> + err = setup_netfront_split(info);
> + else
> + err = setup_netfront_single(info);
> +
> if (err)
> - goto alloc_evtchn_fail;
> + goto setup_evtchn_fail;
>
> - err = bind_evtchn_to_irqhandler(info->evtchn, xennet_interrupt,
> - 0, netdev->name, netdev);
> - if (err < 0)
> - goto bind_fail;
> - netdev->irq = err;
> return 0;
>
> -bind_fail:
> - xenbus_free_evtchn(dev, info->evtchn);
> -alloc_evtchn_fail:
> +setup_evtchn_fail:
> xenbus_unmap_ring_vfree(info->xbdev, (void *)info->rx.sring);
> grant_rx_ring_fail:
> free_pages((unsigned long)info->rx.sring, info->rx_ring_page_order);
> @@ -1696,11 +1799,26 @@ again:
> }
> }
>
> - err = xenbus_printf(xbt, dev->nodename,
> - "event-channel", "%u", info->evtchn);
> - if (err) {
> - message = "writing event-channel";
> - goto abort_transaction;
> + if (info->tx_evtchn == info->rx_evtchn) {
> + err = xenbus_printf(xbt, dev->nodename,
> + "event-channel", "%u", info->tx_evtchn);
> + if (err) {
> + message = "writing event-channel";
> + goto abort_transaction;
> + }
> + } else {
> + err = xenbus_printf(xbt, dev->nodename,
> + "event-channel-tx", "%u", info->tx_evtchn);
> + if (err) {
> + message = "writing event-channel-tx";
> + goto abort_transaction;
> + }
> + err = xenbus_printf(xbt, dev->nodename,
> + "event-channel-rx", "%u", info->rx_evtchn);
> + if (err) {
> + message = "writing event-channel-rx";
> + goto abort_transaction;
> + }
> }
>
> err = xenbus_printf(xbt, dev->nodename, "request-rx-copy", "%u",
> @@ -1814,7 +1932,9 @@ static int xennet_connect(struct net_device *dev)
> * packets.
> */
> netif_carrier_on(np->netdev);
> - notify_remote_via_irq(np->netdev->irq);
> + notify_remote_via_irq(np->tx_irq);
> + if (np->tx_irq != np->rx_irq)
> + notify_remote_via_irq(np->rx_irq);
> xennet_tx_buf_gc(dev);
> xennet_alloc_rx_buffers(dev);
>
> --
> 1.7.10.4
>
^ permalink raw reply
* Re: [PATCH] net: netfilter: nfnetlink: Fixed warning for nfnl_get_lock
From: Pablo Neira Ayuso @ 2013-03-04 21:23 UTC (permalink / raw)
To: Borislav Petkov, Alexandru Gheorghiu, Patrick McHardy,
David S. Miller, netdev, linux-kernel
In-Reply-To: <20130304210551.GA22306@pd.tnic>
On Mon, Mar 04, 2013 at 10:05:51PM +0100, Borislav Petkov wrote:
> On Mon, Mar 04, 2013 at 09:43:11PM +0200, Alexandru Gheorghiu wrote:
> > Removed unused function nfnl_get_lock which fixed the following warning:
> > net/netfilter/nfnetlink.c:65:22: warning: ‘nfnl_get_lock’ defined but not used [-Wunused-function]
> >
> > Signed-off-by: Alexandru Gheorghiu <gheorghiuandru@gmail.com>
> > ---
> > net/netfilter/nfnetlink.c | 5 -----
> > 1 file changed, 5 deletions(-)
> >
> > diff --git a/net/netfilter/nfnetlink.c b/net/netfilter/nfnetlink.c
> > index d578ec2..44aa0a7 100644
> > --- a/net/netfilter/nfnetlink.c
> > +++ b/net/netfilter/nfnetlink.c
> > @@ -62,11 +62,6 @@ void nfnl_unlock(__u8 subsys_id)
> > }
> > EXPORT_SYMBOL_GPL(nfnl_unlock);
> >
> > -static struct mutex *nfnl_get_lock(__u8 subsys_id)
> > -{
> > - return &table[subsys_id].mutex;
> > -}
> > -
>
> I see the same warning here, gcc (Debian 4.7.2-5) 4.7.2.
>
> Actually this function *is* used a bit further in the same file in
> nfnetlink_rcv_msg().
>
> But gcc complains for some reason of which I don't even have the
> slightest idea. However, if you declare the above function "static
> inline..." the warning is gone.
Already got a fix for compilation warning in my tree:
http://1984.lsi.us.es/git/nf/commit/?id=9df9e7832391cf699abbf39fc8d95d7e78297462
Thanks!
^ permalink raw reply
* Re: [ANNOUNCE] iptables 1.4.18 release
From: Jan Engelhardt @ 2013-03-04 21:23 UTC (permalink / raw)
To: Pablo Neira Ayuso
Cc: netfilter-devel, netdev, netfilter, netfilter-announce, lwn
In-Reply-To: <20130303222008.GA28215@localhost>
On Sunday 2013-03-03 23:20, Pablo Neira Ayuso wrote:
>The Netfilter project proudly presents:
>
> iptables 1.4.18
>
>iptables is the userspace command line program used to configure the
>Linux 2.4.x and later packet filtering ruleset.
This ought to be updated to "Linux 3.0.x".
^ permalink raw reply
* Re: [PATCH 7/8] netback: split event channels support
From: Konrad Rzeszutek Wilk @ 2013-03-04 21:22 UTC (permalink / raw)
To: Wei Liu; +Cc: xen-devel, netdev, ian.campbell, annie.li
In-Reply-To: <1360944010-15336-8-git-send-email-wei.liu2@citrix.com>
On Fri, Feb 15, 2013 at 04:00:08PM +0000, Wei Liu wrote:
> Netback and netfront only use one event channel to do tx / rx notification.
> This may cause unnecessary wake-up of process routines. This patch adds a new
> feature called feautre-split-event-channel to netback, enabling it to handle
'feature', not 'feautre'. In the code it looks to also be plural:
feature-split-event-channels
and there is also event-channel-tx and event-channel-rx attribute.
You need to also send an patch to Xen hypervisor tree for this new XenBus
attributes and provide the appropiate syntax.
> Tx and Rx event separately.
>
> Netback will use tx_irq to notify guest for tx completion, rx_irq for rx
> notification.
>
> If frontend doesn't support this feature, tx_irq = rx_irq.
>
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> ---
> drivers/net/xen-netback/common.h | 10 +++--
> drivers/net/xen-netback/interface.c | 78 ++++++++++++++++++++++++++++-------
> drivers/net/xen-netback/netback.c | 7 ++--
> drivers/net/xen-netback/xenbus.c | 44 ++++++++++++++++----
> 4 files changed, 109 insertions(+), 30 deletions(-)
>
> diff --git a/drivers/net/xen-netback/common.h b/drivers/net/xen-netback/common.h
> index f541ba9..cc2a9f0 100644
> --- a/drivers/net/xen-netback/common.h
> +++ b/drivers/net/xen-netback/common.h
> @@ -63,8 +63,11 @@ struct xenvif {
>
> u8 fe_dev_addr[6];
>
> - /* Physical parameters of the comms window. */
> - unsigned int irq;
> + /* Physical parameters of the comms window.
> + * When feature-split-event-channels = 0, tx_irq = rx_irq.
> + */
> + unsigned int tx_irq;
> + unsigned int rx_irq;
>
> /* List of frontends to notify after a batch of frames sent. */
> struct list_head notify_list;
> @@ -122,10 +125,11 @@ struct xenvif *xenvif_alloc(struct device *parent,
> domid_t domid,
> unsigned int handle);
>
> +/* When feature-split-event-channels == 0, tx_evtchn == rx_evtchn */
> int xenvif_connect(struct xenvif *vif,
> unsigned long *tx_ring_ref, unsigned int tx_ring_order,
> unsigned long *rx_ring_ref, unsigned int rx_ring_order,
> - unsigned int evtchn);
> + unsigned int tx_evtchn, unsigned int rx_evtchn);
> void xenvif_disconnect(struct xenvif *vif);
>
> void xenvif_get(struct xenvif *vif);
> diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c
> index fa4d46d..c9ebe21 100644
> --- a/drivers/net/xen-netback/interface.c
> +++ b/drivers/net/xen-netback/interface.c
> @@ -60,7 +60,8 @@ static int xenvif_rx_schedulable(struct xenvif *vif)
> return xenvif_schedulable(vif) && !xen_netbk_rx_ring_full(vif);
> }
>
> -static irqreturn_t xenvif_interrupt(int irq, void *dev_id)
> +/* Tx interrupt handler used when feature-split-event-channels == 1 */
> +static irqreturn_t xenvif_tx_interrupt(int tx_irq, void *dev_id)
> {
> struct xenvif *vif = dev_id;
>
> @@ -69,12 +70,31 @@ static irqreturn_t xenvif_interrupt(int irq, void *dev_id)
>
> xen_netbk_schedule_xenvif(vif);
>
> + return IRQ_HANDLED;
> +}
> +
> +/* Rx interrupt handler used when feature-split-event-channels == 1 */
> +static irqreturn_t xenvif_rx_interrupt(int rx_irq, void *dev_id)
> +{
> + struct xenvif *vif = dev_id;
> +
> + if (vif->netbk == NULL)
> + return IRQ_NONE;
> +
> if (xenvif_rx_schedulable(vif))
> netif_wake_queue(vif->dev);
>
> return IRQ_HANDLED;
> }
>
> +/* Used when feature-split-event-channels == 0 */
> +static irqreturn_t xenvif_interrupt(int irq, void *dev_id)
> +{
> + xenvif_tx_interrupt(irq, dev_id);
> + xenvif_rx_interrupt(irq, dev_id);
> + return IRQ_HANDLED;
> +}
> +
> static int xenvif_start_xmit(struct sk_buff *skb, struct net_device *dev)
> {
> struct xenvif *vif = netdev_priv(dev);
> @@ -125,13 +145,15 @@ static struct net_device_stats *xenvif_get_stats(struct net_device *dev)
> static void xenvif_up(struct xenvif *vif)
> {
> xen_netbk_add_xenvif(vif);
> - enable_irq(vif->irq);
> + enable_irq(vif->tx_irq);
> + enable_irq(vif->rx_irq);
> xen_netbk_check_rx_xenvif(vif);
> }
>
> static void xenvif_down(struct xenvif *vif)
> {
> - disable_irq(vif->irq);
> + disable_irq(vif->tx_irq);
> + disable_irq(vif->rx_irq);
> del_timer_sync(&vif->credit_timeout);
> xen_netbk_deschedule_xenvif(vif);
> xen_netbk_remove_xenvif(vif);
> @@ -308,7 +330,7 @@ struct xenvif *xenvif_alloc(struct device *parent, domid_t domid,
> int xenvif_connect(struct xenvif *vif,
> unsigned long *tx_ring_ref, unsigned int tx_ring_ref_count,
> unsigned long *rx_ring_ref, unsigned int rx_ring_ref_count,
> - unsigned int evtchn)
> + unsigned int tx_evtchn, unsigned int rx_evtchn)
> {
> int err = -ENOMEM;
> void *addr;
> @@ -317,7 +339,7 @@ int xenvif_connect(struct xenvif *vif,
> int tmp[NETBK_MAX_RING_PAGES], i;
>
> /* Already connected through? */
> - if (vif->irq)
> + if (vif->tx_irq)
> return 0;
>
> __module_get(THIS_MODULE);
> @@ -347,13 +369,32 @@ int xenvif_connect(struct xenvif *vif,
> BACK_RING_INIT(&vif->rx, rxs, PAGE_SIZE * rx_ring_ref_count);
> vif->nr_rx_handles = rx_ring_ref_count;
>
> - err = bind_interdomain_evtchn_to_irqhandler(
> - vif->domid, evtchn, xenvif_interrupt, 0,
> - vif->dev->name, vif);
> - if (err < 0)
> - goto err_rx_unmap;
> - vif->irq = err;
> - disable_irq(vif->irq);
> + if (tx_evtchn == rx_evtchn) { /* feature-split-event-channels == 0 */
> + err = bind_interdomain_evtchn_to_irqhandler(
> + vif->domid, tx_evtchn, xenvif_interrupt, 0,
> + vif->dev->name, vif);
> + if (err < 0)
> + goto err_rx_unmap;
> + vif->tx_irq = vif->rx_irq = err;
> + disable_irq(vif->tx_irq);
> + disable_irq(vif->rx_irq);
> + } else { /* feature-split-event-channels == 1 */
> + err = bind_interdomain_evtchn_to_irqhandler(
> + vif->domid, tx_evtchn, xenvif_tx_interrupt, 0,
> + vif->dev->name, vif);
> + if (err < 0)
> + goto err_rx_unmap;
> + vif->tx_irq = err;
> + disable_irq(vif->tx_irq);
> +
> + err = bind_interdomain_evtchn_to_irqhandler(
> + vif->domid, rx_evtchn, xenvif_rx_interrupt, 0,
> + vif->dev->name, vif);
> + if (err < 0)
> + goto err_tx_unbind;
> + vif->rx_irq = err;
> + disable_irq(vif->rx_irq);
> + }
>
> xenvif_get(vif);
>
> @@ -367,6 +408,10 @@ int xenvif_connect(struct xenvif *vif,
> rtnl_unlock();
>
> return 0;
> +
> +err_tx_unbind:
> + unbind_from_irqhandler(vif->tx_irq, vif);
> + vif->tx_irq = 0;
> err_rx_unmap:
> xen_netbk_unmap_frontend_rings(vif, (void *)vif->rx.sring);
> vif->nr_rx_handles = 0;
> @@ -406,8 +451,13 @@ void xenvif_disconnect(struct xenvif *vif)
> atomic_dec(&vif->refcnt);
> wait_event(vif->waiting_to_free, atomic_read(&vif->refcnt) == 0);
>
> - if (vif->irq) {
> - unbind_from_irqhandler(vif->irq, vif);
> + if (vif->tx_irq) {
> + if (vif->tx_irq == vif->rx_irq)
> + unbind_from_irqhandler(vif->tx_irq, vif);
> + else {
> + unbind_from_irqhandler(vif->tx_irq, vif);
> + unbind_from_irqhandler(vif->rx_irq, vif);
> + }
> need_module_put = 1;
> }
>
> diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
> index 644c760..5ac8c35 100644
> --- a/drivers/net/xen-netback/netback.c
> +++ b/drivers/net/xen-netback/netback.c
> @@ -639,7 +639,7 @@ static void xen_netbk_rx_action(struct xen_netbk *netbk)
> {
> struct xenvif *vif = NULL, *tmp;
> s8 status;
> - u16 irq, flags;
> + u16 flags;
> struct xen_netif_rx_response *resp;
> struct sk_buff_head rxq;
> struct sk_buff *skb;
> @@ -750,7 +750,6 @@ static void xen_netbk_rx_action(struct xen_netbk *netbk)
> sco->meta_slots_used);
>
> RING_PUSH_RESPONSES_AND_CHECK_NOTIFY(&vif->rx, ret);
> - irq = vif->irq;
> if (ret && list_empty(&vif->notify_list))
> list_add_tail(&vif->notify_list, ¬ify);
>
> @@ -762,7 +761,7 @@ static void xen_netbk_rx_action(struct xen_netbk *netbk)
> }
>
> list_for_each_entry_safe(vif, tmp, ¬ify, notify_list) {
> - notify_remote_via_irq(vif->irq);
> + notify_remote_via_irq(vif->rx_irq);
> list_del_init(&vif->notify_list);
> }
>
> @@ -1595,7 +1594,7 @@ static void make_tx_response(struct xenvif *vif,
> vif->tx.rsp_prod_pvt = ++i;
> RING_PUSH_RESPONSES_AND_CHECK_NOTIFY(&vif->tx, notify);
> if (notify)
> - notify_remote_via_irq(vif->irq);
> + notify_remote_via_irq(vif->tx_irq);
> }
>
> static struct xen_netif_rx_response *make_rx_response(struct xenvif *vif,
> diff --git a/drivers/net/xen-netback/xenbus.c b/drivers/net/xen-netback/xenbus.c
> index 1791807..6822d89 100644
> --- a/drivers/net/xen-netback/xenbus.c
> +++ b/drivers/net/xen-netback/xenbus.c
> @@ -141,6 +141,15 @@ static int netback_probe(struct xenbus_device *dev,
> goto abort_transaction;
> }
>
> + /* Split event channels support */
> + err = xenbus_printf(xbt, dev->nodename,
> + "feature-split-event-channels",
> + "%u", 1);
> + if (err) {
> + message = "writing feature-split-event-channels";
> + goto abort_transaction;
> + }
I wouldn't abort b/c of it. Just continue on without using this.
> +
> err = xenbus_transaction_end(xbt, 0);
> } while (err == -EAGAIN);
>
> @@ -419,7 +428,7 @@ static int connect_rings(struct backend_info *be)
> {
> struct xenvif *vif = be->vif;
> struct xenbus_device *dev = be->dev;
> - unsigned int evtchn, rx_copy;
> + unsigned int tx_evtchn, rx_evtchn, rx_copy;
> int err;
> int val;
> unsigned long tx_ring_ref[NETBK_MAX_RING_PAGES];
> @@ -428,12 +437,22 @@ static int connect_rings(struct backend_info *be)
> unsigned int rx_ring_order;
>
> err = xenbus_gather(XBT_NIL, dev->otherend,
> - "event-channel", "%u", &evtchn, NULL);
> + "event-channel", "%u", &tx_evtchn, NULL);
> if (err) {
> - xenbus_dev_fatal(dev, err,
> - "reading %s/event-channel",
> - dev->otherend);
> - return err;
> + /* try split event channels */
> + err = xenbus_gather(XBT_NIL, dev->otherend,
> + "event-channel-tx", "%u", &tx_evtchn,
> + "event-channel-rx", "%u", &rx_evtchn,
> + NULL);
> + if (err) {
> + xenbus_dev_fatal(dev, err,
> + "reading %s/event-channel(-tx/rx)",
> + dev->otherend);
> + return err;
> + }
> + } else { /* frontend doesn't support split event channels */
> + rx_evtchn = tx_evtchn;
> + dev_info(&dev->dev, "single event channel\n");
> }
>
> err = xenbus_scanf(XBT_NIL, dev->otherend, "tx-ring-order", "%u",
> @@ -568,12 +587,19 @@ static int connect_rings(struct backend_info *be)
> /* Map the shared frame, irq etc. */
> err = xenvif_connect(vif, tx_ring_ref, (1U << tx_ring_order),
> rx_ring_ref, (1U << rx_ring_order),
> - evtchn);
> + tx_evtchn, rx_evtchn);
> if (err) {
> /* construct 1 2 3 / 4 5 6 */
> int i;
> char txs[3 * (1U << MODPARM_netback_max_tx_ring_page_order)];
> char rxs[3 * (1U << MODPARM_netback_max_rx_ring_page_order)];
> + char evtchns[20];
> +
> + if (tx_evtchn == rx_evtchn)
> + snprintf(evtchns, sizeof(evtchns)-1, "%u", tx_evtchn);
> + else
> + snprintf(evtchns, sizeof(evtchns)-1, "%u/%u",
> + tx_evtchn, rx_evtchn);
>
> txs[0] = rxs[0] = 0;
>
> @@ -586,8 +612,8 @@ static int connect_rings(struct backend_info *be)
> " %lu", rx_ring_ref[i]);
>
> xenbus_dev_fatal(dev, err,
> - "mapping shared-frames%s /%s port %u",
> - txs, rxs, evtchn);
> + "mapping shared-frames%s /%s port %s",
> + txs, rxs, evtchns);
> return err;
> }
> return 0;
> --
> 1.7.10.4
>
^ permalink raw reply
* Re: [PATCH 6/8] netfront: multi-page ring support
From: Konrad Rzeszutek Wilk @ 2013-03-04 21:16 UTC (permalink / raw)
To: Wei Liu; +Cc: xen-devel, netdev, ian.campbell, annie.li
In-Reply-To: <1360944010-15336-7-git-send-email-wei.liu2@citrix.com>
On Fri, Feb 15, 2013 at 04:00:07PM +0000, Wei Liu wrote:
Please:
1) Explain the new PV protocol (you could just do a copy-n-paste
from what you had in the backend).
2).Also submit a patch to Xen hypervisor tree for the new XenBus
extension.
3). Explain in which scenarios this benefits the user.
4). Also provide a Documentation/ABI/stable/sysfs-bus-xen-frontend
to explain the new parameter.
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> ---
> drivers/net/xen-netfront.c | 246 +++++++++++++++++++++++++++++++-------------
> 1 file changed, 174 insertions(+), 72 deletions(-)
>
> diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
> index 8bd75a1..de73a71 100644
> --- a/drivers/net/xen-netfront.c
> +++ b/drivers/net/xen-netfront.c
> @@ -67,9 +67,19 @@ struct netfront_cb {
>
> #define GRANT_INVALID_REF 0
>
> -#define NET_TX_RING_SIZE __CONST_RING_SIZE(xen_netif_tx, PAGE_SIZE)
> -#define NET_RX_RING_SIZE __CONST_RING_SIZE(xen_netif_rx, PAGE_SIZE)
> -#define TX_MAX_TARGET min_t(int, NET_TX_RING_SIZE, 256)
> +#define XENNET_MAX_RING_PAGE_ORDER XENBUS_MAX_RING_PAGE_ORDER
> +#define XENNET_MAX_RING_PAGES (1U << XENNET_MAX_RING_PAGE_ORDER)
> +
> +
> +#define NET_TX_RING_SIZE(_nr_pages) \
> + __CONST_RING_SIZE(xen_netif_tx, PAGE_SIZE * (_nr_pages))
> +#define NET_RX_RING_SIZE(_nr_pages) \
> + __CONST_RING_SIZE(xen_netif_rx, PAGE_SIZE * (_nr_pages))
> +
> +#define XENNET_MAX_TX_RING_SIZE NET_TX_RING_SIZE(XENNET_MAX_RING_PAGES)
> +#define XENNET_MAX_RX_RING_SIZE NET_RX_RING_SIZE(XENNET_MAX_RING_PAGES)
> +
> +#define TX_MAX_TARGET min_t(int, NET_TX_RING_SIZE(1), 256)
>
> struct netfront_stats {
> u64 rx_packets;
> @@ -80,6 +90,11 @@ struct netfront_stats {
> };
>
> struct netfront_info {
> + /* Statistics */
> + struct netfront_stats __percpu *stats;
> +
> + unsigned long rx_gso_checksum_fixup;
> +
> struct list_head list;
> struct net_device *netdev;
>
> @@ -90,7 +105,9 @@ struct netfront_info {
>
> spinlock_t tx_lock;
> struct xen_netif_tx_front_ring tx;
> - int tx_ring_ref;
> + int tx_ring_ref[XENNET_MAX_RING_PAGES];
> + unsigned int tx_ring_page_order;
> + unsigned int tx_ring_pages;
>
> /*
> * {tx,rx}_skbs store outstanding skbuffs. Free tx_skb entries
> @@ -104,36 +121,33 @@ struct netfront_info {
> union skb_entry {
> struct sk_buff *skb;
> unsigned long link;
> - } tx_skbs[NET_TX_RING_SIZE];
> + } tx_skbs[XENNET_MAX_TX_RING_SIZE];
> grant_ref_t gref_tx_head;
> - grant_ref_t grant_tx_ref[NET_TX_RING_SIZE];
> + grant_ref_t grant_tx_ref[XENNET_MAX_TX_RING_SIZE];
> unsigned tx_skb_freelist;
>
> spinlock_t rx_lock ____cacheline_aligned_in_smp;
> struct xen_netif_rx_front_ring rx;
> - int rx_ring_ref;
> + int rx_ring_ref[XENNET_MAX_RING_PAGES];
> + unsigned int rx_ring_page_order;
> + unsigned int rx_ring_pages;
>
> /* Receive-ring batched refills. */
> #define RX_MIN_TARGET 8
> #define RX_DFL_MIN_TARGET 64
> -#define RX_MAX_TARGET min_t(int, NET_RX_RING_SIZE, 256)
> +#define RX_MAX_TARGET min_t(int, NET_RX_RING_SIZE(1), 256)
> unsigned rx_min_target, rx_max_target, rx_target;
> struct sk_buff_head rx_batch;
>
> struct timer_list rx_refill_timer;
>
> - struct sk_buff *rx_skbs[NET_RX_RING_SIZE];
> + struct sk_buff *rx_skbs[XENNET_MAX_RX_RING_SIZE];
> grant_ref_t gref_rx_head;
> - grant_ref_t grant_rx_ref[NET_RX_RING_SIZE];
> -
> - unsigned long rx_pfn_array[NET_RX_RING_SIZE];
> - struct multicall_entry rx_mcl[NET_RX_RING_SIZE+1];
> - struct mmu_update rx_mmu[NET_RX_RING_SIZE];
> -
> - /* Statistics */
> - struct netfront_stats __percpu *stats;
> + grant_ref_t grant_rx_ref[XENNET_MAX_RX_RING_SIZE];
>
> - unsigned long rx_gso_checksum_fixup;
> + unsigned long rx_pfn_array[XENNET_MAX_RX_RING_SIZE];
> + struct multicall_entry rx_mcl[XENNET_MAX_RX_RING_SIZE+1];
> + struct mmu_update rx_mmu[XENNET_MAX_RX_RING_SIZE];
> };
>
> struct netfront_rx_info {
> @@ -171,15 +185,15 @@ static unsigned short get_id_from_freelist(unsigned *head,
> return id;
> }
>
> -static int xennet_rxidx(RING_IDX idx)
> +static int xennet_rxidx(RING_IDX idx, struct netfront_info *info)
> {
> - return idx & (NET_RX_RING_SIZE - 1);
> + return idx & (NET_RX_RING_SIZE(info->rx_ring_pages) - 1);
> }
>
> static struct sk_buff *xennet_get_rx_skb(struct netfront_info *np,
> RING_IDX ri)
> {
> - int i = xennet_rxidx(ri);
> + int i = xennet_rxidx(ri, np);
> struct sk_buff *skb = np->rx_skbs[i];
> np->rx_skbs[i] = NULL;
> return skb;
> @@ -188,7 +202,7 @@ static struct sk_buff *xennet_get_rx_skb(struct netfront_info *np,
> static grant_ref_t xennet_get_rx_ref(struct netfront_info *np,
> RING_IDX ri)
> {
> - int i = xennet_rxidx(ri);
> + int i = xennet_rxidx(ri, np);
> grant_ref_t ref = np->grant_rx_ref[i];
> np->grant_rx_ref[i] = GRANT_INVALID_REF;
> return ref;
> @@ -301,7 +315,7 @@ no_skb:
>
> skb->dev = dev;
>
> - id = xennet_rxidx(req_prod + i);
> + id = xennet_rxidx(req_prod + i, np);
>
> BUG_ON(np->rx_skbs[id]);
> np->rx_skbs[id] = skb;
> @@ -653,7 +667,7 @@ static int xennet_close(struct net_device *dev)
> static void xennet_move_rx_slot(struct netfront_info *np, struct sk_buff *skb,
> grant_ref_t ref)
> {
> - int new = xennet_rxidx(np->rx.req_prod_pvt);
> + int new = xennet_rxidx(np->rx.req_prod_pvt, np);
>
> BUG_ON(np->rx_skbs[new]);
> np->rx_skbs[new] = skb;
> @@ -1109,7 +1123,7 @@ static void xennet_release_tx_bufs(struct netfront_info *np)
> struct sk_buff *skb;
> int i;
>
> - for (i = 0; i < NET_TX_RING_SIZE; i++) {
> + for (i = 0; i < NET_TX_RING_SIZE(np->tx_ring_pages); i++) {
> /* Skip over entries which are actually freelist references */
> if (skb_entry_is_link(&np->tx_skbs[i]))
> continue;
> @@ -1143,7 +1157,7 @@ static void xennet_release_rx_bufs(struct netfront_info *np)
>
> spin_lock_bh(&np->rx_lock);
>
> - for (id = 0; id < NET_RX_RING_SIZE; id++) {
> + for (id = 0; id < NET_RX_RING_SIZE(np->rx_ring_pages); id++) {
> ref = np->grant_rx_ref[id];
> if (ref == GRANT_INVALID_REF) {
> unused++;
> @@ -1324,13 +1338,13 @@ static struct net_device *xennet_create_dev(struct xenbus_device *dev)
>
> /* Initialise tx_skbs as a free chain containing every entry. */
> np->tx_skb_freelist = 0;
> - for (i = 0; i < NET_TX_RING_SIZE; i++) {
> + for (i = 0; i < XENNET_MAX_TX_RING_SIZE; i++) {
> skb_entry_set_link(&np->tx_skbs[i], i+1);
> np->grant_tx_ref[i] = GRANT_INVALID_REF;
> }
>
> /* Clear out rx_skbs */
> - for (i = 0; i < NET_RX_RING_SIZE; i++) {
> + for (i = 0; i < XENNET_MAX_RX_RING_SIZE; i++) {
> np->rx_skbs[i] = NULL;
> np->grant_rx_ref[i] = GRANT_INVALID_REF;
> }
> @@ -1428,13 +1442,6 @@ static int netfront_probe(struct xenbus_device *dev,
> return err;
> }
>
> -static void xennet_end_access(int ref, void *page)
> -{
> - /* This frees the page as a side-effect */
> - if (ref != GRANT_INVALID_REF)
> - gnttab_end_foreign_access(ref, 0, (unsigned long)page);
> -}
> -
> static void xennet_disconnect_backend(struct netfront_info *info)
> {
> /* Stop old i/f to prevent errors whilst we rebuild the state. */
> @@ -1448,12 +1455,12 @@ static void xennet_disconnect_backend(struct netfront_info *info)
> unbind_from_irqhandler(info->netdev->irq, info->netdev);
> info->evtchn = info->netdev->irq = 0;
>
> - /* End access and free the pages */
> - xennet_end_access(info->tx_ring_ref, info->tx.sring);
> - xennet_end_access(info->rx_ring_ref, info->rx.sring);
> + xenbus_unmap_ring_vfree(info->xbdev, (void *)info->tx.sring);
> + free_pages((unsigned long)info->tx.sring, info->tx_ring_page_order);
> +
> + xenbus_unmap_ring_vfree(info->xbdev, (void *)info->rx.sring);
> + free_pages((unsigned long)info->rx.sring, info->rx_ring_page_order);
>
> - info->tx_ring_ref = GRANT_INVALID_REF;
> - info->rx_ring_ref = GRANT_INVALID_REF;
> info->tx.sring = NULL;
> info->rx.sring = NULL;
> }
> @@ -1501,11 +1508,14 @@ static int setup_netfront(struct xenbus_device *dev, struct netfront_info *info)
> struct xen_netif_tx_sring *txs;
> struct xen_netif_rx_sring *rxs;
> int err;
> - int grefs[1];
> struct net_device *netdev = info->netdev;
> + unsigned int max_tx_ring_page_order, max_rx_ring_page_order;
> + int i;
>
> - info->tx_ring_ref = GRANT_INVALID_REF;
> - info->rx_ring_ref = GRANT_INVALID_REF;
> + for (i = 0; i < XENNET_MAX_RING_PAGES; i++) {
> + info->tx_ring_ref[i] = GRANT_INVALID_REF;
> + info->rx_ring_ref[i] = GRANT_INVALID_REF;
> + }
> info->rx.sring = NULL;
> info->tx.sring = NULL;
> netdev->irq = 0;
> @@ -1516,50 +1526,100 @@ static int setup_netfront(struct xenbus_device *dev, struct netfront_info *info)
> goto fail;
> }
>
> - txs = (struct xen_netif_tx_sring *)get_zeroed_page(GFP_NOIO | __GFP_HIGH);
> + err = xenbus_scanf(XBT_NIL, info->xbdev->otherend,
> + "max-tx-ring-page-order", "%u",
> + &max_tx_ring_page_order);
> + if (err < 0) {
> + info->tx_ring_page_order = 0;
> + dev_info(&dev->dev, "single tx ring\n");
> + } else {
> + if (max_tx_ring_page_order > XENNET_MAX_RING_PAGE_ORDER) {
> + dev_info(&dev->dev,
> + "backend ring page order %d too large, clamp to %d\n",
> + max_tx_ring_page_order,
> + XENNET_MAX_RING_PAGE_ORDER);
> + max_tx_ring_page_order = XENNET_MAX_RING_PAGE_ORDER;
> + }
> + info->tx_ring_page_order = max_tx_ring_page_order;
> + dev_info(&dev->dev, "multi-page tx ring, order = %d\n",
> + info->tx_ring_page_order);
> + }
> + info->tx_ring_pages = (1U << info->tx_ring_page_order);
> +
> + txs = (struct xen_netif_tx_sring *)
> + __get_free_pages(__GFP_ZERO | GFP_NOIO | __GFP_HIGH,
> + info->tx_ring_page_order);
> if (!txs) {
> err = -ENOMEM;
> xenbus_dev_fatal(dev, err, "allocating tx ring page");
> goto fail;
> }
> SHARED_RING_INIT(txs);
> - FRONT_RING_INIT(&info->tx, txs, PAGE_SIZE);
> + FRONT_RING_INIT(&info->tx, txs, PAGE_SIZE * info->tx_ring_pages);
> +
> + err = xenbus_grant_ring(dev, txs, info->tx_ring_pages,
> + info->tx_ring_ref);
> + if (err < 0)
> + goto grant_tx_ring_fail;
>
> - err = xenbus_grant_ring(dev, txs, 1, grefs);
> + err = xenbus_scanf(XBT_NIL, info->xbdev->otherend,
> + "max-rx-ring-page-order", "%u",
> + &max_rx_ring_page_order);
> if (err < 0) {
> - free_page((unsigned long)txs);
> - goto fail;
> + info->rx_ring_page_order = 0;
> + dev_info(&dev->dev, "single rx ring\n");
> + } else {
> + if (max_rx_ring_page_order > XENNET_MAX_RING_PAGE_ORDER) {
> + dev_info(&dev->dev,
> + "backend ring page order %d too large, clamp to %d\n",
> + max_rx_ring_page_order,
> + XENNET_MAX_RING_PAGE_ORDER);
> + max_rx_ring_page_order = XENNET_MAX_RING_PAGE_ORDER;
> + }
> + info->rx_ring_page_order = max_rx_ring_page_order;
> + dev_info(&dev->dev, "multi-page rx ring, order = %d\n",
> + info->rx_ring_page_order);
> }
> + info->rx_ring_pages = (1U << info->rx_ring_page_order);
>
> - info->tx_ring_ref = grefs[0];
> - rxs = (struct xen_netif_rx_sring *)get_zeroed_page(GFP_NOIO | __GFP_HIGH);
> + rxs = (struct xen_netif_rx_sring *)
> + __get_free_pages(__GFP_ZERO | GFP_NOIO | __GFP_HIGH,
> + info->rx_ring_page_order);
> if (!rxs) {
> err = -ENOMEM;
> xenbus_dev_fatal(dev, err, "allocating rx ring page");
> - goto fail;
> + goto alloc_rx_ring_fail;
> }
> SHARED_RING_INIT(rxs);
> - FRONT_RING_INIT(&info->rx, rxs, PAGE_SIZE);
> + FRONT_RING_INIT(&info->rx, rxs, PAGE_SIZE * info->rx_ring_pages);
>
> - err = xenbus_grant_ring(dev, rxs, 1, grefs);
> - if (err < 0) {
> - free_page((unsigned long)rxs);
> - goto fail;
> - }
> - info->rx_ring_ref = grefs[0];
> + err = xenbus_grant_ring(dev, rxs, info->rx_ring_pages,
> + info->rx_ring_ref);
> + if (err < 0)
> + goto grant_rx_ring_fail;
>
> err = xenbus_alloc_evtchn(dev, &info->evtchn);
> if (err)
> - goto fail;
> + goto alloc_evtchn_fail;
>
> err = bind_evtchn_to_irqhandler(info->evtchn, xennet_interrupt,
> 0, netdev->name, netdev);
> if (err < 0)
> - goto fail;
> + goto bind_fail;
> netdev->irq = err;
> return 0;
>
> - fail:
> +bind_fail:
> + xenbus_free_evtchn(dev, info->evtchn);
> +alloc_evtchn_fail:
> + xenbus_unmap_ring_vfree(info->xbdev, (void *)info->rx.sring);
> +grant_rx_ring_fail:
> + free_pages((unsigned long)info->rx.sring, info->rx_ring_page_order);
> +alloc_rx_ring_fail:
> + xenbus_unmap_ring_vfree(info->xbdev, (void *)info->tx.sring);
> +grant_tx_ring_fail:
> + free_pages((unsigned long)info->tx.sring, info->tx_ring_page_order);
> +fail:
> return err;
> }
>
> @@ -1570,6 +1630,7 @@ static int talk_to_netback(struct xenbus_device *dev,
> const char *message;
> struct xenbus_transaction xbt;
> int err;
> + int i;
>
> /* Create shared ring, alloc event channel. */
> err = setup_netfront(dev, info);
> @@ -1583,18 +1644,58 @@ again:
> goto destroy_ring;
> }
>
> - err = xenbus_printf(xbt, dev->nodename, "tx-ring-ref", "%u",
> - info->tx_ring_ref);
> - if (err) {
> - message = "writing tx ring-ref";
> - goto abort_transaction;
> + if (info->tx_ring_page_order == 0) {
> + err = xenbus_printf(xbt, dev->nodename, "tx-ring-ref", "%u",
> + info->tx_ring_ref[0]);
> + if (err) {
> + message = "writing tx ring-ref";
> + goto abort_transaction;
> + }
> + } else {
> + err = xenbus_printf(xbt, dev->nodename, "tx-ring-order", "%u",
> + info->tx_ring_page_order);
> + if (err) {
> + message = "writing tx-ring-order";
> + goto abort_transaction;
> + }
> + for (i = 0; i < info->tx_ring_pages; i++) {
> + char name[sizeof("tx-ring-ref")+3];
> + snprintf(name, sizeof(name), "tx-ring-ref%u", i);
> + err = xenbus_printf(xbt, dev->nodename, name, "%u",
> + info->tx_ring_ref[i]);
> + if (err) {
> + message = "writing tx ring-ref";
> + goto abort_transaction;
> + }
> + }
> }
> - err = xenbus_printf(xbt, dev->nodename, "rx-ring-ref", "%u",
> - info->rx_ring_ref);
> - if (err) {
> - message = "writing rx ring-ref";
> - goto abort_transaction;
> +
> + if (info->rx_ring_page_order == 0) {
> + err = xenbus_printf(xbt, dev->nodename, "rx-ring-ref", "%u",
> + info->rx_ring_ref[0]);
> + if (err) {
> + message = "writing rx ring-ref";
> + goto abort_transaction;
> + }
> + } else {
> + err = xenbus_printf(xbt, dev->nodename, "rx-ring-order", "%u",
> + info->rx_ring_page_order);
> + if (err) {
> + message = "writing rx-ring-order";
> + goto abort_transaction;
> + }
> + for (i = 0; i < info->rx_ring_pages; i++) {
> + char name[sizeof("rx-ring-ref")+3];
> + snprintf(name, sizeof(name), "rx-ring-ref%u", i);
> + err = xenbus_printf(xbt, dev->nodename, name, "%u",
> + info->rx_ring_ref[i]);
> + if (err) {
> + message = "writing rx ring-ref";
> + goto abort_transaction;
> + }
> + }
> }
> +
> err = xenbus_printf(xbt, dev->nodename,
> "event-channel", "%u", info->evtchn);
> if (err) {
> @@ -1681,7 +1782,8 @@ static int xennet_connect(struct net_device *dev)
> xennet_release_tx_bufs(np);
>
> /* Step 2: Rebuild the RX buffer freelist and the RX ring itself. */
> - for (requeue_idx = 0, i = 0; i < NET_RX_RING_SIZE; i++) {
> + for (requeue_idx = 0, i = 0; i < NET_RX_RING_SIZE(np->rx_ring_pages);
> + i++) {
> skb_frag_t *frag;
> const struct page *page;
> if (!np->rx_skbs[i])
> --
> 1.7.10.4
>
^ permalink raw reply
* Re: [PATCH 4/8] xenbus_client: Extend interface to support multi-page ring
From: Konrad Rzeszutek Wilk @ 2013-03-04 21:12 UTC (permalink / raw)
To: Wei Liu
Cc: xen-devel, netdev, ian.campbell, annie.li, Roger Pau Monne,
Stefano Stabellini, Mukesh Rathor
In-Reply-To: <1360944010-15336-5-git-send-email-wei.liu2@citrix.com>
On Fri, Feb 15, 2013 at 04:00:05PM +0000, Wei Liu wrote:
> Also bundle fixes for xen frontends and backends in this patch.
Please explain what this does. I have a fairly good idea
of what it does, but if there are folks who are going to look
in the source code and find this git commit they might not understand
how this is suppose to be used or why it is better to have
more than 0-page rings.
>
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> Cc: Roger Pau Monne <roger.pau@citrix.com>
> Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> Cc: Mukesh Rathor <mukesh.rathor@oracle.com>
> ---
> drivers/block/xen-blkback/xenbus.c | 14 +-
> drivers/block/xen-blkfront.c | 6 +-
> drivers/net/xen-netback/netback.c | 4 +-
> drivers/net/xen-netfront.c | 9 +-
> drivers/pci/xen-pcifront.c | 5 +-
> drivers/xen/xen-pciback/xenbus.c | 10 +-
> drivers/xen/xenbus/xenbus_client.c | 314 ++++++++++++++++++++++++++----------
> include/xen/xenbus.h | 17 +-
> 8 files changed, 270 insertions(+), 109 deletions(-)
>
> diff --git a/drivers/block/xen-blkback/xenbus.c b/drivers/block/xen-blkback/xenbus.c
> index 6398072..384ff24 100644
> --- a/drivers/block/xen-blkback/xenbus.c
> +++ b/drivers/block/xen-blkback/xenbus.c
> @@ -122,7 +122,8 @@ static struct xen_blkif *xen_blkif_alloc(domid_t domid)
> return blkif;
> }
>
> -static int xen_blkif_map(struct xen_blkif *blkif, unsigned long shared_page,
> +static int xen_blkif_map(struct xen_blkif *blkif, int *shared_pages,
> + int nr_pages,
> unsigned int evtchn)
> {
> int err;
> @@ -131,7 +132,8 @@ static int xen_blkif_map(struct xen_blkif *blkif, unsigned long shared_page,
> if (blkif->irq)
> return 0;
>
> - err = xenbus_map_ring_valloc(blkif->be->dev, shared_page, &blkif->blk_ring);
> + err = xenbus_map_ring_valloc(blkif->be->dev, shared_pages,
> + nr_pages, &blkif->blk_ring);
> if (err < 0)
> return err;
>
> @@ -726,7 +728,7 @@ again:
> static int connect_ring(struct backend_info *be)
> {
> struct xenbus_device *dev = be->dev;
> - unsigned long ring_ref;
> + int ring_ref;
> unsigned int evtchn;
> unsigned int pers_grants;
> char protocol[64] = "";
> @@ -767,14 +769,14 @@ static int connect_ring(struct backend_info *be)
> be->blkif->vbd.feature_gnt_persistent = pers_grants;
> be->blkif->vbd.overflow_max_grants = 0;
>
> - pr_info(DRV_PFX "ring-ref %ld, event-channel %d, protocol %d (%s) %s\n",
> + pr_info(DRV_PFX "ring-ref %d, event-channel %d, protocol %d (%s) %s\n",
> ring_ref, evtchn, be->blkif->blk_protocol, protocol,
> pers_grants ? "persistent grants" : "");
>
> /* Map the shared frame, irq etc. */
> - err = xen_blkif_map(be->blkif, ring_ref, evtchn);
> + err = xen_blkif_map(be->blkif, &ring_ref, 1, evtchn);
> if (err) {
> - xenbus_dev_fatal(dev, err, "mapping ring-ref %lu port %u",
> + xenbus_dev_fatal(dev, err, "mapping ring-ref %u port %u",
> ring_ref, evtchn);
> return err;
> }
> diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
> index 96e9b00..12c9ebd 100644
> --- a/drivers/block/xen-blkfront.c
> +++ b/drivers/block/xen-blkfront.c
> @@ -991,6 +991,7 @@ static int setup_blkring(struct xenbus_device *dev,
> {
> struct blkif_sring *sring;
> int err;
> + int grefs[1];
Perhaps all of those '1' should have a #define.
Say 'XEN_DEFAULT_RING_PAGE_SIZE'?
>
> info->ring_ref = GRANT_INVALID_REF;
>
> @@ -1004,13 +1005,14 @@ static int setup_blkring(struct xenbus_device *dev,
>
> sg_init_table(info->sg, BLKIF_MAX_SEGMENTS_PER_REQUEST);
>
> - err = xenbus_grant_ring(dev, virt_to_mfn(info->ring.sring));
> + err = xenbus_grant_ring(dev, info->ring.sring,
> + 1, grefs);
> if (err < 0) {
> free_page((unsigned long)sring);
> info->ring.sring = NULL;
> goto fail;
> }
> - info->ring_ref = err;
> + info->ring_ref = grefs[0];
>
> err = xenbus_alloc_evtchn(dev, &info->evtchn);
> if (err)
> diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
> index de59098..98ccea9 100644
> --- a/drivers/net/xen-netback/netback.c
> +++ b/drivers/net/xen-netback/netback.c
> @@ -1665,7 +1665,7 @@ int xen_netbk_map_frontend_rings(struct xenvif *vif,
> int err = -ENOMEM;
>
> err = xenbus_map_ring_valloc(xenvif_to_xenbus_device(vif),
> - tx_ring_ref, &addr);
> + &tx_ring_ref, 1, &addr);
> if (err)
> goto err;
>
> @@ -1673,7 +1673,7 @@ int xen_netbk_map_frontend_rings(struct xenvif *vif,
> BACK_RING_INIT(&vif->tx, txs, PAGE_SIZE);
>
> err = xenbus_map_ring_valloc(xenvif_to_xenbus_device(vif),
> - rx_ring_ref, &addr);
> + &rx_ring_ref, 1, &addr);
> if (err)
> goto err;
>
> diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
> index 7ffa43b..8bd75a1 100644
> --- a/drivers/net/xen-netfront.c
> +++ b/drivers/net/xen-netfront.c
> @@ -1501,6 +1501,7 @@ static int setup_netfront(struct xenbus_device *dev, struct netfront_info *info)
> struct xen_netif_tx_sring *txs;
> struct xen_netif_rx_sring *rxs;
> int err;
> + int grefs[1];
> struct net_device *netdev = info->netdev;
>
> info->tx_ring_ref = GRANT_INVALID_REF;
> @@ -1524,13 +1525,13 @@ static int setup_netfront(struct xenbus_device *dev, struct netfront_info *info)
> SHARED_RING_INIT(txs);
> FRONT_RING_INIT(&info->tx, txs, PAGE_SIZE);
>
> - err = xenbus_grant_ring(dev, virt_to_mfn(txs));
> + err = xenbus_grant_ring(dev, txs, 1, grefs);
> if (err < 0) {
> free_page((unsigned long)txs);
> goto fail;
> }
>
> - info->tx_ring_ref = err;
> + info->tx_ring_ref = grefs[0];
> rxs = (struct xen_netif_rx_sring *)get_zeroed_page(GFP_NOIO | __GFP_HIGH);
> if (!rxs) {
> err = -ENOMEM;
> @@ -1540,12 +1541,12 @@ static int setup_netfront(struct xenbus_device *dev, struct netfront_info *info)
> SHARED_RING_INIT(rxs);
> FRONT_RING_INIT(&info->rx, rxs, PAGE_SIZE);
>
> - err = xenbus_grant_ring(dev, virt_to_mfn(rxs));
> + err = xenbus_grant_ring(dev, rxs, 1, grefs);
> if (err < 0) {
> free_page((unsigned long)rxs);
> goto fail;
> }
> - info->rx_ring_ref = err;
> + info->rx_ring_ref = grefs[0];
>
> err = xenbus_alloc_evtchn(dev, &info->evtchn);
> if (err)
> diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c
> index 966abc6..016a2bb 100644
> --- a/drivers/pci/xen-pcifront.c
> +++ b/drivers/pci/xen-pcifront.c
> @@ -772,12 +772,13 @@ static int pcifront_publish_info(struct pcifront_device *pdev)
> {
> int err = 0;
> struct xenbus_transaction trans;
> + int grefs[1];
>
> - err = xenbus_grant_ring(pdev->xdev, virt_to_mfn(pdev->sh_info));
> + err = xenbus_grant_ring(pdev->xdev, pdev->sh_info, 1, grefs);
> if (err < 0)
> goto out;
>
> - pdev->gnt_ref = err;
> + pdev->gnt_ref = grefs[0];
>
> err = xenbus_alloc_evtchn(pdev->xdev, &pdev->evtchn);
> if (err)
> diff --git a/drivers/xen/xen-pciback/xenbus.c b/drivers/xen/xen-pciback/xenbus.c
> index 64b11f9..4655851 100644
> --- a/drivers/xen/xen-pciback/xenbus.c
> +++ b/drivers/xen/xen-pciback/xenbus.c
> @@ -98,17 +98,17 @@ static void free_pdev(struct xen_pcibk_device *pdev)
> kfree(pdev);
> }
>
> -static int xen_pcibk_do_attach(struct xen_pcibk_device *pdev, int gnt_ref,
> - int remote_evtchn)
> +static int xen_pcibk_do_attach(struct xen_pcibk_device *pdev, int *gnt_ref,
> + int nr_grefs, int remote_evtchn)
> {
> int err = 0;
> void *vaddr;
>
> dev_dbg(&pdev->xdev->dev,
> "Attaching to frontend resources - gnt_ref=%d evtchn=%d\n",
> - gnt_ref, remote_evtchn);
> + gnt_ref[0], remote_evtchn);
>
> - err = xenbus_map_ring_valloc(pdev->xdev, gnt_ref, &vaddr);
> + err = xenbus_map_ring_valloc(pdev->xdev, gnt_ref, nr_grefs, &vaddr);
> if (err < 0) {
> xenbus_dev_fatal(pdev->xdev, err,
> "Error mapping other domain page in ours.");
> @@ -172,7 +172,7 @@ static int xen_pcibk_attach(struct xen_pcibk_device *pdev)
> goto out;
> }
>
> - err = xen_pcibk_do_attach(pdev, gnt_ref, remote_evtchn);
> + err = xen_pcibk_do_attach(pdev, &gnt_ref, 1, remote_evtchn);
> if (err)
> goto out;
>
> diff --git a/drivers/xen/xenbus/xenbus_client.c b/drivers/xen/xenbus/xenbus_client.c
> index 1bac743..7c1bd49 100644
> --- a/drivers/xen/xenbus/xenbus_client.c
> +++ b/drivers/xen/xenbus/xenbus_client.c
> @@ -54,14 +54,16 @@ struct xenbus_map_node {
> struct vm_struct *area; /* PV */
> struct page *page; /* HVM */
> };
> - grant_handle_t handle;
> + grant_handle_t handle[XENBUS_MAX_RING_PAGES];
> + unsigned int nr_handles;
> };
>
> static DEFINE_SPINLOCK(xenbus_valloc_lock);
> static LIST_HEAD(xenbus_valloc_pages);
>
> struct xenbus_ring_ops {
> - int (*map)(struct xenbus_device *dev, int gnt, void **vaddr);
> + int (*map)(struct xenbus_device *dev, int *gnt, int nr_gnts,
> + void **vaddr);
> int (*unmap)(struct xenbus_device *dev, void *vaddr);
> };
>
> @@ -357,17 +359,39 @@ static void xenbus_switch_fatal(struct xenbus_device *dev, int depth, int err,
> /**
> * xenbus_grant_ring
> * @dev: xenbus device
> - * @ring_mfn: mfn of ring to grant
> -
> - * Grant access to the given @ring_mfn to the peer of the given device. Return
> - * 0 on success, or -errno on error. On error, the device will switch to
> + * @vaddr: starting virtual address of the ring
> + * @nr_pages: number of pages to be granted
> + * @grefs: grant reference array to be filled in
> + *
> + * Grant access to the given @vaddr to the peer of the given device.
> + * Then fill in @grefs with grant references. Return 0 on success, or
> + * -errno on error. On error, the device will switch to
> * XenbusStateClosing, and the error will be saved in the store.
> */
> -int xenbus_grant_ring(struct xenbus_device *dev, unsigned long ring_mfn)
> +int xenbus_grant_ring(struct xenbus_device *dev, void *vaddr,
> + int nr_pages, int *grefs)
> {
> - int err = gnttab_grant_foreign_access(dev->otherend_id, ring_mfn, 0);
> - if (err < 0)
> - xenbus_dev_fatal(dev, err, "granting access to ring page");
> + int i;
> + int err;
> +
> + for (i = 0; i < nr_pages; i++) {
> + unsigned long addr = (unsigned long)vaddr +
> + (PAGE_SIZE * i);
> + err = gnttab_grant_foreign_access(dev->otherend_id,
> + virt_to_mfn(addr), 0);
> + if (err < 0) {
> + xenbus_dev_fatal(dev, err,
> + "granting access to ring page");
> + goto fail;
> + }
> + grefs[i] = err;
> + }
> +
> + return 0;
> +
> +fail:
> + for ( ; i >= 0; i--)
> + gnttab_end_foreign_access_ref(grefs[i], 0);
> return err;
> }
> EXPORT_SYMBOL_GPL(xenbus_grant_ring);
> @@ -448,7 +472,8 @@ EXPORT_SYMBOL_GPL(xenbus_free_evtchn);
> /**
> * xenbus_map_ring_valloc
> * @dev: xenbus device
> - * @gnt_ref: grant reference
> + * @gnt_ref: grant reference array
> + * @nr_grefs: number of grant references
> * @vaddr: pointer to address to be filled out by mapping
> *
> * Based on Rusty Russell's skeleton driver's map_page.
> @@ -459,51 +484,61 @@ EXPORT_SYMBOL_GPL(xenbus_free_evtchn);
> * or -ENOMEM on error. If an error is returned, device will switch to
> * XenbusStateClosing and the error message will be saved in XenStore.
> */
> -int xenbus_map_ring_valloc(struct xenbus_device *dev, int gnt_ref, void **vaddr)
> +int xenbus_map_ring_valloc(struct xenbus_device *dev, int *gnt_ref,
> + int nr_grefs, void **vaddr)
> {
> - return ring_ops->map(dev, gnt_ref, vaddr);
> + return ring_ops->map(dev, gnt_ref, nr_grefs, vaddr);
> }
> EXPORT_SYMBOL_GPL(xenbus_map_ring_valloc);
>
> static int xenbus_map_ring_valloc_pv(struct xenbus_device *dev,
> - int gnt_ref, void **vaddr)
> + int *gnt_ref, int nr_grefs, void **vaddr)
> {
> - struct gnttab_map_grant_ref op = {
> - .flags = GNTMAP_host_map | GNTMAP_contains_pte,
> - .ref = gnt_ref,
> - .dom = dev->otherend_id,
> - };
> + struct gnttab_map_grant_ref op;
> struct xenbus_map_node *node;
> struct vm_struct *area;
> - pte_t *pte;
> + pte_t *pte[XENBUS_MAX_RING_PAGES];
> + int i;
> + int err = GNTST_okay;
> + int vma_leaked; /* used in rollback */
bool
>
> *vaddr = NULL;
>
> + if (nr_grefs > XENBUS_MAX_RING_PAGES)
> + return -EINVAL;
> +
> node = kzalloc(sizeof(*node), GFP_KERNEL);
> if (!node)
> return -ENOMEM;
>
> - area = alloc_vm_area(PAGE_SIZE, &pte);
> + area = alloc_vm_area(PAGE_SIZE * nr_grefs, pte);
> if (!area) {
> kfree(node);
> return -ENOMEM;
> }
>
> - op.host_addr = arbitrary_virt_to_machine(pte).maddr;
> -
> - if (HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, &op, 1))
> - BUG();
> -
> - if (op.status != GNTST_okay) {
> - free_vm_area(area);
> - kfree(node);
> - xenbus_dev_fatal(dev, op.status,
> - "mapping in shared page %d from domain %d",
> - gnt_ref, dev->otherend_id);
> - return op.status;
> + /* Issue hypercall for individual entry, rollback if error occurs. */
> + for (i = 0; i < nr_grefs; i++) {
> + op.flags = GNTMAP_host_map | GNTMAP_contains_pte;
> + op.ref = gnt_ref[i];
> + op.dom = dev->otherend_id;
> + op.host_addr = arbitrary_virt_to_machine(pte[i]).maddr;
> +
> + if (HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, &op, 1))
> + BUG();
> +
> + if (op.status != GNTST_okay) {
> + err = op.status;
> + xenbus_dev_fatal(dev, op.status,
> + "mapping in shared page (%d/%d) %d from domain %d",
> + i+1, nr_grefs, gnt_ref[i], dev->otherend_id);
> + node->handle[i] = INVALID_GRANT_HANDLE;
> + goto rollback;
> + } else
> + node->handle[i] = op.handle;
> }
>
> - node->handle = op.handle;
> + node->nr_handles = nr_grefs;
> node->area = area;
>
> spin_lock(&xenbus_valloc_lock);
> @@ -512,31 +547,73 @@ static int xenbus_map_ring_valloc_pv(struct xenbus_device *dev,
>
> *vaddr = area->addr;
> return 0;
> +
> +rollback:
> + vma_leaked = 0;
> + for ( ; i >= 0; i--) {
> + if (node->handle[i] != INVALID_GRANT_HANDLE) {
> + struct gnttab_unmap_grant_ref unmap_op;
> + unmap_op.dev_bus_addr = 0;
> + unmap_op.host_addr =
> + arbitrary_virt_to_machine(pte[i]).maddr;
> + unmap_op.handle = node->handle[i];
> +
> + if (HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref,
> + &unmap_op, 1))
> + BUG();
> +
> + if (unmap_op.status != GNTST_okay) {
> + pr_alert("rollback mapping (%d/%d) %d from domain %d, err = %d",
> + i+1, nr_grefs, gnt_ref[i],
> + dev->otherend_id,
> + unmap_op.status);
> + vma_leaked = 1;
> + }
> + node->handle[i] = INVALID_GRANT_HANDLE;
> + }
> + }
> +
> + if (!vma_leaked)
> + free_vm_area(area);
> + else
> + pr_alert("leaking vm area %p size %d page(s)", area, nr_grefs);
> +
> + kfree(node);
> +
> + return err;
> }
>
> static int xenbus_map_ring_valloc_hvm(struct xenbus_device *dev,
> - int gnt_ref, void **vaddr)
> + int *gnt_ref, int nr_grefs, void **vaddr)
> {
> struct xenbus_map_node *node;
> int err;
> void *addr;
> + int vma_leaked;
>
> *vaddr = NULL;
>
> + if (nr_grefs > XENBUS_MAX_RING_PAGES)
> + return -EINVAL;
> +
> node = kzalloc(sizeof(*node), GFP_KERNEL);
> if (!node)
> return -ENOMEM;
>
> - err = alloc_xenballooned_pages(1, &node->page, false /* lowmem */);
> + err = alloc_xenballooned_pages(nr_grefs, &node->page,
> + false /* lowmem */);
> if (err)
> goto out_err;
>
> addr = pfn_to_kaddr(page_to_pfn(node->page));
>
> - err = xenbus_map_ring(dev, gnt_ref, &node->handle, addr);
> + err = xenbus_map_ring(dev, gnt_ref, nr_grefs, node->handle,
> + addr, &vma_leaked);
> if (err)
> goto out_err;
>
> + node->nr_handles = nr_grefs;
> +
> spin_lock(&xenbus_valloc_lock);
> list_add(&node->next, &xenbus_valloc_pages);
> spin_unlock(&xenbus_valloc_lock);
> @@ -545,7 +622,8 @@ static int xenbus_map_ring_valloc_hvm(struct xenbus_device *dev,
> return 0;
>
> out_err:
> - free_xenballooned_pages(1, &node->page);
> + if (!vma_leaked)
> + free_xenballooned_pages(nr_grefs, &node->page);
> kfree(node);
> return err;
> }
> @@ -554,36 +632,75 @@ static int xenbus_map_ring_valloc_hvm(struct xenbus_device *dev,
> /**
> * xenbus_map_ring
> * @dev: xenbus device
> - * @gnt_ref: grant reference
> + * @gnt_ref: grant reference array
> + * @nr_grefs: number of grant reference
> * @handle: pointer to grant handle to be filled
> * @vaddr: address to be mapped to
> + * @vma_leaked: cannot clean up a failed mapping, vma leaked
> *
> - * Map a page of memory into this domain from another domain's grant table.
> + * Map pages of memory into this domain from another domain's grant table.
> * xenbus_map_ring does not allocate the virtual address space (you must do
> - * this yourself!). It only maps in the page to the specified address.
> + * this yourself!). It only maps in the pages to the specified address.
> * Returns 0 on success, and GNTST_* (see xen/include/interface/grant_table.h)
> * or -ENOMEM on error. If an error is returned, device will switch to
> - * XenbusStateClosing and the error message will be saved in XenStore.
> + * XenbusStateClosing and the last error message will be saved in XenStore.
> */
> -int xenbus_map_ring(struct xenbus_device *dev, int gnt_ref,
> - grant_handle_t *handle, void *vaddr)
> +int xenbus_map_ring(struct xenbus_device *dev, int *gnt_ref, int nr_grefs,
> + grant_handle_t *handle, void *vaddr, int *vma_leaked)
> {
> struct gnttab_map_grant_ref op;
> + int i;
> + int err = GNTST_okay;
> +
> + for (i = 0; i < nr_grefs; i++) {
> + unsigned long addr = (unsigned long)vaddr +
> + (PAGE_SIZE * i);
> + gnttab_set_map_op(&op, (unsigned long)addr,
> + GNTMAP_host_map, gnt_ref[i],
> + dev->otherend_id);
> +
> + if (HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref,
> + &op, 1))
> + BUG();
> +
> + if (op.status != GNTST_okay) {
> + xenbus_dev_fatal(dev, op.status,
> + "mapping in shared page (%d/%d) %d from domain %d",
> + i+1, nr_grefs, gnt_ref[i], dev->otherend_id);
> + handle[i] = INVALID_GRANT_HANDLE;
> + goto rollback;
> + } else
> + handle[i] = op.handle;
> + }
>
> - gnttab_set_map_op(&op, (unsigned long)vaddr, GNTMAP_host_map, gnt_ref,
> - dev->otherend_id);
> -
> - if (HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, &op, 1))
> - BUG();
> + return 0;
>
> - if (op.status != GNTST_okay) {
> - xenbus_dev_fatal(dev, op.status,
> - "mapping in shared page %d from domain %d",
> - gnt_ref, dev->otherend_id);
> - } else
> - *handle = op.handle;
> +rollback:
> + *vma_leaked = 0;
> + for ( ; i >= 0; i--) {
> + if (handle[i] != INVALID_GRANT_HANDLE) {
> + struct gnttab_unmap_grant_ref unmap_op;
> + unsigned long addr = (unsigned long)vaddr +
> + (PAGE_SIZE * i);
> + gnttab_set_unmap_op(&unmap_op, (phys_addr_t)addr,
> + GNTMAP_host_map, handle[i]);
> +
> + if (HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref,
> + &unmap_op, 1))
> + BUG();
> +
> + if (unmap_op.status != GNTST_okay) {
> + pr_alert("rollback mapping (%d/%d) %d from domain %d, err = %d",
> + i+1, nr_grefs, gnt_ref[i],
> + dev->otherend_id,
> + unmap_op.status);
> + *vma_leaked = 1;
> + }
> + handle[i] = INVALID_GRANT_HANDLE;
> + }
> + }
>
> - return op.status;
> + return err;
> }
> EXPORT_SYMBOL_GPL(xenbus_map_ring);
>
> @@ -609,10 +726,11 @@ EXPORT_SYMBOL_GPL(xenbus_unmap_ring_vfree);
> static int xenbus_unmap_ring_vfree_pv(struct xenbus_device *dev, void *vaddr)
> {
> struct xenbus_map_node *node;
> - struct gnttab_unmap_grant_ref op = {
> - .host_addr = (unsigned long)vaddr,
> - };
> + struct gnttab_unmap_grant_ref op[XENBUS_MAX_RING_PAGES];
> unsigned int level;
> + int i;
> + int last_error = GNTST_okay;
> + int vma_leaked;
bool
>
> spin_lock(&xenbus_valloc_lock);
> list_for_each_entry(node, &xenbus_valloc_pages, next) {
> @@ -631,22 +749,39 @@ static int xenbus_unmap_ring_vfree_pv(struct xenbus_device *dev, void *vaddr)
> return GNTST_bad_virt_addr;
> }
>
> - op.handle = node->handle;
> - op.host_addr = arbitrary_virt_to_machine(
> - lookup_address((unsigned long)vaddr, &level)).maddr;
> + for (i = 0; i < node->nr_handles; i++) {
> + unsigned long addr = (unsigned long)vaddr +
> + (PAGE_SIZE * i);
> + op[i].dev_bus_addr = 0;
> + op[i].handle = node->handle[i];
> + op[i].host_addr = arbitrary_virt_to_machine(
> + lookup_address((unsigned long)addr, &level)).maddr;
> + }
>
> - if (HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref, &op, 1))
> + if (HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref, op,
> + node->nr_handles))
> BUG();
>
> - if (op.status == GNTST_okay)
> + vma_leaked = 0;
> + for (i = 0; i < node->nr_handles; i++) {
> + if (op[i].status != GNTST_okay) {
> + last_error = op[i].status;
> + vma_leaked = 1;
> + xenbus_dev_error(dev, op[i].status,
> + "unmapping page (%d/%d) at handle %d error %d",
> + i+1, node->nr_handles, node->handle[i],
> + op[i].status);
> + }
> + }
> +
> + if (!vma_leaked)
> free_vm_area(node->area);
> else
> - xenbus_dev_error(dev, op.status,
> - "unmapping page at handle %d error %d",
> - node->handle, op.status);
> + pr_alert("leaking vm area %p size %d page(s)",
> + node->area, node->nr_handles);
>
> kfree(node);
> - return op.status;
> + return last_error;
> }
>
> static int xenbus_unmap_ring_vfree_hvm(struct xenbus_device *dev, void *vaddr)
> @@ -673,10 +808,10 @@ static int xenbus_unmap_ring_vfree_hvm(struct xenbus_device *dev, void *vaddr)
> return GNTST_bad_virt_addr;
> }
>
> - rv = xenbus_unmap_ring(dev, node->handle, addr);
> + rv = xenbus_unmap_ring(dev, node->handle, node->nr_handles, addr);
>
> if (!rv)
> - free_xenballooned_pages(1, &node->page);
> + free_xenballooned_pages(node->nr_handles, &node->page);
> else
> WARN(1, "Leaking %p\n", vaddr);
>
> @@ -687,7 +822,8 @@ static int xenbus_unmap_ring_vfree_hvm(struct xenbus_device *dev, void *vaddr)
> /**
> * xenbus_unmap_ring
> * @dev: xenbus device
> - * @handle: grant handle
> + * @handle: grant handle array
> + * @nr_handles: number of grant handles
> * @vaddr: addr to unmap
> *
> * Unmap a page of memory in this domain that was imported from another domain.
> @@ -695,21 +831,33 @@ static int xenbus_unmap_ring_vfree_hvm(struct xenbus_device *dev, void *vaddr)
> * (see xen/include/interface/grant_table.h).
> */
> int xenbus_unmap_ring(struct xenbus_device *dev,
> - grant_handle_t handle, void *vaddr)
> + grant_handle_t *handle, int nr_handles,
> + void *vaddr)
> {
> struct gnttab_unmap_grant_ref op;
> + int last_error = GNTST_okay;
> + int i;
> +
> + for (i = 0; i < nr_handles; i++) {
> + unsigned long addr = (unsigned long)vaddr +
> + (PAGE_SIZE * i);
> + gnttab_set_unmap_op(&op, (unsigned long)addr,
> + GNTMAP_host_map, handle[i]);
> + handle[i] = INVALID_GRANT_HANDLE;
> +
> + if (HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref,
> + &op, 1))
> + BUG();
> +
> + if (op.status != GNTST_okay) {
> + xenbus_dev_error(dev, op.status,
> + "unmapping page (%d/%d) at handle %d error %d",
> + i+1, nr_handles, handle[i], op.status);
> + last_error = op.status;
> + }
> + }
>
> - gnttab_set_unmap_op(&op, (unsigned long)vaddr, GNTMAP_host_map, handle);
> -
> - if (HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref, &op, 1))
> - BUG();
> -
> - if (op.status != GNTST_okay)
> - xenbus_dev_error(dev, op.status,
> - "unmapping page at handle %d error %d",
> - handle, op.status);
> -
> - return op.status;
> + return last_error;
> }
> EXPORT_SYMBOL_GPL(xenbus_unmap_ring);
>
> diff --git a/include/xen/xenbus.h b/include/xen/xenbus.h
> index 0a7515c..b7d9613 100644
> --- a/include/xen/xenbus.h
> +++ b/include/xen/xenbus.h
> @@ -46,6 +46,11 @@
> #include <xen/interface/io/xenbus.h>
> #include <xen/interface/io/xs_wire.h>
>
> +/* Max pages supported by multi-page ring in the backend */
> +#define XENBUS_MAX_RING_PAGE_ORDER 2
> +#define XENBUS_MAX_RING_PAGES (1U << XENBUS_MAX_RING_PAGE_ORDER)
So why this value? If this is a mechanical change shouldn't the order be '0' ?
> +#define INVALID_GRANT_HANDLE (~0U)
> +
> /* Register callback to watch this node. */
> struct xenbus_watch
> {
> @@ -195,15 +200,17 @@ int xenbus_watch_pathfmt(struct xenbus_device *dev, struct xenbus_watch *watch,
> const char *pathfmt, ...);
>
> int xenbus_switch_state(struct xenbus_device *dev, enum xenbus_state new_state);
> -int xenbus_grant_ring(struct xenbus_device *dev, unsigned long ring_mfn);
> +int xenbus_grant_ring(struct xenbus_device *dev, void *vaddr,
> + int nr_gages, int *grefs);
> int xenbus_map_ring_valloc(struct xenbus_device *dev,
> - int gnt_ref, void **vaddr);
> -int xenbus_map_ring(struct xenbus_device *dev, int gnt_ref,
> - grant_handle_t *handle, void *vaddr);
> + int *gnt_ref, int nr_grefs, void **vaddr);
> +int xenbus_map_ring(struct xenbus_device *dev, int *gnt_ref, int nr_grefs,
> + grant_handle_t *handle, void *vaddr, int *vma_leaked);
>
> int xenbus_unmap_ring_vfree(struct xenbus_device *dev, void *vaddr);
> int xenbus_unmap_ring(struct xenbus_device *dev,
> - grant_handle_t handle, void *vaddr);
> + grant_handle_t *handle, int nr_handles,
> + void *vaddr);
>
> int xenbus_alloc_evtchn(struct xenbus_device *dev, int *port);
> int xenbus_bind_evtchn(struct xenbus_device *dev, int remote_port, int *port);
> --
> 1.7.10.4
>
^ permalink raw reply
* Re: [PATCH] net: netfilter: nfnetlink: Fixed warning for nfnl_get_lock
From: Borislav Petkov @ 2013-03-04 21:05 UTC (permalink / raw)
To: Alexandru Gheorghiu
Cc: Pablo Neira Ayuso, Patrick McHardy, David S. Miller, netdev,
linux-kernel
In-Reply-To: <1362426192-2921-1-git-send-email-gheorghiuandru@gmail.com>
On Mon, Mar 04, 2013 at 09:43:11PM +0200, Alexandru Gheorghiu wrote:
> Removed unused function nfnl_get_lock which fixed the following warning:
> net/netfilter/nfnetlink.c:65:22: warning: ‘nfnl_get_lock’ defined but not used [-Wunused-function]
>
> Signed-off-by: Alexandru Gheorghiu <gheorghiuandru@gmail.com>
> ---
> net/netfilter/nfnetlink.c | 5 -----
> 1 file changed, 5 deletions(-)
>
> diff --git a/net/netfilter/nfnetlink.c b/net/netfilter/nfnetlink.c
> index d578ec2..44aa0a7 100644
> --- a/net/netfilter/nfnetlink.c
> +++ b/net/netfilter/nfnetlink.c
> @@ -62,11 +62,6 @@ void nfnl_unlock(__u8 subsys_id)
> }
> EXPORT_SYMBOL_GPL(nfnl_unlock);
>
> -static struct mutex *nfnl_get_lock(__u8 subsys_id)
> -{
> - return &table[subsys_id].mutex;
> -}
> -
I see the same warning here, gcc (Debian 4.7.2-5) 4.7.2.
Actually this function *is* used a bit further in the same file in
nfnetlink_rcv_msg().
But gcc complains for some reason of which I don't even have the
slightest idea. However, if you declare the above function "static
inline..." the warning is gone.
--
Regards/Gruss,
Boris.
Sent from a fat crate under my desk. Formatting is fine.
--
^ permalink raw reply
* Re: [Xen-devel] [PATCH 5/8] netback: multi-page ring support
From: Konrad Rzeszutek Wilk @ 2013-03-04 21:00 UTC (permalink / raw)
To: Wei Liu; +Cc: xen-devel, netdev, ian.campbell, annie.li
In-Reply-To: <1360944010-15336-6-git-send-email-wei.liu2@citrix.com>
On Fri, Feb 15, 2013 at 04:00:06PM +0000, Wei Liu wrote:
Please a bit more description. Say which XenBus feature this
is using. And that probably means another patch to the Xen
tree to document this.
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> ---
> drivers/net/xen-netback/common.h | 30 ++++++--
> drivers/net/xen-netback/interface.c | 46 +++++++++--
> drivers/net/xen-netback/netback.c | 73 ++++++++----------
> drivers/net/xen-netback/xenbus.c | 143 +++++++++++++++++++++++++++++++++--
> 4 files changed, 229 insertions(+), 63 deletions(-)
>
> diff --git a/drivers/net/xen-netback/common.h b/drivers/net/xen-netback/common.h
> index 35d8772..f541ba9 100644
> --- a/drivers/net/xen-netback/common.h
> +++ b/drivers/net/xen-netback/common.h
> @@ -45,6 +45,12 @@
> #include <xen/grant_table.h>
> #include <xen/xenbus.h>
>
> +#define NETBK_MAX_RING_PAGE_ORDER XENBUS_MAX_RING_PAGE_ORDER
> +#define NETBK_MAX_RING_PAGES (1U << NETBK_MAX_RING_PAGE_ORDER)
> +
> +#define NETBK_MAX_TX_RING_SIZE XEN_NETIF_TX_RING_SIZE(NETBK_MAX_RING_PAGES)
> +#define NETBK_MAX_RX_RING_SIZE XEN_NETIF_RX_RING_SIZE(NETBK_MAX_RING_PAGES)
> +
> struct xen_netbk;
>
> struct xenvif {
> @@ -66,6 +72,8 @@ struct xenvif {
> /* The shared rings and indexes. */
> struct xen_netif_tx_back_ring tx;
> struct xen_netif_rx_back_ring rx;
> + unsigned int nr_tx_handles;
> + unsigned int nr_rx_handles;
>
> /* Frontend feature information. */
> u8 can_sg:1;
> @@ -105,15 +113,19 @@ static inline struct xenbus_device *xenvif_to_xenbus_device(struct xenvif *vif)
> return to_xenbus_device(vif->dev->dev.parent);
> }
>
> -#define XEN_NETIF_TX_RING_SIZE __CONST_RING_SIZE(xen_netif_tx, PAGE_SIZE)
> -#define XEN_NETIF_RX_RING_SIZE __CONST_RING_SIZE(xen_netif_rx, PAGE_SIZE)
> +#define XEN_NETIF_TX_RING_SIZE(_nr_pages) \
> + __CONST_RING_SIZE(xen_netif_tx, PAGE_SIZE * (_nr_pages))
> +#define XEN_NETIF_RX_RING_SIZE(_nr_pages) \
> + __CONST_RING_SIZE(xen_netif_rx, PAGE_SIZE * (_nr_pages))
>
> struct xenvif *xenvif_alloc(struct device *parent,
> domid_t domid,
> unsigned int handle);
>
> -int xenvif_connect(struct xenvif *vif, unsigned long tx_ring_ref,
> - unsigned long rx_ring_ref, unsigned int evtchn);
> +int xenvif_connect(struct xenvif *vif,
> + unsigned long *tx_ring_ref, unsigned int tx_ring_order,
> + unsigned long *rx_ring_ref, unsigned int rx_ring_order,
> + unsigned int evtchn);
> void xenvif_disconnect(struct xenvif *vif);
>
> void xenvif_get(struct xenvif *vif);
> @@ -129,10 +141,12 @@ int xen_netbk_rx_ring_full(struct xenvif *vif);
> int xen_netbk_must_stop_queue(struct xenvif *vif);
>
> /* (Un)Map communication rings. */
> -void xen_netbk_unmap_frontend_rings(struct xenvif *vif);
> +void xen_netbk_unmap_frontend_rings(struct xenvif *vif, void *addr);
> int xen_netbk_map_frontend_rings(struct xenvif *vif,
> - grant_ref_t tx_ring_ref,
> - grant_ref_t rx_ring_ref);
> + void **addr,
> + int domid,
> + int *ring_ref,
> + unsigned int ring_ref_count);
>
> /* (De)Register a xenvif with the netback backend. */
> void xen_netbk_add_xenvif(struct xenvif *vif);
> @@ -158,4 +172,6 @@ void xenvif_carrier_off(struct xenvif *vif);
> /* Returns number of ring slots required to send an skb to the frontend */
> unsigned int xen_netbk_count_skb_slots(struct xenvif *vif, struct sk_buff *skb);
>
> +extern unsigned int MODPARM_netback_max_tx_ring_page_order;
> +extern unsigned int MODPARM_netback_max_rx_ring_page_order;
> #endif /* __XEN_NETBACK__COMMON_H__ */
> diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c
> index db638e1..fa4d46d 100644
> --- a/drivers/net/xen-netback/interface.c
> +++ b/drivers/net/xen-netback/interface.c
> @@ -305,10 +305,16 @@ struct xenvif *xenvif_alloc(struct device *parent, domid_t domid,
> return vif;
> }
>
> -int xenvif_connect(struct xenvif *vif, unsigned long tx_ring_ref,
> - unsigned long rx_ring_ref, unsigned int evtchn)
> +int xenvif_connect(struct xenvif *vif,
> + unsigned long *tx_ring_ref, unsigned int tx_ring_ref_count,
> + unsigned long *rx_ring_ref, unsigned int rx_ring_ref_count,
> + unsigned int evtchn)
> {
> int err = -ENOMEM;
> + void *addr;
> + struct xen_netif_tx_sring *txs;
> + struct xen_netif_rx_sring *rxs;
> + int tmp[NETBK_MAX_RING_PAGES], i;
>
> /* Already connected through? */
> if (vif->irq)
> @@ -316,15 +322,36 @@ int xenvif_connect(struct xenvif *vif, unsigned long tx_ring_ref,
>
> __module_get(THIS_MODULE);
>
> - err = xen_netbk_map_frontend_rings(vif, tx_ring_ref, rx_ring_ref);
> + for (i = 0; i < tx_ring_ref_count; i++)
> + tmp[i] = tx_ring_ref[i];
> +
> + err = xen_netbk_map_frontend_rings(vif, &addr, vif->domid,
> + tmp, tx_ring_ref_count);
> if (err < 0)
> goto err;
>
> + txs = addr;
> + BACK_RING_INIT(&vif->tx, txs, PAGE_SIZE * tx_ring_ref_count);
> + vif->nr_tx_handles = tx_ring_ref_count;
> +
> + for (i = 0; i < rx_ring_ref_count; i++)
> + tmp[i] = rx_ring_ref[i];
> +
> + err = xen_netbk_map_frontend_rings(vif, &addr, vif->domid,
> + tmp, rx_ring_ref_count);
> +
> + if (err < 0)
> + goto err_tx_unmap;
> +
> + rxs = addr;
> + BACK_RING_INIT(&vif->rx, rxs, PAGE_SIZE * rx_ring_ref_count);
> + vif->nr_rx_handles = rx_ring_ref_count;
> +
> err = bind_interdomain_evtchn_to_irqhandler(
> vif->domid, evtchn, xenvif_interrupt, 0,
> vif->dev->name, vif);
> if (err < 0)
> - goto err_unmap;
> + goto err_rx_unmap;
> vif->irq = err;
> disable_irq(vif->irq);
>
> @@ -340,8 +367,12 @@ int xenvif_connect(struct xenvif *vif, unsigned long tx_ring_ref,
> rtnl_unlock();
>
> return 0;
> -err_unmap:
> - xen_netbk_unmap_frontend_rings(vif);
> +err_rx_unmap:
> + xen_netbk_unmap_frontend_rings(vif, (void *)vif->rx.sring);
> + vif->nr_rx_handles = 0;
> +err_tx_unmap:
> + xen_netbk_unmap_frontend_rings(vif, (void *)vif->tx.sring);
> + vif->nr_tx_handles = 0;
> err:
> module_put(THIS_MODULE);
> return err;
> @@ -382,7 +413,8 @@ void xenvif_disconnect(struct xenvif *vif)
>
> unregister_netdev(vif->dev);
>
> - xen_netbk_unmap_frontend_rings(vif);
> + xen_netbk_unmap_frontend_rings(vif, (void *)vif->tx.sring);
> + xen_netbk_unmap_frontend_rings(vif, (void *)vif->rx.sring);
>
> free_netdev(vif->dev);
>
> diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
> index 98ccea9..644c760 100644
> --- a/drivers/net/xen-netback/netback.c
> +++ b/drivers/net/xen-netback/netback.c
> @@ -47,6 +47,19 @@
> #include <asm/xen/hypercall.h>
> #include <asm/xen/page.h>
>
> +unsigned int MODPARM_netback_max_rx_ring_page_order = NETBK_MAX_RING_PAGE_ORDER;
> +module_param_named(netback_max_rx_ring_page_order,
> + MODPARM_netback_max_rx_ring_page_order, uint, 0);
> +MODULE_PARM_DESC(netback_max_rx_ring_page_order,
> + "Maximum supported receiver ring page order");
> +
> +unsigned int MODPARM_netback_max_tx_ring_page_order = NETBK_MAX_RING_PAGE_ORDER;
> +module_param_named(netback_max_tx_ring_page_order,
> + MODPARM_netback_max_tx_ring_page_order, uint, 0);
> +MODULE_PARM_DESC(netback_max_tx_ring_page_order,
> + "Maximum supported transmitter ring page order");
> +
> +
These should also show up in Documentation/ABI/sysfs/stable/xen* something
But more importantly.. why not make the TX=RX order and just have one
option?
> struct pending_tx_info {
> struct xen_netif_tx_request req;
> struct xenvif *vif;
> @@ -59,7 +72,7 @@ struct netbk_rx_meta {
> int gso_size;
> };
>
> -#define MAX_PENDING_REQS 256
> +#define MAX_PENDING_REQS NETBK_MAX_TX_RING_SIZE
>
> /* Discriminate from any valid pending_idx value. */
> #define INVALID_PENDING_IDX 0xFFFF
> @@ -111,8 +124,8 @@ struct xen_netbk {
> * head/fragment page uses 2 copy operations because it
> * straddles two buffers in the frontend.
> */
> - struct gnttab_copy grant_copy_op[2*XEN_NETIF_RX_RING_SIZE];
> - struct netbk_rx_meta meta[2*XEN_NETIF_RX_RING_SIZE];
> + struct gnttab_copy grant_copy_op[2*NETBK_MAX_RX_RING_SIZE];
> + struct netbk_rx_meta meta[2*NETBK_MAX_RX_RING_SIZE];
> };
>
> static struct xen_netbk *xen_netbk;
> @@ -262,7 +275,8 @@ int xen_netbk_rx_ring_full(struct xenvif *vif)
> RING_IDX needed = max_required_rx_slots(vif);
>
> return ((vif->rx.sring->req_prod - peek) < needed) ||
> - ((vif->rx.rsp_prod_pvt + XEN_NETIF_RX_RING_SIZE - peek) < needed);
> + ((vif->rx.rsp_prod_pvt +
> + XEN_NETIF_RX_RING_SIZE(vif->nr_rx_handles) - peek) < needed);
> }
>
> int xen_netbk_must_stop_queue(struct xenvif *vif)
> @@ -657,7 +671,8 @@ static void xen_netbk_rx_action(struct xen_netbk *netbk)
> __skb_queue_tail(&rxq, skb);
>
> /* Filled the batch queue? */
> - if (count + MAX_SKB_FRAGS >= XEN_NETIF_RX_RING_SIZE)
> + if (count + MAX_SKB_FRAGS >=
> + XEN_NETIF_RX_RING_SIZE(vif->nr_rx_handles))
> break;
> }
>
> @@ -1292,12 +1307,12 @@ static unsigned xen_netbk_tx_build_gops(struct xen_netbk *netbk)
> continue;
>
> if (vif->tx.sring->req_prod - vif->tx.req_cons >
> - XEN_NETIF_TX_RING_SIZE) {
> + XEN_NETIF_TX_RING_SIZE(vif->nr_tx_handles)) {
> netdev_err(vif->dev,
> "Impossible number of requests. "
> "req_prod %d, req_cons %d, size %ld\n",
> vif->tx.sring->req_prod, vif->tx.req_cons,
> - XEN_NETIF_TX_RING_SIZE);
> + XEN_NETIF_TX_RING_SIZE(vif->nr_tx_handles));
> netbk_fatal_tx_err(vif);
> continue;
> }
> @@ -1644,48 +1659,22 @@ static int xen_netbk_kthread(void *data)
> return 0;
> }
>
> -void xen_netbk_unmap_frontend_rings(struct xenvif *vif)
> +void xen_netbk_unmap_frontend_rings(struct xenvif *vif, void *addr)
> {
> - if (vif->tx.sring)
> - xenbus_unmap_ring_vfree(xenvif_to_xenbus_device(vif),
> - vif->tx.sring);
> - if (vif->rx.sring)
> - xenbus_unmap_ring_vfree(xenvif_to_xenbus_device(vif),
> - vif->rx.sring);
> + if (addr)
> + xenbus_unmap_ring_vfree(xenvif_to_xenbus_device(vif), addr);
> }
>
> int xen_netbk_map_frontend_rings(struct xenvif *vif,
> - grant_ref_t tx_ring_ref,
> - grant_ref_t rx_ring_ref)
> + void **vaddr,
> + int domid,
> + int *ring_ref,
> + unsigned int ring_ref_count)
> {
> - void *addr;
> - struct xen_netif_tx_sring *txs;
> - struct xen_netif_rx_sring *rxs;
> -
> - int err = -ENOMEM;
> -
> - err = xenbus_map_ring_valloc(xenvif_to_xenbus_device(vif),
> - &tx_ring_ref, 1, &addr);
> - if (err)
> - goto err;
> -
> - txs = (struct xen_netif_tx_sring *)addr;
> - BACK_RING_INIT(&vif->tx, txs, PAGE_SIZE);
> + int err = 0;
>
> err = xenbus_map_ring_valloc(xenvif_to_xenbus_device(vif),
> - &rx_ring_ref, 1, &addr);
> - if (err)
> - goto err;
> -
> - rxs = (struct xen_netif_rx_sring *)addr;
> - BACK_RING_INIT(&vif->rx, rxs, PAGE_SIZE);
> -
> - vif->rx_req_cons_peek = 0;
> -
> - return 0;
> -
> -err:
> - xen_netbk_unmap_frontend_rings(vif);
> + ring_ref, ring_ref_count, vaddr);
> return err;
> }
>
> diff --git a/drivers/net/xen-netback/xenbus.c b/drivers/net/xen-netback/xenbus.c
> index 65d14f2..1791807 100644
> --- a/drivers/net/xen-netback/xenbus.c
> +++ b/drivers/net/xen-netback/xenbus.c
> @@ -114,6 +114,33 @@ static int netback_probe(struct xenbus_device *dev,
> goto abort_transaction;
> }
>
> + /* Multi-page ring support */
> + if (MODPARM_netback_max_tx_ring_page_order >
> + NETBK_MAX_RING_PAGE_ORDER)
> + MODPARM_netback_max_tx_ring_page_order =
> + NETBK_MAX_RING_PAGE_ORDER;
> + err = xenbus_printf(xbt, dev->nodename,
> + "max-tx-ring-page-order",
> + "%u",
> + MODPARM_netback_max_tx_ring_page_order);
> + if (err) {
> + message = "writing max-tx-ring-page-order";
> + goto abort_transaction;
> + }
> +
> + if (MODPARM_netback_max_rx_ring_page_order >
> + NETBK_MAX_RING_PAGE_ORDER)
> + MODPARM_netback_max_rx_ring_page_order =
> + NETBK_MAX_RING_PAGE_ORDER;
> + err = xenbus_printf(xbt, dev->nodename,
> + "max-rx-ring-page-order",
> + "%u",
> + MODPARM_netback_max_rx_ring_page_order);
> + if (err) {
> + message = "writing max-rx-ring-page-order";
> + goto abort_transaction;
> + }
> +
> err = xenbus_transaction_end(xbt, 0);
> } while (err == -EAGAIN);
>
> @@ -392,22 +419,107 @@ static int connect_rings(struct backend_info *be)
> {
> struct xenvif *vif = be->vif;
> struct xenbus_device *dev = be->dev;
> - unsigned long tx_ring_ref, rx_ring_ref;
> unsigned int evtchn, rx_copy;
> int err;
> int val;
> + unsigned long tx_ring_ref[NETBK_MAX_RING_PAGES];
> + unsigned long rx_ring_ref[NETBK_MAX_RING_PAGES];
> + unsigned int tx_ring_order;
> + unsigned int rx_ring_order;
>
> err = xenbus_gather(XBT_NIL, dev->otherend,
> - "tx-ring-ref", "%lu", &tx_ring_ref,
> - "rx-ring-ref", "%lu", &rx_ring_ref,
> "event-channel", "%u", &evtchn, NULL);
> if (err) {
> xenbus_dev_fatal(dev, err,
> - "reading %s/ring-ref and event-channel",
> + "reading %s/event-channel",
> dev->otherend);
> return err;
> }
>
> + err = xenbus_scanf(XBT_NIL, dev->otherend, "tx-ring-order", "%u",
> + &tx_ring_order);
> + if (err < 0) {
> + tx_ring_order = 0;
> +
> + err = xenbus_scanf(XBT_NIL, dev->otherend, "tx-ring-ref", "%lu",
> + &tx_ring_ref[0]);
> + if (err < 0) {
> + xenbus_dev_fatal(dev, err, "reading %s/tx-ring-ref",
> + dev->otherend);
> + return err;
> + }
> + } else {
> + unsigned int i;
> +
> + if (tx_ring_order > MODPARM_netback_max_tx_ring_page_order) {
> + err = -EINVAL;
> + xenbus_dev_fatal(dev, err,
> + "%s/tx-ring-page-order too big",
> + dev->otherend);
> + return err;
> + }
> +
> + for (i = 0; i < (1U << tx_ring_order); i++) {
> + char ring_ref_name[sizeof("tx-ring-ref") + 2];
> +
> + snprintf(ring_ref_name, sizeof(ring_ref_name),
> + "tx-ring-ref%u", i);
> +
> + err = xenbus_scanf(XBT_NIL, dev->otherend,
> + ring_ref_name, "%lu",
> + &tx_ring_ref[i]);
> + if (err < 0) {
> + xenbus_dev_fatal(dev, err,
> + "reading %s/%s",
> + dev->otherend,
> + ring_ref_name);
> + return err;
> + }
> + }
> + }
> +
> + err = xenbus_scanf(XBT_NIL, dev->otherend, "rx-ring-order", "%u",
> + &rx_ring_order);
> + if (err < 0) {
> + rx_ring_order = 0;
> +
> + err = xenbus_scanf(XBT_NIL, dev->otherend, "rx-ring-ref", "%lu",
> + &rx_ring_ref[0]);
> + if (err < 0) {
> + xenbus_dev_fatal(dev, err, "reading %s/rx-ring-ref",
> + dev->otherend);
> + return err;
> + }
> + } else {
> + unsigned int i;
> +
> + if (rx_ring_order > MODPARM_netback_max_rx_ring_page_order) {
> + err = -EINVAL;
> + xenbus_dev_fatal(dev, err,
> + "%s/rx-ring-page-order too big",
> + dev->otherend);
> + return err;
> + }
> +
> + for (i = 0; i < (1U << rx_ring_order); i++) {
> + char ring_ref_name[sizeof("rx-ring-ref") + 2];
> +
> + snprintf(ring_ref_name, sizeof(ring_ref_name),
> + "rx-ring-ref%u", i);
> +
> + err = xenbus_scanf(XBT_NIL, dev->otherend,
> + ring_ref_name, "%lu",
> + &rx_ring_ref[i]);
> + if (err < 0) {
> + xenbus_dev_fatal(dev, err,
> + "reading %s/%s",
> + dev->otherend,
> + ring_ref_name);
> + return err;
> + }
> + }
> + }
> +
> err = xenbus_scanf(XBT_NIL, dev->otherend, "request-rx-copy", "%u",
> &rx_copy);
> if (err == -ENOENT) {
> @@ -454,11 +566,28 @@ static int connect_rings(struct backend_info *be)
> vif->csum = !val;
>
> /* Map the shared frame, irq etc. */
> - err = xenvif_connect(vif, tx_ring_ref, rx_ring_ref, evtchn);
> + err = xenvif_connect(vif, tx_ring_ref, (1U << tx_ring_order),
> + rx_ring_ref, (1U << rx_ring_order),
> + evtchn);
> if (err) {
> + /* construct 1 2 3 / 4 5 6 */
> + int i;
> + char txs[3 * (1U << MODPARM_netback_max_tx_ring_page_order)];
> + char rxs[3 * (1U << MODPARM_netback_max_rx_ring_page_order)];
> +
> + txs[0] = rxs[0] = 0;
> +
> + for (i = 0; i < (1U << tx_ring_order); i++)
> + snprintf(txs+strlen(txs), sizeof(txs)-strlen(txs)-1,
> + " %lu", tx_ring_ref[i]);
> +
> + for (i = 0; i < (1U << rx_ring_order); i++)
> + snprintf(rxs+strlen(rxs), sizeof(rxs)-strlen(rxs)-1,
> + " %lu", rx_ring_ref[i]);
> +
> xenbus_dev_fatal(dev, err,
> - "mapping shared-frames %lu/%lu port %u",
> - tx_ring_ref, rx_ring_ref, evtchn);
> + "mapping shared-frames%s /%s port %u",
> + txs, rxs, evtchn);
> return err;
> }
> return 0;
> --
> 1.7.10.4
>
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel
>
^ permalink raw reply
* Re: [Xen-devel] [PATCH 2/8] netback: add module unload function
From: Andrew Cooper @ 2013-03-04 20:58 UTC (permalink / raw)
To: Konrad Rzeszutek Wilk
Cc: Wei Liu, netdev@vger.kernel.org, annie.li@oracle.com,
Ian Campbell, xen-devel@lists.xen.org
In-Reply-To: <20130304205530.GC16762@phenom.dumpdata.com>
On 04/03/13 20:55, Konrad Rzeszutek Wilk wrote:
> On Fri, Feb 15, 2013 at 04:00:03PM +0000, Wei Liu wrote:
>> Enable users to unload netback module. Users should make sure there is not vif
>> runnig.
> 'sure there are no vif's running.'
If we are picking at grammar, no apostrophe in 'vifs'
~Andrew
>
> Any way of making this VIF part be automatic? Meaning that netback
> can figure out if there are VIFs running and if so don't unload
> all of the parts and just mention that you are leaking memory.
>
> This looks quite dangerous - meaning if there are guests running and
> we for fun do 'rmmod xen_netback' it looks like we could crash dom0?
>
>> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
>> ---
>> drivers/net/xen-netback/common.h | 1 +
>> drivers/net/xen-netback/netback.c | 18 ++++++++++++++++++
>> drivers/net/xen-netback/xenbus.c | 5 +++++
>> 3 files changed, 24 insertions(+)
>>
>> diff --git a/drivers/net/xen-netback/common.h b/drivers/net/xen-netback/common.h
>> index 9d7f172..35d8772 100644
>> --- a/drivers/net/xen-netback/common.h
>> +++ b/drivers/net/xen-netback/common.h
>> @@ -120,6 +120,7 @@ void xenvif_get(struct xenvif *vif);
>> void xenvif_put(struct xenvif *vif);
>>
>> int xenvif_xenbus_init(void);
>> +void xenvif_xenbus_exit(void);
>>
>> int xenvif_schedulable(struct xenvif *vif);
>>
>> diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
>> index db8d45a..de59098 100644
>> --- a/drivers/net/xen-netback/netback.c
>> +++ b/drivers/net/xen-netback/netback.c
>> @@ -1761,5 +1761,23 @@ failed_init:
>>
>> module_init(netback_init);
>>
>> +static void __exit netback_exit(void)
>> +{
>> + int group, i;
>> + xenvif_xenbus_exit();
> You should check the return code of this function.
>
>> + for (group = 0; group < xen_netbk_group_nr; group++) {
>> + struct xen_netbk *netbk = &xen_netbk[group];
>> + for (i = 0; i < MAX_PENDING_REQS; i++) {
>> + if (netbk->mmap_pages[i])
>> + __free_page(netbk->mmap_pages[i]);
>> + }
>> + del_timer_sync(&netbk->net_timer);
>> + kthread_stop(netbk->task);
>> + }
>> + vfree(xen_netbk);
>> +}
>> +
>> +module_exit(netback_exit);
>> +
>> MODULE_LICENSE("Dual BSD/GPL");
>> MODULE_ALIAS("xen-backend:vif");
>> diff --git a/drivers/net/xen-netback/xenbus.c b/drivers/net/xen-netback/xenbus.c
>> index 410018c..65d14f2 100644
>> --- a/drivers/net/xen-netback/xenbus.c
>> +++ b/drivers/net/xen-netback/xenbus.c
>> @@ -485,3 +485,8 @@ int xenvif_xenbus_init(void)
>> {
>> return xenbus_register_backend(&netback_driver);
>> }
>> +
>> +void xenvif_xenbus_exit(void)
>> +{
>> + return xenbus_unregister_driver(&netback_driver);
>> +}
>> --
>> 1.7.10.4
>>
>>
>> _______________________________________________
>> Xen-devel mailing list
>> Xen-devel@lists.xen.org
>> http://lists.xen.org/xen-devel
>>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel
^ permalink raw reply
* Re: [PATCH 3/8] netback: get/put module along with vif connect/disconnect
From: Konrad Rzeszutek Wilk @ 2013-03-04 20:56 UTC (permalink / raw)
To: Wei Liu; +Cc: xen-devel, netdev, ian.campbell, annie.li
In-Reply-To: <1360944010-15336-4-git-send-email-wei.liu2@citrix.com>
On Fri, Feb 15, 2013 at 04:00:04PM +0000, Wei Liu wrote:
> If there is vif running and user unloads netback, guest's network interface
> just mysteriously stops working. So we need to prevent unloading netback
> module if there is vif running.
>
> The disconnect function of vif may get called by the generic framework even
> before vif connects, so thers is an extra check on whether we actually need to
> put module when disconnecting a vif.
Ah, I think this patch should come before the "netback: add module unload function"
>
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> ---
> drivers/net/xen-netback/interface.c | 18 +++++++++++++++++-
> 1 file changed, 17 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c
> index 221f426..db638e1 100644
> --- a/drivers/net/xen-netback/interface.c
> +++ b/drivers/net/xen-netback/interface.c
> @@ -314,6 +314,8 @@ int xenvif_connect(struct xenvif *vif, unsigned long tx_ring_ref,
> if (vif->irq)
> return 0;
>
> + __module_get(THIS_MODULE);
> +
> err = xen_netbk_map_frontend_rings(vif, tx_ring_ref, rx_ring_ref);
> if (err < 0)
> goto err;
> @@ -341,6 +343,7 @@ int xenvif_connect(struct xenvif *vif, unsigned long tx_ring_ref,
> err_unmap:
> xen_netbk_unmap_frontend_rings(vif);
> err:
> + module_put(THIS_MODULE);
> return err;
> }
>
> @@ -358,18 +361,31 @@ void xenvif_carrier_off(struct xenvif *vif)
>
> void xenvif_disconnect(struct xenvif *vif)
> {
> + /*
> + * This function may get called even before vif connets, set
connects
> + * need_module_put if vif->irq != 0, which means vif has
> + * already connected, we should call module_put to balance the
> + * previous __module_get.
> + */
> + int need_module_put = 0;
> +
> if (netif_carrier_ok(vif->dev))
> xenvif_carrier_off(vif);
>
> atomic_dec(&vif->refcnt);
> wait_event(vif->waiting_to_free, atomic_read(&vif->refcnt) == 0);
>
> - if (vif->irq)
> + if (vif->irq) {
> unbind_from_irqhandler(vif->irq, vif);
> + need_module_put = 1;
> + }
>
> unregister_netdev(vif->dev);
>
> xen_netbk_unmap_frontend_rings(vif);
>
> free_netdev(vif->dev);
> +
> + if (need_module_put)
> + module_put(THIS_MODULE);
> }
> --
> 1.7.10.4
>
^ permalink raw reply
* Re: [Xen-devel] [PATCH 2/8] netback: add module unload function
From: Konrad Rzeszutek Wilk @ 2013-03-04 20:55 UTC (permalink / raw)
To: Wei Liu; +Cc: xen-devel, netdev, ian.campbell, annie.li
In-Reply-To: <1360944010-15336-3-git-send-email-wei.liu2@citrix.com>
On Fri, Feb 15, 2013 at 04:00:03PM +0000, Wei Liu wrote:
> Enable users to unload netback module. Users should make sure there is not vif
> runnig.
'sure there are no vif's running.'
Any way of making this VIF part be automatic? Meaning that netback
can figure out if there are VIFs running and if so don't unload
all of the parts and just mention that you are leaking memory.
This looks quite dangerous - meaning if there are guests running and
we for fun do 'rmmod xen_netback' it looks like we could crash dom0?
>
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> ---
> drivers/net/xen-netback/common.h | 1 +
> drivers/net/xen-netback/netback.c | 18 ++++++++++++++++++
> drivers/net/xen-netback/xenbus.c | 5 +++++
> 3 files changed, 24 insertions(+)
>
> diff --git a/drivers/net/xen-netback/common.h b/drivers/net/xen-netback/common.h
> index 9d7f172..35d8772 100644
> --- a/drivers/net/xen-netback/common.h
> +++ b/drivers/net/xen-netback/common.h
> @@ -120,6 +120,7 @@ void xenvif_get(struct xenvif *vif);
> void xenvif_put(struct xenvif *vif);
>
> int xenvif_xenbus_init(void);
> +void xenvif_xenbus_exit(void);
>
> int xenvif_schedulable(struct xenvif *vif);
>
> diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
> index db8d45a..de59098 100644
> --- a/drivers/net/xen-netback/netback.c
> +++ b/drivers/net/xen-netback/netback.c
> @@ -1761,5 +1761,23 @@ failed_init:
>
> module_init(netback_init);
>
> +static void __exit netback_exit(void)
> +{
> + int group, i;
> + xenvif_xenbus_exit();
You should check the return code of this function.
> + for (group = 0; group < xen_netbk_group_nr; group++) {
> + struct xen_netbk *netbk = &xen_netbk[group];
> + for (i = 0; i < MAX_PENDING_REQS; i++) {
> + if (netbk->mmap_pages[i])
> + __free_page(netbk->mmap_pages[i]);
> + }
> + del_timer_sync(&netbk->net_timer);
> + kthread_stop(netbk->task);
> + }
> + vfree(xen_netbk);
> +}
> +
> +module_exit(netback_exit);
> +
> MODULE_LICENSE("Dual BSD/GPL");
> MODULE_ALIAS("xen-backend:vif");
> diff --git a/drivers/net/xen-netback/xenbus.c b/drivers/net/xen-netback/xenbus.c
> index 410018c..65d14f2 100644
> --- a/drivers/net/xen-netback/xenbus.c
> +++ b/drivers/net/xen-netback/xenbus.c
> @@ -485,3 +485,8 @@ int xenvif_xenbus_init(void)
> {
> return xenbus_register_backend(&netback_driver);
> }
> +
> +void xenvif_xenbus_exit(void)
> +{
> + return xenbus_unregister_driver(&netback_driver);
> +}
> --
> 1.7.10.4
>
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel
>
^ permalink raw reply
* Re: [PATCH 1/8] netback: don't bind kthread to cpu
From: Konrad Rzeszutek Wilk @ 2013-03-04 20:51 UTC (permalink / raw)
To: Wei Liu; +Cc: xen-devel, netdev, ian.campbell, annie.li
In-Reply-To: <1360944010-15336-2-git-send-email-wei.liu2@citrix.com>
On Fri, Feb 15, 2013 at 04:00:02PM +0000, Wei Liu wrote:
> The initialization process makes an assumption that the online cpus are
> numbered from 0 to xen_netbk_group_nr-1, which is not always true.
And xen_netbk_group_nr is num_online_cpus()?
So under what conditions does this change? Is this when the CPU hotplug
is involved and the CPUs go offline? In which case should there be a
CPU hotplug notifier to re-bind the workers are appropiate?
>
> As we only need a pool of worker threads, simply don't bind them to specific
> cpus.
OK. Is there another method of doing this? Are there patches to make the thread
try to be vCPU->guest affinite?
>
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> ---
> drivers/net/xen-netback/netback.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
> index 3ae49b1..db8d45a 100644
> --- a/drivers/net/xen-netback/netback.c
> +++ b/drivers/net/xen-netback/netback.c
> @@ -1729,8 +1729,6 @@ static int __init netback_init(void)
> goto failed_init;
> }
>
> - kthread_bind(netbk->task, group);
> -
> INIT_LIST_HEAD(&netbk->net_schedule_list);
>
> spin_lock_init(&netbk->net_schedule_list_lock);
> --
> 1.7.10.4
>
^ permalink raw reply
* [GIT] Networking
From: David Miller @ 2013-03-04 19:58 UTC (permalink / raw)
To: torvalds; +Cc: akpm, netdev, linux-kernel
A moderately sized pile of fixes, some specifically for merge window
introduced regressions although we others are for longer standing
items and have been queued up for -stable.
I'm kind of tired of all the RDS protocol bugs over the years, to be
honest, it's way out of proportion to the number of people who
actually use it.
1) Fix missing range initialization in netfilter IPSET, from Jozsef
Kadlecsik.
2) ieee80211_local->tim_lock needs to use BH disabling, from Johannes
Berg.
3) Fix DMA syncing in SFC driver, from Ben Hutchings.
4) Fix regression in BOND device MAC address setting, from Jiri Pirko.
5) Missing usb_free_urb in ISDN Hisax driver, from Marina Makienko.
6) Fix UDP checksumming in bnx2x driver for 57710 and 57711 chips, fix
from Dmitry Kravkov.
7) Missing cfgspace_lock initialization in BCMA driver.
8) Validate parameter size for SCTP assoc stats getsockopt(), from
Guenter Roeck.
9) Fix SCTP association hangs, from Lee A. Roberts.
10) Fix jumbo frame handling in r8169, from Francois Romieu.
11) Fix phy_device memory leak, from Petr Malat.
12) Omit trailing FCS from frames received in BGMAC driver, from Hauke
Mehrtens.
13) Missing socket refcount release in L2TP, from Guillaume Nault.
14) sctp_endpoint_init should respect passed in gfp_t, rather than
use GFP_KERNEL unconditionally. From Dan Carpenter.
15) Add AISX AX88179 USB driver, from Freddy Xin.
16) Remove MAINTAINERS entries for drivers deleted during the
merge window, from Cesar Eduardo Barros.
17) RDS protocol can try to allocate huge amounts of memory,
check that the user's request length makes sense, from Cong
Wang.
18) SCTP should use the provided KMALLOC_MAX_SIZE instead of it's
own, bogus, definition. From Cong Wang.
19) Fix deadlocks in FEC driver by moving TX reclaim into NAPI poll,
from Frank Li. Also, fix a build error introduced in the merge
window.
20) Fix bogus purging of default routes in ipv6, from Lorenzo
Colitti.
21) Don't double count RTT measurements when we leave the TCP
receive fast path, from Neal Cardwell.
Please pull, thanks a lot!
The following changes since commit 1cef9350cbee6e3bcf2ff646b8978fbec33f8b85:
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (2013-02-26 11:44:11 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git master
for you to fetch changes up to aab2b4bf224ef8358d262f95b568b8ad0cecf0a0:
tcp: fix double-counted receiver RTT when leaving receiver fast path (2013-03-04 14:12:07 -0500)
----------------------------------------------------------------
Avinash Patil (1):
mwifiex: correct sleep delay counter
Ben Hutchings (3):
sfc: Properly sync RX DMA buffer when it is not the last in the page
sfc: Fix efx_rx_buf_offset() in the presence of swiotlb
sfc: Detach net device when stopping queues for reconfiguration
Bing Zhao (1):
libertas: fix crash for SD8688
Bjørn Mork (1):
net: cdc_ncm: tag Huawei devices (e.g. E5331) with FLAG_WWAN
Cesar Eduardo Barros (3):
MAINTAINERS: remove 3c505
MAINTAINERS: remove drivers/net/wan/cycx*
MAINTAINERS: remove eexpress
Chun-Yeow Yeoh (1):
mac80211: fix the problem of forwarding from DS to DS in Mesh
Cong Wang (3):
rds: limit the size allocated by rds_message_alloc()
sctp: use KMALLOC_MAX_SIZE instead of its own MAX_KMALLOC_SIZE
rds: simplify a warning message
Dan Carpenter (2):
irda: small read beyond end of array in debug code
sctp: use the passed in gfp flags instead GFP_KERNEL
Daniel Mack (1):
drivers: net: ethernet: cpsw: consider number of slaves in interation
David S. Miller (4):
Merge branch 'sfc-3.9' of git://git.kernel.org/.../bwh/sfc
Merge branch 'master' of git://1984.lsi.us.es/nf
Merge branch 'sctp'
Merge branch 'for-davem' of git://git.kernel.org/.../linville/wireless
Dmitry Kravkov (1):
bnx2x: fix UDP checksum for 57710/57711.
Dor Shaish (1):
iwlwifi: mvm: Remove testing of static PIC in PhyDB
Eric Dumazet (1):
tcp: avoid wakeups for pure ACK
Felix Fietkau (6):
mac80211: fix idle handling in monitor mode
mac80211: fix monitor mode channel reporting
ath9k: fix RSSI dummy marker value
ath9k_htc: fix signal strength handling issues
ath9k_hw: improve reset reliability after errors
rt2x00: error in configurations with mesh support disabled
Frank Li (2):
net: fec: put tx to napi poll function to fix dead lock
net: fec: fix build error in no MXC platform
Freddy Xin (1):
ax88179_178a: ASIX AX88179_178A USB 3.0/2.0 to gigabit ethernet adapter driver
Glen Turner (1):
usb/net/asix_devices: Add USBNET HG20F9 ethernet dongle
Guenter Roeck (1):
net/sctp: Validate parameter size for SCTP_GET_ASSOC_STATS
Guillaume Nault (1):
l2tp: Restore socket refcount when sendmsg succeeds
Hauke Mehrtens (2):
bcma: init spin lock
bgmac: omit the fcs
Jiri Pirko (1):
bond: check if slave count is 0 in case when deciding to take slave's mac
Johannes Berg (6):
mac80211: fix tim_lock locking
nl80211: remove radar information
nl80211: remove TCP WoWLAN information
iwlwifi: always copy first 16 bytes of commands
iwlwifi: mvm: fix AP/GO mode station removal
iwlwifi: fix wakeup status query and packet reporting
John W. Linville (2):
Merge branch 'for-john' of git://git.kernel.org/.../iwlwifi/iwlwifi-fixes
Merge branch 'master' of git://git.kernel.org/.../linville/wireless into for-davem
Josh Hunt (1):
netfilter: ipset: timeout values corrupted on set resize
Jozsef Kadlecsik (3):
netfilter: ipset: Fix range bug in hash:ip,port,net
Merge branch 'master' of git://1984.lsi.us.es/nf
netfilter: ipset: "Directory not empty" error message
Kees Cook (1):
proc connector: reject unprivileged listener bumps
Lee A. Roberts (4):
sctp: fix association hangs due to off-by-one errors in sctp_tsnmap_grow()
sctp: fix association hangs due to reneging packets below the cumulative TSN ACK point
sctp: fix association hangs due to errors when reneging events from the ordering queue
sctp: fix association hangs due to partial delivery errors
Lorenzo Colitti (1):
net: ipv6: Don't purge default router if accept_ra=2
Marina Makienko (1):
isdn: hisax: add missing usb_free_urb
Neal Cardwell (1):
tcp: fix double-counted receiver RTT when leaving receiver fast path
Neil Horman (1):
ipv[4|6]: correct dropwatch false positive in local_deliver_finish
Petr Malat (1):
phy: Fix phy_device_free memory leak
Seth Forshee (1):
mac80211: Ensure off-channel frames don't get queued
Silviu-Mihai Popescu (2):
caif_dev: fix sparse warnings for caif_flow_cb
CAIF: fix sparse warning for caif_usb
Vlastimil Kosar (1):
net/phy: micrel: Disable asymmetric pause for KSZ9021
Yaniv Rosner (3):
bnx2x: Fix port identification for the 84834
bnx2x: Fix KR2 link
bnx2x: Fix KR2 work-around condition
françois romieu (1):
r8169: honor jumbo settings when chipset is requested to start.
MAINTAINERS | 18 -
drivers/bcma/driver_pci_host.c | 2 +
drivers/connector/cn_proc.c | 8 +
drivers/isdn/hisax/st5481_usb.c | 12 +-
drivers/net/bonding/bond_main.c | 2 +-
drivers/net/ethernet/broadcom/bgmac.c | 4 +
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 2 +-
drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 6 +
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 64 ++-
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h | 3 +-
drivers/net/ethernet/freescale/fec.c | 85 ++-
drivers/net/ethernet/freescale/fec.h | 18 +-
drivers/net/ethernet/realtek/r8169.c | 27 +-
drivers/net/ethernet/sfc/efx.c | 16 +-
drivers/net/ethernet/sfc/net_driver.h | 4 +-
drivers/net/ethernet/sfc/rx.c | 25 +-
drivers/net/ethernet/ti/cpsw.c | 2 +-
drivers/net/phy/micrel.c | 3 +-
drivers/net/phy/phy_device.c | 10 +-
drivers/net/usb/Kconfig | 18 +
drivers/net/usb/Makefile | 1 +
drivers/net/usb/asix_devices.c | 31 ++
drivers/net/usb/ax88179_178a.c | 1448 ++++++++++++++++++++++++++++++++++++++++++++++++++++
drivers/net/usb/cdc_ncm.c | 8 +
drivers/net/wireless/ath/ath9k/common.h | 2 +-
drivers/net/wireless/ath/ath9k/htc.h | 1 +
drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 18 +-
drivers/net/wireless/ath/ath9k/hw.c | 4 +-
drivers/net/wireless/iwlwifi/iwl-devtrace.h | 10 +-
drivers/net/wireless/iwlwifi/iwl-phy-db.c | 16 -
drivers/net/wireless/iwlwifi/mvm/d3.c | 104 +++-
drivers/net/wireless/iwlwifi/mvm/mac80211.c | 19 +-
drivers/net/wireless/iwlwifi/mvm/mvm.h | 4 +
drivers/net/wireless/iwlwifi/pcie/internal.h | 9 +
drivers/net/wireless/iwlwifi/pcie/tx.c | 75 ++-
drivers/net/wireless/libertas/if_sdio.c | 6 +-
drivers/net/wireless/mwifiex/pcie.c | 2 +-
drivers/net/wireless/rt2x00/rt2x00dev.c | 8 +-
include/linux/netfilter/ipset/ip_set_ahash.h | 4 +-
include/net/tcp.h | 4 +
net/caif/caif_dev.c | 2 +-
net/caif/caif_usb.c | 4 +-
net/ipv4/ip_input.c | 6 +-
net/ipv4/tcp_input.c | 6 +-
net/ipv6/ip6_input.c | 6 +-
net/ipv6/route.c | 3 +-
net/irda/iriap.c | 7 +-
net/l2tp/l2tp_ppp.c | 1 +
net/mac80211/cfg.c | 12 +-
net/mac80211/iface.c | 2 +-
net/mac80211/tx.c | 77 ++-
net/netfilter/ipset/ip_set_core.c | 3 +-
net/rds/message.c | 8 +-
net/sctp/endpointola.c | 2 +-
net/sctp/socket.c | 6 +-
net/sctp/ssnmap.c | 8 +-
net/sctp/tsnmap.c | 13 +-
net/sctp/ulpqueue.c | 87 +++-
net/wireless/nl80211.c | 61 +--
59 files changed, 2083 insertions(+), 334 deletions(-)
create mode 100644 drivers/net/usb/ax88179_178a.c
^ permalink raw reply
* [PATCH] net: netfilter: nfnetlink: Fixed warning for nfnl_get_lock
From: Alexandru Gheorghiu @ 2013-03-04 19:43 UTC (permalink / raw)
To: Pablo Neira Ayuso, Patrick McHardy, David S. Miller
Cc: netdev, linux-kernel, Alexandru Gheorghiu
Removed unused function nfnl_get_lock which fixed the following warning:
net/netfilter/nfnetlink.c:65:22: warning: ‘nfnl_get_lock’ defined but not used [-Wunused-function]
Signed-off-by: Alexandru Gheorghiu <gheorghiuandru@gmail.com>
---
net/netfilter/nfnetlink.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/net/netfilter/nfnetlink.c b/net/netfilter/nfnetlink.c
index d578ec2..44aa0a7 100644
--- a/net/netfilter/nfnetlink.c
+++ b/net/netfilter/nfnetlink.c
@@ -62,11 +62,6 @@ void nfnl_unlock(__u8 subsys_id)
}
EXPORT_SYMBOL_GPL(nfnl_unlock);
-static struct mutex *nfnl_get_lock(__u8 subsys_id)
-{
- return &table[subsys_id].mutex;
-}
-
int nfnetlink_subsys_register(const struct nfnetlink_subsystem *n)
{
nfnl_lock(n->subsys_id);
--
1.7.9.5
^ permalink raw reply related
* Re: [PATCH net] tcp: fix double-counted receiver RTT when leaving receiver fast path
From: David Miller @ 2013-03-04 19:16 UTC (permalink / raw)
To: eric.dumazet; +Cc: ncardwell, edumazet, ycheng, nanditad, netdev
In-Reply-To: <1362416133.15793.105.camel@edumazet-glaptop>
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Mon, 04 Mar 2013 08:55:33 -0800
> On Mon, 2013-03-04 at 11:23 -0500, Neal Cardwell wrote:
>> We should not update ts_recent and call tcp_rcv_rtt_measure_ts() both
>> before and after going to step5. That wastes CPU and double-counts the
>> receiver-side RTT sample.
>>
>> Signed-off-by: Neal Cardwell <ncardwell@google.com>
...
> Acked-by: Eric Dumazet <edumazet@google.com>
Applied and queued up for -stable.
^ permalink raw reply
* Re: [PATCH 1/1] net: fec: fix build error in no MXC platform
From: David Miller @ 2013-03-04 19:15 UTC (permalink / raw)
To: Frank.Li; +Cc: lznuaa, shawn.guo, B38611, linux-arm-kernel, netdev, gerg,
s.hauer
In-Reply-To: <1362379958-12972-1-git-send-email-Frank.Li@freescale.com>
From: Frank Li <Frank.Li@freescale.com>
Date: Mon, 4 Mar 2013 14:52:38 +0800
> build error cause by
> Commit ff43da86c69d76a726ffe7d1666148960dc1d108
> ("NET: FEC: dynamtic check DMA desc buff type")
>
> drivers/net/ethernet/freescale/fec.c: In function ‘fec_enet_get_nextdesc’:
> drivers/net/ethernet/freescale/fec.c:215:18: error: invalid use of undefined type ‘struct bufdesc_ex’
> drivers/net/ethernet/freescale/fec.c: In function ‘fec_enet_get_prevdesc’:
> drivers/net/ethernet/freescale/fec.c:224:18: error: invalid use of undefined type ‘struct bufdesc_ex’
> drivers/net/ethernet/freescale/fec.c: In function ‘fec_enet_start_xmit’:
> drivers/net/ethernet/freescale/fec.c:286:37: error: arithmetic on pointer to an incomplete type
> drivers/net/ethernet/freescale/fec.c:287:13: error: arithmetic on pointer to an incomplete type
> drivers/net/ethernet/freescale/fec.c:324:7: error: dereferencing pointer to incomplete type etc....
>
> Signed-off-by: Frank Li <Frank.Li@freescale.com>
Applied.
^ permalink raw reply
* Re: [PATCH v3] CAIF: fix sparse warning for caif_usb
From: David Miller @ 2013-03-04 19:15 UTC (permalink / raw)
To: silviupopescu1990; +Cc: netdev, sjur.brandeland, linux-kernel
In-Reply-To: <1362380971-23007-1-git-send-email-silviupopescu1990@gmail.com>
From: Silviu-Mihai Popescu <silviupopescu1990@gmail.com>
Date: Mon, 4 Mar 2013 09:09:31 +0200
> This fixes the following sparse warning:
> net/caif/caif_usb.c:84:16: warning: symbol 'cfusbl_create' was not
> declared. Should it be static?
>
> Signed-off-by: Silviu-Mihai Popescu <silviupopescu1990@gmail.com>
Applied.
^ permalink raw reply
* Re: [Patch net] rds: simplify a warning message
From: David Miller @ 2013-03-04 19:15 UTC (permalink / raw)
To: amwang; +Cc: netdev, venkat.x.venkatsubra
In-Reply-To: <1362380238-10435-1-git-send-email-amwang@redhat.com>
From: Cong Wang <amwang@redhat.com>
Date: Mon, 4 Mar 2013 14:57:18 +0800
> From: Cong Wang <amwang@redhat.com>
>
>
> Cc: David S. Miller <davem@davemloft.net>
> Cc: Venkat Venkatsubra <venkat.x.venkatsubra@oracle.com>
> Signed-off-by: Cong Wang <amwang@redhat.com>
Applied.
^ permalink raw reply
* Re: [PATCH] net: ipv6: Don't purge default router if accept_ra=2
From: David Miller @ 2013-03-04 19:15 UTC (permalink / raw)
To: lorenzo; +Cc: netdev, edumazet
In-Reply-To: <CAKD1Yr2e8Z8CDAM3tgp=nUR58OO9QZYEx8zkWwwcQ1S=14D2Qw@mail.gmail.com>
From: Lorenzo Colitti <lorenzo@google.com>
Date: Mon, 4 Mar 2013 15:46:46 +0900
> Setting net.ipv6.conf.<interface>.accept_ra=2 causes the kernel
> to accept RAs even when forwarding is enabled. However, enabling
> forwarding purges all default routes on the system, breaking
> connectivity until the next RA is received. Fix this by not
> purging default routes on interfaces that have accept_ra=2.
>
> Signed-off-by: Lorenzo Colitti <lorenzo@google.com>
Applied and queued up for -stable.
^ permalink raw reply
* Re: [PATCH v3 1/1 net-next] net: fec: put tx to napi poll function to fix dead lock
From: David Miller @ 2013-03-04 19:15 UTC (permalink / raw)
To: Frank.Li; +Cc: lznuaa, shawn.guo, B38611, linux-arm-kernel, netdev, s.hauer
In-Reply-To: <1362368065-5809-1-git-send-email-Frank.Li@freescale.com>
From: Frank Li <Frank.Li@freescale.com>
Date: Mon, 4 Mar 2013 11:34:25 +0800
> up stack ndo_start_xmit already hold lock.
> fec_enet_start_xmit needn't spin lock.
> stat_xmit just update fep->cur_tx
> fec_enet_tx just update fep->dirty_tx
>
> Reserve a empty bdb to check full or empty
> cur_tx == dirty_tx means full
> cur_tx == dirty_tx +1 means empty
>
> So needn't is_full variable.
...
> Signed-off-by: Frank Li <Frank.Li@freescale.com>
Applied.
^ permalink raw reply
* Re: [Patch net] sctp: use KMALLOC_MAX_SIZE instead of its own MAX_KMALLOC_SIZE
From: David Miller @ 2013-03-04 19:14 UTC (permalink / raw)
To: amwang; +Cc: netdev, linux-sctp, vyasevich, sri, nhorman
In-Reply-To: <1362364107-26908-1-git-send-email-amwang@redhat.com>
From: Cong Wang <amwang@redhat.com>
Date: Mon, 4 Mar 2013 10:28:27 +0800
> From: Cong Wang <amwang@redhat.com>
>
> Don't definite its own MAX_KMALLOC_SIZE, use the one
> defined in mm.
>
> Cc: Vlad Yasevich <vyasevich@gmail.com>
> Cc: Sridhar Samudrala <sri@us.ibm.com>
> Cc: Neil Horman <nhorman@tuxdriver.com>
> Cc: David S. Miller <davem@davemloft.net>
> Signed-off-by: Cong Wang <amwang@redhat.com>
Applied.
^ permalink raw reply
* Re: [Patch net] rds: limit the size allocated by rds_message_alloc()
From: David Miller @ 2013-03-04 19:14 UTC (permalink / raw)
To: amwang; +Cc: netdev, rds-devel, davej, venkat.x.venkatsubra
In-Reply-To: <1362363491-24501-1-git-send-email-amwang@redhat.com>
From: Cong Wang <amwang@redhat.com>
Date: Mon, 4 Mar 2013 10:18:11 +0800
> From: Cong Wang <amwang@redhat.com>
>
> Dave Jones reported the following bug:
>
> "When fed mangled socket data, rds will trust what userspace gives it,
> and tries to allocate enormous amounts of memory larger than what
> kmalloc can satisfy."
...
> Reported-by: Dave Jones <davej@redhat.com>
> Cc: Dave Jones <davej@redhat.com>
> Cc: David S. Miller <davem@davemloft.net>
> Cc: Venkat Venkatsubra <venkat.x.venkatsubra@oracle.com>
> Signed-off-by: Cong Wang <amwang@redhat.com>
Applied and queued up for -stable, thanks.
^ permalink raw reply
* Re: [PATCH 3.8-stable] usbnet: smsc95xx: fix suspend failure
From: David Miller @ 2013-03-04 18:56 UTC (permalink / raw)
To: ming.lei-Z7WLFzj8eWMS+FvcfC7Uqw
Cc: gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r, oneukum-l3A5Bk7waGM,
netdev-u79uwXL29TY76Z2rM5mHXA, linux-usb-u79uwXL29TY76Z2rM5mHXA,
stable-u79uwXL29TY76Z2rM5mHXA,
steve.glendinning-nksJyM/082jR7s880joybQ
In-Reply-To: <1362391633-27551-1-git-send-email-ming.lei-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org>
From: Ming Lei <ming.lei-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org>
Date: Mon, 4 Mar 2013 18:07:13 +0800
> The three below functions:
>
> smsc95xx_enter_suspend0()
> smsc95xx_enter_suspend1()
> smsc95xx_enter_suspend2()
>
> return > 0 in case of success, so they will cause smsc95xx_suspend()
> to return > 0 and suspend failure.
>
> This patch is backported from the upstream commit:
>
> From 7643721471117d5f62ca36f328d3dc8d84af4402 Mon Sep 17 00:00:00 2001
> Subject: [PATCH] usbnet: smsc95xx: fix suspend failure
>
> Cc: <stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
> Cc: Steve Glendinning <steve.glendinning-nksJyM/082jR7s880joybQ@public.gmane.org>
> Signed-off-by: Ming Lei <ming.lei-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org>
This is fine, Greg please apply to 3.8-stable, thanks.
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ 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