From patchwork Sat Jul 1 06:23:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arseniy Krasnov X-Patchwork-Id: 114974 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp10870521vqr; Fri, 30 Jun 2023 23:52:15 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5fXgSfFEdEWJ5tuKR3yWcswVJ7XZ40wJYQEdnl1nGEEkwW9iZeHbPmGxTjVRAKn7G9Y5B2 X-Received: by 2002:a05:6808:1481:b0:3a0:4636:d095 with SMTP id e1-20020a056808148100b003a04636d095mr5787746oiw.59.1688194335002; Fri, 30 Jun 2023 23:52:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688194334; cv=none; d=google.com; s=arc-20160816; b=nXtLPnh+6bOohPWXndeaRcX36p0Sq8h9qOZP74WyoknR4pJo37DL92e1hdtziW9mPd mTbQiTo23R9rBq8XWVf0UO3Gl7BUSgs8Z9o2A6QD/F4O+s0Tbt68qE7UoCwXj+Ov5lTX LkHkHud+AMbmVyhaHYpz9S8rr6syxEu2YpKixKJuQcdyUgzmB5LE6WrIrNOepc5MjCLg tG8kX/XFTdyp6H5zHtpC6Xd0iKFnY7FX/lg3xQD9C6d+iQmnOacpOEPuxcfheSzYnoCg 2WZmhEZYVbVDDyiS0rHYmw7aSpF+L+Fy7lRAdbbhssyc6taXZNY2qBTRoj124/oXm5A8 zBbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=fMICzOfYkI5Mz8TuaS8YP+zSEcRMByHXbCdoJ19HiwQ=; fh=PzWIi6JmlJNekYqVy23433fKO6OE4+V62ucRx731HUI=; b=L+XKasM5SqQKPu7lgNUIt4BsOESRsnGTl8RTCKpG9SYbu8m/4aIAK2lXB1irdh8naj 5TWiwpC+0me6OBOPI3WGogaAIx/rHEAoM5rmFJ1Q4CxgGkY17frDfRjSWDybnuYzR1wE WbsBlUzcY7wsxBSQ84ICYwWmpXmIcT0ndsbTZ+ChjAkxBZql7wbkRoBuO70bmzcTC1DR StHnKuL1wFM7DBhib2FCGjnQ6OyTdbshDgPTsELz8zuTUWuHHc2upF/lxPxPHJ6XcPh0 Kxa8eP0wQttOQfrjUKwgTG2K6KMR6jJ6eNo6ZAz3c1SOChP1ALzZTmAP/7tpf6yFnhZJ DGbg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b="I7hXXux/"; 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=sberdevices.ru Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id by5-20020a056a00400500b006785d3c33b6si10690255pfb.285.2023.06.30.23.52.00; Fri, 30 Jun 2023 23:52:14 -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=@sberdevices.ru header.s=mail header.b="I7hXXux/"; 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=sberdevices.ru Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231326AbjGAGk7 (ORCPT + 99 others); Sat, 1 Jul 2023 02:40:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39738 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230163AbjGAGjr (ORCPT ); Sat, 1 Jul 2023 02:39:47 -0400 Received: from mx1.sberdevices.ru (mx2.sberdevices.ru [45.89.224.132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B6CBF44AE; Fri, 30 Jun 2023 23:39:34 -0700 (PDT) Received: from p-infra-ksmg-sc-msk02 (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id 1786A120017; Sat, 1 Jul 2023 09:28:53 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru 1786A120017 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1688192933; bh=fMICzOfYkI5Mz8TuaS8YP+zSEcRMByHXbCdoJ19HiwQ=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=I7hXXux/ILxoTKCwUkpx6nIiTaWeweM1BWjgqy7JtxH/q47WXJHyygUgAldxkjmSp 0W7o8lj0w7XhZwfmunUOZwYO6Eft+cHJsXMOMJcnDW8YVf8Pm9RGUognN18ew+KEm8 hMSuJqwAVmlnyQdSw6F0VJPz3C/Bu8ylgU6r8+oh/tu+qI5HiZ102hoh1XB3Eg9YID FVMQ+FCjnzegVBgMi11SdHoVDyfRF8wMV80G6OBxgJtqYwh4/zHU5gRKmkwiUq6sGd fFqMQxJij5664dRccBBTCK4c1ZU9WR2TsO1fcf/rFSX0HQAFDtDaKW4PEFCHpaLlSQ SqI9+l03o9uvQ== Received: from p-i-exch-sc-m01.sberdevices.ru (p-i-exch-sc-m01.sberdevices.ru [172.16.192.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.sberdevices.ru (Postfix) with ESMTPS; Sat, 1 Jul 2023 09:28:51 +0300 (MSK) Received: from localhost.localdomain (100.64.160.123) by p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.30; Sat, 1 Jul 2023 09:28:25 +0300 From: Arseniy Krasnov To: Stefan Hajnoczi , Stefano Garzarella , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , "Michael S. Tsirkin" , Jason Wang , Bobby Eshleman CC: , , , , , , , Arseniy Krasnov Subject: [RFC PATCH v5] vsock: enable setting SO_ZEROCOPY Date: Sat, 1 Jul 2023 09:23:06 +0300 Message-ID: <20230701062310.3397129-14-AVKrasnov@sberdevices.ru> X-Mailer: git-send-email 2.35.0 In-Reply-To: <20230701062310.3397129-1-AVKrasnov@sberdevices.ru> References: <20230701062310.3397129-1-AVKrasnov@sberdevices.ru> MIME-Version: 1.0 X-Originating-IP: [100.64.160.123] X-ClientProxiedBy: p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) To p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) X-KSMG-Rule-ID: 10 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Lua-Profiles: 178380 [Jun 30 2023] X-KSMG-AntiSpam-Version: 5.9.59.0 X-KSMG-AntiSpam-Envelope-From: AVKrasnov@sberdevices.ru X-KSMG-AntiSpam-Rate: 0 X-KSMG-AntiSpam-Status: not_detected X-KSMG-AntiSpam-Method: none X-KSMG-AntiSpam-Auth: dkim=none X-KSMG-AntiSpam-Info: LuaCore: 517 517 b0056c19d8e10afbb16cb7aad7258dedb0179a79, {Tracking_from_domain_doesnt_match_to}, sberdevices.ru:5.0.1,7.1.1;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;p-i-exch-sc-m01.sberdevices.ru:5.0.1,7.1.1;127.0.0.199:7.1.2;100.64.160.123:7.1.2, FromAlignment: s, {Tracking_white_helo}, ApMailHostAddress: 100.64.160.123 X-MS-Exchange-Organization-SCL: -1 X-KSMG-AntiSpam-Interceptor-Info: scan successful X-KSMG-AntiPhishing: Clean X-KSMG-LinksScanning: Clean X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 2.0.1.6960, bases: 2023/07/01 00:58:00 #21597365 X-KSMG-AntiVirus-Status: Clean, skipped X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham 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?1770199313445290095?= X-GMAIL-MSGID: =?utf-8?q?1770200063074424882?= For AF_VSOCK, zerocopy tx mode depends on transport, so this option must be set in AF_VSOCK implementation where transport is accessible (if transport is not set during setting SO_ZEROCOPY: for example socket is not connected, then SO_ZEROCOPY will be enabled, but once transport will be assigned, support of this type of transmission will be checked). To handle SO_ZEROCOPY, AF_VSOCK implementation uses SOCK_CUSTOM_SOCKOPT bit, thus handling SOL_SOCKET option operations, but all of them except SO_ZEROCOPY will be forwarded to the generic handler by calling 'sock_setsockopt()'. Signed-off-by: Arseniy Krasnov --- Changelog: v4 -> v5: * This patch is totally reworked. Previous version added check for PF_VSOCK directly to 'net/core/sock.c', thus allowing to set SO_ZEROCOPY for AF_VSOCK type of socket. This new version catches attempt to set SO_ZEROCOPY in 'af_vsock.c'. All other options except SO_ZEROCOPY are forwarded to generic handler. Only this option is processed in 'af_vsock.c'. Handling this option includes access to transport to check that MSG_ZEROCOPY transmission is supported by the current transport (if it is set, if not - transport will be checked during 'connect()'). net/vmw_vsock/af_vsock.c | 44 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c index da22ae0ef477..8acc77981d01 100644 --- a/net/vmw_vsock/af_vsock.c +++ b/net/vmw_vsock/af_vsock.c @@ -1406,8 +1406,18 @@ static int vsock_connect(struct socket *sock, struct sockaddr *addr, goto out; } - if (vsock_msgzerocopy_allow(transport)) + if (!vsock_msgzerocopy_allow(transport)) { + /* If this option was set before 'connect()', + * when transport was unknown, check that this + * feature is supported here. + */ + if (sock_flag(sk, SOCK_ZEROCOPY)) { + err = -EOPNOTSUPP; + goto out; + } + } else { set_bit(SOCK_SUPPORT_ZC, &sk->sk_socket->flags); + } err = vsock_auto_bind(vsk); if (err) @@ -1643,7 +1653,7 @@ static int vsock_connectible_setsockopt(struct socket *sock, const struct vsock_transport *transport; u64 val; - if (level != AF_VSOCK) + if (level != AF_VSOCK && level != SOL_SOCKET) return -ENOPROTOOPT; #define COPY_IN(_v) \ @@ -1666,6 +1676,34 @@ static int vsock_connectible_setsockopt(struct socket *sock, transport = vsk->transport; + if (level == SOL_SOCKET) { + if (optname == SO_ZEROCOPY) { + int zc_val; + + /* Use 'int' type here, because variable to + * set this option usually has this type. + */ + COPY_IN(zc_val); + + if (zc_val < 0 || zc_val > 1) { + err = -EINVAL; + goto exit; + } + + if (transport && !vsock_msgzerocopy_allow(transport)) { + err = -EOPNOTSUPP; + goto exit; + } + + sock_valbool_flag(sk, SOCK_ZEROCOPY, + zc_val ? true : false); + goto exit; + } + + release_sock(sk); + return sock_setsockopt(sock, level, optname, optval, optlen); + } + switch (optname) { case SO_VM_SOCKETS_BUFFER_SIZE: COPY_IN(val); @@ -2321,6 +2359,8 @@ static int vsock_create(struct net *net, struct socket *sock, } } + set_bit(SOCK_CUSTOM_SOCKOPT, &sk->sk_socket->flags); + vsock_insert_unbound(vsk); return 0;