{"id":806597,"url":"http://patchwork.ozlabs.org/api/1.0/patches/806597/?format=json","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.0/projects/7/?format=json","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},"msgid":"<20170828141201.14143.84669.stgit@john-Precision-Tower-5810>","date":"2017-08-28T14:12:01","name":"[net-next,7/9] bpf: sockmap indicate sock events to listeners","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"5b0538c8e6564620223b9ee8da07ef0750e82b8b","submitter":{"id":20028,"url":"http://patchwork.ozlabs.org/api/1.0/people/20028/?format=json","name":"John Fastabend","email":"john.fastabend@gmail.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.0/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20170828141201.14143.84669.stgit@john-Precision-Tower-5810/mbox/","series":[{"id":179,"url":"http://patchwork.ozlabs.org/api/1.0/series/179/?format=json","date":"2017-08-28T14:09:45","name":"sockmap UAPI updates and fixes","version":1,"mbox":"http://patchwork.ozlabs.org/series/179/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/806597/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@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=)","ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"JtJInLQo\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xgtxt60fLz9s1h\n\tfor ;\n\tTue, 29 Aug 2017 00:12:18 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751234AbdH1OMR (ORCPT );\n\tMon, 28 Aug 2017 10:12:17 -0400","from mail-pg0-f68.google.com ([74.125.83.68]:34323 \"EHLO\n\tmail-pg0-f68.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751170AbdH1OMP (ORCPT\n\t); Mon, 28 Aug 2017 10:12:15 -0400","by mail-pg0-f68.google.com with SMTP id 63so465517pgc.1\n\tfor ; Mon, 28 Aug 2017 07:12:15 -0700 (PDT)","from [127.0.1.1] ([72.168.144.1]) by smtp.gmail.com with ESMTPSA id\n\tv16sm1706888pgc.26.2017.08.28.07.12.07\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tMon, 28 Aug 2017 07:12:14 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=gmail.com; s=20161025;\n\th=subject:from:to:cc:date:message-id:in-reply-to:references\n\t:user-agent:mime-version:content-transfer-encoding;\n\tbh=GNlEAzs5bUg5BnvunM5t1ztEJBNaH5MDdxNon2GfAHg=;\n\tb=JtJInLQo7+GHrtpeBMncqG2LM2FrkyHcJmqOM7CwnFX/OaC2Yz9pERjP/02OPwBHFp\n\tUi8zm0paItp1dzq3nucXLY4NlF8oT7inAA+mptrpHhZFmStc9Fi6L1siEyWr0jnpqlUu\n\tYzmNmFaziaJHwVEp+2S7bLDS1dLnH2qikgMX+5cZvJVYn5oxAqi8wGLiSbag6IsmZBtu\n\tS7HTixWXPsA2dnaTzaAxjfaNTKtcph8eLOYTAsrblKgZ9woxT2HIYDj6qvSpmPW7c2Vv\n\thHONEzZrYnEB2jDKD3Pdki9hqtRJ5FAhiVEOcDqC/ItC7DX7Jm+2SuX7CrNSbJa+aNrQ\n\tHJOQ==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:subject:from:to:cc:date:message-id:in-reply-to\n\t:references:user-agent:mime-version:content-transfer-encoding;\n\tbh=GNlEAzs5bUg5BnvunM5t1ztEJBNaH5MDdxNon2GfAHg=;\n\tb=glCWZ7x1DhNEq1hRttyJSKITXdPPuSm4F6vDMn/NaRaYdPEJb58omkVAQdTjMfSfnz\n\tJ7xJOcPvvAMBKFnypeWMyS52Y099PrSzyFGU6IpeK84Jtaj02f2xf2qzraQZgUgOLOUr\n\tiilEttVuG5Vc1acSeuLO7J5gd0WrBSEOlzApM/NDJ2myIKt7N2FrBdNuv/9z81Z88amL\n\tDacbZXA6yK/0LifDVsZEIO3jPMCxRqgzik0tozb++t5WEyYnFVOz3kTxEUCMrFWymLvB\n\t9VBpey61WwdlMnRRg6FNlzFRVbH4e4fPqbyW3kibtZum1J6jNZmlja+kiX6t6+kNdcG0\n\t/pQA==","X-Gm-Message-State":"AHYfb5g2mM+MCZf7gfWfD1KOYR3FzaXCyJ82x44DLWmsSGO5BKo/yg/Y\n\tk5DSb3HonwggTc1e","X-Received":"by 10.84.216.71 with SMTP id f7mr918751plj.123.1503929535181;\n\tMon, 28 Aug 2017 07:12:15 -0700 (PDT)","Subject":"[net-next PATCH 7/9] bpf: sockmap indicate sock events to listeners","From":"John Fastabend ","To":"ast@kernel.org, daniel@iogearbox.net, davem@davemloft.net","Cc":"netdev@vger.kernel.org, john.fastabend@gmail.com","Date":"Mon, 28 Aug 2017 07:12:01 -0700","Message-ID":"<20170828141201.14143.84669.stgit@john-Precision-Tower-5810>","In-Reply-To":"<20170828140850.14143.83953.stgit@john-Precision-Tower-5810>","References":"<20170828140850.14143.83953.stgit@john-Precision-Tower-5810>","User-Agent":"StGit/0.17.1-dirty","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"7bit","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"After userspace pushes sockets into a sockmap it may not be receiving\ndata (assuming stream_{parser|verdict} programs are attached). But, it\nmay still want to manage the socks. A common pattern is to poll/select\nfor a POLLRDHUP event so we can close the sock.\n\nThis patch adds the logic to wake up these listeners.\n\nAlso add TCP_SYN_SENT to the list of events to handle. We don't want\nto break the connection just because we happen to be in this state.\n\nSigned-off-by: John Fastabend \n---\n kernel/bpf/sockmap.c | 6 ++++++\n 1 file changed, 6 insertions(+)","diff":"diff --git a/kernel/bpf/sockmap.c b/kernel/bpf/sockmap.c\nindex 38bf4e4..bcc326a 100644\n--- a/kernel/bpf/sockmap.c\n+++ b/kernel/bpf/sockmap.c\n@@ -162,6 +162,7 @@ static void smap_state_change(struct sock *sk)\n {\n \tstruct smap_psock_map_entry *e, *tmp;\n \tstruct smap_psock *psock;\n+\tstruct socket_wq *wq;\n \tstruct sock *osk;\n \n \trcu_read_lock();\n@@ -171,6 +172,7 @@ static void smap_state_change(struct sock *sk)\n \t * is established.\n \t */\n \tswitch (sk->sk_state) {\n+\tcase TCP_SYN_SENT:\n \tcase TCP_SYN_RECV:\n \tcase TCP_ESTABLISHED:\n \t\tbreak;\n@@ -208,6 +210,10 @@ static void smap_state_change(struct sock *sk)\n \t\tsmap_report_sk_error(psock, EPIPE);\n \t\tbreak;\n \t}\n+\n+\twq = rcu_dereference(sk->sk_wq);\n+\tif (skwq_has_sleeper(wq))\n+\t\twake_up_interruptible_all(&wq->wait);\n \trcu_read_unlock();\n }\n \n","prefixes":["net-next","7/9"]}