From patchwork Mon Mar 27 19:11:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bobby Eshleman X-Patchwork-Id: 7289 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1733047vqo; Mon, 27 Mar 2023 12:14:53 -0700 (PDT) X-Google-Smtp-Source: AKy350Zwf8gBaQnArZQrN2JBDmyYNvUcAfIy6loaWg4lUne4dUiG6e905MMjn46loEP7bhpyoRpb X-Received: by 2002:a17:906:49ca:b0:878:545b:e540 with SMTP id w10-20020a17090649ca00b00878545be540mr13809606ejv.51.1679944493369; Mon, 27 Mar 2023 12:14:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679944493; cv=none; d=google.com; s=arc-20160816; b=DV5EN6cghFgC6vOgLJK9B7u/DvIO9RgQ8XbYUfjDXlYAJgJOwuBtDJ5Ch7L/q0j/ce eQxoB1SMpBReO957XqmzyO6u3v8K8LrXZNL9DY+xs9lV8gF5fF6QufE+Ai4vmaA8FUxd Fx15cZHwL3OijeqeRd4IRVyhKnMlZPQhzbvIIxFDjJB1FGKtxlG4g7cgAH0+wkbsrc+o 8Nf+AnU2iDFsPxKYgQ9gjXK5Obu/BGVE0TiqQTpWmXpeNYKyMxgsy/vCXHcRuuQf8UQ7 VWLEQGQutgEQDjMR5sXt4ppPfPhZIhCpbvEPZtT6r9yJ11z0Ok29C+IGcKlfVbLWOXUg tGmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:content-transfer-encoding:mime-version :message-id:date:subject:from:dkim-signature; bh=v7QgF4SPMByI95xKzR5JGt1MbjLLP8ljYyAalP24SZ0=; b=gNOeTQs9mTS1PnPhD59ene1FuNOZKDTuRH0w9CteUOohWgPfCTBpWyaGp+YTE+UWi2 8kjT5eFxA5NShBqj1qXkjG42fuQ8pKxxBxsOf+riBHwHXjOwcM42AYWrMGoO8k6ZAyyC MC57wAyOgmPam0yLojeACp9TCdjQcC5gfrvdJgPg/wqFw/aNcapP0AaGPunmc4VLCXtm wID2sc7/XDOnUXeq87RV4dpJeoJPYwSH14qbtALh7XisQ4fcGNPg+TDQT7+cUe1frwuk KA4NHN038j0peTDpBuseOsGPaUbtAl8nz4Oi5Qy+/MfvRY51to1hgu8kr9XT4tTn1DW6 Ixxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bytedance.com header.s=google header.b=fj9ssUNv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=bytedance.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hr31-20020a1709073f9f00b0093f3027f7c8si7921567ejc.802.2023.03.27.12.14.29; Mon, 27 Mar 2023 12:14:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@bytedance.com header.s=google header.b=fj9ssUNv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=bytedance.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231437AbjC0TMF (ORCPT + 99 others); Mon, 27 Mar 2023 15:12:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33576 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229456AbjC0TMC (ORCPT ); Mon, 27 Mar 2023 15:12:02 -0400 Received: from mail-qt1-x834.google.com (mail-qt1-x834.google.com [IPv6:2607:f8b0:4864:20::834]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 55E2D1721 for ; Mon, 27 Mar 2023 12:11:54 -0700 (PDT) Received: by mail-qt1-x834.google.com with SMTP id h16so2834170qtn.7 for ; Mon, 27 Mar 2023 12:11:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1679944313; h=cc:to:content-transfer-encoding:mime-version:message-id:date :subject:from:from:to:cc:subject:date:message-id:reply-to; bh=v7QgF4SPMByI95xKzR5JGt1MbjLLP8ljYyAalP24SZ0=; b=fj9ssUNvI0n6VKKx7zevE6u4UkHwEvocg0Hwc+ADRIU82d6JgjBqmN8nQCar5UMtmK c3wYyRc/0lYfxRMiHLOGqojq7mSU+v0qyN7P5q793z4033nycPbedcUKGr4pQcb3/dr9 2AABL2LLCF3J6o49Ugq/FZHqbBDaq24f3OQfsvWOmQIgQT9L2kfL12Bcy4hiN+O+lzAt dVMpMikros3nEcW9kg31ahO8Am7qSRuh3LEjDhcGT/XCCSj6+NyX3/ohlvdd0U3ylYHD 1ESXpfdvTsQ5mczGInyzTOkj43Ug0vegCxekafyazAeF9TlncJbddRnDRwvLnPXkKkjm 3VHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679944313; h=cc:to:content-transfer-encoding:mime-version:message-id:date :subject:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=v7QgF4SPMByI95xKzR5JGt1MbjLLP8ljYyAalP24SZ0=; b=5b+pRSAxUGRt6sULlIFk24iS8idsMdRLmL9JR6QpUqdIypZX5xIhYhW27woEfi8UMB irMKwFTsDTOVzEEEzyyzprAvipVNrchg1hL0/1BtYWubmeknlPYAD/WJW5E9GbkUcx0q vJo1g52S+q5emtj0C/OEyFWxWlldfDb3gLdjDi8bvnJi0apIgX9NsRoIpMexefpjIto3 fvPObA1g0/0ZHwPVk6aj5+ZF80crdj4uMrTB4uPH3tI7CJFGx2Q3AuvCfMpHTuAk7EoT HJqdCZZMZi9Mj0ed1mO5Zjh2vaEybsifLPbswg8XR9lJ/ii3EHmpseNXvEFhWGZwwf+L eSyg== X-Gm-Message-State: AAQBX9fDN8n9J/5QOG318zAfBKo34DUiWxbiDLBKscEZpR2RArTxw74u VY17ay5VaIc8Vsnp6KxlOSSCVQ== X-Received: by 2002:ac8:5f53:0:b0:3e4:e58c:d321 with SMTP id y19-20020ac85f53000000b003e4e58cd321mr9356681qta.33.1679944313444; Mon, 27 Mar 2023 12:11:53 -0700 (PDT) Received: from [172.17.0.3] ([130.44.215.126]) by smtp.gmail.com with ESMTPSA id d185-20020a37b4c2000000b007425ef4cbc2sm16989236qkf.100.2023.03.27.12.11.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Mar 2023 12:11:52 -0700 (PDT) From: Bobby Eshleman Subject: [PATCH net-next v4 0/3] Add support for sockmap to vsock. Date: Mon, 27 Mar 2023 19:11:50 +0000 Message-Id: <20230327-vsock-sockmap-v4-0-c62b7cd92a85@bytedance.com> MIME-Version: 1.0 X-B4-Tracking: v=1; b=H4sIAHbqIWQC/1WNQQrCMBBFr1Jm7eCYBIpeRVxkpqMNYloypRRK7 27izs2HB//xdjAtSQ1u3Q5F12RpyhXCqQMZY34ppqEyOHKevOtxtUne2OYTZ/TEdCXpSYYLVIe jKXKJWcZmcThz+Ffaay76TNuveoesC2bdFngcxxfYw958jwAAAA== To: Stefan Hajnoczi , Stefano Garzarella , "Michael S. Tsirkin" , Jason Wang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Andrii Nakryiko , Mykola Lysenko , Alexei Starovoitov , Daniel Borkmann , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Shuah Khan Cc: linux-kernel@vger.kernel.org, kvm@vger.kernel.org, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, bpf@vger.kernel.org, linux-kselftest@vger.kernel.org, Bobby Eshleman X-Mailer: b4 0.12.2 X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761549477081206437?= X-GMAIL-MSGID: =?utf-8?q?1761549477081206437?= We're testing usage of vsock as a way to redirect guest-local UDS requests to the host and this patch series greatly improves the performance of such a setup. Compared to copying packets via userspace, this improves throughput by 121% in basic testing. Tested as follows. Setup: guest unix dgram sender -> guest vsock redirector -> host vsock server Threads: 1 Payload: 64k No sockmap: - 76.3 MB/s - The guest vsock redirector was "socat VSOCK-CONNECT:2:1234 UNIX-RECV:/path/to/sock" Using sockmap (this patch): - 168.8 MB/s (+121%) - The guest redirector was a simple sockmap echo server, redirecting unix ingress to vsock 2:1234 egress. - Same sender and server programs *Note: these numbers are from RFC v1 Only the virtio transport has been tested. The loopback transport was used in writing bpf/selftests, but not thoroughly tested otherwise. This series requires the skb patch. Changes in v4: - af_vsock: fix parameter alignment in vsock_dgram_recvmsg() - af_vsock: add TCP_ESTABLISHED comment in vsock_dgram_connect() - vsock/bpf: change ret type to bool Changes in v3: - vsock/bpf: Refactor wait logic in vsock_bpf_recvmsg() to avoid backwards goto - vsock/bpf: Check psock before acquiring slock - vsock/bpf: Return bool instead of int of 0 or 1 - vsock/bpf: Wrap macro args __sk/__psock in parens - vsock/bpf: Place comment trailer */ on separate line Changes in v2: - vsock/bpf: rename vsock_dgram_* -> vsock_* - vsock/bpf: change sk_psock_{get,put} and {lock,release}_sock() order to minimize slock hold time - vsock/bpf: use "new style" wait - vsock/bpf: fix bug in wait log - vsock/bpf: add check that recvmsg sk_type is one dgram, seqpacket, or stream. Return error if not one of the three. - virtio/vsock: comment __skb_recv_datagram() usage - virtio/vsock: do not init copied in read_skb() - vsock/bpf: add ifdef guard around struct proto in dgram_recvmsg() - selftests/bpf: add vsock loopback config for aarch64 - selftests/bpf: add vsock loopback config for s390x - selftests/bpf: remove vsock device from vmtest.sh qemu machine - selftests/bpf: remove CONFIG_VIRTIO_VSOCKETS=y from config.x86_64 - vsock/bpf: move transport-related (e.g., if (!vsk->transport)) checks out of fast path Signed-off-by: Bobby Eshleman --- Bobby Eshleman (3): vsock: support sockmap selftests/bpf: add vsock to vmtest.sh selftests/bpf: add a test case for vsock sockmap drivers/vhost/vsock.c | 1 + include/linux/virtio_vsock.h | 1 + include/net/af_vsock.h | 17 ++ net/vmw_vsock/Makefile | 1 + net/vmw_vsock/af_vsock.c | 64 +++++++- net/vmw_vsock/virtio_transport.c | 2 + net/vmw_vsock/virtio_transport_common.c | 25 +++ net/vmw_vsock/vsock_bpf.c | 174 +++++++++++++++++++++ net/vmw_vsock/vsock_loopback.c | 2 + tools/testing/selftests/bpf/config.aarch64 | 2 + tools/testing/selftests/bpf/config.s390x | 3 + tools/testing/selftests/bpf/config.x86_64 | 3 + .../selftests/bpf/prog_tests/sockmap_listen.c | 163 +++++++++++++++++++ 13 files changed, 452 insertions(+), 6 deletions(-) --- base-commit: e5b42483ccce50d5b957f474fd332afd4ef0c27b change-id: 20230327-vsock-sockmap-30b090c70cd1 Best regards,