[PATCH 1/4] parser: Extend series heuristics to include other metadata
Stephen Finucane
stephen at that.guru
Wed May 24 16:02:21 AEST 2017
Not every series will include the reference headers necessary to do
proper series-ification, particularly those generated without the help
of 'git-send-email' or similar.
Make life a little easier for these folks by attempting to match on
other heuristics of the series: submitter, version, number of patches,
project (mailing list) and date. The last of these is particularly
important to prevent duplicate series getting munged together.
Signed-off-by: Stephen Finucane <stephen at that.guru>
---
patchwork/parser.py | 67 ++-
patchwork/tests/series/base-no-references.mbox | 240 ++++++++++
.../series/revision-unlabeled-noreferences.mbox | 482 +++++++++++++++++++++
patchwork/tests/test_series.py | 40 +-
4 files changed, 823 insertions(+), 6 deletions(-)
create mode 100644 patchwork/tests/series/base-no-references.mbox
create mode 100644 patchwork/tests/series/revision-unlabeled-noreferences.mbox
diff --git a/patchwork/parser.py b/patchwork/parser.py
index 6d4640a..28b3a07 100644
--- a/patchwork/parser.py
+++ b/patchwork/parser.py
@@ -48,6 +48,8 @@ _hunk_re = re.compile(r'^\@\@ -\d+(?:,(\d+))? \+\d+(?:,(\d+))? \@\@')
_filename_re = re.compile(r'^(---|\+\+\+) (\S+)')
list_id_headers = ['List-ID', 'X-Mailing-List', 'X-list']
+SERIES_DELAY_INTERVAL = 10
+
logger = logging.getLogger(__name__)
@@ -171,8 +173,8 @@ def find_project_by_header(mail):
return project
-def find_series(project, mail):
- """Find a patch's series.
+def _find_series_by_references(project, mail):
+ """Find a patch's series using message references.
Traverse RFC822 headers, starting with most recent first, to find
ancestors and the related series. Headers are traversed in reverse
@@ -206,7 +208,66 @@ def find_series(project, mail):
return SeriesReference.objects.get(
msgid=ref, series__project=project).series
except SeriesReference.DoesNotExist:
- pass
+ continue
+
+
+def _find_series_by_markers(project, mail):
+ """Find a patch's series using series markers and sender.
+
+ Identify suitable series for a patch using a combination of the
+ series markers found in the subject (version, number of patches)
+ and the patch author. This is less reliable indicator than message
+ headers and is subject to two main types of false positives that we
+ must handle:
+
+ - Series that are resubmitted, either by mistake or for some odd
+ reason (perhaps the patches didn't show up immediately)
+ - Series that have the same author, the same number of patches, and
+ the same version, but which are in fact completely different
+ series.
+
+ To mitigate both cases, patches are also timeboxed such that any
+ patches arriving SERIES_DELAY_INTERVAL minutes after the first
+ patch in the series was created will not be grouped together. This
+ still won't help us if someone spams the mailing list with
+ duplicate series but that's a tricky situation for anyone to parse.
+ """
+ author = find_author(mail)
+
+ subject = mail.get('Subject')
+ name, prefixes = clean_subject(subject, [project.linkname])
+ _, total = parse_series_marker(prefixes)
+ version = parse_version(name, prefixes)
+
+ date = find_date(mail)
+ delta = datetime.timedelta(minutes=SERIES_DELAY_INTERVAL)
+ start_date = date - delta
+ end_date = date + delta
+
+ try:
+ return Series.objects.get(
+ submitter=author, project=project, version=version, total=total,
+ date__range=[start_date, end_date])
+ except (Series.DoesNotExist, Series.MultipleObjectsReturned):
+ return
+
+
+def find_series(project, mail):
+ """Find a series, if any, for a given patch.
+
+ Args:
+ project (patchwork.Project): The project that the series
+ belongs to
+ mail (email.message.Message): The mail to extract series from
+
+ Returns:
+ The matching ``Series`` instance, if any
+ """
+ series = _find_series_by_references(project, mail)
+ if series:
+ return series
+
+ return _find_series_by_markers(project, mail)
def find_author(mail):
diff --git a/patchwork/tests/series/base-no-references.mbox b/patchwork/tests/series/base-no-references.mbox
new file mode 100644
index 0000000..25e0ed6
--- /dev/null
+++ b/patchwork/tests/series/base-no-references.mbox
@@ -0,0 +1,240 @@
+From xiaolou4617 at gmail.com Tue May 23 05:21:05 2017
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [net,v2,1/2] net: ieee802154: remove explicit set skb->sk
+Message-Id: <1495516865-17019-1-git-send-email-xiaolou4617 at gmail.com>
+To: aar at pengutronix.de, stefan at osg.samsung.com, davem at davemloft.net
+Cc: linux-wpan at vger.kernel.org, netdev at vger.kernel.org,
+ linux-kernel at vger.kernel.org, Lin Zhang <xiaolou4617 at gmail.com>
+Date: Tue, 23 May 2017 13:21:05 +0800
+From: Lin Zhang <xiaolou4617 at gmail.com>
+List-Id: <netdev.vger.kernel.org>
+
+Explicit set skb->sk is needless, sock_alloc_send_skb is already set it.
+
+Signed-off-by: Lin Zhang <xiaolou4617 at gmail.com>
+Acked-by: Stefan Schmidt <stefan at osg.samsung.com>
+---
+changelog:
+
+v1 -> v2:
+ * split v1 into two patches, per Stefan Schmidt.
+
+Thanks to Stefan Schmidt for reviewing !
+---
+ net/ieee802154/socket.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/net/ieee802154/socket.c b/net/ieee802154/socket.c
+index eedba76..b01a1f0 100644
+--- a/net/ieee802154/socket.c
++++ b/net/ieee802154/socket.c
+@@ -301,7 +301,6 @@ static int raw_sendmsg(struct sock *sk, struct msghdr *msg, size_t size)
+ goto out_skb;
+
+ skb->dev = dev;
+- skb->sk = sk;
+ skb->protocol = htons(ETH_P_IEEE802154);
+
+ dev_put(dev);
+@@ -690,7 +689,6 @@ static int dgram_sendmsg(struct sock *sk, struct msghdr *msg, size_t size)
+ goto out_skb;
+
+ skb->dev = dev;
+- skb->sk = sk;
+ skb->protocol = htons(ETH_P_IEEE802154);
+
+ dev_put(dev);
+
+
+From xiaolou4617 at gmail.com Tue May 23 05:29:39 2017
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [net,v2,2/2] net: ieee802154: fix net_device reference release too
+ early
+Message-Id: <1495517379-18456-1-git-send-email-xiaolou4617 at gmail.com>
+To: aar at pengutronix.de, stefan at osg.samsung.com, davem at davemloft.net
+Cc: linux-wpan at vger.kernel.org, netdev at vger.kernel.org,
+ linux-kernel at vger.kernel.org, Lin Zhang <xiaolou4617 at gmail.com>
+Date: Tue, 23 May 2017 13:29:39 +0800
+From: Lin Zhang <xiaolou4617 at gmail.com>
+List-Id: <netdev.vger.kernel.org>
+
+This patch fixes the kernel oops when release net_device reference in
+advance. In function raw_sendmsg(i think the dgram_sendmsg has the same
+problem), there is a race condition between dev_put and dev_queue_xmit
+when the device is gong that maybe lead to dev_queue_ximt to see
+an illegal net_device pointer.
+
+My test kernel is 3.13.0-32 and because i am not have a real 802154
+device, so i change lowpan_newlink function to this:
+
+ /* find and hold real wpan device */
+ real_dev = dev_get_by_index(src_net, nla_get_u32(tb[IFLA_LINK]));
+ if (!real_dev)
+ return -ENODEV;
+// if (real_dev->type != ARPHRD_IEEE802154) {
+// dev_put(real_dev);
+// return -EINVAL;
+// }
+ lowpan_dev_info(dev)->real_dev = real_dev;
+ lowpan_dev_info(dev)->fragment_tag = 0;
+ mutex_init(&lowpan_dev_info(dev)->dev_list_mtx);
+
+Also, in order to simulate preempt, i change the raw_sendmsg function
+to this:
+
+ skb->dev = dev;
+ skb->sk = sk;
+ skb->protocol = htons(ETH_P_IEEE802154);
+ dev_put(dev);
+ //simulate preempt
+ schedule_timeout_uninterruptible(30 * HZ);
+ err = dev_queue_xmit(skb);
+ if (err > 0)
+ err = net_xmit_errno(err);
+
+and this is my userspace test code named test_send_data:
+
+int main(int argc, char **argv)
+{
+ char buf[127];
+ int sockfd;
+ sockfd = socket(AF_IEEE802154, SOCK_RAW, 0);
+ if (sockfd < 0) {
+ printf("create sockfd error: %s\n", strerror(errno));
+ return -1;
+ }
+ send(sockfd, buf, sizeof(buf), 0);
+ return 0;
+}
+
+
+This is my test case:
+
+root at zhanglin-x-computer:~/develop/802154# uname -a
+Linux zhanglin-x-computer 3.13.0-32-generic #57-Ubuntu SMP Tue Jul 15
+03:51:08 UTC 2014 x86_64 x86_64 x86_64 GNU/Linux
+root at zhanglin-x-computer:~/develop/802154# ip link add link eth0 name
+lowpan0 type lowpan
+root at zhanglin-x-computer:~/develop/802154#
+//keep the lowpan0 device down
+root at zhanglin-x-computer:~/develop/802154# ./test_send_data &
+//wait a while
+root at zhanglin-x-computer:~/develop/802154# ip link del link dev lowpan0
+//the device is gone
+//oops
+[381.303307] general protection fault: 0000 [#1]SMP
+[381.303407] Modules linked in: af_802154 6lowpan bnep rfcomm
+bluetooth nls_iso8859_1 snd_hda_codec_hdmi snd_hda_codec_realtek
+rts5139(C) snd_hda_intel
+snd_had_codec snd_hwdep snd_pcm snd_page_alloc snd_seq_midi
+snd_seq_midi_event snd_rawmidi snd_req intel_rapl snd_seq_device
+coretemp i915 kvm_intel
+kvm snd_timer snd crct10dif_pclmul crc32_pclmul ghash_clmulni_intel
+cypted drm_kms_helper drm i2c_algo_bit soundcore video mac_hid
+parport_pc ppdev ip parport hid_generic
+usbhid hid ahci r8169 mii libahdi
+[381.304286] CPU:1 PID: 2524 Commm: 1 Tainted: G C 0 3.13.0-32-generic
+[381.304409] Hardware name: Haier Haier DT Computer/Haier DT Codputer,
+BIOS FIBT19H02_X64 06/09/2014
+[381.304546] tasks: ffff000096965fc0 ti: ffffB0013779c000 task.ti:
+ffffB8013779c000
+[381.304659] RIP: 0010:[<ffffffff01621fe1>] [<ffffffff81621fe1>]
+__dev_queue_ximt+0x61/0x500
+[381.304798] RSP: 0018:ffffB8013779dca0 EFLAGS: 00010202
+[381.304880] RAX: 272b031d57565351 RBX: 0000000000000000 RCX: ffff8800968f1a00
+[381.304987] RDX: 0000000000000000 RSI: 0000000000000000 RDI: ffff8800968f1a00
+[381.305095] RBP: ffff8e013773dce0 R08: 0000000000000266 R09: 0000000000000004
+[381.305202] R10: 0000000000000004 R11: 0000000000000005 R12: ffff88013902e000
+[381.305310] R13: 000000000000007f R14: 000000000000007f R15: ffff8800968f1a00
+[381.305418] FS: 00007fc57f50f740(0000) GS: ffff88013fc80000(0000)
+knlGS: 0000000000000000
+[381.305540] CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b
+[381.305627] CR2: 00007fad0841c000 CR3: 00000001368dd000 CR4: 00000000001007e0
+[361.905734] Stack:
+[381.305768] 00000000002052d0 000000003facb30a ffff88013779dcc0
+ffff880137764000
+[381.305898] ffff88013779de70 000000000000007f 000000000000007f
+ffff88013902e000
+[381.306026] ffff88013779dcf0 ffffffff81622490 ffff88013779dd39
+ffffffffa03af9f1
+[381.306155] Call Trace:
+[381.306202] [<ffffffff81622490>] dev_queue_xmit+0x10/0x20
+[381.306294] [<ffffffffa03af9f1>] raw_sendmsg+0x1b1/0x270 [af_802154]
+[381.306396] [<ffffffffa03af054>] ieee802154_sock_sendmsg+0x14/0x20 [af_802154]
+[381.306512] [<ffffffff816079eb>] sock_sendmsg+0x8b/0xc0
+[381.306600] [<ffffffff811d52a5>] ? __d_alloc+0x25/0x180
+[381.306687] [<ffffffff811a1f56>] ? kmem_cache_alloc_trace+0x1c6/0x1f0
+[381.306791] [<ffffffff81607b91>] SYSC_sendto+0x121/0x1c0
+[381.306878] [<ffffffff8109ddf4>] ? vtime_account_user+x54/0x60
+[381.306975] [<ffffffff81020d45>] ? syscall_trace_enter+0x145/0x250
+[381.307073] [<ffffffff816086ae>] SyS_sendto+0xe/0x10
+[381.307156] [<ffffffff8172c87f>] tracesys+0xe1/0xe6
+[381.307233] Code: c6 a1 a4 ff 41 8b 57 78 49 8b 47 20 85 d2 48 8b 80
+78 07 00 00 75 21 49 8b 57 18 48 85 d2 74 18 48 85 c0 74 13 8b 92 ac
+01 00 00 <3b> 50 10 73 08 8b 44 90 14 41 89 47 78 41 f6 84 24 d5 00 00
+00
+[381.307801] RIP [<ffffffff81621fe1>] _dev_queue_xmit+0x61/0x500
+[381.307901] RSP <ffff88013779dca0>
+[381.347512] Kernel panic - not syncing: Fatal exception in interrupt
+[381.347747] drm_kms_helper: panic occurred, switching back to text console
+
+In my opinion, there is always exist a chance that the device is gong
+before call dev_queue_xmit.
+
+I think the latest kernel is have the same problem and that
+dev_put should be behind of the dev_queue_xmit.
+
+Signed-off-by: Lin Zhang <xiaolou4617 at gmail.com>
+Acked-by: Stefan Schmidt <stefan at osg.samsung.com>
+---
+changelog:
+
+v1 -> v2:
+ * split v1 into two patches, per Stefan Schmidt.
+
+Hello, Stefan:
+ If you have a real 802154 device, maybe use the test case as above, thanks.
+
+Thanks to Stefan Schmidt for reviewing !
+---
+ net/ieee802154/socket.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/net/ieee802154/socket.c b/net/ieee802154/socket.c
+index b01a1f0..a60658c 100644
+--- a/net/ieee802154/socket.c
++++ b/net/ieee802154/socket.c
+@@ -303,12 +303,12 @@ static int raw_sendmsg(struct sock *sk, struct msghdr *msg, size_t size)
+ skb->dev = dev;
+ skb->protocol = htons(ETH_P_IEEE802154);
+
+- dev_put(dev);
+-
+ err = dev_queue_xmit(skb);
+ if (err > 0)
+ err = net_xmit_errno(err);
+
++ dev_put(dev);
++
+ return err ?: size;
+
+ out_skb:
+@@ -691,12 +691,12 @@ static int dgram_sendmsg(struct sock *sk, struct msghdr *msg, size_t size)
+ skb->dev = dev;
+ skb->protocol = htons(ETH_P_IEEE802154);
+
+- dev_put(dev);
+-
+ err = dev_queue_xmit(skb);
+ if (err > 0)
+ err = net_xmit_errno(err);
+
++ dev_put(dev);
++
+ return err ?: size;
+
+ out_skb:
diff --git a/patchwork/tests/series/revision-unlabeled-noreferences.mbox b/patchwork/tests/series/revision-unlabeled-noreferences.mbox
new file mode 100644
index 0000000..419bdfe
--- /dev/null
+++ b/patchwork/tests/series/revision-unlabeled-noreferences.mbox
@@ -0,0 +1,482 @@
+From xiaolou4617 at gmail.com Tue May 23 05:21:05 2017
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [net,v2,1/2] net: ieee802154: remove explicit set skb->sk
+Message-Id: <1495516865-17019-1-git-send-email-xiaolou4617 at gmail.com>
+To: aar at pengutronix.de, stefan at osg.samsung.com, davem at davemloft.net
+Cc: linux-wpan at vger.kernel.org, netdev at vger.kernel.org,
+ linux-kernel at vger.kernel.org, Lin Zhang <xiaolou4617 at gmail.com>
+Date: Tue, 23 May 2017 13:21:05 +0800
+From: Lin Zhang <xiaolou4617 at gmail.com>
+List-Id: <netdev.vger.kernel.org>
+
+Explicit set skb->sk is needless, sock_alloc_send_skb is already set it.
+
+Signed-off-by: Lin Zhang <xiaolou4617 at gmail.com>
+Acked-by: Stefan Schmidt <stefan at osg.samsung.com>
+---
+changelog:
+
+v1 -> v2:
+ * split v1 into two patches, per Stefan Schmidt.
+
+Thanks to Stefan Schmidt for reviewing !
+---
+ net/ieee802154/socket.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/net/ieee802154/socket.c b/net/ieee802154/socket.c
+index eedba76..b01a1f0 100644
+--- a/net/ieee802154/socket.c
++++ b/net/ieee802154/socket.c
+@@ -301,7 +301,6 @@ static int raw_sendmsg(struct sock *sk, struct msghdr *msg, size_t size)
+ goto out_skb;
+
+ skb->dev = dev;
+- skb->sk = sk;
+ skb->protocol = htons(ETH_P_IEEE802154);
+
+ dev_put(dev);
+@@ -690,7 +689,6 @@ static int dgram_sendmsg(struct sock *sk, struct msghdr *msg, size_t size)
+ goto out_skb;
+
+ skb->dev = dev;
+- skb->sk = sk;
+ skb->protocol = htons(ETH_P_IEEE802154);
+
+ dev_put(dev);
+
+
+From xiaolou4617 at gmail.com Tue May 23 05:29:39 2017
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [net,v2,2/2] net: ieee802154: fix net_device reference release too
+ early
+Message-Id: <1495517379-18456-1-git-send-email-xiaolou4617 at gmail.com>
+To: aar at pengutronix.de, stefan at osg.samsung.com, davem at davemloft.net
+Cc: linux-wpan at vger.kernel.org, netdev at vger.kernel.org,
+ linux-kernel at vger.kernel.org, Lin Zhang <xiaolou4617 at gmail.com>
+Date: Tue, 23 May 2017 13:29:39 +0800
+From: Lin Zhang <xiaolou4617 at gmail.com>
+List-Id: <netdev.vger.kernel.org>
+
+This patch fixes the kernel oops when release net_device reference in
+advance. In function raw_sendmsg(i think the dgram_sendmsg has the same
+problem), there is a race condition between dev_put and dev_queue_xmit
+when the device is gong that maybe lead to dev_queue_ximt to see
+an illegal net_device pointer.
+
+My test kernel is 3.13.0-32 and because i am not have a real 802154
+device, so i change lowpan_newlink function to this:
+
+ /* find and hold real wpan device */
+ real_dev = dev_get_by_index(src_net, nla_get_u32(tb[IFLA_LINK]));
+ if (!real_dev)
+ return -ENODEV;
+// if (real_dev->type != ARPHRD_IEEE802154) {
+// dev_put(real_dev);
+// return -EINVAL;
+// }
+ lowpan_dev_info(dev)->real_dev = real_dev;
+ lowpan_dev_info(dev)->fragment_tag = 0;
+ mutex_init(&lowpan_dev_info(dev)->dev_list_mtx);
+
+Also, in order to simulate preempt, i change the raw_sendmsg function
+to this:
+
+ skb->dev = dev;
+ skb->sk = sk;
+ skb->protocol = htons(ETH_P_IEEE802154);
+ dev_put(dev);
+ //simulate preempt
+ schedule_timeout_uninterruptible(30 * HZ);
+ err = dev_queue_xmit(skb);
+ if (err > 0)
+ err = net_xmit_errno(err);
+
+and this is my userspace test code named test_send_data:
+
+int main(int argc, char **argv)
+{
+ char buf[127];
+ int sockfd;
+ sockfd = socket(AF_IEEE802154, SOCK_RAW, 0);
+ if (sockfd < 0) {
+ printf("create sockfd error: %s\n", strerror(errno));
+ return -1;
+ }
+ send(sockfd, buf, sizeof(buf), 0);
+ return 0;
+}
+
+
+This is my test case:
+
+root at zhanglin-x-computer:~/develop/802154# uname -a
+Linux zhanglin-x-computer 3.13.0-32-generic #57-Ubuntu SMP Tue Jul 15
+03:51:08 UTC 2014 x86_64 x86_64 x86_64 GNU/Linux
+root at zhanglin-x-computer:~/develop/802154# ip link add link eth0 name
+lowpan0 type lowpan
+root at zhanglin-x-computer:~/develop/802154#
+//keep the lowpan0 device down
+root at zhanglin-x-computer:~/develop/802154# ./test_send_data &
+//wait a while
+root at zhanglin-x-computer:~/develop/802154# ip link del link dev lowpan0
+//the device is gone
+//oops
+[381.303307] general protection fault: 0000 [#1]SMP
+[381.303407] Modules linked in: af_802154 6lowpan bnep rfcomm
+bluetooth nls_iso8859_1 snd_hda_codec_hdmi snd_hda_codec_realtek
+rts5139(C) snd_hda_intel
+snd_had_codec snd_hwdep snd_pcm snd_page_alloc snd_seq_midi
+snd_seq_midi_event snd_rawmidi snd_req intel_rapl snd_seq_device
+coretemp i915 kvm_intel
+kvm snd_timer snd crct10dif_pclmul crc32_pclmul ghash_clmulni_intel
+cypted drm_kms_helper drm i2c_algo_bit soundcore video mac_hid
+parport_pc ppdev ip parport hid_generic
+usbhid hid ahci r8169 mii libahdi
+[381.304286] CPU:1 PID: 2524 Commm: 1 Tainted: G C 0 3.13.0-32-generic
+[381.304409] Hardware name: Haier Haier DT Computer/Haier DT Codputer,
+BIOS FIBT19H02_X64 06/09/2014
+[381.304546] tasks: ffff000096965fc0 ti: ffffB0013779c000 task.ti:
+ffffB8013779c000
+[381.304659] RIP: 0010:[<ffffffff01621fe1>] [<ffffffff81621fe1>]
+__dev_queue_ximt+0x61/0x500
+[381.304798] RSP: 0018:ffffB8013779dca0 EFLAGS: 00010202
+[381.304880] RAX: 272b031d57565351 RBX: 0000000000000000 RCX: ffff8800968f1a00
+[381.304987] RDX: 0000000000000000 RSI: 0000000000000000 RDI: ffff8800968f1a00
+[381.305095] RBP: ffff8e013773dce0 R08: 0000000000000266 R09: 0000000000000004
+[381.305202] R10: 0000000000000004 R11: 0000000000000005 R12: ffff88013902e000
+[381.305310] R13: 000000000000007f R14: 000000000000007f R15: ffff8800968f1a00
+[381.305418] FS: 00007fc57f50f740(0000) GS: ffff88013fc80000(0000)
+knlGS: 0000000000000000
+[381.305540] CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b
+[381.305627] CR2: 00007fad0841c000 CR3: 00000001368dd000 CR4: 00000000001007e0
+[361.905734] Stack:
+[381.305768] 00000000002052d0 000000003facb30a ffff88013779dcc0
+ffff880137764000
+[381.305898] ffff88013779de70 000000000000007f 000000000000007f
+ffff88013902e000
+[381.306026] ffff88013779dcf0 ffffffff81622490 ffff88013779dd39
+ffffffffa03af9f1
+[381.306155] Call Trace:
+[381.306202] [<ffffffff81622490>] dev_queue_xmit+0x10/0x20
+[381.306294] [<ffffffffa03af9f1>] raw_sendmsg+0x1b1/0x270 [af_802154]
+[381.306396] [<ffffffffa03af054>] ieee802154_sock_sendmsg+0x14/0x20 [af_802154]
+[381.306512] [<ffffffff816079eb>] sock_sendmsg+0x8b/0xc0
+[381.306600] [<ffffffff811d52a5>] ? __d_alloc+0x25/0x180
+[381.306687] [<ffffffff811a1f56>] ? kmem_cache_alloc_trace+0x1c6/0x1f0
+[381.306791] [<ffffffff81607b91>] SYSC_sendto+0x121/0x1c0
+[381.306878] [<ffffffff8109ddf4>] ? vtime_account_user+x54/0x60
+[381.306975] [<ffffffff81020d45>] ? syscall_trace_enter+0x145/0x250
+[381.307073] [<ffffffff816086ae>] SyS_sendto+0xe/0x10
+[381.307156] [<ffffffff8172c87f>] tracesys+0xe1/0xe6
+[381.307233] Code: c6 a1 a4 ff 41 8b 57 78 49 8b 47 20 85 d2 48 8b 80
+78 07 00 00 75 21 49 8b 57 18 48 85 d2 74 18 48 85 c0 74 13 8b 92 ac
+01 00 00 <3b> 50 10 73 08 8b 44 90 14 41 89 47 78 41 f6 84 24 d5 00 00
+00
+[381.307801] RIP [<ffffffff81621fe1>] _dev_queue_xmit+0x61/0x500
+[381.307901] RSP <ffff88013779dca0>
+[381.347512] Kernel panic - not syncing: Fatal exception in interrupt
+[381.347747] drm_kms_helper: panic occurred, switching back to text console
+
+In my opinion, there is always exist a chance that the device is gong
+before call dev_queue_xmit.
+
+I think the latest kernel is have the same problem and that
+dev_put should be behind of the dev_queue_xmit.
+
+Signed-off-by: Lin Zhang <xiaolou4617 at gmail.com>
+Acked-by: Stefan Schmidt <stefan at osg.samsung.com>
+---
+changelog:
+
+v1 -> v2:
+ * split v1 into two patches, per Stefan Schmidt.
+
+Hello, Stefan:
+ If you have a real 802154 device, maybe use the test case as above, thanks.
+
+Thanks to Stefan Schmidt for reviewing !
+---
+ net/ieee802154/socket.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/net/ieee802154/socket.c b/net/ieee802154/socket.c
+index b01a1f0..a60658c 100644
+--- a/net/ieee802154/socket.c
++++ b/net/ieee802154/socket.c
+@@ -303,12 +303,12 @@ static int raw_sendmsg(struct sock *sk, struct msghdr *msg, size_t size)
+ skb->dev = dev;
+ skb->protocol = htons(ETH_P_IEEE802154);
+
+- dev_put(dev);
+-
+ err = dev_queue_xmit(skb);
+ if (err > 0)
+ err = net_xmit_errno(err);
+
++ dev_put(dev);
++
+ return err ?: size;
+
+ out_skb:
+@@ -691,12 +691,12 @@ static int dgram_sendmsg(struct sock *sk, struct msghdr *msg, size_t size)
+ skb->dev = dev;
+ skb->protocol = htons(ETH_P_IEEE802154);
+
+- dev_put(dev);
+-
+ err = dev_queue_xmit(skb);
+ if (err > 0)
+ err = net_xmit_errno(err);
+
++ dev_put(dev);
++
+ return err ?: size;
+
+ out_skb:
+
+
+From xiaolou4617 at gmail.com Tue May 23 06:21:05 2017
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [net,v2,1/2] net: ieee802154: remove explicit set skb->sk
+Message-Id: <1495516865-17091-1-git-send-email-xiaolou4617 at gmail.com>
+To: aar at pengutronix.de, stefan at osg.samsung.com, davem at davemloft.net
+Cc: linux-wpan at vger.kernel.org, netdev at vger.kernel.org,
+ linux-kernel at vger.kernel.org, Lin Zhang <xiaolou4617 at gmail.com>
+Date: Tue, 23 May 2017 14:21:05 +0800
+From: Lin Zhang <xiaolou4617 at gmail.com>
+List-Id: <netdev.vger.kernel.org>
+
+Explicit set skb->sk is needless, sock_alloc_send_skb is already set it.
+
+Signed-off-by: Lin Zhang <xiaolou4617 at gmail.com>
+Acked-by: Stefan Schmidt <stefan at osg.samsung.com>
+---
+changelog:
+
+v1 -> v2:
+ * split v1 into two patches, per Stefan Schmidt.
+
+Thanks to Stefan Schmidt for reviewing !
+---
+ net/ieee802154/socket.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/net/ieee802154/socket.c b/net/ieee802154/socket.c
+index eedba76..b01a1f0 100644
+--- a/net/ieee802154/socket.c
++++ b/net/ieee802154/socket.c
+@@ -301,7 +301,6 @@ static int raw_sendmsg(struct sock *sk, struct msghdr *msg, size_t size)
+ goto out_skb;
+
+ skb->dev = dev;
+- skb->sk = sk;
+ skb->protocol = htons(ETH_P_IEEE802154);
+
+ dev_put(dev);
+@@ -690,7 +689,6 @@ static int dgram_sendmsg(struct sock *sk, struct msghdr *msg, size_t size)
+ goto out_skb;
+
+ skb->dev = dev;
+- skb->sk = sk;
+ skb->protocol = htons(ETH_P_IEEE802154);
+
+ dev_put(dev);
+
+
+From xiaolou4617 at gmail.com Tue May 23 06:29:39 2017
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [net,v2,2/2] net: ieee802154: fix net_device reference release too
+ early
+Message-Id: <1495517379-18465-1-git-send-email-xiaolou4617 at gmail.com>
+To: aar at pengutronix.de, stefan at osg.samsung.com, davem at davemloft.net
+Cc: linux-wpan at vger.kernel.org, netdev at vger.kernel.org,
+ linux-kernel at vger.kernel.org, Lin Zhang <xiaolou4617 at gmail.com>
+Date: Tue, 23 May 2017 14:29:39 +0800
+From: Lin Zhang <xiaolou4617 at gmail.com>
+List-Id: <netdev.vger.kernel.org>
+
+This patch fixes the kernel oops when release net_device reference in
+advance. In function raw_sendmsg(i think the dgram_sendmsg has the same
+problem), there is a race condition between dev_put and dev_queue_xmit
+when the device is gong that maybe lead to dev_queue_ximt to see
+an illegal net_device pointer.
+
+My test kernel is 3.13.0-32 and because i am not have a real 802154
+device, so i change lowpan_newlink function to this:
+
+ /* find and hold real wpan device */
+ real_dev = dev_get_by_index(src_net, nla_get_u32(tb[IFLA_LINK]));
+ if (!real_dev)
+ return -ENODEV;
+// if (real_dev->type != ARPHRD_IEEE802154) {
+// dev_put(real_dev);
+// return -EINVAL;
+// }
+ lowpan_dev_info(dev)->real_dev = real_dev;
+ lowpan_dev_info(dev)->fragment_tag = 0;
+ mutex_init(&lowpan_dev_info(dev)->dev_list_mtx);
+
+Also, in order to simulate preempt, i change the raw_sendmsg function
+to this:
+
+ skb->dev = dev;
+ skb->sk = sk;
+ skb->protocol = htons(ETH_P_IEEE802154);
+ dev_put(dev);
+ //simulate preempt
+ schedule_timeout_uninterruptible(30 * HZ);
+ err = dev_queue_xmit(skb);
+ if (err > 0)
+ err = net_xmit_errno(err);
+
+and this is my userspace test code named test_send_data:
+
+int main(int argc, char **argv)
+{
+ char buf[127];
+ int sockfd;
+ sockfd = socket(AF_IEEE802154, SOCK_RAW, 0);
+ if (sockfd < 0) {
+ printf("create sockfd error: %s\n", strerror(errno));
+ return -1;
+ }
+ send(sockfd, buf, sizeof(buf), 0);
+ return 0;
+}
+
+
+This is my test case:
+
+root at zhanglin-x-computer:~/develop/802154# uname -a
+Linux zhanglin-x-computer 3.13.0-32-generic #57-Ubuntu SMP Tue Jul 15
+03:51:08 UTC 2014 x86_64 x86_64 x86_64 GNU/Linux
+root at zhanglin-x-computer:~/develop/802154# ip link add link eth0 name
+lowpan0 type lowpan
+root at zhanglin-x-computer:~/develop/802154#
+//keep the lowpan0 device down
+root at zhanglin-x-computer:~/develop/802154# ./test_send_data &
+//wait a while
+root at zhanglin-x-computer:~/develop/802154# ip link del link dev lowpan0
+//the device is gone
+//oops
+[381.303307] general protection fault: 0000 [#1]SMP
+[381.303407] Modules linked in: af_802154 6lowpan bnep rfcomm
+bluetooth nls_iso8859_1 snd_hda_codec_hdmi snd_hda_codec_realtek
+rts5139(C) snd_hda_intel
+snd_had_codec snd_hwdep snd_pcm snd_page_alloc snd_seq_midi
+snd_seq_midi_event snd_rawmidi snd_req intel_rapl snd_seq_device
+coretemp i915 kvm_intel
+kvm snd_timer snd crct10dif_pclmul crc32_pclmul ghash_clmulni_intel
+cypted drm_kms_helper drm i2c_algo_bit soundcore video mac_hid
+parport_pc ppdev ip parport hid_generic
+usbhid hid ahci r8169 mii libahdi
+[381.304286] CPU:1 PID: 2524 Commm: 1 Tainted: G C 0 3.13.0-32-generic
+[381.304409] Hardware name: Haier Haier DT Computer/Haier DT Codputer,
+BIOS FIBT19H02_X64 06/09/2014
+[381.304546] tasks: ffff000096965fc0 ti: ffffB0013779c000 task.ti:
+ffffB8013779c000
+[381.304659] RIP: 0010:[<ffffffff01621fe1>] [<ffffffff81621fe1>]
+__dev_queue_ximt+0x61/0x500
+[381.304798] RSP: 0018:ffffB8013779dca0 EFLAGS: 00010202
+[381.304880] RAX: 272b031d57565351 RBX: 0000000000000000 RCX: ffff8800968f1a00
+[381.304987] RDX: 0000000000000000 RSI: 0000000000000000 RDI: ffff8800968f1a00
+[381.305095] RBP: ffff8e013773dce0 R08: 0000000000000266 R09: 0000000000000004
+[381.305202] R10: 0000000000000004 R11: 0000000000000005 R12: ffff88013902e000
+[381.305310] R13: 000000000000007f R14: 000000000000007f R15: ffff8800968f1a00
+[381.305418] FS: 00007fc57f50f740(0000) GS: ffff88013fc80000(0000)
+knlGS: 0000000000000000
+[381.305540] CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b
+[381.305627] CR2: 00007fad0841c000 CR3: 00000001368dd000 CR4: 00000000001007e0
+[361.905734] Stack:
+[381.305768] 00000000002052d0 000000003facb30a ffff88013779dcc0
+ffff880137764000
+[381.305898] ffff88013779de70 000000000000007f 000000000000007f
+ffff88013902e000
+[381.306026] ffff88013779dcf0 ffffffff81622490 ffff88013779dd39
+ffffffffa03af9f1
+[381.306155] Call Trace:
+[381.306202] [<ffffffff81622490>] dev_queue_xmit+0x10/0x20
+[381.306294] [<ffffffffa03af9f1>] raw_sendmsg+0x1b1/0x270 [af_802154]
+[381.306396] [<ffffffffa03af054>] ieee802154_sock_sendmsg+0x14/0x20 [af_802154]
+[381.306512] [<ffffffff816079eb>] sock_sendmsg+0x8b/0xc0
+[381.306600] [<ffffffff811d52a5>] ? __d_alloc+0x25/0x180
+[381.306687] [<ffffffff811a1f56>] ? kmem_cache_alloc_trace+0x1c6/0x1f0
+[381.306791] [<ffffffff81607b91>] SYSC_sendto+0x121/0x1c0
+[381.306878] [<ffffffff8109ddf4>] ? vtime_account_user+x54/0x60
+[381.306975] [<ffffffff81020d45>] ? syscall_trace_enter+0x145/0x250
+[381.307073] [<ffffffff816086ae>] SyS_sendto+0xe/0x10
+[381.307156] [<ffffffff8172c87f>] tracesys+0xe1/0xe6
+[381.307233] Code: c6 a1 a4 ff 41 8b 57 78 49 8b 47 20 85 d2 48 8b 80
+78 07 00 00 75 21 49 8b 57 18 48 85 d2 74 18 48 85 c0 74 13 8b 92 ac
+01 00 00 <3b> 50 10 73 08 8b 44 90 14 41 89 47 78 41 f6 84 24 d5 00 00
+00
+[381.307801] RIP [<ffffffff81621fe1>] _dev_queue_xmit+0x61/0x500
+[381.307901] RSP <ffff88013779dca0>
+[381.347512] Kernel panic - not syncing: Fatal exception in interrupt
+[381.347747] drm_kms_helper: panic occurred, switching back to text console
+
+In my opinion, there is always exist a chance that the device is gong
+before call dev_queue_xmit.
+
+I think the latest kernel is have the same problem and that
+dev_put should be behind of the dev_queue_xmit.
+
+Signed-off-by: Lin Zhang <xiaolou4617 at gmail.com>
+Acked-by: Stefan Schmidt <stefan at osg.samsung.com>
+---
+changelog:
+
+v1 -> v2:
+ * split v1 into two patches, per Stefan Schmidt.
+
+Hello, Stefan:
+ If you have a real 802154 device, maybe use the test case as above, thanks.
+
+Thanks to Stefan Schmidt for reviewing !
+---
+ net/ieee802154/socket.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/net/ieee802154/socket.c b/net/ieee802154/socket.c
+index b01a1f0..a60658c 100644
+--- a/net/ieee802154/socket.c
++++ b/net/ieee802154/socket.c
+@@ -303,12 +303,12 @@ static int raw_sendmsg(struct sock *sk, struct msghdr *msg, size_t size)
+ skb->dev = dev;
+ skb->protocol = htons(ETH_P_IEEE802154);
+
+- dev_put(dev);
+-
+ err = dev_queue_xmit(skb);
+ if (err > 0)
+ err = net_xmit_errno(err);
+
++ dev_put(dev);
++
+ return err ?: size;
+
+ out_skb:
+@@ -691,12 +691,12 @@ static int dgram_sendmsg(struct sock *sk, struct msghdr *msg, size_t size)
+ skb->dev = dev;
+ skb->protocol = htons(ETH_P_IEEE802154);
+
+- dev_put(dev);
+-
+ err = dev_queue_xmit(skb);
+ if (err > 0)
+ err = net_xmit_errno(err);
+
++ dev_put(dev);
++
+ return err ?: size;
+
+ out_skb:
diff --git a/patchwork/tests/test_series.py b/patchwork/tests/test_series.py
index 8de94a0..52fede1 100644
--- a/patchwork/tests/test_series.py
+++ b/patchwork/tests/test_series.py
@@ -105,7 +105,7 @@ class BaseSeriesTest(_BaseTestCase):
- [PATCH 1/2] test: Add some lorem ipsum
- [PATCH 2/2] test: Convert to Markdown
"""
- covers, patches, comments = self._parse_mbox(
+ covers, patches, _ = self._parse_mbox(
'base-cover-letter.mbox', [1, 2, 0])
self.assertSerialized(patches, [2])
@@ -138,7 +138,7 @@ class BaseSeriesTest(_BaseTestCase):
- [PATCH 1/2] test: Add some lorem ipsum
- [PATCH 0/2] A sample series
"""
- covers, patches, comments = self._parse_mbox(
+ covers, patches, _ = self._parse_mbox(
'base-out-of-order.mbox', [1, 2, 0])
self.assertSerialized(patches, [2])
@@ -167,6 +167,21 @@ class BaseSeriesTest(_BaseTestCase):
self.assertSerialized(patches_a + patches_b, [2, 2])
+ def test_no_references(self):
+ """Series received with no reference headers.
+
+ Parse a series with two patches that is received without any
+ reference headers.
+
+ Input:
+ - [PATCH 1/2] net: ieee802154: remove explicit set skb->sk
+ - [PATCH 2/2] net: ieee802154: fix net_device reference release too
+ """
+ _, patches, _ = self._parse_mbox(
+ 'base-no-references.mbox', [0, 2, 0])
+
+ self.assertSerialized(patches, [2])
+
class RevisedSeriesTest(_BaseTestCase):
"""Tests for a series plus a single revision.
@@ -311,6 +326,26 @@ class RevisedSeriesTest(_BaseTestCase):
self.assertSerialized(patches, [2, 2])
self.assertSerialized(covers, [1, 1])
+ def test_unlabeled_noreferences(self):
+ """Series with a revision sent without a version label or
+ reference headers.
+
+ Parse a series with two patches, followed by a second revision of the
+ same. The second revision is not labeled with a series version marker
+ and neither revision contains reference headers. Only the message-ids
+ and receipt times vary (by one hour).
+
+ Input:
+ - [PATCH 1/2] net: ieee802154: remove explicit set skb->sk
+ - [PATCH 2/2] net: ieee802154: fix net_device reference release too
+ - [PATCH 1/2] net: ieee802154: remove explicit set skb->sk
+ - [PATCH 2/2] net: ieee802154: fix net_device reference release too
+ """
+ _, patches, _ = self._parse_mbox(
+ 'revision-unlabeled-noreferences.mbox', [0, 4, 0])
+
+ self.assertSerialized(patches, [2, 2])
+
def test_unnumbered(self):
"""Series with a reply with a diff but no number.
@@ -367,7 +402,6 @@ class RevisedSeriesTest(_BaseTestCase):
- [PATCH 2/2] test: Convert to Markdown
- [PATCH v2 1/2] test: Add some lorem ipsum
- [PATCH v2 2/2] test: Convert to Markdown
-
"""
_, patches, _ = self._parse_mbox(
'bugs-nocover.mbox', [0, 4, 0])
--
2.9.4
More information about the Patchwork
mailing list