Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp8117386imu; Tue, 4 Dec 2018 03:18:01 -0800 (PST) X-Google-Smtp-Source: AFSGD/Uj2AjiKwD/KRqoCvGHeqiaHMUHFuSknfbOfKcdR+4jceAmWmaN+eeLRGmzpa5IYePxQ2q7 X-Received: by 2002:a17:902:14e:: with SMTP id 72mr19742325plb.287.1543922281915; Tue, 04 Dec 2018 03:18:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543922281; cv=none; d=google.com; s=arc-20160816; b=rPWvuY3rWfQ6hKzIYrpgOXtyrf6kbcn33FCRqOBZ+BsrDj/jXJh/gnkuzPcOqRtjZ5 HJDHyXv1a/nW9C5hJc9Y7Cm8F9WS7S8uwOpIRMwI12D5aOE86Qbn9EWUemtHztaFRuKm EPi+n25rudZK0NmAKxuVIC7vX4nkKhkwmMv89643uZzq/slqpOSwDEBrLcI4xskUVroP 157A0W5L/Jz8lG1rsxyZkRVKQAcOL8BPQEJyUe0bk8k+DOrIR3/B9rr2vU4VNPX3nUKT fkQ5Fbo4l+lGkr8gTs29o0awljaX0GIB6yNuCF1FPQCIQuC5yg9DRQ1VNTFnV42PZRcL L4Qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Qze0hVxYSi51/rBnKjnxkT08+A7PkUz+sWprBUWpyXc=; b=unLybI0ewX1DQCN5piw0qbgRN3W+B6POkOidzWb5T9UObCaaqmmdnhGkwNdlVtq59L Imd0DjsKUuwstPPm3aWeYJEUwUBkGTwmdRSwyJysLvZMLikEyqyvH82pPbMwOCu+KNn9 rFhONjT8FdigyWZqPpqoA/fR4GuIr5l3az+Q37RUMxTTJvW3gIH7Wzkm7wPhttZsW4XG XZUuX1iPz/BxqCjk4NnhucCyqW2hgQyWgG4Y+5/tX5SdD7I/TbLE8bcMh0SwKE9WjxSf UbKG5HCzs/V3uTFS53iOCHo1Ow1vYABm7uHqSSqtMPSc81t4i/StJpXgWrcXSvjXmlfN 2g+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="Mi/4uFQO"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i13si15086968pgc.41.2018.12.04.03.17.46; Tue, 04 Dec 2018 03:18:01 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="Mi/4uFQO"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728280AbeLDLRL (ORCPT + 99 others); Tue, 4 Dec 2018 06:17:11 -0500 Received: from mail.kernel.org ([198.145.29.99]:53332 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727706AbeLDLFb (ORCPT ); Tue, 4 Dec 2018 06:05:31 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7E5E62082D; Tue, 4 Dec 2018 11:05:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1543921531; bh=vTuN7eTt47Ouztaz+SHyQFf8oB4JiJ6LYUDA6NbndAI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Mi/4uFQOXKia6uyx5QQAcKA2ulYQ9sKZIuLsLuyNyGUVXiDnEw8EY+0kiBPdHDeSL DZTSpY3THf3fx3ie0gQYTEv8JQ/JFRYYjnx3r2G0IwOgaZF/iObJgL9bcB2QxqNovw YvKuz3KP3HK1LvgKRCWLkzb/EtdTTCVqoxpyiiw8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jesper Dangaard Brouer , Pavel Popa , David Ahern , Jason Wang , "David S. Miller" Subject: [PATCH 4.14 062/146] virtio-net: fail XDP set if guest csum is negotiated Date: Tue, 4 Dec 2018 11:49:08 +0100 Message-Id: <20181204103729.332283309@linuxfoundation.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181204103726.750894136@linuxfoundation.org> References: <20181204103726.750894136@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jason Wang [ Upstream commit 18ba58e1c234ea1a2d9835ac8c1735d965ce4640 ] We don't support partial csumed packet since its metadata will be lost or incorrect during XDP processing. So fail the XDP set if guest_csum feature is negotiated. Fixes: f600b6905015 ("virtio_net: Add XDP support") Reported-by: Jesper Dangaard Brouer Cc: Jesper Dangaard Brouer Cc: Pavel Popa Cc: David Ahern Signed-off-by: Jason Wang Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/virtio_net.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -1966,8 +1966,9 @@ static int virtnet_xdp_set(struct net_de && (virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_TSO4) || virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_TSO6) || virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_ECN) || - virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_UFO))) { - NL_SET_ERR_MSG_MOD(extack, "Can't set XDP while host is implementing LRO, disable LRO first"); + virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_UFO) || + virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_CSUM))) { + NL_SET_ERR_MSG_MOD(extack, "Can't set XDP while host is implementing LRO/CSUM, disable LRO/CSUM first"); return -EOPNOTSUPP; }