From patchwork Fri Dec 18 20:16:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Lemon X-Patchwork-Id: 345888 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7A41BC35270 for ; Fri, 18 Dec 2020 20:17:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4ABEF23A53 for ; Fri, 18 Dec 2020 20:17:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387460AbgLRURW convert rfc822-to-8bit (ORCPT ); Fri, 18 Dec 2020 15:17:22 -0500 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:27778 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729953AbgLRURU (ORCPT ); Fri, 18 Dec 2020 15:17:20 -0500 Received: from pps.filterd (m0044012.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 0BIKG8I0021003 for ; Fri, 18 Dec 2020 12:16:39 -0800 Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com with ESMTP id 35g80u7ym3-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 18 Dec 2020 12:16:39 -0800 Received: from intmgw005.03.ash8.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:83::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Fri, 18 Dec 2020 12:16:39 -0800 Received: by devvm2494.atn0.facebook.com (Postfix, from userid 172786) id CED8759FBE6B; Fri, 18 Dec 2020 12:16:33 -0800 (PST) From: Jonathan Lemon To: , , CC: Subject: [PATCH 0/9 v1 RFC] Generic zcopy_* functions Date: Fri, 18 Dec 2020 12:16:24 -0800 Message-ID: <20201218201633.2735367-1-jonathan.lemon@gmail.com> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 X-FB-Internal: Safe X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.343, 18.0.737 definitions=2020-12-18_12:2020-12-18,2020-12-18 signatures=0 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 mlxscore=0 priorityscore=1501 bulkscore=0 mlxlogscore=437 lowpriorityscore=0 clxscore=1034 spamscore=0 suspectscore=0 phishscore=0 impostorscore=0 adultscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2012180136 X-FB-Internal: deliver Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jonathan Lemon This is set of cleanup patches for zerocopy which are intended to allow a introduction of a different zerocopy implementation. The top level api will use the skb_zcopy_*() functions, while the current TCP specific zerocopy would use the sock_zerocopy_*() calls. There should be no functional changes from these patches. Patch 1: Move zerocopy bits from tx_flags into zc_flags for clarity. These bits will be used in the RX path in the future. Patch 2: remove dead function Patch 3: Replace sock_zerocopy_put() with skb_zcopy_put(), moving the zerocopy logic into sock_zerocopy_callback(). Push the refcounting into the callback, since not all implemenetations will have a refcount. Patch 4: rename sock_zerocopy_get for consistency. Patch 5: Add an optional skb parameter to callback, allowing access to the attached skb from the callback. Patch 6: Add skb_zcopy_put_abort, and move zerocopy logic into the callback function. There unfortunately is still a check against the callback type here. Patch 7: Set the skb zc_flags from the ubuf being attached, instead of a fixed value, allowing different initialization types. Patch 8: Replace open-coded assignments Patch 9: Relocate skb_zcopy_clear() in skb_release_data() Jonathan Lemon (9): net: group skb_shinfo zerocopy related bits together. skbuff: remove unused skb_zcopy_abort function skbuff: replace sock_zerocopy_put() with skb_zcopy_put() skbuff: replace sock_zerocopy_get with skb_zcopy_get skbuff: Add skb parameter to the ubuf zerocopy callback skbuff: Call sock_zerocopy_put_abort from skb_zcopy_put_abort skbuff: add zc_flags to ubuf_info for ubuf setup tap/tun: use skb_zcopy_set() instead of open coded assignment skbuff: Call skb_zcopy_clear() before unref'ing fragments drivers/net/tap.c | 6 +-- drivers/net/tun.c | 6 +-- drivers/net/xen-netback/common.h | 3 +- drivers/net/xen-netback/interface.c | 4 +- drivers/net/xen-netback/netback.c | 7 +-- drivers/vhost/net.c | 4 +- include/linux/skbuff.h | 77 +++++++++++++++-------------- net/core/skbuff.c | 48 +++++++++--------- net/ipv4/ip_output.c | 3 +- net/ipv4/tcp.c | 6 +-- net/ipv6/ip6_output.c | 3 +- net/kcm/kcmsock.c | 4 +- 12 files changed, 85 insertions(+), 86 deletions(-)