* [PATCH 2/2] net/usb: hso: allocate serial_state_notification as separate buffer
From: Jussi Kivilinna @ 2013-08-07 13:29 UTC (permalink / raw)
To: netdev-u79uwXL29TY76Z2rM5mHXA
Cc: Greg Kroah-Hartman, linux-usb-u79uwXL29TY76Z2rM5mHXA,
David S. Miller, Jan Dumon
In-Reply-To: <20130807132902.14451.37517.stgit-bi+AKbBUZKagILUCTcTcHdKyNwTtLsGr@public.gmane.org>
URB transfer_buffers must not be allocated as part of larger structure because
DMA coherence issues.
Patch changes hso to allocate serial_state_notification member of
'struct hso_tiocmget' as separate buffer.
Patch is only compile tested.
Cc: <stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
Signed-off-by: Jussi Kivilinna <jussi.kivilinna-X3B1VOXEql0@public.gmane.org>
---
drivers/net/usb/hso.c | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
index fc082c0..21ffa6f 100644
--- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c
@@ -211,7 +211,7 @@ struct hso_tiocmget {
int intr_completed;
struct usb_endpoint_descriptor *endp;
struct urb *urb;
- struct hso_serial_state_notification serial_state_notification;
+ struct hso_serial_state_notification *serial_state_notification;
u16 prev_UART_state_bitmap;
struct uart_icount icount;
};
@@ -1465,7 +1465,7 @@ static int tiocmget_submit_urb(struct hso_serial *serial,
usb_rcvintpipe(usb,
tiocmget->endp->
bEndpointAddress & 0x7F),
- &tiocmget->serial_state_notification,
+ tiocmget->serial_state_notification,
sizeof(struct hso_serial_state_notification),
tiocmget_intr_callback, serial,
tiocmget->endp->bInterval);
@@ -1499,7 +1499,7 @@ static void tiocmget_intr_callback(struct urb *urb)
if (!tiocmget)
return;
usb = serial->parent->usb;
- serial_state_notification = &tiocmget->serial_state_notification;
+ serial_state_notification = tiocmget->serial_state_notification;
if (serial_state_notification->bmRequestType != BM_REQUEST_TYPE ||
serial_state_notification->bNotification != B_NOTIFICATION ||
le16_to_cpu(serial_state_notification->wValue) != W_VALUE ||
@@ -2608,6 +2608,7 @@ static void hso_free_tiomget(struct hso_serial *serial)
usb_free_urb(tiocmget->urb);
tiocmget->urb = NULL;
serial->tiocmget = NULL;
+ kfree(tiocmget->serial_state_notification);
kfree(tiocmget);
}
}
@@ -2664,6 +2665,13 @@ static struct hso_device *hso_create_bulk_serial_device(
*/
if (serial->tiocmget) {
tiocmget = serial->tiocmget;
+
+ tiocmget->serial_state_notification = kzalloc(
+ sizeof(struct hso_serial_state_notification),
+ GFP_KERNEL);
+ if (!tiocmget->serial_state_notification)
+ goto tiocmget_fail;
+
tiocmget->urb = usb_alloc_urb(0, GFP_KERNEL);
if (tiocmget->urb) {
mutex_init(&tiocmget->mutex);
@@ -2672,8 +2680,10 @@ static struct hso_device *hso_create_bulk_serial_device(
interface,
USB_ENDPOINT_XFER_INT,
USB_DIR_IN);
- } else
+ } else {
+tiocmget_fail:
hso_free_tiomget(serial);
+ }
}
}
else
--
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 related
* [PATCH 2/2] net/usb: catc: allocate URB transfer_buffers as separate buffers
From: Jussi Kivilinna @ 2013-08-07 13:26 UTC (permalink / raw)
To: netdev; +Cc: Greg Kroah-Hartman, linux-usb, David S. Miller
In-Reply-To: <20130807132629.14001.2370.stgit@localhost6.localdomain6>
URB transfer_buffer must not be allocated as part of larger structure
because DMA coherence issues.
Patch changes catc to allocate tx_buf, rx_buf, irq_buf and ctrl_buf members
as separate buffers.
Patch is only compile tested.
Cc: <stable@vger.kernel.org>
Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi>
---
drivers/net/usb/catc.c | 30 +++++++++++++++++++++++-------
1 file changed, 23 insertions(+), 7 deletions(-)
diff --git a/drivers/net/usb/catc.c b/drivers/net/usb/catc.c
index a7d3c1b..26039d6 100644
--- a/drivers/net/usb/catc.c
+++ b/drivers/net/usb/catc.c
@@ -169,10 +169,10 @@ struct catc {
unsigned int ctrl_head, ctrl_tail;
spinlock_t tx_lock, ctrl_lock;
- u8 tx_buf[2][TX_MAX_BURST * (PKT_SZ + 2)];
- u8 rx_buf[RX_MAX_BURST * (PKT_SZ + 2)];
- u8 irq_buf[2];
- u8 ctrl_buf[64];
+ u8 *tx_buf[2];
+ u8 *rx_buf;
+ u8 *irq_buf;
+ u8 *ctrl_buf;
struct usb_ctrlrequest *ctrl_dr;
struct timer_list timer;
@@ -794,9 +794,15 @@ static int catc_probe(struct usb_interface *intf, const struct usb_device_id *id
catc = netdev_priv(netdev);
catc->ctrl_dr = kzalloc(sizeof(*catc->ctrl_dr), GFP_KERNEL);
- if (!catc->ctrl_dr) {
+ catc->tx_buf[0] = kzalloc(TX_MAX_BURST * (PKT_SZ + 2), GFP_KERNEL);
+ catc->tx_buf[1] = kzalloc(TX_MAX_BURST * (PKT_SZ + 2), GFP_KERNEL);
+ catc->rx_buf = kzalloc(RX_MAX_BURST * (PKT_SZ + 2), GFP_KERNEL);
+ catc->irq_buf = kzalloc(2, GFP_KERNEL);
+ catc->ctrl_buf = kzalloc(64, GFP_KERNEL);
+ if (!catc->ctrl_dr || !catc->ctrl_buf || !catc->tx_buf[0] ||
+ !catc->tx_buf[1] || !catc->rx_buf || !catc->irq_buf) {
err = -ENOMEM;
- goto err_free_dev;
+ goto err_free_buf;
}
netdev->netdev_ops = &catc_netdev_ops;
@@ -930,8 +936,13 @@ err_free:
usb_free_urb(catc->tx_urb);
usb_free_urb(catc->rx_urb);
usb_free_urb(catc->irq_urb);
+err_free_buf:
+ kfree(catc->ctrl_buf);
+ kfree(catc->irq_buf);
+ kfree(catc->rx_buf);
+ kfree(catc->tx_buf[1]);
+ kfree(catc->tx_buf[0]);
kfree(catc->ctrl_dr);
-err_free_dev:
free_netdev(netdev);
return err;
@@ -948,6 +959,11 @@ static void catc_disconnect(struct usb_interface *intf)
usb_free_urb(catc->tx_urb);
usb_free_urb(catc->rx_urb);
usb_free_urb(catc->irq_urb);
+ kfree(catc->ctrl_buf);
+ kfree(catc->irq_buf);
+ kfree(catc->rx_buf);
+ kfree(catc->tx_buf[1]);
+ kfree(catc->tx_buf[0]);
kfree(catc->ctrl_dr);
free_netdev(catc->netdev);
}
^ permalink raw reply related
* [PATCH 1/2] net/usb: catc: allocate URB setup_packet as separate buffer
From: Jussi Kivilinna @ 2013-08-07 13:26 UTC (permalink / raw)
To: netdev-u79uwXL29TY76Z2rM5mHXA
Cc: Greg Kroah-Hartman, linux-usb-u79uwXL29TY76Z2rM5mHXA,
David S. Miller
URB setup packet must not be allocated as part of larger structure
because DMA coherence issues.
Patch changes catc to allocate ctrl_dr member as separate buffer.
Patch is only compile tested.
Cc: <stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
Signed-off-by: Jussi Kivilinna <jussi.kivilinna-X3B1VOXEql0@public.gmane.org>
---
drivers/net/usb/catc.c | 40 +++++++++++++++++++++++++---------------
1 file changed, 25 insertions(+), 15 deletions(-)
diff --git a/drivers/net/usb/catc.c b/drivers/net/usb/catc.c
index 8d5cac2..a7d3c1b 100644
--- a/drivers/net/usb/catc.c
+++ b/drivers/net/usb/catc.c
@@ -173,7 +173,7 @@ struct catc {
u8 rx_buf[RX_MAX_BURST * (PKT_SZ + 2)];
u8 irq_buf[2];
u8 ctrl_buf[64];
- struct usb_ctrlrequest ctrl_dr;
+ struct usb_ctrlrequest *ctrl_dr;
struct timer_list timer;
u8 stats_buf[8];
@@ -485,7 +485,7 @@ static void catc_ctrl_run(struct catc *catc)
struct ctrl_queue *q = catc->ctrl_queue + catc->ctrl_tail;
struct usb_device *usbdev = catc->usbdev;
struct urb *urb = catc->ctrl_urb;
- struct usb_ctrlrequest *dr = &catc->ctrl_dr;
+ struct usb_ctrlrequest *dr = catc->ctrl_dr;
int status;
dr->bRequest = q->request;
@@ -779,7 +779,7 @@ static int catc_probe(struct usb_interface *intf, const struct usb_device_id *id
struct net_device *netdev;
struct catc *catc;
u8 broadcast[6];
- int i, pktsz;
+ int i, pktsz, err;
if (usb_set_interface(usbdev,
intf->altsetting->desc.bInterfaceNumber, 1)) {
@@ -793,6 +793,12 @@ static int catc_probe(struct usb_interface *intf, const struct usb_device_id *id
catc = netdev_priv(netdev);
+ catc->ctrl_dr = kzalloc(sizeof(*catc->ctrl_dr), GFP_KERNEL);
+ if (!catc->ctrl_dr) {
+ err = -ENOMEM;
+ goto err_free_dev;
+ }
+
netdev->netdev_ops = &catc_netdev_ops;
netdev->watchdog_timeo = TX_TIMEOUT;
SET_ETHTOOL_OPS(netdev, &ops);
@@ -814,12 +820,8 @@ static int catc_probe(struct usb_interface *intf, const struct usb_device_id *id
if ((!catc->ctrl_urb) || (!catc->tx_urb) ||
(!catc->rx_urb) || (!catc->irq_urb)) {
dev_err(&intf->dev, "No free urbs available.\n");
- usb_free_urb(catc->ctrl_urb);
- usb_free_urb(catc->tx_urb);
- usb_free_urb(catc->rx_urb);
- usb_free_urb(catc->irq_urb);
- free_netdev(netdev);
- return -ENOMEM;
+ err = -ENOMEM;
+ goto err_free;
}
/* The F5U011 has the same vendor/product as the netmate but a device version of 0x130 */
@@ -918,14 +920,21 @@ static int catc_probe(struct usb_interface *intf, const struct usb_device_id *id
SET_NETDEV_DEV(netdev, &intf->dev);
if (register_netdev(netdev) != 0) {
usb_set_intfdata(intf, NULL);
- usb_free_urb(catc->ctrl_urb);
- usb_free_urb(catc->tx_urb);
- usb_free_urb(catc->rx_urb);
- usb_free_urb(catc->irq_urb);
- free_netdev(netdev);
- return -EIO;
+ err = -EIO;
+ goto err_free;
}
return 0;
+
+err_free:
+ usb_free_urb(catc->ctrl_urb);
+ usb_free_urb(catc->tx_urb);
+ usb_free_urb(catc->rx_urb);
+ usb_free_urb(catc->irq_urb);
+ kfree(catc->ctrl_dr);
+err_free_dev:
+ free_netdev(netdev);
+
+ return err;
}
static void catc_disconnect(struct usb_interface *intf)
@@ -939,6 +948,7 @@ static void catc_disconnect(struct usb_interface *intf)
usb_free_urb(catc->tx_urb);
usb_free_urb(catc->rx_urb);
usb_free_urb(catc->irq_urb);
+ kfree(catc->ctrl_dr);
free_netdev(catc->netdev);
}
}
--
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 related
* Re: [Patch net-next v2 5/8] sunrpc: use generic union inet_addr
From: Jeff Layton @ 2013-08-07 13:21 UTC (permalink / raw)
To: Cong Wang
Cc: netdev, David S. Miller, Trond Myklebust, J. Bruce Fields,
linux-nfs
In-Reply-To: <1375878446.11370.36.camel@cr0>
On Wed, 07 Aug 2013 20:27:26 +0800
Cong Wang <amwang@redhat.com> wrote:
> On Tue, 2013-08-06 at 06:28 -0400, Jeff Layton wrote:
> >
> > My question is a bit more fundamental: Why are you using this new union
> > in your patches instead of simply passing around "struct sockaddr"
> > pointers? If you did that, then you could simply replace all of the
> > rpc_* wrappers with your generic ones, since you wouldn't need to do
> > the cast to this (seemingly unnecessary) union.
>
> Because there are some places have to interpret the structure, without
> this union, they need to cast to either sockaddr_in or sockaddr_in6
> first, which is not as pretty as using a union.
>
> For example, the code in netpoll:
>
> ipv6_addr_equal(daddr, &np->local_ip.sin6.sin6_addr)
>
> without the union, it would be:
>
> struct sockaddr_in6 *addr = (struct sockaddr_in6 *) &np->local_ip;
> ipv6_addr_equal(daddr, addr->sin6_addr);
>
> >
> > FWIW, I too am happy to see these routines moved to common code. I just
> > wonder whether it might make more sense to use the existing convention
> > instead of this new union.
> >
>
Ok, good point. That does look cleaner. I'd still like to see the rpc_*
wrappers go away, but that can be done later.
--
Jeff Layton <jlayton@redhat.com>
^ permalink raw reply
* skbs delivered to 'wrong' packet_type handler
From: Erik Hugne @ 2013-08-07 13:08 UTC (permalink / raw)
To: netdev; +Cc: tipc-discussion, jon.maloy, ying.xue
We have a race condition in TIPC when using both the parent ethernet
device, and a vlan on top of this device as TIPC bearers. For some reason,
net/core/dev.c is delivering vlan packets to packet handlers registered to
the native device. This only seems to occur when a packet_type handler is
registered on both the vlan device and it's parent ethernet device. This
causes all kinds of weird behaviour in TIPC, from cross-vlan links being
established to oopses.
At first, i thought this was due to a missing PACKET_OTHERHOST filtering
in the TIPC ethernet code, but adding that check did not resolve the issue.
Adding an explicit check for skb->dev vs packet_type->dev does work, but
i dont think that's the proper way to solve it.
What's the purpose of having a dev entry in the packet_type if it's ignored
by the lower layers?
//E
^ permalink raw reply
* [PATCH v2 3.11] genetlink: fix family dump race
From: Johannes Berg @ 2013-08-07 12:39 UTC (permalink / raw)
To: linux-wireless, netdev, Thomas Graf
Cc: Andrei Otcheretianski, Ilan Peer, Johannes Berg
From: Johannes Berg <johannes.berg@intel.com>
When dumping generic netlink families, only the first dump call
is locked with genl_lock(), which protects the list of families,
and thus subsequent calls can access the data without locking,
racing against family addition/removal. This can cause a crash.
Fix it - the locking needs to be conditional because the first
time around it's already locked.
BUG: unable to handle kernel paging request at f8467360
IP: [<c14c56bb>] ctrl_dumpfamily+0x6b/0xe0
EIP: 0060:[<c14c56bb>] EFLAGS: 00210297 CPU: 2
EIP is at ctrl_dumpfamily+0x6b/0xe0
EAX: f8467378 EBX: f8467340 ECX: 00000000 EDX: ec1610c4
ESI: 00000001 EDI: c2077cc0 EBP: c46c3c00 ESP: c46c3bd4
DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068
CR0: 80050033 CR2: f8467360 CR3: 26e54000 CR4: 001407d0
DR0: 00000000 DR1: 00000000 DR2: 00000000 DR3: 00000000
DR6: ffff0ff0 DR7: 00000400
Process wpa_supplicant (pid: 20081, ti=c46c2000 task=c44640b0 task.ti=c46c2000)
Call Trace:
[<c14c20bc>] netlink_dump+0x5c/0x200
[<c14c3450>] __netlink_dump_start+0x140/0x160
[<c14c5172>] genl_rcv_msg+0x102/0x270
[<c14c4b5e>] netlink_rcv_skb+0x8e/0xb0
[<c14c505c>] genl_rcv+0x1c/0x30
[<c14c456b>] netlink_unicast+0x17b/0x1c0
[<c14c47d4>] netlink_sendmsg+0x224/0x370
[<c1485adf>] sock_sendmsg+0xff/0x120
[<c1486b0a>] __sys_sendmsg+0x24a/0x260
[<c1487fdb>] sys_sendmsg+0x3b/0x60
[<c1488683>] sys_socketcall+0x283/0x2e0
[<c15b7c1f>] sysenter_do_call+0x12/0x38
Code: 8d 3c c5 c0 7c 07 c2 8b 04 c5 c0 7c 07 c2 39 c7 8d 58 c8 75 16 eb 71 90 81 7d ec 00 1f 86 c1 74 10 8b 43 38 39 c7 8d 58 c8 74 5d <80> 7b 20 00 74 e7 83 c6 01 3b 75 f0 7c e8 8b 55 e8 8b 42 04 8b
Cc: stable@vger.kernel.org
Reported-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
net/netlink/genetlink.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c
index 2fd6dbe..6b6a03a 100644
--- a/net/netlink/genetlink.c
+++ b/net/netlink/genetlink.c
@@ -789,6 +789,10 @@ static int ctrl_dumpfamily(struct sk_buff *skb, struct netlink_callback *cb)
struct net *net = sock_net(skb->sk);
int chains_to_skip = cb->args[0];
int fams_to_skip = cb->args[1];
+ bool need_locking = chains_to_skip || fams_to_skip;
+
+ if (need_locking)
+ genl_lock();
for (i = chains_to_skip; i < GENL_FAM_TAB_SIZE; i++) {
n = 0;
@@ -810,6 +814,9 @@ errout:
cb->args[0] = i;
cb->args[1] = n;
+ if (need_locking)
+ genl_unlock();
+
return skb->len;
}
--
1.8.0
^ permalink raw reply related
* [PATCH 3.11] genetlink: fix family dump race
From: Johannes Berg @ 2013-08-07 12:34 UTC (permalink / raw)
To: linux-wireless, netdev, Thomas Graf
Cc: Andrei Otcheretianski, Ilan Peer, Johannes Berg
From: Johannes Berg <johannes.berg@intel.com>
When dumping generic netlink families, only the first dump call
is locked with genl_lock(), which protects the list of families,
and thus subsequent calls can access the data without locking,
racing against family addition/removal. This can cause a crash.
Fix it - the locking needs to be conditional because the first
time around it's already locked.
BUG: unable to handle kernel paging request at f8467360
IP: [<c14c56bb>] ctrl_dumpfamily+0x6b/0xe0
EIP: 0060:[<c14c56bb>] EFLAGS: 00210297 CPU: 2
EIP is at ctrl_dumpfamily+0x6b/0xe0
EAX: f8467378 EBX: f8467340 ECX: 00000000 EDX: ec1610c4
ESI: 00000001 EDI: c2077cc0 EBP: c46c3c00 ESP: c46c3bd4
DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068
CR0: 80050033 CR2: f8467360 CR3: 26e54000 CR4: 001407d0
DR0: 00000000 DR1: 00000000 DR2: 00000000 DR3: 00000000
DR6: ffff0ff0 DR7: 00000400
Process wpa_supplicant (pid: 20081, ti=c46c2000 task=c44640b0 task.ti=c46c2000)
Call Trace:
[<c14c20bc>] netlink_dump+0x5c/0x200
[<c14c3450>] __netlink_dump_start+0x140/0x160
[<c14c5172>] genl_rcv_msg+0x102/0x270
[<c14c4b5e>] netlink_rcv_skb+0x8e/0xb0
[<c14c505c>] genl_rcv+0x1c/0x30
[<c14c456b>] netlink_unicast+0x17b/0x1c0
[<c14c47d4>] netlink_sendmsg+0x224/0x370
[<c1485adf>] sock_sendmsg+0xff/0x120
[<c1486b0a>] __sys_sendmsg+0x24a/0x260
[<c1487fdb>] sys_sendmsg+0x3b/0x60
[<c1488683>] sys_socketcall+0x283/0x2e0
[<c15b7c1f>] sysenter_do_call+0x12/0x38
Code: 8d 3c c5 c0 7c 07 c2 8b 04 c5 c0 7c 07 c2 39 c7 8d 58 c8 75 16 eb 71 90 81 7d ec 00 1f 86 c1 74 10 8b 43 38 39 c7 8d 58 c8 74 5d <80> 7b 20 00 74 e7 83 c6 01 3b 75 f0 7c e8 8b 55 e8 8b 42 04 8b
Cc: stable@vger.kernel.org
Reported-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
net/netlink/genetlink.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c
index 2fd6dbe..07a0b18 100644
--- a/net/netlink/genetlink.c
+++ b/net/netlink/genetlink.c
@@ -790,6 +790,9 @@ static int ctrl_dumpfamily(struct sk_buff *skb, struct netlink_callback *cb)
int chains_to_skip = cb->args[0];
int fams_to_skip = cb->args[1];
+ if (chains_to_skip)
+ genl_lock();
+
for (i = chains_to_skip; i < GENL_FAM_TAB_SIZE; i++) {
n = 0;
list_for_each_entry(rt, genl_family_chain(i), family_list) {
@@ -810,6 +813,9 @@ errout:
cb->args[0] = i;
cb->args[1] = n;
+ if (chains_to_skip)
+ genl_unlock();
+
return skb->len;
}
--
1.8.0
^ permalink raw reply related
* Mail Back If Interested!
From: WilliT @ 2013-08-07 13:14 UTC (permalink / raw)
Good Day,
RE:INVESTMENT / BUSINESS PARTNERSHIP PROPOSAL.
I represent a group of company based in the Gulf Region with access to
over 270 Million Euros and we are seeking means of expanding and
relocating our business interest abroad in the following sectors: oil/Gas,
banking, real estate, stock speculation and mining, transportation, health
sector and tobacco, Communication Services, Agriculture Forestry &
Fishing, thus any sector.
If you have a solid background and idea of making good profit in any of
the mentioned business sectors or any other business in your country,
Please write me for possible business co-operation. More so, we are ready
to facilitate and fund any business that is capable of generating 10%
annual return on investment (AROI) Joint Venture partnership and Hard loan
funding can also be considered.
I am confident that you will give your consideration to this proposal and
respond positively within a short period of time. I am available to
discuss this proposal with you and to answer any questions you may have in
regard to this investment. As soon as you give your positive response to
this proposal, I will not hesitate in sending you the details information
of this great investment partnership opportunity. Email contact:
I look forward to discussing this opportunity further with you.
Sincerely,
Willi Tenisch
^ permalink raw reply
* Re: [Patch net-next v2 5/8] sunrpc: use generic union inet_addr
From: Cong Wang @ 2013-08-07 12:27 UTC (permalink / raw)
To: Jeff Layton
Cc: netdev-u79uwXL29TY76Z2rM5mHXA, David S. Miller, Trond Myklebust,
J. Bruce Fields, linux-nfs-u79uwXL29TY76Z2rM5mHXA
In-Reply-To: <20130806062801.67714276-9yPaYZwiELC+kQycOl6kW4xkIHaj4LzF@public.gmane.org>
On Tue, 2013-08-06 at 06:28 -0400, Jeff Layton wrote:
>
> My question is a bit more fundamental: Why are you using this new union
> in your patches instead of simply passing around "struct sockaddr"
> pointers? If you did that, then you could simply replace all of the
> rpc_* wrappers with your generic ones, since you wouldn't need to do
> the cast to this (seemingly unnecessary) union.
Because there are some places have to interpret the structure, without
this union, they need to cast to either sockaddr_in or sockaddr_in6
first, which is not as pretty as using a union.
For example, the code in netpoll:
ipv6_addr_equal(daddr, &np->local_ip.sin6.sin6_addr)
without the union, it would be:
struct sockaddr_in6 *addr = (struct sockaddr_in6 *) &np->local_ip;
ipv6_addr_equal(daddr, addr->sin6_addr);
>
> FWIW, I too am happy to see these routines moved to common code. I just
> wonder whether it might make more sense to use the existing convention
> instead of this new union.
>
Thanks.
--
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
* Re: [PATCH net-next] xfrm: Remove rebundant address family checking
From: Steffen Klassert @ 2013-08-07 10:57 UTC (permalink / raw)
To: Fan Du; +Cc: davem, netdev
In-Reply-To: <1375775456-22628-1-git-send-email-fan.du@windriver.com>
On Tue, Aug 06, 2013 at 03:50:56PM +0800, Fan Du wrote:
> present_and_same_family has checked addresses family validness for both
> SADB_EXT_ADDRESS_SRC and SADB_EXT_ADDRESS_DST in the beginning.
> Thereafter pfkey_sadb_addr2xfrm_addr doesn't need to do the checking again.
>
> Signed-off-by: Fan Du <fan.du@windriver.com>
Applied to ipsec-next,
Thanks!
^ permalink raw reply
* [PATCH 2/2] net: via-rhine: Fix incorrect placement of __initdata
From: Sachin Kamat @ 2013-08-07 10:38 UTC (permalink / raw)
To: netdev; +Cc: davem, sachin.kamat, rl
In-Reply-To: <1375871896-25821-1-git-send-email-sachin.kamat@linaro.org>
__initdata should be placed between the variable name and equal
sign for the variable to be placed in the intended section.
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
drivers/net/ethernet/via/via-rhine.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c
index b75eb9e..c8f088a 100644
--- a/drivers/net/ethernet/via/via-rhine.c
+++ b/drivers/net/ethernet/via/via-rhine.c
@@ -2407,7 +2407,7 @@ static struct pci_driver rhine_driver = {
.driver.pm = RHINE_PM_OPS,
};
-static struct dmi_system_id __initdata rhine_dmi_table[] = {
+static struct dmi_system_id rhine_dmi_table[] __initdata = {
{
.ident = "EPIA-M",
.matches = {
--
1.7.9.5
^ permalink raw reply related
* [PATCH 1/2] net: wan: sbni: Fix incorrect placement of __initdata
From: Sachin Kamat @ 2013-08-07 10:38 UTC (permalink / raw)
To: netdev; +Cc: davem, sachin.kamat, rl
__initdata should be placed between the variable name and equal
sign for the variable to be placed in the intended section.
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
drivers/net/wan/sbni.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c
index d43f4ef..5bbcb5e 100644
--- a/drivers/net/wan/sbni.c
+++ b/drivers/net/wan/sbni.c
@@ -176,7 +176,7 @@ static u32 mac[ SBNI_MAX_NUM_CARDS ] __initdata;
#ifndef MODULE
typedef u32 iarr[];
-static iarr __initdata *dest[5] = { &io, &irq, &baud, &rxl, &mac };
+static iarr *dest[5] __initdata = { &io, &irq, &baud, &rxl, &mac };
#endif
/* A zero-terminated list of I/O addresses to be probed on ISA bus */
--
1.7.9.5
^ permalink raw reply related
* Re: bonding + arp monitoring fails if interface is a vlan
From: Santiago Garcia Mantinan @ 2013-08-07 10:44 UTC (permalink / raw)
To: Nikolay Aleksandrov; +Cc: netdev
In-Reply-To: <5201F99D.2060809@redhat.com>
2013/8/7 Nikolay Aleksandrov <nikolay@redhat.com>:
>> Ok, after several days of testing it seems to work ok if I go with
>> arp_validate 0, going for arp_validate 1 would cause the link failure
>> count to be increased from time to time, is this ok?
>>
> If arp_interval is changed then you have to disable the interface (e.g.
> ifconfig bondX down) and enable it again (ifconfig bondX up), or set it
> while the interface is down. Also there're pr_debug()s in bond_validate_arp
> and bond_arp_rcv that you can enable to check if it's validated properly.
I don't quite get what you mean here, if you want me to activate de
debug and check that please explain me what I should do.
Aside this, I've been doing some other tests like enabling arp
validate with xor balance and I've got a problem:
Ethernet Channel Bonding Driver: v3.7.1 (April 27, 2011)
Bonding Mode: load balancing (xor)
Transmit Hash Policy: layer2 (0)
MII Status: up
MII Polling Interval (ms): 0
Up Delay (ms): 0
Down Delay (ms): 0
ARP Polling Interval (ms): 2000
ARP IP target/s (n.n.n.n form): 192.168.1.1
Slave Interface: eth1.1001
MII Status: up
Speed: 1000 Mbps
Duplex: full
Link Failure Count: 1
Permanent HW addr: 00:23:7d:30:bc:48
Slave queue ID: 0
Slave Interface: eth1.1002
MII Status: up
Speed: 1000 Mbps
Duplex: full
Link Failure Count: 1
Permanent HW addr: 00:23:7d:30:bc:48
Slave queue ID: 0
Slave Interface: eth2.1001
MII Status: down
Speed: 1000 Mbps
Duplex: full
Link Failure Count: 1
Permanent HW addr: 00:23:7d:30:bc:48
Slave queue ID: 0
Slave Interface: eth2.1002
MII Status: up
Speed: 1000 Mbps
Duplex: full
Link Failure Count: 0
Permanent HW addr: 00:23:7d:30:bc:48
The arp target is only visible through the vlan 1002, not the vlan
1001, then eth1.1001 and eth2.1001 shoult both be down, however
eth1.1001 is up. I'm monitoring eth1.1001 and I can see the arp
queries but no replies, then... why is it up?
arp validation is incompatible with xor balance? if so... why is
eth2.1001 set to down?
Regards.
--
Manty/BestiaTester -> http://manty.net
^ permalink raw reply
* [PATCH net-next] net: sctp: sctp_set_owner_w: fix panic during skb orphaning
From: Daniel Borkmann @ 2013-08-07 10:42 UTC (permalink / raw)
To: davem; +Cc: netdev, linux-sctp
This patch fixes the following triggered bug ...
[ 553.109742] kernel BUG at include/linux/skbuff.h:1813!
[ 553.109766] invalid opcode: 0000 [#1] SMP
[ 553.109789] Modules linked in: sctp libcrc32c rfcomm [...]
[ 553.110259] uinput i915 i2c_algo_bit drm_kms_helper e1000e drm ptp pps_core i2c_core wmi video sunrpc
[ 553.110320] CPU: 0 PID: 1636 Comm: lt-test_1_to_1_ Not tainted 3.11.0-rc3+ #2
[ 553.110350] Hardware name: LENOVO 74597D6/74597D6, BIOS 6DET60WW (3.10 ) 09/17/2009
[ 553.110381] task: ffff88020a01dd40 ti: ffff880204ed0000 task.ti: ffff880204ed0000
[ 553.110411] RIP: 0010:[<ffffffffa0698017>] [<ffffffffa0698017>] skb_orphan.part.9+0x4/0x6 [sctp]
[ 553.110459] RSP: 0018:ffff880204ed1bb8 EFLAGS: 00010286
[ 553.110483] RAX: ffff8802086f5a40 RBX: ffff880204303300 RCX: 0000000000000000
[ 553.110487] RDX: ffff880204303c28 RSI: ffff8802086f5a40 RDI: ffff880202158000
[ 553.110487] RBP: ffff880204ed1bb8 R08: 0000000000000000 R09: 0000000000000000
[ 553.110487] R10: ffff88022f2d9a04 R11: ffff880233001600 R12: 0000000000000000
[ 553.110487] R13: ffff880204303c00 R14: ffff8802293d0000 R15: ffff880202158000
[ 553.110487] FS: 00007f31b31fe740(0000) GS:ffff88023bc00000(0000) knlGS:0000000000000000
[ 553.110487] CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b
[ 553.110487] CR2: 000000379980e3e0 CR3: 000000020d225000 CR4: 00000000000407f0
[ 553.110487] Stack:
[ 553.110487] ffff880204ed1ca8 ffffffffa068d7fc 0000000000000000 0000000000000000
[ 553.110487] 0000000000000000 ffff8802293d0000 ffff880202158000 ffffffff81cb7900
[ 553.110487] 0000000000000000 0000400000001c68 ffff8802086f5a40 000000000000000f
[ 553.110487] Call Trace:
[ 553.110487] [<ffffffffa068d7fc>] sctp_sendmsg+0x6bc/0xc80 [sctp]
[ 553.110487] [<ffffffff8128f185>] ? sock_has_perm+0x75/0x90
[ 553.110487] [<ffffffff815a3593>] inet_sendmsg+0x63/0xb0
[ 553.110487] [<ffffffff8128f2b3>] ? selinux_socket_sendmsg+0x23/0x30
[ 553.110487] [<ffffffff8151c5d6>] sock_sendmsg+0xa6/0xd0
[ 553.110487] [<ffffffff81637b05>] ? _raw_spin_unlock_bh+0x15/0x20
[ 553.110487] [<ffffffff8151cd38>] SYSC_sendto+0x128/0x180
[ 553.110487] [<ffffffff8151ce6b>] ? SYSC_connect+0xdb/0x100
[ 553.110487] [<ffffffffa0690031>] ? sctp_inet_listen+0x71/0x1f0 [sctp]
[ 553.110487] [<ffffffff8151d35e>] SyS_sendto+0xe/0x10
[ 553.110487] [<ffffffff81640202>] system_call_fastpath+0x16/0x1b
[ 553.110487] Code: e0 48 c7 c7 00 22 6a a0 e8 67 a3 f0 e0 48 c7 [...]
[ 553.110487] RIP [<ffffffffa0698017>] skb_orphan.part.9+0x4/0x6 [sctp]
[ 553.110487] RSP <ffff880204ed1bb8>
[ 553.121578] ---[ end trace 46c20c5903ef5be2 ]---
... that is triggered after commit 376c7311b ("net: add a temporary sanity
check in skb_orphan()"). What is happening is that we call sctp_set_owner_w()
for chunks in the SCTP output path from sctp_sendmsg(). Such chunks eventually
origin from constructors like sctp_make_chunk() where skb->sk = sk is being
set for socket accounting. Doing a git grep -n "skb->sk" net/sctp/ shows that
also in other places the socket pointer is being set, before issuing a
SCTP_CMD_SEND_PKT command and the like. Since SCTP is doing it's own memory
accounting anyway and has its own skb destructor functions, we should
customize sctp_set_owner_w() and call skb_orphan() if we set a different
owner of the skb than the current one in order to properly call their
destructor function, but not run into a panic due to our non-exisiting one as
we set sctp_wfree() destructor right after that. Otherwise, we can just skip
orphaning and reassignment to the very same socket and only set the destructor
handler.
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
---
Only in net-next.
net/sctp/socket.c | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index d5d5882..7459b6c 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -153,13 +153,18 @@ static inline void sctp_set_owner_w(struct sctp_chunk *chunk)
{
struct sctp_association *asoc = chunk->asoc;
struct sock *sk = asoc->base.sk;
+ struct sk_buff *skb = chunk->skb;
/* The sndbuf space is tracked per association. */
sctp_association_hold(asoc);
- skb_set_owner_w(chunk->skb, sk);
+ if (skb->sk != sk) {
+ skb_orphan(skb);
+ skb->sk = sk;
+ }
+
+ skb->destructor = sctp_wfree;
- chunk->skb->destructor = sctp_wfree;
/* Save the chunk pointer in skb for sctp_wfree to use later. */
*((struct sctp_chunk **)(chunk->skb->cb)) = chunk;
@@ -167,9 +172,10 @@ static inline void sctp_set_owner_w(struct sctp_chunk *chunk)
sizeof(struct sk_buff) +
sizeof(struct sctp_chunk);
- atomic_add(sizeof(struct sctp_chunk), &sk->sk_wmem_alloc);
- sk->sk_wmem_queued += chunk->skb->truesize;
- sk_mem_charge(sk, chunk->skb->truesize);
+ atomic_add(sizeof(struct sctp_chunk) + skb->truesize,
+ &sk->sk_wmem_alloc);
+ sk->sk_wmem_queued += skb->truesize;
+ sk_mem_charge(sk, skb->truesize);
}
/* Verify that this is a valid address. */
--
1.7.11.7
^ permalink raw reply related
* [PATCH 2/2][net-next] gianfar: Add ethtool -A support for pause frame
From: Claudiu Manoil @ 2013-08-07 10:24 UTC (permalink / raw)
To: netdev; +Cc: David S. Miller
In-Reply-To: <1375871056-10420-1-git-send-email-claudiu.manoil@freescale.com>
Allow Rx/Tx pause frame configuration via ethtool.
The gfar devices feature link autonegotioation by default.
The device is being configured with the new pause frame
parameters if the link is up, depending on link duplex (no
pause frames for half-duplex links), or during link autoneg
(see adjust_link()).
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
---
drivers/net/ethernet/freescale/gianfar.h | 1 +
drivers/net/ethernet/freescale/gianfar_ethtool.c | 30 ++++++++++++++++++++++++
2 files changed, 31 insertions(+)
diff --git a/drivers/net/ethernet/freescale/gianfar.h b/drivers/net/ethernet/freescale/gianfar.h
index e6a03f4..aaac843 100644
--- a/drivers/net/ethernet/freescale/gianfar.h
+++ b/drivers/net/ethernet/freescale/gianfar.h
@@ -1186,6 +1186,7 @@ void gfar_init_sysfs(struct net_device *dev);
int gfar_set_features(struct net_device *dev, netdev_features_t features);
extern void gfar_check_rx_parser_mode(struct gfar_private *priv);
extern void gfar_vlan_mode(struct net_device *dev, netdev_features_t features);
+void gfar_configure_pause(struct gfar_private *priv, bool en);
extern const struct ethtool_ops gfar_ethtool_ops;
diff --git a/drivers/net/ethernet/freescale/gianfar_ethtool.c b/drivers/net/ethernet/freescale/gianfar_ethtool.c
index 21cd881..6cf89c1 100644
--- a/drivers/net/ethernet/freescale/gianfar_ethtool.c
+++ b/drivers/net/ethernet/freescale/gianfar_ethtool.c
@@ -535,6 +535,34 @@ static int gfar_sringparam(struct net_device *dev,
return err;
}
+static void gfar_gpauseparam(struct net_device *dev,
+ struct ethtool_pauseparam *pause)
+{
+ struct gfar_private *priv = netdev_priv(dev);
+
+ pause->autoneg = AUTONEG_ENABLE;
+ if (priv->rx_pause)
+ pause->rx_pause = 1;
+ if (priv->tx_pause)
+ pause->tx_pause = 1;
+}
+
+static int gfar_spauseparam(struct net_device *dev,
+ struct ethtool_pauseparam *pause)
+{
+ struct gfar_private *priv = netdev_priv(dev);
+ struct phy_device *phydev = priv->phydev;
+
+ priv->rx_pause = !!pause->rx_pause;
+ priv->tx_pause = !!pause->tx_pause;
+
+ /* update h/w settings, if link is up */
+ if (phydev && phydev->link)
+ gfar_configure_pause(priv, !!phydev->duplex);
+
+ return 0;
+}
+
int gfar_set_features(struct net_device *dev, netdev_features_t features)
{
struct gfar_private *priv = netdev_priv(dev);
@@ -1806,6 +1834,8 @@ const struct ethtool_ops gfar_ethtool_ops = {
.set_coalesce = gfar_scoalesce,
.get_ringparam = gfar_gringparam,
.set_ringparam = gfar_sringparam,
+ .get_pauseparam = gfar_gpauseparam,
+ .set_pauseparam = gfar_spauseparam,
.get_strings = gfar_gstrings,
.get_sset_count = gfar_sset_count,
.get_ethtool_stats = gfar_fill_stats,
--
1.7.11.7
^ permalink raw reply related
* [PATCH 1/2][net-next] gianfar: Fix pause frame handling for half duplex links
From: Claudiu Manoil @ 2013-08-07 10:24 UTC (permalink / raw)
To: netdev; +Cc: David S. Miller
MACCFG1 register bits to enable PAUSE frame handling are set by the
driver unconditionally. Per 802.3 standard, PAUSE frame handling is a
full duplex feature, and neither meaningful nor correct in half duplex.
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
---
drivers/net/ethernet/freescale/gianfar.c | 31 +++++++++++++++++++++++++++++--
drivers/net/ethernet/freescale/gianfar.h | 2 ++
2 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c
index edf06f1..54cf9be 100644
--- a/drivers/net/ethernet/freescale/gianfar.c
+++ b/drivers/net/ethernet/freescale/gianfar.c
@@ -764,6 +764,9 @@ static int gfar_of_init(struct platform_device *ofdev, struct net_device **pdev)
FSL_GIANFAR_DEV_HAS_EXTENDED_HASH |
FSL_GIANFAR_DEV_HAS_TIMER;
+ /* default pause frame settings */
+ priv->rx_pause = priv->tx_pause = true;
+
ctype = of_get_property(np, "phy-connection-type", NULL);
/* We only care about rgmii-id. The rest are autodetected */
@@ -1016,8 +1019,10 @@ static int gfar_probe(struct platform_device *ofdev)
/* We need to delay at least 3 TX clocks */
udelay(2);
- tempval = (MACCFG1_TX_FLOW | MACCFG1_RX_FLOW);
- gfar_write(®s->maccfg1, tempval);
+ /* the soft reset bit is not self-resetting, so we need to
+ * clear it before resuming normal operation
+ */
+ gfar_write(®s->maccfg1, 0);
/* Initialize MACCFG2. */
tempval = MACCFG2_INIT_SETTINGS;
@@ -3025,6 +3030,25 @@ static irqreturn_t gfar_interrupt(int irq, void *grp_id)
return IRQ_HANDLED;
}
+/* toggle pause frame settings */
+void gfar_configure_pause(struct gfar_private *priv, bool en)
+{
+ struct gfar __iomem *regs = priv->gfargrp[0].regs;
+ u32 tempval = gfar_read(®s->maccfg1);
+
+ if (en && priv->rx_pause)
+ tempval |= MACCFG1_RX_FLOW;
+ else
+ tempval &= ~MACCFG1_RX_FLOW;
+
+ if (en && priv->tx_pause)
+ tempval |= MACCFG1_TX_FLOW;
+ else
+ tempval &= ~MACCFG1_TX_FLOW;
+
+ gfar_write(®s->maccfg1, tempval);
+}
+
/* Called every time the controller might need to be made
* aware of new link state. The PHY code conveys this
* information through variables in the phydev structure, and this
@@ -3056,6 +3080,9 @@ static void adjust_link(struct net_device *dev)
else
tempval |= MACCFG2_FULL_DUPLEX;
+ /* update pause frame settings */
+ gfar_configure_pause(priv, !!phydev->duplex);
+
priv->oldduplex = phydev->duplex;
}
diff --git a/drivers/net/ethernet/freescale/gianfar.h b/drivers/net/ethernet/freescale/gianfar.h
index ee19f2c..e6a03f4 100644
--- a/drivers/net/ethernet/freescale/gianfar.h
+++ b/drivers/net/ethernet/freescale/gianfar.h
@@ -1084,6 +1084,8 @@ struct gfar_private {
int oldspeed;
int oldduplex;
int oldlink;
+ bool rx_pause;
+ bool tx_pause;
/* Bitfield update lock */
spinlock_t bflock;
--
1.7.11.7
^ permalink raw reply related
* Re: [RFC PATCHv2 1/3] hrtimer: Add notifer for clock_was_set
From: Daniel Borkmann @ 2013-08-07 9:35 UTC (permalink / raw)
To: Fan Du; +Cc: steffen.klassert, davem, herbert, netdev
In-Reply-To: <520213F2.5090401@windriver.com>
On 08/07/2013 11:31 AM, Fan Du wrote:
> On 2013年08月07日 17:20, Daniel Borkmann wrote:
>> On 08/07/2013 11:04 AM, Fan Du wrote:
>>> When clock_was_set is called in case of system wall time change
>>> or host resume from suspend state, use this notifier for places
>>> where interested in this action.
>>
>> (Only minor commenting on this one ...)
>>
>>> Signed-off-by: Fan Du <fan.du@windriver.com>
>>> ---
>>> kernel/hrtimer.c | 4 ++++
>>> 1 file changed, 4 insertions(+)
>>>
>>> diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
>>> index 383319b..b7c62a9 100644
>>> --- a/kernel/hrtimer.c
>>> +++ b/kernel/hrtimer.c
>>> @@ -755,6 +755,9 @@ static inline void retrigger_next_event(void *arg) { }
>>>
>>> #endif /* CONFIG_HIGH_RES_TIMERS */
>>>
>>> +ATOMIC_NOTIFIER_HEAD(clock_change_notifier_list);
>>> +EXPORT_SYMBOL(clock_change_notifier_list);
>>
>> This should be static and hidden from other modules, e.g. have a look at
>> netevent_notif_chain (net/core/netevent.c).
>>
>> Instead, this should be accessed via registration/un-registration handlers
>> for notifier blocks, and those can then be exported as EXPORT_SYMBOL_GPL
>> as this is core area.
>>
>>> +
>>> /*
>>> * Clock realtime was set
>>> *
>>> @@ -773,6 +776,7 @@ void clock_was_set(void)
>>> on_each_cpu(retrigger_next_event, NULL, 1);
>>> #endif
>>> timerfd_clock_was_set();
>>> + atomic_notifier_call_chain(&clock_change_notifier_list, 0, 0);
>>
>> Also here a small one-line handler call_clock_change_notifiers() would be
>> better.
>
> Thanks for your attention.
> After taking a look at netevent_notif_chain, you mean I should do it in below style:
>
> static ATOMIC_NOTIFIER_HEAD(clock_change_notifier_list);
>
> int un/register_clock_change_notifier(struct notifier_block *nb)
> {
> int err;
>
> err = atomic_notifier_chain_un/register(&clock_change_notifier_list, nb);
> return err;
return atomic_notifier_chain_un/register(&clock_change_notifier_list, nb);
> }
> EXPORT_SYMBOL_GPL(clock_change_notifier_list);
>
> int call_clock_change_notifiers(unsigned long val, void *v)
> {
> return atomic_notifier_call_chain(&clock_change_notifier, val, v);
> }
> EXPORT_SYMBOL_GPL(call_clock_change_notifiers);
>
> Will do it in next version after others comment rest of patches.
Yes, sounds good to me (you might also want to cc Thomas Gleixner on this one).
^ permalink raw reply
* Re: [RFC PATCHv2 1/3] hrtimer: Add notifer for clock_was_set
From: Fan Du @ 2013-08-07 9:31 UTC (permalink / raw)
To: Daniel Borkmann; +Cc: steffen.klassert, davem, herbert, netdev
In-Reply-To: <52021177.6020306@redhat.com>
On 2013年08月07日 17:20, Daniel Borkmann wrote:
> On 08/07/2013 11:04 AM, Fan Du wrote:
>> When clock_was_set is called in case of system wall time change
>> or host resume from suspend state, use this notifier for places
>> where interested in this action.
>
> (Only minor commenting on this one ...)
>
>> Signed-off-by: Fan Du <fan.du@windriver.com>
>> ---
>> kernel/hrtimer.c | 4 ++++
>> 1 file changed, 4 insertions(+)
>>
>> diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
>> index 383319b..b7c62a9 100644
>> --- a/kernel/hrtimer.c
>> +++ b/kernel/hrtimer.c
>> @@ -755,6 +755,9 @@ static inline void retrigger_next_event(void *arg) { }
>>
>> #endif /* CONFIG_HIGH_RES_TIMERS */
>>
>> +ATOMIC_NOTIFIER_HEAD(clock_change_notifier_list);
>> +EXPORT_SYMBOL(clock_change_notifier_list);
>
> This should be static and hidden from other modules, e.g. have a look at
> netevent_notif_chain (net/core/netevent.c).
>
> Instead, this should be accessed via registration/un-registration handlers
> for notifier blocks, and those can then be exported as EXPORT_SYMBOL_GPL
> as this is core area.
>
>> +
>> /*
>> * Clock realtime was set
>> *
>> @@ -773,6 +776,7 @@ void clock_was_set(void)
>> on_each_cpu(retrigger_next_event, NULL, 1);
>> #endif
>> timerfd_clock_was_set();
>> + atomic_notifier_call_chain(&clock_change_notifier_list, 0, 0);
>
> Also here a small one-line handler call_clock_change_notifiers() would be
> better.
Thanks for your attention.
After taking a look at netevent_notif_chain, you mean I should do it in below style:
static ATOMIC_NOTIFIER_HEAD(clock_change_notifier_list);
int un/register_clock_change_notifier(struct notifier_block *nb)
{
int err;
err = atomic_notifier_chain_un/register(&clock_change_notifier_list, nb);
return err;
}
EXPORT_SYMBOL_GPL(clock_change_notifier_list);
int call_clock_change_notifiers(unsigned long val, void *v)
{
return atomic_notifier_call_chain(&clock_change_notifier, val, v);
}
EXPORT_SYMBOL_GPL(call_clock_change_notifiers);
Will do it in next version after others comment rest of patches.
Thanks Daniel.
>> }
>>
>> /*
>>
>
--
浮沉随浪只记今朝笑
--fan
^ permalink raw reply
* Re: [RFC PATCHv2 1/3] hrtimer: Add notifer for clock_was_set
From: Daniel Borkmann @ 2013-08-07 9:20 UTC (permalink / raw)
To: Fan Du; +Cc: steffen.klassert, davem, herbert, netdev
In-Reply-To: <1375866296-15079-2-git-send-email-fan.du@windriver.com>
On 08/07/2013 11:04 AM, Fan Du wrote:
> When clock_was_set is called in case of system wall time change
> or host resume from suspend state, use this notifier for places
> where interested in this action.
(Only minor commenting on this one ...)
> Signed-off-by: Fan Du <fan.du@windriver.com>
> ---
> kernel/hrtimer.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
> index 383319b..b7c62a9 100644
> --- a/kernel/hrtimer.c
> +++ b/kernel/hrtimer.c
> @@ -755,6 +755,9 @@ static inline void retrigger_next_event(void *arg) { }
>
> #endif /* CONFIG_HIGH_RES_TIMERS */
>
> +ATOMIC_NOTIFIER_HEAD(clock_change_notifier_list);
> +EXPORT_SYMBOL(clock_change_notifier_list);
This should be static and hidden from other modules, e.g. have a look at
netevent_notif_chain (net/core/netevent.c).
Instead, this should be accessed via registration/un-registration handlers
for notifier blocks, and those can then be exported as EXPORT_SYMBOL_GPL
as this is core area.
> +
> /*
> * Clock realtime was set
> *
> @@ -773,6 +776,7 @@ void clock_was_set(void)
> on_each_cpu(retrigger_next_event, NULL, 1);
> #endif
> timerfd_clock_was_set();
> + atomic_notifier_call_chain(&clock_change_notifier_list, 0, 0);
Also here a small one-line handler call_clock_change_notifiers() would be
better.
> }
>
> /*
>
^ permalink raw reply
* Re: [PATCH v3 11/11] netfilter: use ns_printk in iptable context
From: Pablo Neira Ayuso @ 2013-08-07 9:17 UTC (permalink / raw)
To: Rui Xiang
Cc: containers, linux-kernel, netdev, netfilter-devel, serge.hallyn,
ebiederm, akpm, gaofeng, guz.fnst, libo.chen
In-Reply-To: <1375861035-24320-12-git-send-email-rui.xiang@huawei.com>
Hi,
On Wed, Aug 07, 2013 at 03:37:15PM +0800, Rui Xiang wrote:
> To containerise iptables log, use ns_printk
> to report individual logs to container as
> getting syslog_ns from net->user_ns.
This patch is missing the removal of a couple of LOC at the very
beginning of ipt_log_packet and ip6t_log_packet to get this working.
Please, revamp it. Thanks.
^ permalink raw reply
* Re: [GIT PULL 0/2] IPVS enhancement for v3.12
From: Pablo Neira Ayuso @ 2013-08-07 9:09 UTC (permalink / raw)
To: Simon Horman
Cc: lvs-devel, netdev, netfilter-devel, Wensong Zhang,
Julian Anastasov
In-Reply-To: <1375864829-19840-1-git-send-email-horms@verge.net.au>
On Wed, Aug 07, 2013 at 05:40:27PM +0900, Simon Horman wrote:
> Hi Pablo,
>
> please consider the following IPVS enhancement for v3.12.
>
> It looks like v3.12 is going to be pretty quiet for IPVS
> as at this stage I'm not expecting anything more than a few more cleanup
> patches. And I'm not even sure if they will come through.
I see, thanks for the information Simon. Pulled these two patches.
^ permalink raw reply
* [RFC PATCHv2 3/3] xfrm: Revert "Fix unexpected SA hard expiration after changing date"
From: Fan Du @ 2013-08-07 9:04 UTC (permalink / raw)
To: steffen.klassert, davem, herbert; +Cc: netdev
In-Reply-To: <1375866296-15079-1-git-send-email-fan.du@windriver.com>
Since SAs lifetime timeout has been updated whenever clock_was_set is
called. So commit: e3c0d04750751389d5116267f8cf4687444d9a50
("Fix unexpected SA hard expiration after changing date") is not needed
anymore.
Signed-off-by: Fan Du <fan.du@windriver.com>
---
include/net/xfrm.h | 4 ----
net/xfrm/xfrm_state.c | 21 ++++-----------------
2 files changed, 4 insertions(+), 21 deletions(-)
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index 94ce082..b9df23f 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -214,9 +214,6 @@ struct xfrm_state {
struct xfrm_lifetime_cur curlft;
struct tasklet_hrtimer mtimer;
- /* used to fix curlft->add_time when changing date */
- long saved_tmo;
-
/* Last used time */
unsigned long lastused;
@@ -242,7 +239,6 @@ static inline struct net *xs_net(struct xfrm_state *x)
/* xflags - make enum if more show up */
#define XFRM_TIME_DEFER 1
-#define XFRM_SOFT_EXPIRE 2
enum {
XFRM_STATE_VOID,
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index 25e808d..310985d 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -407,17 +407,8 @@ static enum hrtimer_restart xfrm_timer_handler(struct hrtimer * me)
if (x->lft.hard_add_expires_seconds) {
long tmo = x->lft.hard_add_expires_seconds +
x->curlft.add_time - now;
- if (tmo <= 0) {
- if (x->xflags & XFRM_SOFT_EXPIRE) {
- /* enter hard expire without soft expire first?!
- * setting a new date could trigger this.
- * workarbound: fix x->curflt.add_time by below:
- */
- x->curlft.add_time = now - x->saved_tmo - 1;
- tmo = x->lft.hard_add_expires_seconds - x->saved_tmo;
- } else
- goto expired;
- }
+ if (tmo <= 0)
+ goto expired;
if (tmo < next)
next = tmo;
}
@@ -434,14 +425,10 @@ static enum hrtimer_restart xfrm_timer_handler(struct hrtimer * me)
if (x->lft.soft_add_expires_seconds) {
long tmo = x->lft.soft_add_expires_seconds +
x->curlft.add_time - now;
- if (tmo <= 0) {
+ if (tmo <= 0)
warn = 1;
- x->xflags &= ~XFRM_SOFT_EXPIRE;
- } else if (tmo < next) {
+ else if (tmo < next)
next = tmo;
- x->xflags |= XFRM_SOFT_EXPIRE;
- x->saved_tmo = tmo;
- }
}
if (x->lft.soft_use_expires_seconds) {
long tmo = x->lft.soft_use_expires_seconds +
--
1.7.9.5
^ permalink raw reply related
* [RFC PATCHv2 0/3] xfrm: Refactor xfrm_state timer management
From: Fan Du @ 2013-08-07 9:04 UTC (permalink / raw)
To: steffen.klassert, davem, herbert; +Cc: netdev
The first version of "refactor xfrm_state timer management" has been
flushed into toilet since nobody but only me like it.
Anyway new approach here is updating SAs lifetime timeout whenever
clock_was_set is called, iow, system clock changed or host resume from
suspend state. Rule is simple, force soft expire for any SAs which has
not reach their soft expire limit and hard expire for those has experienced
soft expire timeout but wait for hard expire timeout to come.(If I undestand
Dave advice clearly)
Locking issue:
- holding rtnl_lock when iterate on all net namespace.
- holding xfrm_state_lock when iterate all xfrm_state in this net.
- holding state->lock when changing xfrm_state.
I'm not aware of any other locks other than above ones, so if I'm missing
something obviously, please tell me.
Thanks!
Fan Du (3):
hrtimer: Add notifer for clock_was_set
xfrm: Update xfrm_state lifetime expire after clock_was_set
xfrm: Revert "Fix unexpected SA hard expiration after changing date"
include/net/xfrm.h | 4 ----
kernel/hrtimer.c | 4 ++++
net/xfrm/xfrm_state.c | 61 +++++++++++++++++++++++++++++++++++--------------
3 files changed, 48 insertions(+), 21 deletions(-)
--
1.7.9.5
^ permalink raw reply
* [RFC PATCHv2 1/3] hrtimer: Add notifer for clock_was_set
From: Fan Du @ 2013-08-07 9:04 UTC (permalink / raw)
To: steffen.klassert, davem, herbert; +Cc: netdev
In-Reply-To: <1375866296-15079-1-git-send-email-fan.du@windriver.com>
When clock_was_set is called in case of system wall time change
or host resume from suspend state, use this notifier for places
where interested in this action.
Signed-off-by: Fan Du <fan.du@windriver.com>
---
kernel/hrtimer.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index 383319b..b7c62a9 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -755,6 +755,9 @@ static inline void retrigger_next_event(void *arg) { }
#endif /* CONFIG_HIGH_RES_TIMERS */
+ATOMIC_NOTIFIER_HEAD(clock_change_notifier_list);
+EXPORT_SYMBOL(clock_change_notifier_list);
+
/*
* Clock realtime was set
*
@@ -773,6 +776,7 @@ void clock_was_set(void)
on_each_cpu(retrigger_next_event, NULL, 1);
#endif
timerfd_clock_was_set();
+ atomic_notifier_call_chain(&clock_change_notifier_list, 0, 0);
}
/*
--
1.7.9.5
^ permalink raw reply related
* [RFC PATCHv2 2/3] xfrm: Update xfrm_state lifetime expire after clock_was_set
From: Fan Du @ 2013-08-07 9:04 UTC (permalink / raw)
To: steffen.klassert, davem, herbert; +Cc: netdev
In-Reply-To: <1375866296-15079-1-git-send-email-fan.du@windriver.com>
After clock_was_set called to set new time or host resume from suspend
state. Notify IKED with soft timeout for SAs which haven't reach its
soft timeout limit. For those dying SAs, arrange them to hard expire.
Signed-off-by: Fan Du <fan.du@windriver.com>
---
net/xfrm/xfrm_state.c | 40 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index 78f66fa..25e808d 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -2002,6 +2002,44 @@ int xfrm_init_state(struct xfrm_state *x)
EXPORT_SYMBOL(xfrm_init_state);
+extern struct atomic_notifier_head clock_change_notifier_list;
+static int clock_change_callback(struct notifier_block *nb,
+ unsigned long reason, void *arg)
+{
+ struct xfrm_state_walk *walk;
+ struct xfrm_state *state;
+ struct net *net;
+ long next;
+
+ rtnl_lock();
+ for_each_net(net) {
+ spin_lock_bh(&xfrm_state_lock);
+ list_for_each_entry(walk, &net->xfrm.state_all, all) {
+ state = container_of(walk, struct xfrm_state, km);
+ spin_lock(&state->lock);
+ if(state->km.dying) {
+ next = 0;
+ } else {
+ state->km.dying = 1;
+ km_state_expired(state, 0, 0);
+ next = state->lft.hard_add_expires_seconds -
+ state->lft.soft_add_expires_seconds;
+ }
+ state->km.state = XFRM_STATE_EXPIRED;
+ tasklet_hrtimer_start(&state->mtimer, ktime_set(next,0), HRTIMER_MODE_REL);
+ spin_unlock(&state->lock);
+ }
+ spin_unlock_bh(&xfrm_state_lock);
+ }
+ rtnl_unlock();
+
+ return NOTIFY_DONE;
+}
+
+static struct notifier_block clock_change_notifier = {
+ .notifier_call = clock_change_callback,
+};
+
int __net_init xfrm_state_init(struct net *net)
{
unsigned int sz;
@@ -2026,6 +2064,8 @@ int __net_init xfrm_state_init(struct net *net)
INIT_HLIST_HEAD(&net->xfrm.state_gc_list);
INIT_WORK(&net->xfrm.state_gc_work, xfrm_state_gc_task);
init_waitqueue_head(&net->xfrm.km_waitq);
+ atomic_notifier_chain_register(&clock_change_notifier_list,
+ &clock_change_notifier);
return 0;
out_byspi:
--
1.7.9.5
^ 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