From mboxrd@z Thu Jan 1 00:00:00 1970 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=-6.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 CD3D1C28CBC for ; Wed, 6 May 2020 06:16:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AE678206E6 for ; Wed, 6 May 2020 06:16:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="LwDvbua6" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727829AbgEFGQw (ORCPT ); Wed, 6 May 2020 02:16:52 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:37571 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727790AbgEFGQv (ORCPT ); Wed, 6 May 2020 02:16:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588745810; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AfWTvjFJDL5wYV2ZbXSYiOFLkMGDFarHl694AF23Z14=; b=LwDvbua63iUwD4JJBQq2ujj5TGHipyy8wHnkCMvN9oKMAcKbl7Ytn8SOBtkOQ/Fhjtg0BW JlkcVOehnCfYbknVytqE5pOUW+I+jNLDaKK0BBl3FP/CUpfv3e2FgRcqwNkZ+R/b68H3yW KQCIil+2PKhcVHrpMnVlg3Brr/lsa6A= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-475-Uxs1rhM2N06BGeh0kM_DQw-1; Wed, 06 May 2020 02:16:48 -0400 X-MC-Unique: Uxs1rhM2N06BGeh0kM_DQw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 23811464; Wed, 6 May 2020 06:16:47 +0000 (UTC) Received: from jason-ThinkPad-X1-Carbon-6th.redhat.com (ovpn-13-165.pek2.redhat.com [10.72.13.165]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2EEFF5C241; Wed, 6 May 2020 06:16:43 +0000 (UTC) From: Jason Wang To: mst@redhat.com, jasowang@redhat.com Cc: virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, Jesper Dangaard Brouer Subject: [PATCH net-next 2/2] virtio-net: fix the XDP truesize calculation for mergeable buffers Date: Wed, 6 May 2020 14:16:33 +0800 Message-Id: <20200506061633.16327-2-jasowang@redhat.com> In-Reply-To: <20200506061633.16327-1-jasowang@redhat.com> References: <20200506061633.16327-1-jasowang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Content-Transfer-Encoding: quoted-printable Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org We should not exclude headroom and tailroom when XDP is set. So this patch fixes this by initializing the truesize from PAGE_SIZE when XDP is set. Cc: Jesper Dangaard Brouer Signed-off-by: Jason Wang --- drivers/net/virtio_net.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 98dd75b665a5..3f3aa8308918 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -1184,7 +1184,7 @@ static int add_recvbuf_mergeable(struct virtnet_inf= o *vi, char *buf; void *ctx; int err; - unsigned int len, hole; + unsigned int len, hole, truesize; =20 /* Extra tailroom is needed to satisfy XDP's assumption. This * means rx frags coalescing won't work, but consider we've @@ -1194,6 +1194,7 @@ static int add_recvbuf_mergeable(struct virtnet_inf= o *vi, if (unlikely(!skb_page_frag_refill(len + room, alloc_frag, gfp))) return -ENOMEM; =20 + truesize =3D headroom ? PAGE_SIZE : len; buf =3D (char *)page_address(alloc_frag->page) + alloc_frag->offset; buf +=3D headroom; /* advance address leaving hole at front of pkt */ get_page(alloc_frag->page); @@ -1205,11 +1206,12 @@ static int add_recvbuf_mergeable(struct virtnet_i= nfo *vi, * the current buffer. */ len +=3D hole; + truesize +=3D hole; alloc_frag->offset +=3D hole; } =20 sg_init_one(rq->sg, buf, len); - ctx =3D mergeable_len_to_ctx(len, headroom); + ctx =3D mergeable_len_to_ctx(truesize, headroom); err =3D virtqueue_add_inbuf_ctx(rq->vq, rq->sg, 1, buf, ctx, gfp); if (err < 0) put_page(virt_to_head_page(buf)); --=20 2.20.1