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=-9.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, 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 EAC92C4727E for ; Wed, 30 Sep 2020 10:05:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8F5752074A for ; Wed, 30 Sep 2020 10:05:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="IqLZYi0/" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728430AbgI3KFw (ORCPT ); Wed, 30 Sep 2020 06:05:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49016 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725776AbgI3KFw (ORCPT ); Wed, 30 Sep 2020 06:05:52 -0400 Received: from mail-ua1-x941.google.com (mail-ua1-x941.google.com [IPv6:2607:f8b0:4864:20::941]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3DA3CC061755 for ; Wed, 30 Sep 2020 03:05:52 -0700 (PDT) Received: by mail-ua1-x941.google.com with SMTP id q26so325120uaa.12 for ; Wed, 30 Sep 2020 03:05:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=sw8MWy65K0URDWaVY+ZCIih81TlOoNQvNGMszTNW1YA=; b=IqLZYi0/AWq+R/9zodfquqj+KRUjW5h5YHkOyw8Vbwg0hNPltUrL8Gb/TdSIKNmbdu FfpRSdyjbcQSzmq2tEyhoZBkgXqy95s5avi9YHdbx2a8E/pjOwzefzCqWFM/JK9wcZ9Z U9S+AKxVfXPUYaPkBV3AtI9Yg3e40Bw8Y2khnVsqy/VBZK4bcX6FdfHUi36lmvojPKUI dvbvNz4aycRHCSSpDitxfEMN0VsTeD7XUylkYhPhdGP6cOL9SIayl3Zn4TU9FnuflWl/ yFyfhef9JGUsGhLfnO8ssWMxT0wrk03foCNN7TSDn77daKMVXLXPWOENHEbVwTvjZsAN uBGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=sw8MWy65K0URDWaVY+ZCIih81TlOoNQvNGMszTNW1YA=; b=tDHJ8D6o2KFTFcKwCPGXlgxZiSJsoTkmW1AGNHsoq05Iy/I3eX+IgpmpjPrTNq3gGJ 83lcxoXW6W2YDjpN/vs6IkG3wW7UDhPKJC36yx+rPs+ZKtCX3uqaWjGx6PoMQr4yMme6 1GNhfb5UWjo4gc0k8+MZQpsA701ZcJWAfXIjuZIQJYI1d83/zjRpC9wtZpmEzwY6bKLq tW0CNFDypvpnS41wWI6aiQN39zrDUhNb99b6y85M7343nSl4HonyUqGf2CiTrlU/ZWDt 0vRUDNgER+beLZKGtbmrDO5CcBCc344W2ne3t19qqYMjjH6naFqINvgPlrby2PbeQSfA tTGw== X-Gm-Message-State: AOAM532d86ippWOmVRT1y2UcHdbFnrUyjVxqRBJq/NaNWQUzVuJzUjSc Z0K4P6vB3hh/F57H9FAdfuMfH5QP0LpMMw== X-Google-Smtp-Source: ABdhPJxwYUq1Amj9v8LVqKAQLOObAxBg3AjvEJVSZSo99PC8dMMoeynyjnFQmn1ih/4rk2QNefyqGw== X-Received: by 2002:ab0:b18:: with SMTP id b24mr872142uak.75.1601460350711; Wed, 30 Sep 2020 03:05:50 -0700 (PDT) Received: from mail-vk1-f178.google.com (mail-vk1-f178.google.com. [209.85.221.178]) by smtp.gmail.com with ESMTPSA id j21sm145304vkn.26.2020.09.30.03.05.49 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 30 Sep 2020 03:05:49 -0700 (PDT) Received: by mail-vk1-f178.google.com with SMTP id d2so276826vkd.13 for ; Wed, 30 Sep 2020 03:05:49 -0700 (PDT) X-Received: by 2002:a1f:1f15:: with SMTP id f21mr751691vkf.12.1601460348742; Wed, 30 Sep 2020 03:05:48 -0700 (PDT) MIME-Version: 1.0 References: <20200930020300.62245-1-xiangxia.m.yue@gmail.com> In-Reply-To: <20200930020300.62245-1-xiangxia.m.yue@gmail.com> From: Willem de Bruijn Date: Wed, 30 Sep 2020 12:05:12 +0200 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH net-next v2] virtio-net: ethtool configurable RXCSUM To: Tonghao Zhang Cc: Jason Wang , "Michael S. Tsirkin" , virtualization@lists.linux-foundation.org, Network Development Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Wed, Sep 30, 2020 at 4:05 AM wrote: > > From: Tonghao Zhang > > Allow user configuring RXCSUM separately with ethtool -K, > reusing the existing virtnet_set_guest_offloads helper > that configures RXCSUM for XDP. This is conditional on > VIRTIO_NET_F_CTRL_GUEST_OFFLOADS. > > If Rx checksum is disabled, LRO should also be disabled. > > Cc: Michael S. Tsirkin > Cc: Jason Wang > Signed-off-by: Tonghao Zhang The first patch was merged into net. Please wait until that is merged into net-next, as this depends on the other patch. > --- > v2: > * LRO depends the rx csum > * remove the unnecessary check > --- > drivers/net/virtio_net.c | 49 ++++++++++++++++++++++++++++++---------- > 1 file changed, 37 insertions(+), 12 deletions(-) > > diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c > index 21b71148c532..5407a0106771 100644 > --- a/drivers/net/virtio_net.c > +++ b/drivers/net/virtio_net.c > @@ -68,6 +68,8 @@ static const unsigned long guest_offloads[] = { > (1ULL << VIRTIO_NET_F_GUEST_ECN) | \ > (1ULL << VIRTIO_NET_F_GUEST_UFO)) > > +#define GUEST_OFFLOAD_CSUM_MASK (1ULL << VIRTIO_NET_F_GUEST_CSUM) > + > struct virtnet_stat_desc { > char desc[ETH_GSTRING_LEN]; > size_t offset; > @@ -2522,29 +2524,49 @@ static int virtnet_get_phys_port_name(struct net_device *dev, char *buf, > return 0; > } > > +static netdev_features_t virtnet_fix_features(struct net_device *netdev, > + netdev_features_t features) > +{ > + /* If Rx checksum is disabled, LRO should also be disabled. > + * That is life. :) Please remove this second line. > + */ > + if (!(features & NETIF_F_RXCSUM)) > + features &= ~NETIF_F_LRO; > + > + return features; > +} > + > static int virtnet_set_features(struct net_device *dev, > netdev_features_t features) > { > struct virtnet_info *vi = netdev_priv(dev); > - u64 offloads; > + u64 offloads = vi->guest_offloads & > + vi->guest_offloads_capable; When can vi->guest_offloads have bits set outside the mask of vi->guest_offloads_capable? 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=-9.5 required=3.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 7D5CFC4727E for ; Wed, 30 Sep 2020 10:05:58 +0000 (UTC) Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EE1242074A for ; Wed, 30 Sep 2020 10:05:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="IqLZYi0/" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EE1242074A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=virtualization-bounces@lists.linux-foundation.org Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 936ED86508; Wed, 30 Sep 2020 10:05:57 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3PQSp-FqyUep; Wed, 30 Sep 2020 10:05:54 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by whitealder.osuosl.org (Postfix) with ESMTP id D40A186133; Wed, 30 Sep 2020 10:05:54 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id BACA1C0890; Wed, 30 Sep 2020 10:05:54 +0000 (UTC) Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by lists.linuxfoundation.org (Postfix) with ESMTP id 32E53C016F for ; Wed, 30 Sep 2020 10:05:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 18A7E871EB for ; Wed, 30 Sep 2020 10:05:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id dqxqCjLrPIcl for ; Wed, 30 Sep 2020 10:05:52 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-vs1-f67.google.com (mail-vs1-f67.google.com [209.85.217.67]) by hemlock.osuosl.org (Postfix) with ESMTPS id B59AA8719A for ; Wed, 30 Sep 2020 10:05:52 +0000 (UTC) Received: by mail-vs1-f67.google.com with SMTP id u7so363274vsq.11 for ; Wed, 30 Sep 2020 03:05:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=sw8MWy65K0URDWaVY+ZCIih81TlOoNQvNGMszTNW1YA=; b=IqLZYi0/AWq+R/9zodfquqj+KRUjW5h5YHkOyw8Vbwg0hNPltUrL8Gb/TdSIKNmbdu FfpRSdyjbcQSzmq2tEyhoZBkgXqy95s5avi9YHdbx2a8E/pjOwzefzCqWFM/JK9wcZ9Z U9S+AKxVfXPUYaPkBV3AtI9Yg3e40Bw8Y2khnVsqy/VBZK4bcX6FdfHUi36lmvojPKUI dvbvNz4aycRHCSSpDitxfEMN0VsTeD7XUylkYhPhdGP6cOL9SIayl3Zn4TU9FnuflWl/ yFyfhef9JGUsGhLfnO8ssWMxT0wrk03foCNN7TSDn77daKMVXLXPWOENHEbVwTvjZsAN uBGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=sw8MWy65K0URDWaVY+ZCIih81TlOoNQvNGMszTNW1YA=; b=i+NWJCdBvt2XLmrU6Hr/WEv67B/Q3Tl7gHR2V99+4wW7vY1JWb7Lkx+JZ61Z9ITtkt RUwq2GiF3WRcHe29LMzGw9dbVRFq6CJdfME5W7ObGyHN6qyCLv73AG20Lkfr/TeLQE+G BYV7Lg028V9USgvGfZeIv4uLpHHSZisDrfv7Pw7lXQTAbCKHMgkCYm//zZLb65d5BJwt RD+nw8BwvNnHG0n6kLBvY/HxsQn3ZetgIoqKzdlD/nim6ctfNXSRjMbDKRFlfF2HJUnH MZel9qG3ifpYFOiS26V37QmNNXRgy4Oa+aDxSDYY3bnKuYJDELRnO8ATrIHy3l8dPWl6 42cA== X-Gm-Message-State: AOAM530J9YvOzjZ7MRRgStZzj/7lOL9ylPB2iiEp5DN3HIU6LJC3AO2Z lIhsgKFQvyw2quwFDQqe8a8dFjQlefyTpg== X-Google-Smtp-Source: ABdhPJzVdVjcagYiulZdWGGvcW6XdMS15wO9yRd4nMI1tXOASc04+FyNlXbsWfg47DjmwXDW1IE19Q== X-Received: by 2002:a67:ed48:: with SMTP id m8mr788865vsp.47.1601460350755; Wed, 30 Sep 2020 03:05:50 -0700 (PDT) Received: from mail-vk1-f177.google.com (mail-vk1-f177.google.com. [209.85.221.177]) by smtp.gmail.com with ESMTPSA id i67sm142330vkg.55.2020.09.30.03.05.49 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 30 Sep 2020 03:05:49 -0700 (PDT) Received: by mail-vk1-f177.google.com with SMTP id h23so284135vkn.4 for ; Wed, 30 Sep 2020 03:05:49 -0700 (PDT) X-Received: by 2002:a1f:1f15:: with SMTP id f21mr751691vkf.12.1601460348742; Wed, 30 Sep 2020 03:05:48 -0700 (PDT) MIME-Version: 1.0 References: <20200930020300.62245-1-xiangxia.m.yue@gmail.com> In-Reply-To: <20200930020300.62245-1-xiangxia.m.yue@gmail.com> From: Willem de Bruijn Date: Wed, 30 Sep 2020 12:05:12 +0200 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH net-next v2] virtio-net: ethtool configurable RXCSUM To: Tonghao Zhang Cc: Network Development , virtualization@lists.linux-foundation.org, "Michael S. Tsirkin" X-BeenThere: virtualization@lists.linux-foundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Linux virtualization List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: virtualization-bounces@lists.linux-foundation.org Sender: "Virtualization" On Wed, Sep 30, 2020 at 4:05 AM wrote: > > From: Tonghao Zhang > > Allow user configuring RXCSUM separately with ethtool -K, > reusing the existing virtnet_set_guest_offloads helper > that configures RXCSUM for XDP. This is conditional on > VIRTIO_NET_F_CTRL_GUEST_OFFLOADS. > > If Rx checksum is disabled, LRO should also be disabled. > > Cc: Michael S. Tsirkin > Cc: Jason Wang > Signed-off-by: Tonghao Zhang The first patch was merged into net. Please wait until that is merged into net-next, as this depends on the other patch. > --- > v2: > * LRO depends the rx csum > * remove the unnecessary check > --- > drivers/net/virtio_net.c | 49 ++++++++++++++++++++++++++++++---------- > 1 file changed, 37 insertions(+), 12 deletions(-) > > diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c > index 21b71148c532..5407a0106771 100644 > --- a/drivers/net/virtio_net.c > +++ b/drivers/net/virtio_net.c > @@ -68,6 +68,8 @@ static const unsigned long guest_offloads[] = { > (1ULL << VIRTIO_NET_F_GUEST_ECN) | \ > (1ULL << VIRTIO_NET_F_GUEST_UFO)) > > +#define GUEST_OFFLOAD_CSUM_MASK (1ULL << VIRTIO_NET_F_GUEST_CSUM) > + > struct virtnet_stat_desc { > char desc[ETH_GSTRING_LEN]; > size_t offset; > @@ -2522,29 +2524,49 @@ static int virtnet_get_phys_port_name(struct net_device *dev, char *buf, > return 0; > } > > +static netdev_features_t virtnet_fix_features(struct net_device *netdev, > + netdev_features_t features) > +{ > + /* If Rx checksum is disabled, LRO should also be disabled. > + * That is life. :) Please remove this second line. > + */ > + if (!(features & NETIF_F_RXCSUM)) > + features &= ~NETIF_F_LRO; > + > + return features; > +} > + > static int virtnet_set_features(struct net_device *dev, > netdev_features_t features) > { > struct virtnet_info *vi = netdev_priv(dev); > - u64 offloads; > + u64 offloads = vi->guest_offloads & > + vi->guest_offloads_capable; When can vi->guest_offloads have bits set outside the mask of vi->guest_offloads_capable? _______________________________________________ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/virtualization