From patchwork Mon Aug 14 21:27:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arseniy Krasnov X-Patchwork-Id: 136125 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b82d:0:b0:3f2:4152:657d with SMTP id z13csp1977738vqi; Sat, 19 Aug 2023 04:54:38 -0700 (PDT) X-Google-Smtp-Source: AGHT+IErZufrCJqpR3ZOlh1R07zEfGUfI3uDxw9yrjTNzml4Pa7o7p8YCAvDDd/uANnh1TpK9w+v X-Received: by 2002:a05:6808:f8f:b0:3a4:2941:b0d4 with SMTP id o15-20020a0568080f8f00b003a42941b0d4mr2219290oiw.24.1692446077883; Sat, 19 Aug 2023 04:54:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692446077; cv=none; d=google.com; s=arc-20160816; b=eNnjoJktuiHMKLPG+YrjRuEKNkFhtLFP4h8/9Of4ARlqyLfHPGfAzPl7ROTROak/wg UGAAR4yipK3hTeQL32bOkfn1KZoGKoe1+o2DJ4AZHrouv3gRrS5TXjQhJORQDhYrnxsB f4NKNbiFoTa/bRdfkffEGAbR11ePslX1zJ4+GO20POv+3jA30/4RtSoot7iJqJ4ya+Iv I8ouS7PK0EdDjQ8keUqRDYRuIetrqXPo2+idsFcyYaS8e5Yw0SuL0yIKxcFkcDS1FJe+ EsvTWxAvFG6pd6Rbf8hL3GB/M37vPCiG4tSD/Su9TRAPCZODrQ3rq2Uz3JAMrpSF9OaQ aDqw== 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=ZyXkmXGKkQGFUNbNIMk5JU/RfKeM0y2G0Y+egHv18AM=; fh=IiLlUAYZQ4hWuQbi3V9KE00VdjFsw4tg4Y6JCUFRLn0=; b=wA5aZLMDuYieGe6BgX4ljn6SXaFVzju2laigkWZ1sIvuSS5BxczDbAxLQqJ/E/suZQ 0hugs8138LAzkUSvD+NFcHy+82cGSB/e6YWpJ8GDGPIhD3A5yS0fvBwFi3p1CHaGqzGp OrrJvejl/7OdFiqW3mehGXZsvfjHhtovnH0ubJVkamVmgQv13KlSAukgqVZJpUNDUnh/ DdaNUaoVC75/d9cYD8kP9twAtvNCbgR06VxkYyRjVYnejnXjATx010NAgi3Ussk5tvOG Votlu51/RchF/9rj7F9dYANLCZR9bpJQ9J+uqgHK29vSqkZUewgpiiBt7E+/ORKdgISy tikg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=WOVFDBlz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 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 lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id c8-20020a633508000000b005641fc2684bsi3267986pga.527.2023.08.19.04.54.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Aug 2023 04:54:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=WOVFDBlz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 8959C72799; Sat, 19 Aug 2023 01:35:36 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232957AbjHNVeL (ORCPT + 99 others); Mon, 14 Aug 2023 17:34:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54172 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231681AbjHNVdh (ORCPT ); Mon, 14 Aug 2023 17:33:37 -0400 Received: from mx1.sberdevices.ru (mx2.sberdevices.ru [45.89.224.132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B840811D; Mon, 14 Aug 2023 14:33:30 -0700 (PDT) Received: from p-infra-ksmg-sc-msk02 (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id F1656120009; Tue, 15 Aug 2023 00:33:28 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru F1656120009 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1692048808; bh=ZyXkmXGKkQGFUNbNIMk5JU/RfKeM0y2G0Y+egHv18AM=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=WOVFDBlzX5zZImK04vQ25qxqtlbO8V4rcTjF0/CIcRHsjTzug9sARqsNw8svVPP0U mmw3xcMdnNqP/JsDThIlg1bH7CNQcP4OG038BrX3zA/9elhLE96oMoi47xebQRyr9E Nhn67ypFYGRyeUesXzufhLsKswyOcOrnSwLucZRMPo1Thii39gYRVOuzpo7NxUhJPk sdyjt8hVvvMPcoP+jdU6BrpYKeW0Tz/AXFmoeApvbRl8FlixlIaty/K8gvip3NjdBS 6ZxULS9XwuSGp39d2VMyfjmJ6T2m2aC0/jOkcYbjnBMd0hgFpXltcKe8+XKF7/V30F xFc5XqKhmGydA== 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; Tue, 15 Aug 2023 00:33:28 +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; Tue, 15 Aug 2023 00:33: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: [PATCH net-next v6 3/4] vsock/virtio: non-linear skb handling for tap Date: Tue, 15 Aug 2023 00:27:19 +0300 Message-ID: <20230814212720.3679058-4-AVKrasnov@sberdevices.ru> X-Mailer: git-send-email 2.35.0 In-Reply-To: <20230814212720.3679058-1-AVKrasnov@sberdevices.ru> References: <20230814212720.3679058-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: 179236 [Aug 14 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: 526 526 7a6a9b19f6b9b3921b5701490f189af0e0cd5310, {Tracking_from_domain_doesnt_match_to}, 100.64.160.123:7.1.2;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;p-i-exch-sc-m01.sberdevices.ru:7.1.1,5.0.1;sberdevices.ru:7.1.1,5.0.1;127.0.0.199: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/08/14 17:33:00 #21612035 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,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_NONE 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: INBOX X-GMAIL-THRID: 1774658338259462228 X-GMAIL-MSGID: 1774658338259462228 For tap device new skb is created and data from the current skb is copied to it. This adds copying data from non-linear skb to new the skb. Signed-off-by: Arseniy Krasnov Reviewed-by: Stefano Garzarella --- net/vmw_vsock/virtio_transport_common.c | 31 ++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c index 3e08d52a9355..3a48e48a99ac 100644 --- a/net/vmw_vsock/virtio_transport_common.c +++ b/net/vmw_vsock/virtio_transport_common.c @@ -106,6 +106,27 @@ virtio_transport_alloc_skb(struct virtio_vsock_pkt_info *info, return NULL; } +static void virtio_transport_copy_nonlinear_skb(const struct sk_buff *skb, + void *dst, + size_t len) +{ + struct iov_iter iov_iter = { 0 }; + struct kvec kvec; + size_t to_copy; + + kvec.iov_base = dst; + kvec.iov_len = len; + + iov_iter.iter_type = ITER_KVEC; + iov_iter.kvec = &kvec; + iov_iter.nr_segs = 1; + + to_copy = min_t(size_t, len, skb->len); + + skb_copy_datagram_iter(skb, VIRTIO_VSOCK_SKB_CB(skb)->offset, + &iov_iter, to_copy); +} + /* Packet capture */ static struct sk_buff *virtio_transport_build_skb(void *opaque) { @@ -114,7 +135,6 @@ static struct sk_buff *virtio_transport_build_skb(void *opaque) struct af_vsockmon_hdr *hdr; struct sk_buff *skb; size_t payload_len; - void *payload_buf; /* A packet could be split to fit the RX buffer, so we can retrieve * the payload length from the header and the buffer pointer taking @@ -122,7 +142,6 @@ static struct sk_buff *virtio_transport_build_skb(void *opaque) */ pkt_hdr = virtio_vsock_hdr(pkt); payload_len = pkt->len; - payload_buf = pkt->data; skb = alloc_skb(sizeof(*hdr) + sizeof(*pkt_hdr) + payload_len, GFP_ATOMIC); @@ -165,7 +184,13 @@ static struct sk_buff *virtio_transport_build_skb(void *opaque) skb_put_data(skb, pkt_hdr, sizeof(*pkt_hdr)); if (payload_len) { - skb_put_data(skb, payload_buf, payload_len); + if (skb_is_nonlinear(pkt)) { + void *data = skb_put(skb, payload_len); + + virtio_transport_copy_nonlinear_skb(pkt, data, payload_len); + } else { + skb_put_data(skb, pkt->data, payload_len); + } } return skb;