From patchwork Wed Oct 4 16:37:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 821399 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3y6hQK1qBjz9sxR for ; Thu, 5 Oct 2017 03:37:29 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751384AbdJDQh1 (ORCPT ); Wed, 4 Oct 2017 12:37:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50440 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750966AbdJDQh0 (ORCPT ); Wed, 4 Oct 2017 12:37:26 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 35CC9641CA; Wed, 4 Oct 2017 16:37:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 35CC9641CA Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=stefanha@redhat.com Received: from localhost (ovpn-117-53.ams2.redhat.com [10.36.117.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7243F600C8; Wed, 4 Oct 2017 16:37:20 +0000 (UTC) From: Stefan Hajnoczi To: netdev@vger.kernel.org Cc: "David S . Miller" , Jorgen Hansen , Dexuan Cui , Stefan Hajnoczi Subject: [PATCH v2 0/5] VSOCK: add sock_diag interface Date: Wed, 4 Oct 2017 12:37:11 -0400 Message-Id: <20171004163716.3964-1-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Wed, 04 Oct 2017 16:37:26 +0000 (UTC) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org v2: * Moved tests to tools/testing/vsock/. I was unable to put them in selftests/ because they require manual setup of a VMware/KVM guest. * Moved to __vsock_in_bound/connected_table() to af_vsock.h * Fixed local variable ordering in Patch 4 There is currently no way for userspace to query open AF_VSOCK sockets. This means ss(8), netstat(8), and other utilities cannot display AF_VSOCK sockets. This patch series adds the netlink sock_diag interface for AF_VSOCK. Userspace programs sent a DUMP request including an sk_state bitmap to filter sockets based on their state (connected, listening, etc). The vsock_diag.ko module replies with information about matching sockets. This userspace ABI is defined in . The final patch adds a test suite that exercises the basic cases. Jorgen and Dexuan: I have only tested the virtio transport but this should also work for VMCI and Hyper-V. Please give it a shot if you have time. Stefan Hajnoczi (5): VSOCK: export socket tables for sock_diag interface VSOCK: move __vsock_in_bound/connected_table() to af_vsock.h VSOCK: use TCP state constants for sk_state VSOCK: add sock_diag interface VSOCK: add tools/testing/vsock/vsock_diag_test MAINTAINERS | 3 + net/vmw_vsock/Makefile | 3 + tools/testing/vsock/Makefile | 9 + include/net/af_vsock.h | 20 +- include/uapi/linux/vm_sockets_diag.h | 33 ++ tools/testing/vsock/control.h | 13 + tools/testing/vsock/timeout.h | 14 + net/vmw_vsock/af_vsock.c | 66 +-- net/vmw_vsock/diag.c | 186 ++++++++ net/vmw_vsock/virtio_transport.c | 2 +- net/vmw_vsock/virtio_transport_common.c | 22 +- net/vmw_vsock/vmci_transport.c | 34 +- net/vmw_vsock/vmci_transport_notify.c | 2 +- net/vmw_vsock/vmci_transport_notify_qstate.c | 2 +- tools/testing/vsock/control.c | 219 +++++++++ tools/testing/vsock/timeout.c | 64 +++ tools/testing/vsock/vsock_diag_test.c | 681 +++++++++++++++++++++++++++ net/vmw_vsock/Kconfig | 10 + tools/testing/vsock/.gitignore | 2 + tools/testing/vsock/README | 36 ++ 20 files changed, 1354 insertions(+), 67 deletions(-) create mode 100644 tools/testing/vsock/Makefile create mode 100644 include/uapi/linux/vm_sockets_diag.h create mode 100644 tools/testing/vsock/control.h create mode 100644 tools/testing/vsock/timeout.h create mode 100644 net/vmw_vsock/diag.c create mode 100644 tools/testing/vsock/control.c create mode 100644 tools/testing/vsock/timeout.c create mode 100644 tools/testing/vsock/vsock_diag_test.c create mode 100644 tools/testing/vsock/.gitignore create mode 100644 tools/testing/vsock/README