* Re: [*v3 PATCH 01/22] IPVS: netns, add basic init per netns.
From: Hans Schillstrom @ 2010-12-31 15:36 UTC (permalink / raw)
To: Jan Engelhardt
Cc: horms, ja, daniel.lezcano, wensong, lvs-devel, netdev,
netfilter-devel, Hans Schillstrom
In-Reply-To: <alpine.LNX.2.01.1012310055050.15397@obet.zrqbmnf.qr>
On Friday, December 31, 2010 00:58:35 Jan Engelhardt wrote:
>
> On Thursday 2010-12-30 11:50, hans@schillstrom.com wrote:
> >+++ b/include/net/ip_vs.h
> >@@ -28,6 +28,15 @@
> > #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
> > #include <net/netfilter/nf_conntrack.h>
> > #endif
> >+#include <net/net_namespace.h> /* Netw namespace */
> >+
> >+/*
> >+ * Generic access of ipvs struct
> >+ */
> >+static inline struct netns_ipvs * net_ipvs(struct net* net)
>
> Balancing the '*' between the ' ' would be nice... I know it's hard at this
> time of the year ;-)
>
I'll send a new patch set and run checkpatch,
but that will be after new years eve :-)
> >diff --git a/include/net/netns/ip_vs.h b/include/net/netns/ip_vs.h
> >new file mode 100644
> >index 0000000..9068d95
> >--- /dev/null
> >+++ b/include/net/netns/ip_vs.h
> >@@ -0,0 +1,26 @@
> >+/*
> >+ * ip_vs.h
> >+ *
> >+ * Created on: Nov 23, 2010
> >+ * Author: hans
> >+ */
>
> Filenames, creation dates, author names (when they don't serve a copyright
> notice), CVS $Id$ tags, etc. don't belong into files. The git log exists for
> that very purpose.
>
Oops that's an eclipse feature, that should be removed.
> >+struct netns_ipvs {
> >+ int inc; /* Incarnation */
> >+};
>
> Just my thoughts: Incarnation - haven't heard that in a while. ("inc"
> is also used as an abbreviation for increment, so ~ ~). Other places
> use "generation" as a term (such as the VFS on inode generation). [I
> also get the feeling that (re)"incarnation" may require a death, so
> it is different from "generation" after all -]
:-))
>
> >+++ b/net/netfilter/ipvs/ip_vs_core.c
> >@@ -1813,6 +1820,44 @@ static struct nf_hook_ops ip_vs_ops[] __read_mostly = {
> > #endif
> > };
> >
> >+/*
> >+ * Initialize IP Virtual Server netns mem.
> >+ */
> >+static int __net_init __ip_vs_init(struct net *net)
> >+{
> >+ struct netns_ipvs *ipvs;
> >+
> >+ if (!net_eq(net, &init_net)) {
> >+ pr_err("The final patch for enabling netns is missing\n");
> >+ return -EPERM;
> >+ }
> >+ ipvs = (struct netns_ipvs *)net_generic(net, ip_vs_net_id);
>
> Pointless cast is pointless.
Well, that is a reminder from a backport...
>
> >index c1c167a..ea390f8 100644
> >--- a/net/netfilter/ipvs/ip_vs_sync.c
> >+++ b/net/netfilter/ipvs/ip_vs_sync.c
> >@@ -1639,3 +1639,31 @@ int stop_sync_thread(int state)
> >
> > return 0;
> > }
> >+
> >+/*
> >+ * Initialize data struct for each netns
> >+ */
> >+static int __net_init __ip_vs_sync_init(struct net *net)
> >+{
> >+ return 0;
> >+}
> >+
> >+static void __ip_vs_sync_cleanup(struct net *net)
> >+{
> >+ return;
> >+}
>
> The trailing return; in functions returning nothing can be (and
> generally, is) omitted.
>
Oops
Thanks alot
/Hans
^ permalink raw reply
* Re: [PATCH v2 00/12] make rpc_pipefs be mountable multiple time
From: Trond Myklebust @ 2010-12-31 16:54 UTC (permalink / raw)
To: Rob Landley
Cc: Kirill A. Shutemov, Rob Landley, J. Bruce Fields, Neil Brown,
Pavel Emelyanov, linux-nfs-u79uwXL29TY76Z2rM5mHXA,
David S. Miller, netdev-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA
In-Reply-To: <4D1C5953.6020200-bzQdu9zFT3WakBO8gow8eQ@public.gmane.org>
On Thu, 2010-12-30 at 04:05 -0600, Rob Landley wrote:
> On 12/30/2010 03:44 AM, Kirill A. Shutemov wrote:
> >>> If no rpcmount mountoption, no rpc_pipefs was found at
> >>> '/var/lib/nfs/rpc_pipefs' and we are in init's mount namespace, we use
> >>> init_rpc_pipefs.
> >>
> >> It's the "we are in init's mount namespace" that I was wondering about.
> >>
> >> So if I naievely chroot, nfs mount stops working the way it did before I
> >> chrooted unless I do an extra setup step?
> >
> > No. It will work as before since you are still in init's mount namespace.
> > Creating new mount namespace changes rules.
>
> Ah, CLONE_NEWNS and then you need /var/lib/nfs/rpc_pipefs. Got it.
>
> I'm kind of surprised that the kernel cares about a specific path under
> /var/lib. (Seems like policy in the kernel somehow.) Can't it just
> check the current process's mount list to see if an instance of
> rpc_pipefs is mounted in the current namespace the way lxc looks for
> cgroups? Or are there potential performance/scalability issues with that?
The kernel doesn't give a damn about the /var/lib/nfs/rpc_pipefs bit.
That's all for the benefit of the userland utilities.
Trond
--
Trond Myklebust
Linux NFS client maintainer
NetApp
Trond.Myklebust-HgOvQuBEEgTQT0dZR+AlfA@public.gmane.org
www.netapp.com
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" 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
* [PATCH 2/7] net/sungem.h Typo change desciptor to descriptor.
From: Justin P. Mattock @ 2010-12-31 17:38 UTC (permalink / raw)
To: trivial; +Cc: netdev, linux-kernel, Justin P. Mattock
Below is a patch, that changes a typo from "desciptor" to "descriptor".
Let me know if I missed anything.
Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>
---
drivers/net/sungem.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/sungem.h b/drivers/net/sungem.h
index 1990546..bfb6683 100644
--- a/drivers/net/sungem.h
+++ b/drivers/net/sungem.h
@@ -843,7 +843,7 @@ struct gem_txd {
/* GEM requires that RX descriptors are provided four at a time,
* aligned. Also, the RX ring may not wrap around. This means that
- * there will be at least 4 unused desciptor entries in the middle
+ * there will be at least 4 unused descriptor entries in the middle
* of the RX ring at all times.
*
* Similar to HME, GEM assumes that it can write garbage bytes before
--
1.6.5.2.180.gc5b3e
^ permalink raw reply related
* [PATCH 3/7] net/atl1c/atl1c.h Typo change desciptor to descriptor.
From: Justin P. Mattock @ 2010-12-31 17:39 UTC (permalink / raw)
To: trivial; +Cc: netdev, linux-kernel, Justin P. Mattock
Below is a patch, that changes a typo from "desciptor" to "descriptor".
Let me know if I missed anything.
Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>
---
drivers/net/atl1c/atl1c.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/atl1c/atl1c.h b/drivers/net/atl1c/atl1c.h
index 9ab5809..7cb375e 100644
--- a/drivers/net/atl1c/atl1c.h
+++ b/drivers/net/atl1c/atl1c.h
@@ -265,7 +265,7 @@ struct atl1c_recv_ret_status {
__le32 word3;
};
-/* RFD desciptor */
+/* RFD descriptor */
struct atl1c_rx_free_desc {
__le64 buffer_addr;
};
@@ -531,7 +531,7 @@ struct atl1c_rfd_ring {
struct atl1c_buffer *buffer_info;
};
-/* receive return desciptor (rrd) ring */
+/* receive return descriptor (rrd) ring */
struct atl1c_rrd_ring {
void *desc; /* descriptor ring virtual address */
dma_addr_t dma; /* descriptor ring physical address */
--
1.6.5.2.180.gc5b3e
^ permalink raw reply related
* Re: [PATCH 02/15]drivers:spi:dw_spi.c Typo change diable to disable.
From: Dan Carpenter @ 2010-12-31 17:41 UTC (permalink / raw)
To: Justin P. Mattock
Cc: Grant Likely, trivial, devel, linux-scsi, netdev, linux-usb,
linux-wireless, linux-kernel, ivtv-devel, linux-m68k,
spi-devel-general, linux-media
In-Reply-To: <4D1DE616.7010105@gmail.com>
On Fri, Dec 31, 2010 at 06:17:58AM -0800, Justin P. Mattock wrote:
> >Wrong: [PATCH 02/15]drivers:spi:dw_spi.c Typo change diable to disable.
> >
> >Right: [PATCH 02/15] spi/dw_spi: Typo change diable to disable
> >
> >regards,
> >dan carpenter
> >
>
> alright.. so having the backlash is alright for the subject
Well really my point is not so much about backslashes vs colons, it's
about getting the *one* correct prefix. This stuff is probably
scriptable most of the time, but you may still be required to think a
little on the corner cases.
Here is a script to get you started.
git log --format="%s" drivers/spi/dw_spi.c | \
head -n 20 | \
perl -ne 's/(.*):.*/$1/; print' | \
sort | uniq -c | sort -rn | \
perl -ne 's/^\W+\d+ //; print' | \
head -n 1
regards,
dan carpenter
^ permalink raw reply
* Re: [PATCH] UDPCP Communication Protocol
From: Stephen Hemminger @ 2010-12-31 17:46 UTC (permalink / raw)
To: stefani; +Cc: linux-kernel, akpm, davem, netdev
In-Reply-To: <1293787785-3834-1-git-send-email-stefani@seibold.net>
On Fri, 31 Dec 2010 10:29:45 +0100
stefani@seibold.net wrote:
> +struct __attribute__ ((packed)) udpcphdr {
> + struct udphdr udphdr;
> + __be32 chksum;
> + __be16 msginfo;
> + u8 fragamount;
> + u8 fragnum;
> + __be16 msgid;
> + __be16 length;
> +};
Adding (unnecessary) packed attribute will make access slow on
some architectures. For arch that can't do unaligned access, the
compiler ends up doing byte access for each element.
^ permalink raw reply
* Re: [PATCH] UDPCP Communication Protocol
From: Stephen Hemminger @ 2010-12-31 17:46 UTC (permalink / raw)
To: stefani; +Cc: linux-kernel, akpm, davem, netdev
In-Reply-To: <1293787785-3834-1-git-send-email-stefani@seibold.net>
On Fri, 31 Dec 2010 10:29:45 +0100
stefani@seibold.net wrote:
> +/*
> + * UDPCP destination descriptor
> + *
> + * For each communication address an individual destination descriptor will
> + * be create.
> + *
> + * The fields has the following meanings:
> + *
> + * list: link list: part of udpcp_sock.destlist
> + * xmit: messages fragments to be transmit
> + * tx_time: timestamp of the last transmitted message fragment
> + * rx_time: timestamp ot the last received message fragment
> + * txTimeout: statistic use only: number of transmit timeout
> + * rxTimeout: statistic use only: number of receive timeout
> + * txRetries: statistic use only: number of transmit retries
> + * rxDiscardedFrags: statistic use only: number of discarded messages
> + * xmit_wait: message fragment which is waiting for an ACK
> + * xmit_last: last fragment transmitted
> + * recv_msg: first fragment of the received message
> + * recv_last: last fragment of the received message
> + * lastmsg: last messages fragment header received
> + * ipc: linux internal ipc cookie
> + * fl: flow/routing information
> + * rt: routing entry currently used for this destination
> + * addr: ipv4 destination address
> + * port: destination port number
> + * msgid: current message id for outgoing data messages
> + * use_flag: statistic use only: flag for dest using TX and/or RX
> + * insync: flag for protocol synchronization
> + * ackmode; ack mode for the current assembled message
> + * chkmode; checksum mode for the current assembled message
> + * try: current number of retries xmit_wait message
> + * acks: number of outstandig ack's
> + */
Why not use docbook format comments for this?
^ permalink raw reply
* Re: [PATCH 02/15]drivers:spi:dw_spi.c Typo change diable to disable.
From: Justin P. Mattock @ 2010-12-31 17:59 UTC (permalink / raw)
To: Dan Carpenter, Grant Likely, trivial-DgEjT+Ai2ygdnm+yROfE0A,
devel-gWbeCf7V1WCQmaza687I9mD2FQJk+8+b,
linux-scsi-u79uwXL29TY76Z2rM5mHXA, netdev-u79uwXL29TY76Z2rM5mHXA,
li
In-Reply-To: <20101231174100.GF1886@bicker>
On 12/31/2010 09:41 AM, Dan Carpenter wrote:
> On Fri, Dec 31, 2010 at 06:17:58AM -0800, Justin P. Mattock wrote:
>>> Wrong: [PATCH 02/15]drivers:spi:dw_spi.c Typo change diable to disable.
>>>
>>> Right: [PATCH 02/15] spi/dw_spi: Typo change diable to disable
>>>
>>> regards,
>>> dan carpenter
>>>
>>
>> alright.. so having the backlash is alright for the subject
>
> Well really my point is not so much about backslashes vs colons, it's
> about getting the *one* correct prefix. This stuff is probably
> scriptable most of the time, but you may still be required to think a
> little on the corner cases.
>
> Here is a script to get you started.
>
> git log --format="%s" drivers/spi/dw_spi.c | \
> head -n 20 | \
> perl -ne 's/(.*):.*/$1/; print' | \
> sort | uniq -c | sort -rn | \
> perl -ne 's/^\W+\d+ //; print' | \
> head -n 1
>
> regards,
> dan carpenter
>
thats a nice little script there(just ran it) any way you want to add
this into to getmaintainers.pl or something? (this way people get the
maintainers address plus a subject line in the mix)
Justin P. Mattock
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
^ permalink raw reply
* Re: Sky2 - problems with VLANs - kernel 2.6.36
From: Stephen Hemminger @ 2010-12-31 18:13 UTC (permalink / raw)
To: David; +Cc: netdev, Linux Kernel Mailing List
In-Reply-To: <4CD48DE6.7060906@unsolicited.net>
On Fri, 05 Nov 2010 23:06:14 +0000
David <david@unsolicited.net> wrote:
> I've just installed a Lycom dual port gigabit ethernet card, picked up
> as follows :-
>
> 03:00.0 Ethernet controller: Marvell Technology Group Ltd. 88E8062 PCI-E
> IPMI Gigabit Ethernet Controller (rev 14)
> Subsystem: Marvell Technology Group Ltd. Device 6222
> Control: I/O+ Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr-
> Stepping- SERR+ FastB2B- DisINTx+
> Status: Cap+ 66MHz- UDF- FastB2B- ParErr- DEVSEL=fast >TAbort-
> <TAbort- <MAbort- >SERR- <PERR- INTx-
> Latency: 0, Cache Line Size: 64 bytes
> Interrupt: pin A routed to IRQ 41
> Region 0: Memory at fe8fc000 (64-bit, non-prefetchable) [size=16K]
> Region 2: I/O ports at c800 [size=256]
> Expansion ROM at fe8c0000 [disabled] [size=128K]
> Capabilities: <access denied>
> Kernel driver in use: sky2
> Kernel modules: sky2
>
> I'm having a problem with VLANs. Outgoing packets are tagged correctly
> and devices on the VLAN are responding. Unfortunately all of the
> response packets stay on the raw device and are not allocated to the VLAN.
>
> I've done some investigation (printks etc.), and have found that neither
> of the following cases in sky2_status_intr() are being triggered...
>
> case OP_RXVLAN:
> printk("RXVLAN, length=%u, status=%u\n", length,
> status);
> sky2->rx_tag = length;
> break;
>
> case OP_RXCHKSVLAN:
> printk("RXCHKSVLAN, length=%u, status=%u\n",
> length, status);
> sky2->rx_tag = length;
> /* fall through */
>
> ... however the status when calling sky2_skb_rx() does have GMR_FS_VLAN
> set, it's just we haven't been able to find out which VLAN the packet
> comes from (and sky2->rx_tag is zero). Does anyone have any suggestions
> as to how I proceed from here? I'm happy to test patches etc.
Did it work with older kernels?
^ permalink raw reply
* Re: [PATCH] sky2: Do not use legacy PCI power management
From: Stephen Hemminger @ 2010-12-31 18:15 UTC (permalink / raw)
To: Rafael J. Wysocki, David Miller
Cc: netdev, Stephen Hemminger, Linux-pm mailing list
In-Reply-To: <201012261944.32517.rjw@sisk.pl>
On Sun, 26 Dec 2010 19:44:32 +0100
"Rafael J. Wysocki" <rjw@sisk.pl> wrote:
> From: Rafael J. Wysocki <rjw@sisk.pl>
>
> The sky2 driver uses the legacy PCI power management, so it has to do
> some PCI-specific things in its ->suspend() and ->resume() callbacks,
> which isn't necessary and should better be done by the PCI
> sybsystem-level power management code. Moreover, it uses
> device_set_wakeup_enable() incorrectly (that function should be
> used when the WoL setting is changed rather than during suspend).
>
> Convert sky2 to the new PCI power management framework and make it
> let the PCI subsystem take care of all the PCI-specific aspects of
> device handling during system power transitions.
>
> Tested on a desktop machine with a Marvell 88E8056 PCI-E adapter.
>
> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Tested on 88E8055 (laptop), my desktop machines have video issues and
won't suspend/resume.
Acked-by: Stephen Hemminger <shemminger@vyatta.com>
^ permalink raw reply
* Re: [net-next-2.6 PATCH 1/3] dcbnl: add support for ieee8021Qaz attributes
From: David Miller @ 2010-12-31 18:42 UTC (permalink / raw)
To: john.r.fastabend; +Cc: netdev, tgraf
In-Reply-To: <20101220205013.24232.3980.stgit@jf-dev1-dcblab>
From: John Fastabend <john.r.fastabend@intel.com>
Date: Mon, 20 Dec 2010 12:50:13 -0800
> The IEEE8021Qaz is the IEEE standard version of CEE. The
> standard has had enough significant changes from the CEE
> version that many of the CEE attributes have no meaning
> in the new spec or do not easily map to IEEE standards.
>
> Rather then attempt to create a complicated mapping
> between CEE and IEEE standards this patch adds a nested
> IEEE attribute to the list of DCB attributes. The policy
> is,
...
> Signed-off-by: John Fastabend <john.r.fastabend@intel.com>
Applied.
^ permalink raw reply
* Re: [net-next-2.6 PATCH 3/3] net_dcb: add application notifiers
From: David Miller @ 2010-12-31 18:42 UTC (permalink / raw)
To: john.r.fastabend; +Cc: netdev, tgraf
In-Reply-To: <20101220205023.24232.72153.stgit@jf-dev1-dcblab>
From: John Fastabend <john.r.fastabend@intel.com>
Date: Mon, 20 Dec 2010 12:50:24 -0800
> DCBx applications priorities can be changed dynamically. If
> application stacks are expected to keep the skb priority
> consistent with the dcbx priority the stack will need to
> be notified when these changes occur.
>
> This patch adds application notifiers for the stack to register
> with.
>
> Signed-off-by: John Fastabend <john.r.fastabend@intel.com>
Applied.
^ permalink raw reply
* Re: [net-next-2.6 PATCH 2/3] dcbnl: add appliction tlv handlers
From: David Miller @ 2010-12-31 18:42 UTC (permalink / raw)
To: john.r.fastabend; +Cc: netdev, tgraf
In-Reply-To: <20101220205018.24232.994.stgit@jf-dev1-dcblab>
From: John Fastabend <john.r.fastabend@intel.com>
Date: Mon, 20 Dec 2010 12:50:18 -0800
> This patch adds application tlv handlers. Networking stacks
> may use the application priority to set the skb priority of
> their stack using the negoatiated dcbx priority.
>
> This patch provides the dcb_{get|set}app() routines for the
> stack to query these parameters. Notice lower layer drivers
> can use the dcbnl_ops routines if additional handling is
> needed. Perhaps in the firmware case for example
>
> Signed-off-by: John Fastabend <john.r.fastabend@intel.com>
Applied.
^ permalink raw reply
* Re: [net-next-2.6 PATCH v2 0/3] Series short description
From: David Miller @ 2010-12-31 18:49 UTC (permalink / raw)
To: john.r.fastabend; +Cc: netdev, lucy.liu, shmulikr
In-Reply-To: <20101230192449.21487.9764.stgit@jf-dev1-dcblab>
From: John Fastabend <john.r.fastabend@intel.com>
Date: Thu, 30 Dec 2010 11:25:40 -0800
> Version 2 adds the recommended tlv attributes to the ets struct this will
> be needed for offloaded LLDP engines. Host controlled LLDP agents will most
> likely not use these fields.
>
> Also Shmulik Ravid caught an error with a spin_lock on kmalloc failure.
BTW, even though I replied "applied" to v1 of these patches I made
sure to actully apply v2 :-)
^ permalink raw reply
* Re: [net-next-2.6 PATCH v2 0/4] dcbnl: Extending dcbnl to support non-host DCBX
From: David Miller @ 2010-12-31 18:52 UTC (permalink / raw)
To: shmulikr; +Cc: eilong, john.r.fastabend, lucy.liu, netdev
In-Reply-To: <1293726402.29378.91.camel@lb-tlvb-shmulik.il.broadcom.com>
From: "Shmulik Ravid" <shmulikr@broadcom.com>
Date: Thu, 30 Dec 2010 18:26:42 +0200
> DCBX is the exchange protocol for negotiating DCB parameters between a
> host and a switch. In some circumstances the DCBX negotiator can not
> reside in the host directly on top of the networking interface. For
> instance many converged network adapters support an embedded DCBX engine
> that performs the negotiation and configures the device with the
> negotiated parameters. Another example is virtual hosts and SRIOV
> virtual functions.
>
> The following patches extend the dcbnl netlink interface so in addition
> to its current semantics it offers a standard mechanism for managing
> such non-host DCBX engines. In this new mode 'set' operations are used
> to set the initial negotiation configuration and the 'get' operation are
> used to retrieve the negotiated results.
All applied, thanks.
^ permalink raw reply
* Re: [PATCH NEXT 1/3] netxen: update module description
From: David Miller @ 2010-12-31 18:55 UTC (permalink / raw)
To: amit.salecha; +Cc: netdev, ameen.rahman, anirban.chakraborty
In-Reply-To: <1293439423-25193-2-git-send-email-amit.salecha@qlogic.com>
From: Amit Kumar Salecha <amit.salecha@qlogic.com>
Date: Mon, 27 Dec 2010 00:43:41 -0800
> This driver supports only Intelligent Ethernet Adapters.
>
> Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com>
Applied.
^ permalink raw reply
* Re: [PATCH NEXT 2/3] netxen: enable LRO based on NETIF_F_LRO
From: David Miller @ 2010-12-31 18:58 UTC (permalink / raw)
To: amit.salecha
Cc: netdev, ameen.rahman, anirban.chakraborty, sucheta.chakraborty
In-Reply-To: <1293439423-25193-3-git-send-email-amit.salecha@qlogic.com>
From: Amit Kumar Salecha <amit.salecha@qlogic.com>
Date: Mon, 27 Dec 2010 00:43:42 -0800
> + if (!!data) {
This form of the test is not only unnecessary, it's ugly. Please just
test plain "data".
> + dev->features &= ~NETIF_F_LRO;
> + netxen_send_lro_cleanup(adapter);
> + dev_info(&adapter->pdev->dev,
> + "disabling LRO as rx_csum is off\n");
You should use netdev_info() and fix the tabbing here.
> + if (!adapter->rx_csum) {
> + dev_info(&adapter->pdev->dev, "rx csum is off, "
> + "cannot toggle LRO\n");
> + return -EINVAL;
> + }
Please use netdev_info().
^ permalink raw reply
* Re: [PATCH net-next 1/2] bnx2: Free IRQ before freeing status block memory
From: David Miller @ 2010-12-31 19:04 UTC (permalink / raw)
To: mchan; +Cc: netdev
In-Reply-To: <1293157320-13758-1-git-send-email-mchan@broadcom.com>
From: "Michael Chan" <mchan@broadcom.com>
Date: Thu, 23 Dec 2010 18:21:59 -0800
> When changing ring size, we free all memory including status block
> memory. If we're in INTA mode and sharing IRQ, the IRQ handler can
> be called and it will reference the NULL status block pointer.
>
> Because of the lockless design of the IRQ handler, there is no simple
> way to synchronize and prevent this. So we avoid this problem by
> freeing the IRQ handler before freeing the status block memory.
>
> Signed-off-by: Michael Chan <mchan@broadcom.com>
Applied.
^ permalink raw reply
* Re: [PATCH net-next 2/2] bnx2: Update firmware and version
From: David Miller @ 2010-12-31 19:04 UTC (permalink / raw)
To: mchan; +Cc: netdev
In-Reply-To: <1293157320-13758-2-git-send-email-mchan@broadcom.com>
From: "Michael Chan" <mchan@broadcom.com>
Date: Thu, 23 Dec 2010 18:22:00 -0800
> Update MIPS firmware to 6.2.1, with improved small packet performance
> in RSS mode, and iSCSI CID allocation bug fix on 5708.
>
> Update driver version to 2.0.21.
>
> Signed-off-by: Michael Chan <mchan@broadcom.com>
Applied.
^ permalink raw reply
* Re: [PATCH] net: bridge: check the length of skb after nf_bridge_maybe_copy_header()
From: David Miller @ 2010-12-31 19:10 UTC (permalink / raw)
To: xiaosuo; +Cc: shemminger, bridge, netdev
In-Reply-To: <1293284490-17114-1-git-send-email-xiaosuo@gmail.com>
From: Changli Gao <xiaosuo@gmail.com>
Date: Sat, 25 Dec 2010 21:41:30 +0800
> Since nf_bridge_maybe_copy_header() may change the length of skb,
> we should check the length of skb after it to handle the ppoe skbs.
>
> Signed-off-by: Changli Gao <xiaosuo@gmail.com>
This is really strange.
packet_length() subtracts VLAN_HLEN from the value it returns, so the
correct fix seems to be to make this function handle the PPPOE case
too.
Otherwise I suspect you have many other functions to fix as well.
I'm not applying this patch.
^ permalink raw reply
* Re: [patch] USB: cdc_ether: remove unneeded check
From: David Miller @ 2010-12-31 19:11 UTC (permalink / raw)
To: error27; +Cc: oliver, gregkh, linux-usb, netdev, kernel-janitors
In-Reply-To: <20101225222341.GS1936@bicker>
From: Dan Carpenter <error27@gmail.com>
Date: Sun, 26 Dec 2010 01:23:42 +0300
> We already verified that "dev->udev->actconfig->extralen" was non-zero
> so "len" is non-zero here as well.
>
> Signed-off-by: Dan Carpenter <error27@gmail.com>
Applied, thanks.
^ permalink raw reply
* [PATCH V8 00/13] ptp: IEEE 1588 hardware clock support
From: Richard Cochran @ 2010-12-31 19:11 UTC (permalink / raw)
To: linux-kernel-u79uwXL29TY76Z2rM5mHXA
Cc: linux-api-u79uwXL29TY76Z2rM5mHXA, netdev-u79uwXL29TY76Z2rM5mHXA,
Alan Cox, Arnd Bergmann, Christoph Lameter, David Miller,
John Stultz, Krzysztof Halasa, Peter Zijlstra, Rodolfo Giometti,
Thomas Gleixner
* Introduction
The aim of this patch set is to add support for PTP Hardware Clocks
(PHCs) into the Linux kernel.
* PTP Patch ChangeLog
** v8
- incorporates Arnd Bergmann's and Thomas Gleixner's comments from v7
- use John Stultz's timekeeping_inject_offset in do_adjtimex()
- adds new syscall clock_adjtime to each arch individually
- cleaned up the CLOCK_DISPATCH mess
- redsigned posix_clock_operations:
. remove compat_ioctl
. flatten clock ops and chardev ops into one structure
. drivers use container_of to get private data
- removed unused and useless code from posix-clock.c|h
- moved posix-clock syscall prototypes into private header
- moved extern declaration from c source file into header
- ptp drivers use container_of to get private data
* Previous Discussions
This patch set previously appeared on the netdev list. Since V5 of
the character device patch set, the discussion has moved to the
lkml.
- IEEE 1588 hardware clock support [V5]
http://lkml.org/lkml/2010/8/16/90
- POSIX clock tuning syscall with static clock ids
http://lkml.org/lkml/2010/8/23/49
- POSIX clock tuning syscall with dynamic clock ids
http://lkml.org/lkml/2010/9/3/119
- IEEE 1588 hardware clock support [V6]
http://lkml.org/lkml/2010/9/23/310
- Dynamic clock devices [RFC]
http://lkml.org/lkml/2010/11/4/290
- IEEE 1588 hardware clock support [V7]
http://lkml.org/lkml/2010/12/16/195
John Stultz (1):
time: Introduce timekeeping_inject_offset
Richard Cochran (12):
ntp: add ADJ_SETOFFSET mode bit
posix clocks: introduce a syscall for clock tuning.
posix_clocks: add clock_adjtime for arm
posix_clocks: add clock_adjtime for blackfin
posix_clocks: add clock_adjtime for powerpc
posix_clocks: add clock_adjtime for x86
posix clocks: cleanup the CLOCK_DISPTACH macro
posix clocks: introduce dynamic clocks
ptp: Added a brand new class driver for ptp clocks.
ptp: Added a clock that uses the eTSEC found on the MPC85xx.
ptp: Added a clock driver for the IXP46x.
ptp: Added a clock driver for the National Semiconductor PHYTER.
Documentation/ABI/testing/sysfs-ptp | 97 +++
Documentation/powerpc/dts-bindings/fsl/tsec.txt | 57 ++
Documentation/ptp/ptp.txt | 93 +++
Documentation/ptp/testptp.c | 352 +++++++++
Documentation/ptp/testptp.mk | 33 +
arch/arm/include/asm/unistd.h | 1 +
arch/arm/kernel/calls.S | 1 +
arch/arm/mach-ixp4xx/include/mach/ixp46x_ts.h | 78 ++
arch/blackfin/include/asm/unistd.h | 3 +-
arch/blackfin/mach-common/entry.S | 1 +
arch/powerpc/boot/dts/mpc8313erdb.dts | 14 +
arch/powerpc/boot/dts/mpc8572ds.dts | 14 +
arch/powerpc/boot/dts/p2020ds.dts | 14 +
arch/powerpc/boot/dts/p2020rdb.dts | 14 +
arch/powerpc/include/asm/systbl.h | 1 +
arch/powerpc/include/asm/unistd.h | 3 +-
arch/x86/ia32/ia32entry.S | 1 +
arch/x86/include/asm/unistd_32.h | 3 +-
arch/x86/include/asm/unistd_64.h | 2 +
arch/x86/kernel/syscall_table_32.S | 1 +
drivers/Kconfig | 2 +
drivers/Makefile | 1 +
drivers/char/mmtimer.c | 1 +
drivers/net/Makefile | 1 +
drivers/net/arm/ixp4xx_eth.c | 191 +++++
drivers/net/gianfar_ptp.c | 448 +++++++++++
drivers/net/gianfar_ptp_reg.h | 113 +++
drivers/net/phy/Kconfig | 29 +
drivers/net/phy/Makefile | 1 +
drivers/net/phy/dp83640.c | 896 +++++++++++++++++++++++
drivers/net/phy/dp83640_reg.h | 261 +++++++
drivers/ptp/Kconfig | 53 ++
drivers/ptp/Makefile | 7 +
drivers/ptp/ptp_chardev.c | 146 ++++
drivers/ptp/ptp_clock.c | 318 ++++++++
drivers/ptp/ptp_ixp46x.c | 344 +++++++++
drivers/ptp/ptp_private.h | 86 +++
drivers/ptp/ptp_sysfs.c | 226 ++++++
include/linux/Kbuild | 1 +
include/linux/posix-clock.h | 137 ++++
include/linux/posix-timers.h | 23 +-
include/linux/ptp_clock.h | 79 ++
include/linux/ptp_clock_kernel.h | 141 ++++
include/linux/syscalls.h | 2 +
include/linux/time.h | 3 +
include/linux/timex.h | 3 +-
kernel/compat.c | 136 +++--
kernel/posix-cpu-timers.c | 6 +
kernel/posix-timers.c | 279 ++++++--
kernel/time/Makefile | 3 +-
kernel/time/ntp.c | 11 +
kernel/time/posix-clock-syscalls.h | 39 +
kernel/time/posix-clock.c | 454 ++++++++++++
kernel/time/timekeeping.c | 36 +
54 files changed, 5163 insertions(+), 97 deletions(-)
create mode 100644 Documentation/ABI/testing/sysfs-ptp
create mode 100644 Documentation/ptp/ptp.txt
create mode 100644 Documentation/ptp/testptp.c
create mode 100644 Documentation/ptp/testptp.mk
create mode 100644 arch/arm/mach-ixp4xx/include/mach/ixp46x_ts.h
create mode 100644 drivers/net/gianfar_ptp.c
create mode 100644 drivers/net/gianfar_ptp_reg.h
create mode 100644 drivers/net/phy/dp83640.c
create mode 100644 drivers/net/phy/dp83640_reg.h
create mode 100644 drivers/ptp/Kconfig
create mode 100644 drivers/ptp/Makefile
create mode 100644 drivers/ptp/ptp_chardev.c
create mode 100644 drivers/ptp/ptp_clock.c
create mode 100644 drivers/ptp/ptp_ixp46x.c
create mode 100644 drivers/ptp/ptp_private.h
create mode 100644 drivers/ptp/ptp_sysfs.c
create mode 100644 include/linux/posix-clock.h
create mode 100644 include/linux/ptp_clock.h
create mode 100644 include/linux/ptp_clock_kernel.h
create mode 100644 kernel/time/posix-clock-syscalls.h
create mode 100644 kernel/time/posix-clock.c
^ permalink raw reply
* [PATCH V8 01/13] time: Introduce timekeeping_inject_offset
From: John Stultz @ 2010-12-31 19:12 UTC (permalink / raw)
To: linux-kernel-u79uwXL29TY76Z2rM5mHXA
Cc: linux-api-u79uwXL29TY76Z2rM5mHXA, netdev-u79uwXL29TY76Z2rM5mHXA,
Alan Cox, Arnd Bergmann, Christoph Lameter, David Miller,
John Stultz, Krzysztof Halasa, Peter Zijlstra, Rodolfo Giometti,
Thomas Gleixner
In-Reply-To: <cover.1293820862.git.richard.cochran-3mrvs1K0uXizZXS1Dc/lvw@public.gmane.org>
This adds a kernel-internal timekeeping interface to add or subtract
a fixed amount from CLOCK_REALTIME. This makes it so kernel users or
interfaces trying to do so do not have to read the time, then add an
offset and then call settimeofday(), which adds some extra error in
comparision to just simply adding the offset in the kernel timekeeping
core.
CC: Thomas Gleixner <tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
CC: Richard Cochran <richard.cochran-3mrvs1K0uXizZXS1Dc/lvw@public.gmane.org>
Signed-off-by: John Stultz <john.stultz-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
---
include/linux/time.h | 1 +
kernel/time/timekeeping.c | 36 ++++++++++++++++++++++++++++++++++++
2 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/include/linux/time.h b/include/linux/time.h
index 9f15ac7..b402134 100644
--- a/include/linux/time.h
+++ b/include/linux/time.h
@@ -166,6 +166,7 @@ extern int timekeeping_valid_for_hres(void);
extern u64 timekeeping_max_deferment(void);
extern void update_wall_time(void);
extern void timekeeping_leap_insert(int leapsecond);
+extern int timekeeping_inject_offset(struct timespec *ts);
struct tms;
extern void do_sys_times(struct tms *);
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index 49010d8..77e79b3 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -340,6 +340,42 @@ int do_settimeofday(struct timespec *tv)
EXPORT_SYMBOL(do_settimeofday);
+
+/**
+ * timekeeping_inject_offset - Adds or subtracts from the current time.
+ * @tv: pointer to the timespec variable containing the offset
+ *
+ * Adds or subtracts an offset value from the current time.
+ */
+int timekeeping_inject_offset(struct timespec *ts)
+{
+ unsigned long flags;
+
+ if ((unsigned long)ts->tv_nsec >= NSEC_PER_SEC)
+ return -EINVAL;
+
+ write_seqlock_irqsave(&xtime_lock, flags);
+
+ timekeeping_forward_now();
+
+ xtime = timespec_add(xtime, *ts);
+ wall_to_monotonic = timespec_sub(wall_to_monotonic, *ts);
+
+ timekeeper.ntp_error = 0;
+ ntp_clear();
+
+ update_vsyscall(&xtime, &wall_to_monotonic, timekeeper.clock,
+ timekeeper.mult);
+
+ write_sequnlock_irqrestore(&xtime_lock, flags);
+
+ /* signal hrtimers about time change */
+ clock_was_set();
+
+ return 0;
+}
+EXPORT_SYMBOL(timekeeping_inject_offset);
+
/**
* change_clocksource - Swaps clocksources if a new one is available
*
--
1.7.0.4
^ permalink raw reply related
* Re: [PATCH v2] CAN: Use inode instead of kernel address for /proc file
From: David Miller @ 2010-12-31 19:13 UTC (permalink / raw)
To: socketcan; +Cc: drosenberg, urs.thuermann, netdev, security
In-Reply-To: <4D189707.5000708@hartkopp.net>
From: Oliver Hartkopp <socketcan@hartkopp.net>
Date: Mon, 27 Dec 2010 14:39:19 +0100
> On 26.12.2010 17:54, Dan Rosenberg wrote:
>> Since the socket address is just being used as a unique identifier, its
>> inode number is an alternative that does not leak potentially sensitive
>> information.
>>
>> CC-ing stable because MITRE has assigned CVE-2010-4565 to the issue.
>>
>> Signed-off-by: Dan Rosenberg <drosenberg@vsecurity.com>
>> Cc: stable <stable@kernel.org>
>
> Acked-by: Oliver Hartkopp <socketcan@hartkopp.net>
Applied, thanks.
^ permalink raw reply
* [PATCH V8 02/13] ntp: add ADJ_SETOFFSET mode bit
From: Richard Cochran @ 2010-12-31 19:12 UTC (permalink / raw)
To: linux-kernel-u79uwXL29TY76Z2rM5mHXA
Cc: linux-api-u79uwXL29TY76Z2rM5mHXA, netdev-u79uwXL29TY76Z2rM5mHXA,
Alan Cox, Arnd Bergmann, Christoph Lameter, David Miller,
John Stultz, Krzysztof Halasa, Peter Zijlstra, Rodolfo Giometti,
Thomas Gleixner
In-Reply-To: <cover.1293820862.git.richard.cochran-3mrvs1K0uXizZXS1Dc/lvw@public.gmane.org>
This patch adds a new mode bit into the timex structure. When set, the bit
instructs the kernel to add the given time value to the current time.
Signed-off-by: Richard Cochran <richard.cochran-3mrvs1K0uXizZXS1Dc/lvw@public.gmane.org>
---
include/linux/timex.h | 3 ++-
kernel/time/ntp.c | 11 +++++++++++
2 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/include/linux/timex.h b/include/linux/timex.h
index 32d852f..82d4b24 100644
--- a/include/linux/timex.h
+++ b/include/linux/timex.h
@@ -73,7 +73,7 @@ struct timex {
long tolerance; /* clock frequency tolerance (ppm)
* (read only)
*/
- struct timeval time; /* (read only) */
+ struct timeval time; /* (read only, except for ADJ_SETOFFSET) */
long tick; /* (modified) usecs between clock ticks */
long ppsfreq; /* pps frequency (scaled ppm) (ro) */
@@ -101,6 +101,7 @@ struct timex {
#define ADJ_ESTERROR 0x0008 /* estimated time error */
#define ADJ_STATUS 0x0010 /* clock status */
#define ADJ_TIMECONST 0x0020 /* pll time constant */
+#define ADJ_SETOFFSET 0x0040 /* add 'time' to current time */
#define ADJ_TAI 0x0080 /* set TAI offset */
#define ADJ_MICRO 0x1000 /* select microsecond resolution */
#define ADJ_NANO 0x2000 /* select nanosecond resolution */
diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
index d232189..0c87858 100644
--- a/kernel/time/ntp.c
+++ b/kernel/time/ntp.c
@@ -482,6 +482,17 @@ int do_adjtimex(struct timex *txc)
hrtimer_cancel(&leap_timer);
}
+ if (txc->modes & ADJ_SETOFFSET) {
+ struct timespec delta;
+ if ((unsigned long)txc->time.tv_usec >= NSEC_PER_SEC)
+ return -EINVAL;
+ delta.tv_sec = txc->time.tv_sec;
+ delta.tv_nsec = txc->time.tv_usec;
+ if (!(txc->modes & ADJ_NANO))
+ delta.tv_nsec *= 1000;
+ timekeeping_inject_offset(&delta);
+ }
+
getnstimeofday(&ts);
write_seqlock_irq(&xtime_lock);
--
1.7.0.4
^ permalink raw reply related
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