From patchwork Sun Jul 30 08:59:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arseniy Krasnov X-Patchwork-Id: 128215 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp1458532vqg; Sun, 30 Jul 2023 04:51:45 -0700 (PDT) X-Google-Smtp-Source: APBJJlGe7jF6wsjAioBoAiuoZwCF5zCOV7UDLtbscwZ4xv9aMrlKbJgSZHyBhq/MmgpFHWC0cexn X-Received: by 2002:a17:902:cecb:b0:1bb:a922:4a1a with SMTP id d11-20020a170902cecb00b001bba9224a1amr7754426plg.6.1690717905512; Sun, 30 Jul 2023 04:51:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690717905; cv=none; d=google.com; s=arc-20160816; b=SQ82QdsK2NxmZCIU9Y32PDjGGVsrFjA4Ooi466O9B8PJyWRMHLYnya9H/uJ/a6l84o IThzQxTJnKri5vLP7i9H+VBkNv9Nb9BKRqvVFQAsQOoYx5ifNkx14J4MT/9s5O42Sepd +T1T1iCgfkpcs1zP/rNcjioW7uk9yyGwGLEPgsgQqsSOU3/egTU3qIxCFae0QHeHhdj9 xW7KsKsXB/HFGyH1tdhW50nYuLDA1aaVbM3bXrcjiXnUCCHjAX2NW3GckuQAYev8pi56 rRKqxauzoUU4nnWVlOZpF+sqEhLbHuxSLV0UR+ynu/sopataEiedhuBJ/mwdordyZbcD /47A== 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=q2L8Aprxr7L3JdhqehKzgX5TwglfdvsCDN/hciIXqRg=; fh=IiLlUAYZQ4hWuQbi3V9KE00VdjFsw4tg4Y6JCUFRLn0=; b=T09tOU3Qpq0g18zATzALK3Q3N/OS5kv3LF0qLExRD8Vc26W+tjNdEaDwj+GjQXIFcD 9bcZxazSiWO1whaHUFr0PytgwVupWylbz7zb8IJ67nZV+lZO97K3gz3bSCc/hRdkUfBM GpiRdZt8//8Je++4JrqLQCHLL3R82ibThdEtcnhA9U0MNTrEP8IbEegeVQx6fvilzRZg tmsktkGAHxJIByWLqUSYBhjYtJVlAKcoEl9SzSrdT8PQ3CV/89Hv3N9Vm+pA0TMTu5wI 1vv1XjizrNQ06HW68FefHrjGVgSIZIrbrUN54nSVYUzgHd/98ii198h5yJ6ffExDI2PW MrSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b="OuL/Frki"; 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 c15-20020a63d50f000000b00563e1aa2100si5756137pgg.362.2023.07.30.04.51.33; Sun, 30 Jul 2023 04:51:45 -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="OuL/Frki"; 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 S229803AbjG3JFC (ORCPT + 99 others); Sun, 30 Jul 2023 05:05:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42484 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229522AbjG3JE7 (ORCPT ); Sun, 30 Jul 2023 05:04:59 -0400 Received: from mx1.sberdevices.ru (mx1.sberdevices.ru [37.18.73.165]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CB34FE7E; Sun, 30 Jul 2023 02:04:57 -0700 (PDT) Received: from p-infra-ksmg-sc-msk01 (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id 500B610000A; Sun, 30 Jul 2023 12:04:56 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru 500B610000A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1690707896; bh=q2L8Aprxr7L3JdhqehKzgX5TwglfdvsCDN/hciIXqRg=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=OuL/FrkiQnpVUezHbTmJGdn97bMO3cP6638dZnAHPzXRhiqdMcSxVIV1zZhdCmLd2 CsJCkCoGv3i3HGa3CRgtOK80V1vzeO03wcS106Fs2+AtwDBjNE3PpK4UU9TJGe180/ 4CjybXcbxqRS/i/PZAKn+UYtX9xYs4VS9DpH5pv02fjbjOCfjzhA0RvgA/y92ijrkK JK+VTlX5SVlBb8XlXwEH7UXA64YN7LAt3dq1Iil/bKGAlHpEk8KVk49TNNNBPGwSSI qxlCSznbfJPqsVeGKYJfrUFP6Dq9jIJ4uXs/UVUHbfxCMvySsfFieFz50lqQiuEXGb y7OprWEdVQHKA== 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; Sun, 30 Jul 2023 12:04:56 +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; Sun, 30 Jul 2023 12:04:16 +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 v5 2/4] vsock/virtio: support to send non-linear skb Date: Sun, 30 Jul 2023 11:59:03 +0300 Message-ID: <20230730085905.3420811-3-AVKrasnov@sberdevices.ru> X-Mailer: git-send-email 2.35.0 In-Reply-To: <20230730085905.3420811-1-AVKrasnov@sberdevices.ru> References: <20230730085905.3420811-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: 178796 [Jul 22 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: 525 525 723604743bfbdb7e16728748c3fa45e9eba05f7d, {Tracking_from_domain_doesnt_match_to}, FromAlignment: s, 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/23 08:49:00 #21663637 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 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: 1772846218646663663 X-GMAIL-MSGID: 1772846218646663663 For non-linear skb use its pages from fragment array as buffers in virtio tx queue. These pages are already pinned by 'get_user_pages()' during such skb creation. Signed-off-by: Arseniy Krasnov Reviewed-by: Stefano Garzarella --- Changelog: v2 -> v3: * Comment about 'page_to_virt()' is updated. I don't remove R-b, as this change is quiet small I guess. net/vmw_vsock/virtio_transport.c | 41 +++++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/net/vmw_vsock/virtio_transport.c b/net/vmw_vsock/virtio_transport.c index e95df847176b..7bbcc8093e51 100644 --- a/net/vmw_vsock/virtio_transport.c +++ b/net/vmw_vsock/virtio_transport.c @@ -100,7 +100,9 @@ virtio_transport_send_pkt_work(struct work_struct *work) vq = vsock->vqs[VSOCK_VQ_TX]; for (;;) { - struct scatterlist hdr, buf, *sgs[2]; + /* +1 is for packet header. */ + struct scatterlist *sgs[MAX_SKB_FRAGS + 1]; + struct scatterlist bufs[MAX_SKB_FRAGS + 1]; int ret, in_sg = 0, out_sg = 0; struct sk_buff *skb; bool reply; @@ -111,12 +113,39 @@ virtio_transport_send_pkt_work(struct work_struct *work) virtio_transport_deliver_tap_pkt(skb); reply = virtio_vsock_skb_reply(skb); + sg_init_one(&bufs[out_sg], virtio_vsock_hdr(skb), + sizeof(*virtio_vsock_hdr(skb))); + sgs[out_sg] = &bufs[out_sg]; + out_sg++; + + if (!skb_is_nonlinear(skb)) { + if (skb->len > 0) { + sg_init_one(&bufs[out_sg], skb->data, skb->len); + sgs[out_sg] = &bufs[out_sg]; + out_sg++; + } + } else { + struct skb_shared_info *si; + int i; + + si = skb_shinfo(skb); + + for (i = 0; i < si->nr_frags; i++) { + skb_frag_t *skb_frag = &si->frags[i]; + void *va; - sg_init_one(&hdr, virtio_vsock_hdr(skb), sizeof(*virtio_vsock_hdr(skb))); - sgs[out_sg++] = &hdr; - if (skb->len > 0) { - sg_init_one(&buf, skb->data, skb->len); - sgs[out_sg++] = &buf; + /* We will use 'page_to_virt()' for the userspace page + * here, because virtio or dma-mapping layers will call + * 'virt_to_phys()' later to fill the buffer descriptor. + * We don't touch memory at "virtual" address of this page. + */ + va = page_to_virt(skb_frag->bv_page); + sg_init_one(&bufs[out_sg], + va + skb_frag->bv_offset, + skb_frag->bv_len); + sgs[out_sg] = &bufs[out_sg]; + out_sg++; + } } ret = virtqueue_add_sgs(vq, sgs, out_sg, in_sg, skb, GFP_KERNEL);