From nobody Fri May 17 08:39:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1663951245; cv=none; d=zohomail.com; s=zohoarc; b=hors/pcZUEFLfpnChSbLla+wJUZEmDF1OSk9t80IyJj4TWouIkpgvsIaNfBVqHWfzo8WgN9N9kv5pqWvSQF0t6h+3M6LuMQScrP7n42n+HXy4PZ6qn4pXJEVsw55ZGKJN99VHIhqRIOpoiJfbQvrK87bs1ignrQ9IeNmedJtW2Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663951245; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=uIbjcfAGyfInoLm/OvWITyB0RrSdYYX1RircUBZVOuM=; b=QizMSKyGZIl+dSg4tc3Lvg5+QK1FF4pNVQJ9nRjA+I1+j4y9PJkUMSpCnVkIUO8OUHRDQQy4Bd3FLzcf1vboPtu8FINXyu8WuM252TABOoE57QJMujb7lB8rE6B3reoen+Q681qktj87cmobsgDhB2w8M6UHAKkPdBwid2w6Ym4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1663951245569800.7427364144543; Fri, 23 Sep 2022 09:40:45 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.410879.654031 (Exim 4.92) (envelope-from ) id 1oblj0-0004Fl-7p; Fri, 23 Sep 2022 16:40:26 +0000 Received: by outflank-mailman (output) from mailman id 410879.654031; Fri, 23 Sep 2022 16:40:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oblj0-0004Fd-5F; Fri, 23 Sep 2022 16:40:26 +0000 Received: by outflank-mailman (input) for mailman id 410879; Fri, 23 Sep 2022 16:40:24 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1obliy-0003zv-9l for xen-devel@lists.xenproject.org; Fri, 23 Sep 2022 16:40:24 +0000 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [2a00:1450:4864:20::32c]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 6b7673d7-3b5e-11ed-9647-05401a9f4f97; Fri, 23 Sep 2022 18:40:23 +0200 (CEST) Received: by mail-wm1-x32c.google.com with SMTP id e18so582025wmq.3 for ; Fri, 23 Sep 2022 09:40:23 -0700 (PDT) Received: from 127.0.0.1localhost (188.28.201.74.threembb.co.uk. [188.28.201.74]) by smtp.gmail.com with ESMTPSA id x13-20020a5d60cd000000b0022af6c93340sm7717399wrt.17.2022.09.23.09.40.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Sep 2022 09:40:22 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 6b7673d7-3b5e-11ed-9647-05401a9f4f97 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=uIbjcfAGyfInoLm/OvWITyB0RrSdYYX1RircUBZVOuM=; b=CKI/w9qlPppvR3tyBdHeNFUn52RNE+MeZLNbpK6WQHJMNQ7f3vkWFTdLCCcM+xWq3t 88EF5j5pTqPAB2s3p0pS1p4UUk241RhmRK9VMkOzQijAnB5okJgircXsRKhYPwGleM3N de//MuiWg86ofbLfaub6s67iv1uESid4nF14NOWOT5jY3SBRpR7/H12eiO/oxBSXm0/P ILfCI77hYYZ+7YxxAz7yP8DxSO8h0V/lXa2Gih0fct6VL2AJNREKCz2Xt1ycpc+sJE2Y VHG/A+GqTB4qZ5Cxq9oyDzh1hyfFvfD0o3F+uWIc7yGHB2I5tBiyMFhHzB0o6nFg5XwE pLlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=uIbjcfAGyfInoLm/OvWITyB0RrSdYYX1RircUBZVOuM=; b=QiqFvgBoN22BiAb9rl9XqFF8gSLp95y00aPnhiXM4TL6QdUGzVOzKyXXyfi8JIuCEK G5WtbXKkTv8xQlTeOHbiBLlCTZBKK6oPA7dODH/ZYx4pn5368B+8ddjUnYElziQJrKYr SLuwIsLpWHX8fGSI2j8AgBErrH4pdCw6ousUX+KM9cX5t7pfgsjrwmqHH3NID+iJzWid OMvZy0iBl5lVLFak1vNg5yUBvoQCmzU4jE4i2j/PzRDcLzD9Ky6vhzKRCQwK0v+wg+ja /YIyJ6e+cDFq+baYThN84WhsCPizOlhf+P42N4MXdId4mvSZgFPo7ljsbKnJ14Q2fKbG fYvg== X-Gm-Message-State: ACrzQf0s13VVGGQnbT5kRbddcpEvEIGINxL2yynEuVOs+gzE9D8GDDpy JkRo1LM/RlwXvJkmjUxK5S8= X-Google-Smtp-Source: AMsMyM4CW6l8pZR3BmCcj39hcl6rGI9MDfbfk8pAVz7vOj4J8jOaapYhvNsZhT0FZMIxSSMOhL5SAw== X-Received: by 2002:a05:600c:3d86:b0:3b4:b65f:a393 with SMTP id bi6-20020a05600c3d8600b003b4b65fa393mr6744885wmb.0.1663951223070; Fri, 23 Sep 2022 09:40:23 -0700 (PDT) From: Pavel Begunkov To: netdev@vger.kernel.org Cc: "David S . Miller" , Jakub Kicinski , linux-kernel@vger.kernel.org, xen-devel@lists.xenproject.org, Wei Liu , Paul Durrant , kvm@vger.kernel.org, virtualization@lists.linux-foundation.org, "Michael S . Tsirkin" , Jason Wang , Pavel Begunkov Subject: [PATCH net-next 1/4] net: introduce struct ubuf_info_msgzc Date: Fri, 23 Sep 2022 17:39:01 +0100 Message-Id: <641bb6844e67e639a9403b8eab96c3fa34659e2a.1663892211.git.asml.silence@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1663951246297100001 Content-Type: text/plain; charset="utf-8" We're going to split struct ubuf_info and leave there only mandatory fields. Users are free to extend it. Add struct ubuf_info_msgzc, which will be an extended version for MSG_ZEROCOPY and some other users. It duplicates of struct ubuf_info for now and will be removed in a couple of patches. Signed-off-by: Pavel Begunkov Acked-by: Paolo Abeni --- include/linux/skbuff.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index f15d5b62539b..fd7dcb977fdf 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -554,7 +554,28 @@ struct ubuf_info { } mmp; }; =20 +struct ubuf_info_msgzc { + struct ubuf_info ubuf; + + union { + struct { + unsigned long desc; + void *ctx; + }; + struct { + u32 id; + u16 len; + u16 zerocopy:1; + u32 bytelen; + }; + }; + + struct mmpin mmp; +}; + #define skb_uarg(SKB) ((struct ubuf_info *)(skb_shinfo(SKB)->destructor_ar= g)) +#define uarg_to_msgzc(ubuf_ptr) container_of((ubuf_ptr), struct ubuf_info_= msgzc, \ + ubuf) =20 int mm_account_pinned_pages(struct mmpin *mmp, size_t size); void mm_unaccount_pinned_pages(struct mmpin *mmp); --=20 2.37.2 From nobody Fri May 17 08:39:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1663951250; cv=none; d=zohomail.com; s=zohoarc; b=m0YVI1s30pPLG2dlK0tUlPh08UgswcFyvRZ/C879mjyynepo3XhvPCKCTnv45FjiWLXpS+asrwD57D9VHhMaeXH0FUIezdZmOOjVis0bpPkGJhcqxM6ds1L3iDRPuVgJs/YHQWMaWTpxKArW9dvV27rOu9BN3/AoZAEiuFF9Szg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663951250; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=NLIYqCB5GFGbnjqA6dYmmqdLI8BuNFTVxSCPXONSBRc=; b=a4Qe4ymY7iGo4kN+wKu3rFfkVbud/Tm5OLqx+5emfwVOy29KOoE202a0cMijvhgnvVgWQse6cJ2JBOv0P7ABWaRCd2G2cMYjsuUTsTnzM3LmFMCjzsQPiz9+YGXaxmtq9TTQyML0E3PRmYROdGn9ce4TckVg/bwZyzD6QOOEB2w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 166395125051888.56480690811668; Fri, 23 Sep 2022 09:40:50 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.410880.654037 (Exim 4.92) (envelope-from ) id 1oblj0-0004N3-MI; Fri, 23 Sep 2022 16:40:26 +0000 Received: by outflank-mailman (output) from mailman id 410880.654037; Fri, 23 Sep 2022 16:40:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oblj0-0004LJ-Hw; Fri, 23 Sep 2022 16:40:26 +0000 Received: by outflank-mailman (input) for mailman id 410880; Fri, 23 Sep 2022 16:40:26 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1obliz-0003zv-SV for xen-devel@lists.xenproject.org; Fri, 23 Sep 2022 16:40:25 +0000 Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [2a00:1450:4864:20::42b]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 6c54ea6f-3b5e-11ed-9647-05401a9f4f97; Fri, 23 Sep 2022 18:40:25 +0200 (CEST) Received: by mail-wr1-x42b.google.com with SMTP id cc5so834031wrb.6 for ; Fri, 23 Sep 2022 09:40:25 -0700 (PDT) Received: from 127.0.0.1localhost (188.28.201.74.threembb.co.uk. [188.28.201.74]) by smtp.gmail.com with ESMTPSA id x13-20020a5d60cd000000b0022af6c93340sm7717399wrt.17.2022.09.23.09.40.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Sep 2022 09:40:24 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 6c54ea6f-3b5e-11ed-9647-05401a9f4f97 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=NLIYqCB5GFGbnjqA6dYmmqdLI8BuNFTVxSCPXONSBRc=; b=owDxYda7B4frXz3u0Fwc1/mPY0PkIoc9YEt4hkPPANfeq4CAFBjXeUytt806Zgzrh2 Oflmk3RWPGkL3H4Kqr+rh0g6ue3kNa5qh9EG2VFQ5SqjrD782ppbdaoa2zK8ufjpi3tg YpW05bXLXbqTGO0ZMSAueq+peDDRvbo8UVlb48ZmGp0vWAJpfOl00oTe17PDhCBXTmcj 4LkSJcqD4FNFtW3MKLedobmMatlst3bdPyImM5Y1cg33OA2+GGukbR5y3KFMrsGkoqPe QYLUipMNRbiIvHjo0pc7wNIYe7Hj0Xd06Y+WNBvXMB+pfT+4vyFvrFYbZ+73u9ePpxWd LFHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=NLIYqCB5GFGbnjqA6dYmmqdLI8BuNFTVxSCPXONSBRc=; b=iSbJMo/KAePsC/dh/1kVu9SXfES9G0luB/nUJ99DVtTCXMA4z9DKTmUBhE+QlXKLZN CQM9xBZ6/v17xFedEB7mTiC3kna6y86op+C0cneIyo8LFgkajuQtW17mQb/5QbGKfu6T KwU7o4XlyVXXjdr2GaumqiWIEz4nSv+aKy2d7LSzQIQZS6rwZBywHmDiR5U2QjFpN3la 2Wg/D4q310O9xKCHOEDr8AajZDdgeL0yYDb9bPRavmPccMAmiTXDouds/P1WUiC1pgi9 TT4LUAyq2r3nWsnWe9Jry03xP4u2uEu0VUPWCJU6R/d/UhH3XCV8ZG3SJsa5n+A2PGlh lbeA== X-Gm-Message-State: ACrzQf1U7631u93MIg+6nXEKbIzS25Qjlex+r3D3BPtG9valHbrJ8wKY a3XLQLQIpugoB3xMrJ5W9LM= X-Google-Smtp-Source: AMsMyM5HMaxWgOxUGbCzg/XjKD/kmOOlcN0KKz9OmaE/RAZn/7aZ8z59Qz72lGSep1WOF16x4j6q2w== X-Received: by 2002:a5d:5c06:0:b0:22a:7b52:cda6 with SMTP id cc6-20020a5d5c06000000b0022a7b52cda6mr5635717wrb.485.1663951224622; Fri, 23 Sep 2022 09:40:24 -0700 (PDT) From: Pavel Begunkov To: netdev@vger.kernel.org Cc: "David S . Miller" , Jakub Kicinski , linux-kernel@vger.kernel.org, xen-devel@lists.xenproject.org, Wei Liu , Paul Durrant , kvm@vger.kernel.org, virtualization@lists.linux-foundation.org, "Michael S . Tsirkin" , Jason Wang , Pavel Begunkov Subject: [PATCH net-next 2/4] xen/netback: use struct ubuf_info_msgzc Date: Fri, 23 Sep 2022 17:39:02 +0100 Message-Id: <5e00bc6d4d8c3fdcf3ed02549ba8a36d5552e56c.1663892211.git.asml.silence@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1663951252213100007 Content-Type: text/plain; charset="utf-8" struct ubuf_info will be changed, use ubuf_info_msgzc instead. Signed-off-by: Pavel Begunkov Acked-by: Paolo Abeni --- drivers/net/xen-netback/common.h | 2 +- drivers/net/xen-netback/interface.c | 4 ++-- drivers/net/xen-netback/netback.c | 7 ++++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/net/xen-netback/common.h b/drivers/net/xen-netback/com= mon.h index 8174d7b2966c..1545cbee77a4 100644 --- a/drivers/net/xen-netback/common.h +++ b/drivers/net/xen-netback/common.h @@ -62,7 +62,7 @@ struct pending_tx_info { * ubuf_to_vif is a helper which finds the struct xenvif from a pointer * to this field. */ - struct ubuf_info callback_struct; + struct ubuf_info_msgzc callback_struct; }; =20 #define XEN_NETIF_TX_RING_SIZE __CONST_RING_SIZE(xen_netif_tx, XEN_PAGE_SI= ZE) diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/= interface.c index fb32ae82d9b0..e579ecd40b74 100644 --- a/drivers/net/xen-netback/interface.c +++ b/drivers/net/xen-netback/interface.c @@ -591,8 +591,8 @@ int xenvif_init_queue(struct xenvif_queue *queue) } =20 for (i =3D 0; i < MAX_PENDING_REQS; i++) { - queue->pending_tx_info[i].callback_struct =3D (struct ubuf_info) - { .callback =3D xenvif_zerocopy_callback, + queue->pending_tx_info[i].callback_struct =3D (struct ubuf_info_msgzc) + { { .callback =3D xenvif_zerocopy_callback }, { { .ctx =3D NULL, .desc =3D i } } }; queue->grant_tx_handle[i] =3D NETBACK_INVALID_HANDLE; diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/ne= tback.c index a256695fc89e..3d2081bbbc86 100644 --- a/drivers/net/xen-netback/netback.c +++ b/drivers/net/xen-netback/netback.c @@ -133,7 +133,7 @@ static inline unsigned long idx_to_kaddr(struct xenvif_= queue *queue, =20 /* Find the containing VIF's structure from a pointer in pending_tx_info a= rray */ -static inline struct xenvif_queue *ubuf_to_queue(const struct ubuf_info *u= buf) +static inline struct xenvif_queue *ubuf_to_queue(const struct ubuf_info_ms= gzc *ubuf) { u16 pending_idx =3D ubuf->desc; struct pending_tx_info *temp =3D @@ -1228,11 +1228,12 @@ static int xenvif_tx_submit(struct xenvif_queue *qu= eue) return work_done; } =20 -void xenvif_zerocopy_callback(struct sk_buff *skb, struct ubuf_info *ubuf, +void xenvif_zerocopy_callback(struct sk_buff *skb, struct ubuf_info *ubuf_= base, bool zerocopy_success) { unsigned long flags; pending_ring_idx_t index; + struct ubuf_info_msgzc *ubuf =3D uarg_to_msgzc(ubuf_base); struct xenvif_queue *queue =3D ubuf_to_queue(ubuf); =20 /* This is the only place where we grab this lock, to protect callbacks @@ -1241,7 +1242,7 @@ void xenvif_zerocopy_callback(struct sk_buff *skb, st= ruct ubuf_info *ubuf, spin_lock_irqsave(&queue->callback_lock, flags); do { u16 pending_idx =3D ubuf->desc; - ubuf =3D (struct ubuf_info *) ubuf->ctx; + ubuf =3D (struct ubuf_info_msgzc *) ubuf->ctx; BUG_ON(queue->dealloc_prod - queue->dealloc_cons >=3D MAX_PENDING_REQS); index =3D pending_index(queue->dealloc_prod); --=20 2.37.2 From nobody Fri May 17 08:39:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1663951246; cv=none; d=zohomail.com; s=zohoarc; b=cxAbvBV1vZxmT8eKFmRvjHP/4sqSGgw0nJvoXFbM/VnAX1UAJ5yP5g6FC+lmmkLH+VTot2ECiQ2uIlhVigNXH7VFbyEOftuq/qTJENTuKAAd8fKc/uzo5GCTKi4+gCYfXyODVBNb7/fF07iXq3Jrx4IB8FCYWuO4ZFeJB+02A5w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663951246; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=FG3Mj1csJ7FbeoY2zgdLrFVr7w1D2Zs//acRgBf+TRE=; b=a9b5QRfdeDdapO4tDl4Pv6hqkR5Pg6SbG9h2EZW7Udwsr+yefO3lKaDRQpAkO0euN0cZxCNlG71srm5JNDC9n6f+jPtUaVaN1J2gU2OzavTe/6vcdq1tfCjlcMf8+mx/VTPFOti5Uqdfd8BizXsAeLSZAOS0B3KOo4MN8ltq2g4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1663951246354900.1579519950899; Fri, 23 Sep 2022 09:40:46 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.410881.654053 (Exim 4.92) (envelope-from ) id 1oblj3-0004o3-1N; Fri, 23 Sep 2022 16:40:29 +0000 Received: by outflank-mailman (output) from mailman id 410881.654053; Fri, 23 Sep 2022 16:40:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oblj2-0004ni-Ug; Fri, 23 Sep 2022 16:40:28 +0000 Received: by outflank-mailman (input) for mailman id 410881; Fri, 23 Sep 2022 16:40:27 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oblj1-0003zv-CO for xen-devel@lists.xenproject.org; Fri, 23 Sep 2022 16:40:27 +0000 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [2a00:1450:4864:20::42a]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 6d4c0e39-3b5e-11ed-9647-05401a9f4f97; Fri, 23 Sep 2022 18:40:26 +0200 (CEST) Received: by mail-wr1-x42a.google.com with SMTP id c11so791791wrp.11 for ; Fri, 23 Sep 2022 09:40:26 -0700 (PDT) Received: from 127.0.0.1localhost (188.28.201.74.threembb.co.uk. [188.28.201.74]) by smtp.gmail.com with ESMTPSA id x13-20020a5d60cd000000b0022af6c93340sm7717399wrt.17.2022.09.23.09.40.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Sep 2022 09:40:25 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 6d4c0e39-3b5e-11ed-9647-05401a9f4f97 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=FG3Mj1csJ7FbeoY2zgdLrFVr7w1D2Zs//acRgBf+TRE=; b=eE5aVrZKg1v/P9UeaHNz1t9u6KrDObJzPuHWUbsNB0CGvL2ozT6QO6y8RV3J4TvApK gPGLloFmul/9NycdPQzEdBinJ0njxpLdx/5DMi9pkPqxHexWAitmYT7B+590/zvfROM9 CIVg8YVhNarmc9WM95AOuXgoiDJPoZLmdOExh3cWbH26mGW6YjwixTE3hbClVdbEUOis 9uTUExsQwAPYQ75waTv9Um9hLpemVfJuIj+0GaxnBaIvAP3G5baJmEnOoa51UmzPE0/V 9wc+Ze+zqXKhGHGQroVMuqM6b/rlyf5FCzbF0pKQAhzaxGDoxQxA7E7iIWwRmyyPXktb EuHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=FG3Mj1csJ7FbeoY2zgdLrFVr7w1D2Zs//acRgBf+TRE=; b=PDUYkJvS55E7jbewHmaOR3gV/rGFlIPaB4COQizkHgTt6FELRhZZpzJjOjMbagFWGK Hhwo8d08/MsFT1jaNo6eKabQRZ7GhPlB0GxqfrCYLnXJNa9pL19vF7fxSE11P3sKw3tg xkSP2KF5AMqRIWGdHVHBZ076GXijHYVlhfy8zy9TRRqZc2VZY1H7X+jmPXZ9mEshfHtF prCPIFT387Kshds6qjUV9DyoJ2X+Assueldi7qbDTXz6g/zJiUIxb+fEtgSgVjYGzaVO zWLsRPdtYfnHkprvk9MkJTpo3cD70lpCeHvfWbwFPRh5NJrYVIlUEH35pwciuzCBuRgk Q7Kg== X-Gm-Message-State: ACrzQf3mTZzh5r3sRLPVqZSBK/3ZMMx51YFYbFHlWJHTEh+Aiq1+v1lW LLeckuWS2fM7NgB15javKvY= X-Google-Smtp-Source: AMsMyM7kN8lNHyV1w1d1RL8dD6evo1RUYO8Wx/UWQQUl5cn81n4HQTVjecLZI9rI0Uh/wzPOiMq83A== X-Received: by 2002:a5d:5452:0:b0:228:d6f0:dbeb with SMTP id w18-20020a5d5452000000b00228d6f0dbebmr5883466wrv.84.1663951226140; Fri, 23 Sep 2022 09:40:26 -0700 (PDT) From: Pavel Begunkov To: netdev@vger.kernel.org Cc: "David S . Miller" , Jakub Kicinski , linux-kernel@vger.kernel.org, xen-devel@lists.xenproject.org, Wei Liu , Paul Durrant , kvm@vger.kernel.org, virtualization@lists.linux-foundation.org, "Michael S . Tsirkin" , Jason Wang , Pavel Begunkov Subject: [PATCH net-next 3/4] vhost/net: use struct ubuf_info_msgzc Date: Fri, 23 Sep 2022 17:39:03 +0100 Message-Id: <126df081c74ecf06de383b4fdaad5080346f93dd.1663892211.git.asml.silence@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1663951248171100003 Content-Type: text/plain; charset="utf-8" struct ubuf_info will be changed, use ubuf_info_msgzc instead. Signed-off-by: Pavel Begunkov Acked-by: Paolo Abeni --- drivers/vhost/net.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c index 68e4ecd1cc0e..d7a04d573988 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c @@ -118,7 +118,7 @@ struct vhost_net_virtqueue { /* Number of XDP frames batched */ int batched_xdp; /* an array of userspace buffers info */ - struct ubuf_info *ubuf_info; + struct ubuf_info_msgzc *ubuf_info; /* Reference counting for outstanding ubufs. * Protected by vq mutex. Writers must also take device mutex. */ struct vhost_net_ubuf_ref *ubufs; @@ -382,8 +382,9 @@ static void vhost_zerocopy_signal_used(struct vhost_net= *net, } =20 static void vhost_zerocopy_callback(struct sk_buff *skb, - struct ubuf_info *ubuf, bool success) + struct ubuf_info *ubuf_base, bool success) { + struct ubuf_info_msgzc *ubuf =3D uarg_to_msgzc(ubuf_base); struct vhost_net_ubuf_ref *ubufs =3D ubuf->ctx; struct vhost_virtqueue *vq =3D ubufs->vq; int cnt; @@ -871,7 +872,7 @@ static void handle_tx_zerocopy(struct vhost_net *net, s= truct socket *sock) size_t len, total_len =3D 0; int err; struct vhost_net_ubuf_ref *ubufs; - struct ubuf_info *ubuf; + struct ubuf_info_msgzc *ubuf; bool zcopy_used; int sent_pkts =3D 0; =20 @@ -907,14 +908,14 @@ static void handle_tx_zerocopy(struct vhost_net *net,= struct socket *sock) ubuf =3D nvq->ubuf_info + nvq->upend_idx; vq->heads[nvq->upend_idx].id =3D cpu_to_vhost32(vq, head); vq->heads[nvq->upend_idx].len =3D VHOST_DMA_IN_PROGRESS; - ubuf->callback =3D vhost_zerocopy_callback; ubuf->ctx =3D nvq->ubufs; ubuf->desc =3D nvq->upend_idx; - ubuf->flags =3D SKBFL_ZEROCOPY_FRAG; - refcount_set(&ubuf->refcnt, 1); + ubuf->ubuf.callback =3D vhost_zerocopy_callback; + ubuf->ubuf.flags =3D SKBFL_ZEROCOPY_FRAG; + refcount_set(&ubuf->ubuf.refcnt, 1); msg.msg_control =3D &ctl; ctl.type =3D TUN_MSG_UBUF; - ctl.ptr =3D ubuf; + ctl.ptr =3D &ubuf->ubuf; msg.msg_controllen =3D sizeof(ctl); ubufs =3D nvq->ubufs; atomic_inc(&ubufs->refcount); --=20 2.37.2 From nobody Fri May 17 08:39:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1663951252; cv=none; d=zohomail.com; s=zohoarc; b=izlzUAXui+YcVmDl7hCGzA1qulGWc4o0yNE3faPEF91e7Nwo7BT8x3XwzrjbTGA+FPnHRXlenWVJCIAHfdIfzN6aLB/fAnMCeUAAmyllRR8UPFPVVuST6YSRp5hC7gt9F03AI5/qkOy1JaaOa/Fy5ElSBO0Z23ISDHjEpGS3i9M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663951252; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9VVplsCxvC3CPJyNAguid6PlNyGw4lN66t6t3nf9Zaw=; b=jv4PYJSU6UYvRiBhisNCRKUb5ZjX7oRM7FcsIKBfUjFtgCmk31GXVLIp2KMW5WOF9Ok35sjtOVf9wkmNxnVDWfXcd6/0s1enGAlSVFQUtvY3l7roSLKIDPpI+HVobvLuUhoimqbyouu4bJHEgn+34MM208HSNORCW8izSx4maNo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1663951252047519.5114018653513; Fri, 23 Sep 2022 09:40:52 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.410882.654064 (Exim 4.92) (envelope-from ) id 1oblj5-00057m-DV; Fri, 23 Sep 2022 16:40:31 +0000 Received: by outflank-mailman (output) from mailman id 410882.654064; Fri, 23 Sep 2022 16:40:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oblj5-00057K-9G; Fri, 23 Sep 2022 16:40:31 +0000 Received: by outflank-mailman (input) for mailman id 410882; Fri, 23 Sep 2022 16:40:30 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oblj4-00050m-6L for xen-devel@lists.xenproject.org; Fri, 23 Sep 2022 16:40:30 +0000 Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [2a00:1450:4864:20::32e]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 6e5a3d3a-3b5e-11ed-9374-c1cf23e5d27e; Fri, 23 Sep 2022 18:40:29 +0200 (CEST) Received: by mail-wm1-x32e.google.com with SMTP id r3-20020a05600c35c300b003b4b5f6c6bdso324930wmq.2 for ; Fri, 23 Sep 2022 09:40:28 -0700 (PDT) Received: from 127.0.0.1localhost (188.28.201.74.threembb.co.uk. [188.28.201.74]) by smtp.gmail.com with ESMTPSA id x13-20020a5d60cd000000b0022af6c93340sm7717399wrt.17.2022.09.23.09.40.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Sep 2022 09:40:27 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 6e5a3d3a-3b5e-11ed-9374-c1cf23e5d27e DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=9VVplsCxvC3CPJyNAguid6PlNyGw4lN66t6t3nf9Zaw=; b=YX4cbnzVIadel+pT1A6WodnDs0MR3NSCVsnHE38CJKF7XkI7KvaIQ4X6UmO2SfaMby 3VG63f3bamCi8YVL8ww08dism3Nm3ZvPgDMvFHyrKNRzINXMBssaysY/QDsZovrtNXWO gddHNXxGWa8BakVKjQ5YbFO8g393XpvaAu125LTZaJ3U/JaL0wKZvINwFV4DLmKgHz7T Xw7f7SfpPz9S5UhKJqbPOz8SYQZLUnnVbiqzammFHsqMEzmYr/Jf/7M227Gu2RTGDhGm G+jXB2dWbPryASB1xMe7LrokxjofXsZVvU+X/L2122P0YwcjI8IYTMdbFPhAAa4OkK00 foRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=9VVplsCxvC3CPJyNAguid6PlNyGw4lN66t6t3nf9Zaw=; b=sxQ6eYdaoa3DLNW6sVz6PvN/FXaOHsyEncH7LBA9j18S2zp3gZi3KCorsBKDainLGT 9xxdmCOT2bTzWKbNtU/i5XN++Hu5LSME9fJIWURyoSLn7rKsDE89S/qEwah/21F0Gqd2 BL2tiu0VLK2kZ89ppRNb6oFGbjaC6mQ1lOJrLw7wOwf1+iExe6OF9QaCiinlbYhivJGb msFdwKy19c8WahNo0ojt1G5yX1M8IoFE1rdGbWyg8UDSJmYYvIEiBHGv58bJedbB7auf S8VgKr5o5JLavvhpMDu8XcaOXf0oDyOPGFxW0U2ub/wbzgFLR9CZR4Jet/A10oAkRjDT Uy9g== X-Gm-Message-State: ACrzQf1NZpeOYxdCkVpks0zKM51ywXQb5TyBRIB4n20tg9KLS6ZsPo9m fH+fel9K0pNqYNtCKcRaE40= X-Google-Smtp-Source: AMsMyM6Fs/pfy41Rfyr/MfeH4GoV13INTvx0st23vngXOgKxULEpbfBhZr8VAlVXwkSzQowWksWZFQ== X-Received: by 2002:a05:600c:1989:b0:3b4:b6b6:737 with SMTP id t9-20020a05600c198900b003b4b6b60737mr6550166wmq.79.1663951227773; Fri, 23 Sep 2022 09:40:27 -0700 (PDT) From: Pavel Begunkov To: netdev@vger.kernel.org Cc: "David S . Miller" , Jakub Kicinski , linux-kernel@vger.kernel.org, xen-devel@lists.xenproject.org, Wei Liu , Paul Durrant , kvm@vger.kernel.org, virtualization@lists.linux-foundation.org, "Michael S . Tsirkin" , Jason Wang , Pavel Begunkov Subject: [PATCH net-next 4/4] net: shrink struct ubuf_info Date: Fri, 23 Sep 2022 17:39:04 +0100 Message-Id: X-Mailer: git-send-email 2.37.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1663951254476100001 Content-Type: text/plain; charset="utf-8" We can benefit from a smaller struct ubuf_info, so leave only mandatory fields and let users to decide how they want to extend it. Convert MSG_ZEROCOPY to struct ubuf_info_msgzc and remove duplicated fields. This reduces the size from 48 bytes to just 16. Signed-off-by: Pavel Begunkov Acked-by: Paolo Abeni --- include/linux/skbuff.h | 22 ++++------------------ net/core/skbuff.c | 38 +++++++++++++++++++++----------------- net/ipv4/ip_output.c | 2 +- net/ipv4/tcp.c | 2 +- net/ipv6/ip6_output.c | 2 +- 5 files changed, 28 insertions(+), 38 deletions(-) diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index fd7dcb977fdf..920eb6413fee 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -533,25 +533,8 @@ enum { struct ubuf_info { void (*callback)(struct sk_buff *, struct ubuf_info *, bool zerocopy_success); - union { - struct { - unsigned long desc; - void *ctx; - }; - struct { - u32 id; - u16 len; - u16 zerocopy:1; - u32 bytelen; - }; - }; refcount_t refcnt; u8 flags; - - struct mmpin { - struct user_struct *user; - unsigned int num_pg; - } mmp; }; =20 struct ubuf_info_msgzc { @@ -570,7 +553,10 @@ struct ubuf_info_msgzc { }; }; =20 - struct mmpin mmp; + struct mmpin { + struct user_struct *user; + unsigned int num_pg; + } mmp; }; =20 #define skb_uarg(SKB) ((struct ubuf_info *)(skb_shinfo(SKB)->destructor_ar= g)) diff --git a/net/core/skbuff.c b/net/core/skbuff.c index f1b8b20fc20b..bbcfb1c7f59e 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -1188,7 +1188,7 @@ EXPORT_SYMBOL_GPL(mm_unaccount_pinned_pages); =20 static struct ubuf_info *msg_zerocopy_alloc(struct sock *sk, size_t size) { - struct ubuf_info *uarg; + struct ubuf_info_msgzc *uarg; struct sk_buff *skb; =20 WARN_ON_ONCE(!in_task()); @@ -1206,19 +1206,19 @@ static struct ubuf_info *msg_zerocopy_alloc(struct = sock *sk, size_t size) return NULL; } =20 - uarg->callback =3D msg_zerocopy_callback; + uarg->ubuf.callback =3D msg_zerocopy_callback; uarg->id =3D ((u32)atomic_inc_return(&sk->sk_zckey)) - 1; uarg->len =3D 1; uarg->bytelen =3D size; uarg->zerocopy =3D 1; - uarg->flags =3D SKBFL_ZEROCOPY_FRAG | SKBFL_DONT_ORPHAN; - refcount_set(&uarg->refcnt, 1); + uarg->ubuf.flags =3D SKBFL_ZEROCOPY_FRAG | SKBFL_DONT_ORPHAN; + refcount_set(&uarg->ubuf.refcnt, 1); sock_hold(sk); =20 - return uarg; + return &uarg->ubuf; } =20 -static inline struct sk_buff *skb_from_uarg(struct ubuf_info *uarg) +static inline struct sk_buff *skb_from_uarg(struct ubuf_info_msgzc *uarg) { return container_of((void *)uarg, struct sk_buff, cb); } @@ -1227,6 +1227,7 @@ struct ubuf_info *msg_zerocopy_realloc(struct sock *s= k, size_t size, struct ubuf_info *uarg) { if (uarg) { + struct ubuf_info_msgzc *uarg_zc; const u32 byte_limit =3D 1 << 19; /* limit to a few TSO */ u32 bytelen, next; =20 @@ -1242,8 +1243,9 @@ struct ubuf_info *msg_zerocopy_realloc(struct sock *s= k, size_t size, return NULL; } =20 - bytelen =3D uarg->bytelen + size; - if (uarg->len =3D=3D USHRT_MAX - 1 || bytelen > byte_limit) { + uarg_zc =3D uarg_to_msgzc(uarg); + bytelen =3D uarg_zc->bytelen + size; + if (uarg_zc->len =3D=3D USHRT_MAX - 1 || bytelen > byte_limit) { /* TCP can create new skb to attach new uarg */ if (sk->sk_type =3D=3D SOCK_STREAM) goto new_alloc; @@ -1251,11 +1253,11 @@ struct ubuf_info *msg_zerocopy_realloc(struct sock = *sk, size_t size, } =20 next =3D (u32)atomic_read(&sk->sk_zckey); - if ((u32)(uarg->id + uarg->len) =3D=3D next) { - if (mm_account_pinned_pages(&uarg->mmp, size)) + if ((u32)(uarg_zc->id + uarg_zc->len) =3D=3D next) { + if (mm_account_pinned_pages(&uarg_zc->mmp, size)) return NULL; - uarg->len++; - uarg->bytelen =3D bytelen; + uarg_zc->len++; + uarg_zc->bytelen =3D bytelen; atomic_set(&sk->sk_zckey, ++next); =20 /* no extra ref when appending to datagram (MSG_MORE) */ @@ -1291,7 +1293,7 @@ static bool skb_zerocopy_notify_extend(struct sk_buff= *skb, u32 lo, u16 len) return true; } =20 -static void __msg_zerocopy_callback(struct ubuf_info *uarg) +static void __msg_zerocopy_callback(struct ubuf_info_msgzc *uarg) { struct sk_buff *tail, *skb =3D skb_from_uarg(uarg); struct sock_exterr_skb *serr; @@ -1344,19 +1346,21 @@ static void __msg_zerocopy_callback(struct ubuf_inf= o *uarg) void msg_zerocopy_callback(struct sk_buff *skb, struct ubuf_info *uarg, bool success) { - uarg->zerocopy =3D uarg->zerocopy & success; + struct ubuf_info_msgzc *uarg_zc =3D uarg_to_msgzc(uarg); + + uarg_zc->zerocopy =3D uarg_zc->zerocopy & success; =20 if (refcount_dec_and_test(&uarg->refcnt)) - __msg_zerocopy_callback(uarg); + __msg_zerocopy_callback(uarg_zc); } EXPORT_SYMBOL_GPL(msg_zerocopy_callback); =20 void msg_zerocopy_put_abort(struct ubuf_info *uarg, bool have_uref) { - struct sock *sk =3D skb_from_uarg(uarg)->sk; + struct sock *sk =3D skb_from_uarg(uarg_to_msgzc(uarg))->sk; =20 atomic_dec(&sk->sk_zckey); - uarg->len--; + uarg_to_msgzc(uarg)->len--; =20 if (have_uref) msg_zerocopy_callback(NULL, uarg, true); diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index 8201cd423ff9..1ae83ad629b2 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c @@ -1043,7 +1043,7 @@ static int __ip_append_data(struct sock *sk, paged =3D true; zc =3D true; } else { - uarg->zerocopy =3D 0; + uarg_to_msgzc(uarg)->zerocopy =3D 0; skb_zcopy_set(skb, uarg, &extra_uref); } } diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 829beee3fa32..34fd52c07534 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -1239,7 +1239,7 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghdr= *msg, size_t size) } zc =3D sk->sk_route_caps & NETIF_F_SG; if (!zc) - uarg->zerocopy =3D 0; + uarg_to_msgzc(uarg)->zerocopy =3D 0; } } =20 diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index e3dbb32b70dc..2f279cbd2648 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -1569,7 +1569,7 @@ static int __ip6_append_data(struct sock *sk, paged =3D true; zc =3D true; } else { - uarg->zerocopy =3D 0; + uarg_to_msgzc(uarg)->zerocopy =3D 0; skb_zcopy_set(skb, uarg, &extra_uref); } } --=20 2.37.2