Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1168600/?format=api
{ "id": 1168600, "url": "http://patchwork.ozlabs.org/api/patches/1168600/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/patch/c568efa1d4a6e35f9494201549490eb36d468d45.1569491461.git.sd@queasysnail.net/", "project": { "id": 7, "url": "http://patchwork.ozlabs.org/api/projects/7/?format=api", "name": "Linux network development", "link_name": "netdev", "list_id": "netdev.vger.kernel.org", "list_email": "netdev@vger.kernel.org", "web_url": null, "scm_url": null, "webscm_url": null, "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<c568efa1d4a6e35f9494201549490eb36d468d45.1569491461.git.sd@queasysnail.net>", "list_archive_url": null, "date": "2019-09-27T14:58:56", "name": "[ipsec-next,v3,1/6] net: add queue argument to __skb_wait_for_more_packets and __skb_{,try_}recv_datagram", "commit_ref": null, "pull_url": null, "state": "awaiting-upstream", "archived": false, "hash": "cb058c6e3ecf9ecf4488092b9a71b2a980331898", "submitter": { "id": 47767, "url": "http://patchwork.ozlabs.org/api/people/47767/?format=api", "name": "Sabrina Dubroca", "email": "sd@queasysnail.net" }, "delegate": { "id": 34, "url": "http://patchwork.ozlabs.org/api/users/34/?format=api", "username": "davem", "first_name": "David", "last_name": "Miller", "email": "davem@davemloft.net" }, "mbox": "http://patchwork.ozlabs.org/project/netdev/patch/c568efa1d4a6e35f9494201549490eb36d468d45.1569491461.git.sd@queasysnail.net/mbox/", "series": [ { "id": 132948, "url": "http://patchwork.ozlabs.org/api/series/132948/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/list/?series=132948", "date": "2019-09-27T14:58:55", "name": "ipsec: add TCP encapsulation support (RFC 8229)", "version": 3, "mbox": "http://patchwork.ozlabs.org/series/132948/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1168600/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1168600/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<netdev-owner@vger.kernel.org>", "X-Original-To": "patchwork-incoming-netdev@ozlabs.org", "Delivered-To": "patchwork-incoming-netdev@ozlabs.org", "Authentication-Results": [ "ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org; dmarc=none (p=none dis=none)\n\theader.from=queasysnail.net" ], "Received": [ "from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 46fw0X1W15z9sP3\n\tfor <patchwork-incoming-netdev@ozlabs.org>;\n\tSat, 28 Sep 2019 00:58:36 +1000 (AEST)", "(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1727557AbfI0O6f (ORCPT\n\t<rfc822;patchwork-incoming-netdev@ozlabs.org>);\n\tFri, 27 Sep 2019 10:58:35 -0400", "from mx1.redhat.com ([209.132.183.28]:44744 \"EHLO mx1.redhat.com\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1726843AbfI0O6e (ORCPT <rfc822;netdev@vger.kernel.org>);\n\tFri, 27 Sep 2019 10:58:34 -0400", "from smtp.corp.redhat.com\n\t(int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id D5EFA191864C;\n\tFri, 27 Sep 2019 14:58:33 +0000 (UTC)", "from hog.localdomain, (unknown [10.40.206.20])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id BBD2E8DC14;\n\tFri, 27 Sep 2019 14:58:32 +0000 (UTC)" ], "From": "Sabrina Dubroca <sd@queasysnail.net>", "To": "netdev@vger.kernel.org", "Cc": "Herbert Xu <herbert@gondor.apana.org.au>,\n\tSteffen Klassert <steffen.klassert@secunet.com>,\n\tSabrina Dubroca <sd@queasysnail.net>", "Subject": "[PATCH ipsec-next v3 1/6] net: add queue argument to\n\t__skb_wait_for_more_packets and __skb_{, try_}recv_datagram", "Date": "Fri, 27 Sep 2019 16:58:56 +0200", "Message-Id": "<c568efa1d4a6e35f9494201549490eb36d468d45.1569491461.git.sd@queasysnail.net>", "In-Reply-To": "<cover.1569491461.git.sd@queasysnail.net>", "References": "<cover.1569491461.git.sd@queasysnail.net>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-Scanned-By": "MIMEDefang 2.79 on 10.5.11.13", "X-Greylist": "Sender IP whitelisted, not delayed by milter-greylist-4.6.2\n\t(mx1.redhat.com [10.5.110.70]);\n\tFri, 27 Sep 2019 14:58:33 +0000 (UTC)", "Sender": "netdev-owner@vger.kernel.org", "Precedence": "bulk", "List-ID": "<netdev.vger.kernel.org>", "X-Mailing-List": "netdev@vger.kernel.org" }, "content": "This will be used by ESP over TCP to handle the queue of IKE messages.\n\nSigned-off-by: Sabrina Dubroca <sd@queasysnail.net>\n---\nv2: document the new argument to __skb_try_recv_datagram\n\n include/linux/skbuff.h | 11 ++++++++---\n net/core/datagram.c | 27 +++++++++++++++++----------\n net/ipv4/udp.c | 3 ++-\n net/unix/af_unix.c | 7 ++++---\n 4 files changed, 31 insertions(+), 17 deletions(-)", "diff": "diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h\nindex 907209c0794e..c33cafb9d26f 100644\n--- a/include/linux/skbuff.h\n+++ b/include/linux/skbuff.h\n@@ -3441,7 +3441,8 @@ static inline void skb_frag_list_init(struct sk_buff *skb)\n \tfor (iter = skb_shinfo(skb)->frag_list; iter; iter = iter->next)\n \n \n-int __skb_wait_for_more_packets(struct sock *sk, int *err, long *timeo_p,\n+int __skb_wait_for_more_packets(struct sock *sk, struct sk_buff_head *queue,\n+\t\t\t\tint *err, long *timeo_p,\n \t\t\t\tconst struct sk_buff *skb);\n struct sk_buff *__skb_try_recv_from_queue(struct sock *sk,\n \t\t\t\t\t struct sk_buff_head *queue,\n@@ -3450,12 +3451,16 @@ struct sk_buff *__skb_try_recv_from_queue(struct sock *sk,\n \t\t\t\t\t\t\t struct sk_buff *skb),\n \t\t\t\t\t int *off, int *err,\n \t\t\t\t\t struct sk_buff **last);\n-struct sk_buff *__skb_try_recv_datagram(struct sock *sk, unsigned flags,\n+struct sk_buff *__skb_try_recv_datagram(struct sock *sk,\n+\t\t\t\t\tstruct sk_buff_head *queue,\n+\t\t\t\t\tunsigned int flags,\n \t\t\t\t\tvoid (*destructor)(struct sock *sk,\n \t\t\t\t\t\t\t struct sk_buff *skb),\n \t\t\t\t\tint *off, int *err,\n \t\t\t\t\tstruct sk_buff **last);\n-struct sk_buff *__skb_recv_datagram(struct sock *sk, unsigned flags,\n+struct sk_buff *__skb_recv_datagram(struct sock *sk,\n+\t\t\t\t struct sk_buff_head *sk_queue,\n+\t\t\t\t unsigned int flags,\n \t\t\t\t void (*destructor)(struct sock *sk,\n \t\t\t\t\t\t struct sk_buff *skb),\n \t\t\t\t int *off, int *err);\ndiff --git a/net/core/datagram.c b/net/core/datagram.c\nindex 4cc8dc5db2b7..ef192359f707 100644\n--- a/net/core/datagram.c\n+++ b/net/core/datagram.c\n@@ -84,7 +84,8 @@ static int receiver_wake_function(wait_queue_entry_t *wait, unsigned int mode, i\n /*\n * Wait for the last received packet to be different from skb\n */\n-int __skb_wait_for_more_packets(struct sock *sk, int *err, long *timeo_p,\n+int __skb_wait_for_more_packets(struct sock *sk, struct sk_buff_head *queue,\n+\t\t\t\tint *err, long *timeo_p,\n \t\t\t\tconst struct sk_buff *skb)\n {\n \tint error;\n@@ -97,7 +98,7 @@ int __skb_wait_for_more_packets(struct sock *sk, int *err, long *timeo_p,\n \tif (error)\n \t\tgoto out_err;\n \n-\tif (sk->sk_receive_queue.prev != skb)\n+\tif (queue->prev != skb)\n \t\tgoto out;\n \n \t/* Socket shut down? */\n@@ -209,6 +210,7 @@ struct sk_buff *__skb_try_recv_from_queue(struct sock *sk,\n /**\n *\t__skb_try_recv_datagram - Receive a datagram skbuff\n *\t@sk: socket\n+ *\t@queue: socket queue from which to receive\n *\t@flags: MSG\\_ flags\n *\t@destructor: invoked under the receive lock on successful dequeue\n *\t@off: an offset in bytes to peek skb from. Returns an offset\n@@ -241,13 +243,14 @@ struct sk_buff *__skb_try_recv_from_queue(struct sock *sk,\n *\tquite explicitly by POSIX 1003.1g, don't change them without having\n *\tthe standard around please.\n */\n-struct sk_buff *__skb_try_recv_datagram(struct sock *sk, unsigned int flags,\n+struct sk_buff *__skb_try_recv_datagram(struct sock *sk,\n+\t\t\t\t\tstruct sk_buff_head *queue,\n+\t\t\t\t\tunsigned int flags,\n \t\t\t\t\tvoid (*destructor)(struct sock *sk,\n \t\t\t\t\t\t\t struct sk_buff *skb),\n \t\t\t\t\tint *off, int *err,\n \t\t\t\t\tstruct sk_buff **last)\n {\n-\tstruct sk_buff_head *queue = &sk->sk_receive_queue;\n \tstruct sk_buff *skb;\n \tunsigned long cpu_flags;\n \t/*\n@@ -278,7 +281,7 @@ struct sk_buff *__skb_try_recv_datagram(struct sock *sk, unsigned int flags,\n \t\t\tbreak;\n \n \t\tsk_busy_loop(sk, flags & MSG_DONTWAIT);\n-\t} while (sk->sk_receive_queue.prev != *last);\n+\t} while (queue->prev != *last);\n \n \terror = -EAGAIN;\n \n@@ -288,7 +291,9 @@ struct sk_buff *__skb_try_recv_datagram(struct sock *sk, unsigned int flags,\n }\n EXPORT_SYMBOL(__skb_try_recv_datagram);\n \n-struct sk_buff *__skb_recv_datagram(struct sock *sk, unsigned int flags,\n+struct sk_buff *__skb_recv_datagram(struct sock *sk,\n+\t\t\t\t struct sk_buff_head *sk_queue,\n+\t\t\t\t unsigned int flags,\n \t\t\t\t void (*destructor)(struct sock *sk,\n \t\t\t\t\t\t struct sk_buff *skb),\n \t\t\t\t int *off, int *err)\n@@ -299,15 +304,16 @@ struct sk_buff *__skb_recv_datagram(struct sock *sk, unsigned int flags,\n \ttimeo = sock_rcvtimeo(sk, flags & MSG_DONTWAIT);\n \n \tdo {\n-\t\tskb = __skb_try_recv_datagram(sk, flags, destructor, off, err,\n-\t\t\t\t\t &last);\n+\t\tskb = __skb_try_recv_datagram(sk, sk_queue, flags, destructor,\n+\t\t\t\t\t off, err, &last);\n \t\tif (skb)\n \t\t\treturn skb;\n \n \t\tif (*err != -EAGAIN)\n \t\t\tbreak;\n \t} while (timeo &&\n-\t\t!__skb_wait_for_more_packets(sk, err, &timeo, last));\n+\t\t !__skb_wait_for_more_packets(sk, sk_queue, err,\n+\t\t\t\t\t &timeo, last));\n \n \treturn NULL;\n }\n@@ -318,7 +324,8 @@ struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned int flags,\n {\n \tint off = 0;\n \n-\treturn __skb_recv_datagram(sk, flags | (noblock ? MSG_DONTWAIT : 0),\n+\treturn __skb_recv_datagram(sk, &sk->sk_receive_queue,\n+\t\t\t\t flags | (noblock ? MSG_DONTWAIT : 0),\n \t\t\t\t NULL, &off, err);\n }\n EXPORT_SYMBOL(skb_recv_datagram);\ndiff --git a/net/ipv4/udp.c b/net/ipv4/udp.c\nindex fbcd9be3a470..2ce132c7a120 100644\n--- a/net/ipv4/udp.c\n+++ b/net/ipv4/udp.c\n@@ -1676,7 +1676,8 @@ struct sk_buff *__skb_recv_udp(struct sock *sk, unsigned int flags,\n \n \t\t/* sk_queue is empty, reader_queue may contain peeked packets */\n \t} while (timeo &&\n-\t\t !__skb_wait_for_more_packets(sk, &error, &timeo,\n+\t\t !__skb_wait_for_more_packets(sk, &sk->sk_receive_queue,\n+\t\t\t\t\t &error, &timeo,\n \t\t\t\t\t (struct sk_buff *)sk_queue));\n \n \t*err = error;\ndiff --git a/net/unix/af_unix.c b/net/unix/af_unix.c\nindex 67e87db5877f..93e004f97f48 100644\n--- a/net/unix/af_unix.c\n+++ b/net/unix/af_unix.c\n@@ -2048,8 +2048,8 @@ static int unix_dgram_recvmsg(struct socket *sock, struct msghdr *msg,\n \t\tmutex_lock(&u->iolock);\n \n \t\tskip = sk_peek_offset(sk, flags);\n-\t\tskb = __skb_try_recv_datagram(sk, flags, NULL, &skip, &err,\n-\t\t\t\t\t &last);\n+\t\tskb = __skb_try_recv_datagram(sk, &sk->sk_receive_queue, flags,\n+\t\t\t\t\t NULL, &skip, &err, &last);\n \t\tif (skb)\n \t\t\tbreak;\n \n@@ -2058,7 +2058,8 @@ static int unix_dgram_recvmsg(struct socket *sock, struct msghdr *msg,\n \t\tif (err != -EAGAIN)\n \t\t\tbreak;\n \t} while (timeo &&\n-\t\t !__skb_wait_for_more_packets(sk, &err, &timeo, last));\n+\t\t !__skb_wait_for_more_packets(sk, &sk->sk_receive_queue,\n+\t\t\t\t\t &err, &timeo, last));\n \n \tif (!skb) { /* implies iolock unlocked */\n \t\tunix_state_lock(sk);\n", "prefixes": [ "ipsec-next", "v3", "1/6" ] }