From nobody Thu May 2 07:00:42 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1491581115354142.04430145491597; Fri, 7 Apr 2017 09:05:15 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B42DC80514; Fri, 7 Apr 2017 16:05:13 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 89B1CBAF87; Fri, 7 Apr 2017 16:05:13 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 41F2118523C7; Fri, 7 Apr 2017 16:05:13 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v37G52Sr015917 for ; Fri, 7 Apr 2017 12:05:02 -0400 Received: by smtp.corp.redhat.com (Postfix) id DCFF68AC20; Fri, 7 Apr 2017 16:05:02 +0000 (UTC) Received: from caroline.brq.redhat.com (dhcp129-198.brq.redhat.com [10.34.129.198]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6241388669 for ; Fri, 7 Apr 2017 16:04:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com B42DC80514 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com B42DC80514 From: Martin Kletzander To: libvir-list@redhat.com Date: Fri, 7 Apr 2017 18:04:53 +0200 Message-Id: <08c7064cb9929dc399e770689c8e3a1a228b711b.1491580983.git.mkletzan@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/3] util: Add virNetDevSetCoalesce function X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Fri, 07 Apr 2017 16:05:14 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" That function is able to configure coalesce settings for an interface, similarly to 'ethtool -C'. This function also updates back the structure so that it contains actual data on the device (if the device doesn't support some settings kernel might just return 0 and not set whatever is not supported), so this way we'll have up-to-date information in the live domain XML. Signed-off-by: Martin Kletzander --- configure.ac | 3 +- src/libvirt_private.syms | 1 + src/util/virnetdev.c | 83 ++++++++++++++++++++++++++++++++++++++++++++= ++++ src/util/virnetdev.h | 34 ++++++++++++++++++++ 4 files changed, 120 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 383493836bff..5f7a07a2a67a 100644 --- a/configure.ac +++ b/configure.ac @@ -347,7 +347,8 @@ AC_CHECK_TYPE([struct sockpeercred], ]]) AC_CHECK_DECLS([ETH_FLAG_TXVLAN, ETH_FLAG_NTUPLE, ETH_FLAG_RXHASH, ETH_FLA= G_LRO, - ETHTOOL_GGSO, ETHTOOL_GGRO, ETHTOOL_GFLAGS, ETHTOOL_GFEATU= RES], + ETHTOOL_GGSO, ETHTOOL_GGRO, ETHTOOL_GFLAGS, ETHTOOL_GFEATU= RES, + ETHTOOL_SCOALESCE, ETHTOOL_GCOALESCE], [], [], [[#include ]]) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 49d49db81265..7ba9b7d98d86 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2062,6 +2062,7 @@ virNetDevRxFilterModeTypeFromString; virNetDevRxFilterModeTypeToString; virNetDevRxFilterNew; virNetDevSaveNetConfig; +virNetDevSetCoalesce; virNetDevSetMAC; virNetDevSetMTU; virNetDevSetMTUFromDevice; diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 170e34827f12..6ff1b489857d 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -3078,6 +3078,89 @@ virNetDevGetEthtoolGFeatures(virBitmapPtr bitmap ATT= RIBUTE_UNUSED, # endif +# if HAVE_DECL_ETHTOOL_SCOALESCE && HAVE_DECL_ETHTOOL_GCOALESCE +/** + * virNetDevSetCoalesce: + * @ifname: interface name to modify + * @coalesce: Coalesce settings to set and update + * + * This function sets the various coalesce settings for a given interface + * @ifname and updates them back into @coalesce. + * + * Returns 0 in case of success or -1 on failure + */ +int virNetDevSetCoalesce(const char *ifname, + virNetDevCoalescePtr coalesce) +{ + int fd =3D -1; + int ret =3D -1; + struct ifreq ifr; + struct ethtool_coalesce coal =3D {0}; + + if (!coalesce) + return 0; + + coal =3D (struct ethtool_coalesce) { + .cmd =3D ETHTOOL_SCOALESCE, + .rx_max_coalesced_frames =3D coalesce->rx_max_coalesced_frames, + .rx_coalesce_usecs_irq =3D coalesce->rx_coalesce_usecs_irq, + .rx_max_coalesced_frames_irq =3D coalesce->rx_max_coalesced_frames= _irq, + .tx_coalesce_usecs =3D coalesce->tx_coalesce_usecs, + .tx_max_coalesced_frames =3D coalesce->tx_max_coalesced_frames, + .tx_coalesce_usecs_irq =3D coalesce->tx_coalesce_usecs_irq, + .tx_max_coalesced_frames_irq =3D coalesce->tx_max_coalesced_frames= _irq, + .stats_block_coalesce_usecs =3D coalesce->stats_block_coalesce_use= cs, + .use_adaptive_rx_coalesce =3D coalesce->use_adaptive_rx_coalesce, + .use_adaptive_tx_coalesce =3D coalesce->use_adaptive_tx_coalesce, + .pkt_rate_low =3D coalesce->pkt_rate_low, + .rx_coalesce_usecs_low =3D coalesce->rx_coalesce_usecs_low, + .rx_max_coalesced_frames_low =3D coalesce->rx_max_coalesced_frames= _low, + .tx_coalesce_usecs_low =3D coalesce->tx_coalesce_usecs_low, + .tx_max_coalesced_frames_low =3D coalesce->tx_max_coalesced_frames= _low, + .pkt_rate_high =3D coalesce->pkt_rate_high, + .rx_coalesce_usecs_high =3D coalesce->rx_coalesce_usecs_high, + .rx_max_coalesced_frames_high =3D coalesce->rx_max_coalesced_frame= s_high, + .tx_coalesce_usecs_high =3D coalesce->tx_coalesce_usecs_high, + .tx_max_coalesced_frames_high =3D coalesce->tx_max_coalesced_frame= s_high, + .rate_sample_interval =3D coalesce->rate_sample_interval, + }; + + if ((fd =3D virNetDevSetupControl(ifname, &ifr)) < 0) + return -1; + + ifr.ifr_data =3D (void *) &coal; + + if (virNetDevSendEthtoolIoctl(fd, &ifr) < 0) { + virReportSystemError(errno, + _("Cannot set coalesce info on '%s'"), + ifname); + goto cleanup; + } + + coal =3D (struct ethtool_coalesce) { + .cmd =3D ETHTOOL_GCOALESCE, + }; + + /* Don't fail if the update itself fails */ + virNetDevSendEthtoolIoctl(fd, &ifr); + + ret =3D 0; + cleanup: + VIR_FORCE_CLOSE(fd); + return ret; +} +# else +int virNetDevSetCoalesce(const char *ifname, + virNetDevCoalescePtr coalesce ATTRIBUTE_UNUSED) +{ + virReportSystemError(ENOSYS, + _("Cannot set coalesce info on interface '%s'"), + ifname); + return -1; +} +# endif + + /** * virNetDevGetFeatures: * This function gets the nic offloads features available for ifname diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h index 437a776257b6..cff8cb51c2bb 100644 --- a/src/util/virnetdev.h +++ b/src/util/virnetdev.h @@ -112,6 +112,36 @@ typedef enum { VIR_ENUM_DECL(virNetDevFeature) +/* Modeled after struct ethtool_coalesce, see linux/ethtool.h for explanat= ions + * of particular fields */ +typedef struct _virNetDevCoalesce virNetDevCoalesce; +typedef virNetDevCoalesce *virNetDevCoalescePtr; +struct _virNetDevCoalesce { + uint32_t rx_coalesce_usecs; + uint32_t rx_max_coalesced_frames; + uint32_t rx_coalesce_usecs_irq; + uint32_t rx_max_coalesced_frames_irq; + uint32_t tx_coalesce_usecs; + uint32_t tx_max_coalesced_frames; + uint32_t tx_coalesce_usecs_irq; + uint32_t tx_max_coalesced_frames_irq; + uint32_t stats_block_coalesce_usecs; + uint32_t use_adaptive_rx_coalesce; + uint32_t use_adaptive_tx_coalesce; + uint32_t pkt_rate_low; + uint32_t rx_coalesce_usecs_low; + uint32_t rx_max_coalesced_frames_low; + uint32_t tx_coalesce_usecs_low; + uint32_t tx_max_coalesced_frames_low; + uint32_t pkt_rate_high; + uint32_t rx_coalesce_usecs_high; + uint32_t rx_max_coalesced_frames_high; + uint32_t tx_coalesce_usecs_high; + uint32_t tx_max_coalesced_frames_high; + uint32_t rate_sample_interval; +}; + + int virNetDevSetupControl(const char *ifname, virIfreq *ifr) ATTRIBUTE_RETURN_CHECK; @@ -144,6 +174,10 @@ int virNetDevRestoreMacAddress(const char *linkdev, const char *stateDir) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; +int virNetDevSetCoalesce(const char *ifname, + virNetDevCoalescePtr coalesce) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + int virNetDevSetMTU(const char *ifname, int mtu) ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; --=20 2.12.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 2 07:00:42 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 14915811093311002.8063656148616; Fri, 7 Apr 2017 09:05:09 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 06958C05B1FD; Fri, 7 Apr 2017 16:05:07 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9D5BBBAF7D; Fri, 7 Apr 2017 16:05:06 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 4154118521CA; Fri, 7 Apr 2017 16:05:06 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v37G55Dg015956 for ; Fri, 7 Apr 2017 12:05:05 -0400 Received: by smtp.corp.redhat.com (Postfix) id 042FA8867A; Fri, 7 Apr 2017 16:05:05 +0000 (UTC) Received: from caroline.brq.redhat.com (dhcp129-198.brq.redhat.com [10.34.129.198]) by smtp.corp.redhat.com (Postfix) with ESMTP id 554D68AC42 for ; Fri, 7 Apr 2017 16:05:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 06958C05B1FD Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 06958C05B1FD From: Martin Kletzander To: libvir-list@redhat.com Date: Fri, 7 Apr 2017 18:04:54 +0200 Message-Id: <5d6559beb7d338ec755d4282afaf47675de4838e.1491580983.git.mkletzan@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/3] conf, docs: Add support for coalesce setting(s) X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Fri, 07 Apr 2017 16:05:08 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" We are currently parsing only rx_max_coalesced_frames because that's the only value that makes sense for us. The tun device just added support for this one and the others are only supported by hardware devices which we don't need to worry about as the only way we'd pass those to the domain is using or . And in those cases the guest can modify the settings itself. Signed-off-by: Martin Kletzander --- docs/formatdomain.html.in | 24 ++++++ docs/schemas/domaincommon.rng | 3 + docs/schemas/networkcommon.rng | 17 ++++ src/conf/domain_conf.c | 9 +++ src/conf/domain_conf.h | 2 + src/conf/networkcommon_conf.c | 91 ++++++++++++++++++= ++++ src/conf/networkcommon_conf.h | 9 +++ src/libvirt_private.syms | 2 + src/qemu/qemu_domain.c | 31 ++++++++ .../qemuxml2argvdata/qemuxml2argv-net-coalesce.xml | 64 +++++++++++++++ .../qemuxml2xmlout-net-coalesce.xml | 69 ++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 12 files changed, 322 insertions(+) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-coalesce.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-net-coalesce.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index b1e38f00e423..ea64b7fd1193 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -5405,6 +5405,30 @@ qemu-kvm -net nic,model=3D? /dev/null Since 3.1.0

+
Coalesce settings
+
+...
+<devices>
+  <interface type=3D'network'>
+    <source network=3D'default'/>
+    <target dev=3D'vnet0'/>
+    <coalesce>
+      <rx_max_coalesced_frames>5</rx_max_coalesced_frames>
+    </coalesce>
+  </interface>
+</devices>
+...
+ +

+ This element provides means of setting coalesce settings for some + interface devices (currently only type network + and bridge. Currently there is just one sub-element + named rx_max_coalesced_frames which accepts a non-negat= ive + integer that specifies the maximum number of packets that will be re= ceived + before an interrupt. + Since 3.3.0 +

+
IP configuration
 ...
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index edc225fe50c5..b703515fb897 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -2509,6 +2509,9 @@
         
       
       
+        
+      
+      
         
           
             
diff --git a/docs/schemas/networkcommon.rng b/docs/schemas/networkcommon.rng
index 26995556d48d..27e78d13e4a6 100644
--- a/docs/schemas/networkcommon.rng
+++ b/docs/schemas/networkcommon.rng
@@ -275,4 +275,21 @@
       
     
   
+
+  
+    
+      
+        
+        
+          
+            
+          
+        
+      
+    
+  
+
 
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 80baa090a7f8..3cc17b5fd228 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -10251,6 +10251,13 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlo=
pt,
         goto error;
     }

+    node =3D virXPathNode("./coalesce", ctxt);
+    if (node) {
+        def->coalesce =3D virNetDevCoalesceParseXML(node, ctxt);
+        if (!def->coalesce)
+            goto error;
+    }
+
  cleanup:
     ctxt->node =3D oldnode;
     VIR_FREE(macaddr);
@@ -22144,6 +22151,8 @@ virDomainNetDefFormat(virBufferPtr buf,
     if (def->mtu)
         virBufferAsprintf(buf, "\n", def->mtu);

+    virNetDevCoalesceFormatXML(buf, def->coalesce);
+
     if (virDomainDeviceInfoFormat(buf, &def->info,
                                   flags | VIR_DOMAIN_DEF_FORMAT_ALLOW_BOOT
                                   | VIR_DOMAIN_DEF_FORMAT_ALLOW_ROM) < 0)
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 26c0e6b88759..6c3de9cc2cd4 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -41,6 +41,7 @@
 # include "numa_conf.h"
 # include "virnetdevmacvlan.h"
 # include "virsysinfo.h"
+# include "virnetdev.h"
 # include "virnetdevip.h"
 # include "virnetdevvportprofile.h"
 # include "virnetdevbandwidth.h"
@@ -1036,6 +1037,7 @@ struct _virDomainNetDef {
     int trustGuestRxFilters; /* enum virTristateBool */
     int linkstate;
     unsigned int mtu;
+    virNetDevCoalescePtr coalesce;
 };

 /* Used for prefix of ifname of any network name generated dynamically
diff --git a/src/conf/networkcommon_conf.c b/src/conf/networkcommon_conf.c
index 29e978bbdfe5..e0756da6c9ec 100644
--- a/src/conf/networkcommon_conf.c
+++ b/src/conf/networkcommon_conf.c
@@ -328,3 +328,94 @@ virNetDevIPRouteFormat(virBufferPtr buf,
  cleanup:
     return result;
 }
+
+virNetDevCoalescePtr
+virNetDevCoalesceParseXML(xmlNodePtr node,
+                          xmlXPathContextPtr ctxt)
+{
+    virNetDevCoalescePtr ret =3D NULL;
+    xmlNodePtr save =3D NULL;
+    char *str =3D NULL;
+    unsigned long long tmp =3D 0;
+
+    save =3D ctxt->node;
+    ctxt->node =3D node;
+
+#define GET_COALESCE_PARAM(name)                                        \
+    do {                                                                \
+        str =3D virXPathString("string(./" #name ")", ctxt);              \
+        if (!str)                                                       \
+            break;                                                      \
+                                                                        \
+        if (!ret && VIR_ALLOC(ret) < 0)                                 \
+            return NULL;                                                \
+                                                                        \
+        if (virStrToLong_ullp(str, NULL, 10, &tmp) < 0) {               \
+            virReportError(VIR_ERR_XML_DETAIL,                          \
+                           _("cannot parse value '%s' for parameter '%s'")=
, \
+                           str, #name);                                 \
+            VIR_FREE(str);                                              \
+            goto error;                                                 \
+        }                                                               \
+        VIR_FREE(str);                                                  \
+                                                                        \
+        if (tmp > UINT32_MAX) {                                         \
+            virReportError(VIR_ERR_OVERFLOW,                            \
+                           _("value '%llu' is too big for " #name       \
+                             ", maximum is '%lu'"),                     \
+                           tmp, (unsigned long) UINT32_MAX);            \
+            goto error;                                                 \
+        }                                                               \
+                                                                        \
+        ret->name =3D tmp;                                                \
+    } while (0)
+
+    /* Just add more parameters if needed */
+
+    GET_COALESCE_PARAM(rx_max_coalesced_frames);
+
+#undef GET_COALESCE_PARAM
+
+ cleanup:
+    ctxt->node =3D save;
+    return ret;
+
+ error:
+    VIR_FREE(ret);
+    goto cleanup;
+}
+
+void
+virNetDevCoalesceFormatXML(virBufferPtr buf,
+                           virNetDevCoalescePtr coalesce)
+{
+    virBuffer childrenBuf =3D VIR_BUFFER_INITIALIZER;
+    int indent =3D virBufferGetIndent(buf, false);
+
+    if (!coalesce)
+        return;
+
+    virBufferAdjustIndent(&childrenBuf, indent + 2);
+
+#define SET_COALESCE_PARAM(name)                                \
+    do {                                                        \
+        if (coalesce->name) {                                   \
+            virBufferAsprintf(&childrenBuf,                     \
+                              /* TODO: turn %u into something 32-bit compa=
tible */ \
+                              "<" #name ">%u\n",    \
+                              coalesce->name);                  \
+        }                                                       \
+    } while (0)
+
+    /* Just add more parameters if needed */
+
+    SET_COALESCE_PARAM(rx_max_coalesced_frames);
+
+#undef SET_COALESCE_PARAM
+
+    if (virBufferUse(&childrenBuf)) {
+        virBufferAddLit(buf, "\n");
+        virBufferAddBuffer(buf, &childrenBuf);
+        virBufferAddLit(buf, "\n");
+    }
+}
diff --git a/src/conf/networkcommon_conf.h b/src/conf/networkcommon_conf.h
index 70e46793f67b..a842e2075292 100644
--- a/src/conf/networkcommon_conf.h
+++ b/src/conf/networkcommon_conf.h
@@ -32,6 +32,7 @@
 # include "virbuffer.h"
 # include "virsocketaddr.h"
 # include "virnetdevip.h"
+# include "virnetdev.h"

 virNetDevIPRoutePtr
 virNetDevIPRouteCreate(const char *networkName,
@@ -52,4 +53,12 @@ int
 virNetDevIPRouteFormat(virBufferPtr buf,
                        const virNetDevIPRoute *def);

+virNetDevCoalescePtr
+virNetDevCoalesceParseXML(xmlNodePtr node,
+                          xmlXPathContextPtr ctxt);
+
+void
+virNetDevCoalesceFormatXML(virBufferPtr buf,
+                           virNetDevCoalescePtr coalesce);
+
 #endif /* __NETWORKCOMMON_CONF_H__ */
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 7ba9b7d98d86..7712e3d0a7f2 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -685,6 +685,8 @@ virNetworkEventStateRegisterID;


 # conf/networkcommon_conf.h
+virNetDevCoalesceFormatXML;
+virNetDevCoalesceParseXML;
 virNetDevIPRouteCreate;
 virNetDevIPRouteFormat;
 virNetDevIPRouteParseXML;
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index a3bb7dbc9a25..ac7193c9743f 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -2953,6 +2953,30 @@ qemuDomainDefValidate(const virDomainDef *def,
 }


+static bool
+qemuDomainNetSupportsCoalesce(virDomainNetType type)
+{
+    switch (type) {
+    case VIR_DOMAIN_NET_TYPE_NETWORK:
+    case VIR_DOMAIN_NET_TYPE_BRIDGE:
+        return true;
+    case VIR_DOMAIN_NET_TYPE_VHOSTUSER:
+    case VIR_DOMAIN_NET_TYPE_ETHERNET:
+    case VIR_DOMAIN_NET_TYPE_DIRECT:
+    case VIR_DOMAIN_NET_TYPE_HOSTDEV:
+    case VIR_DOMAIN_NET_TYPE_USER:
+    case VIR_DOMAIN_NET_TYPE_SERVER:
+    case VIR_DOMAIN_NET_TYPE_CLIENT:
+    case VIR_DOMAIN_NET_TYPE_MCAST:
+    case VIR_DOMAIN_NET_TYPE_INTERNAL:
+    case VIR_DOMAIN_NET_TYPE_UDP:
+    case VIR_DOMAIN_NET_TYPE_LAST:
+        break;
+    }
+    return false;
+}
+
+
 static int
 qemuDomainDeviceDefValidate(const virDomainDeviceDef *dev,
                             const virDomainDef *def ATTRIBUTE_UNUSED,
@@ -2987,6 +3011,13 @@ qemuDomainDeviceDefValidate(const virDomainDeviceDef=
 *dev,
                            virDomainNetTypeToString(net->type));
             goto cleanup;
         }
+
+        if (net->coalesce && !qemuDomainNetSupportsCoalesce(net->type)) {
+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                           _("coalesce settings on interface type %s are n=
ot supported"),
+                           virDomainNetTypeToString(net->type));
+            goto cleanup;
+        }
     }

     ret =3D 0;
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-coalesce.xml b/tests/q=
emuxml2argvdata/qemuxml2argv-net-coalesce.xml
new file mode 100644
index 000000000000..0c44cb1c8abc
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-coalesce.xml
@@ -0,0 +1,64 @@
+
+  test
+  15d091de-0181-456b-9554-e4382dc1f1ab
+  1048576
+  1048576
+  1
+  
+    hvm
+    
+    
+    
+  
+  
+  destroy
+  restart
+  restart
+  
+    /usr/bin/qemu
+    
+      
+      
+      
+      

+    
+    
+      
+      
+      
+      
+      

+    
+    
+    
+      

+    
+    
+    
+    
+      
+      
+      
+      
+        7
+      
+    
+    
+      
+      
+      
+      
+        0
+      
+    
+    
+      
+    
+    
+      
+    
+    
+    
+    
+  
+
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-coalesce.xml b/tes=
ts/qemuxml2xmloutdata/qemuxml2xmlout-net-coalesce.xml
new file mode 100644
index 000000000000..facf3212c79c
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-coalesce.xml
@@ -0,0 +1,69 @@
+
+  test
+  15d091de-0181-456b-9554-e4382dc1f1ab
+  1048576
+  1048576
+  1
+  
+    hvm
+    
+    
+    
+  
+  
+  destroy
+  restart
+  restart
+  
+    /usr/bin/qemu
+    
+      
+      
+      
+      

+    
+    
+      
+      
+      
+      
+      

+    
+    
+      

+    
+    
+      

+    
+    
+      

+    
+    
+    
+      
+      
+      
+      
+        7
+      
+      

+    
+    
+      
+      
+      
+      

+    
+    
+      
+    
+    
+      
+    
+    
+    
+    
+      

+    
+  
+
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 252f1ed5f2a8..692b63866e53 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -532,6 +532,7 @@ mymain(void)
     DO_TEST("net-bandwidth", NONE);
     DO_TEST("net-bandwidth2", NONE);
     DO_TEST("net-mtu", NONE);
+    DO_TEST("net-coalesce", NONE);

     DO_TEST("serial-vc", NONE);
     DO_TEST("serial-pty", NONE);
--=20
2.12.2

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Thu May  2 07:00:42 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zoho.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
Return-Path: 
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1491581119615183.67493968470535;
 Fri, 7 Apr 2017 09:05:19 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com
 [10.5.11.15])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 2450AC04D288;
	Fri,  7 Apr 2017 16:05:18 +0000 (UTC)
Received: from colo-mx.corp.redhat.com (unknown [10.5.11.21])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id E5F68B2136;
	Fri,  7 Apr 2017 16:05:17 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id 8EE804BB74;
	Fri,  7 Apr 2017 16:05:17 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com
	[10.5.11.11])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id v37G55oi015961 for ;
	Fri, 7 Apr 2017 12:05:05 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id D1101857B7; Fri,  7 Apr 2017 16:05:05 +0000 (UTC)
Received: from caroline.brq.redhat.com (dhcp129-198.brq.redhat.com
	[10.34.129.198])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 551D28AC42
	for ; Fri,  7 Apr 2017 16:05:05 +0000 (UTC)
DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 2450AC04D288
Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com;
 dmarc=none (p=none dis=none) header.from=redhat.com
Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com;
 spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com
DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 2450AC04D288
From: Martin Kletzander 
To: libvir-list@redhat.com
Date: Fri,  7 Apr 2017 18:04:55 +0200
Message-Id: 
 <8fecf89e5fdc61f493cd88e68f1760bb8b2e56ff.1491580983.git.mkletzan@redhat.com>
In-Reply-To: 
References: 
In-Reply-To: 
References: 
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH 3/3] Set coalesce settings for domain interfaces
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]);
 Fri, 07 Apr 2017 16:05:18 +0000 (UTC)
X-ZohoMail: RSF_0  Z_629925259 SPT_0
Content-Type: text/plain; charset="utf-8"

This patch makes use of the virNetDevSetCoalesce() function to make
appropriate settings effective for devices that support them.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=3D1414627

Signed-off-by: Martin Kletzander 
---
 src/bhyve/bhyve_command.c   | 2 +-
 src/network/bridge_driver.c | 2 +-
 src/qemu/qemu_interface.c   | 2 +-
 src/uml/uml_conf.c          | 2 +-
 src/util/virnetdevtap.c     | 8 +++++++-
 src/util/virnetdevtap.h     | 2 ++
 tests/bhyvexml2argvmock.c   | 1 +
 7 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c
index e0528ed77a2c..e9c072b9f578 100644
--- a/src/bhyve/bhyve_command.c
+++ b/src/bhyve/bhyve_command.c
@@ -100,7 +100,7 @@ bhyveBuildNetArgStr(virConnectPtr conn,
                                            def->uuid, NULL, NULL, 0,
                                            virDomainNetGetActualVirtPortPr=
ofile(net),
                                            virDomainNetGetActualVlan(net),
-                                           0, NULL,
+                                           NULL, 0, NULL,
                                            VIR_NETDEV_TAP_CREATE_IFUP | VI=
R_NETDEV_TAP_CREATE_PERSIST) < 0) {
             goto cleanup;
         }
diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 5ccd37a3213b..9517f97dfb40 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -2312,7 +2312,7 @@ networkStartNetworkVirtual(virNetworkDriverStatePtr d=
river,
         if (virNetDevTapCreateInBridgePort(network->def->bridge,
                                            &macTapIfName, &network->def->m=
ac,
                                            NULL, NULL, &tapfd, 1, NULL, NU=
LL,
-                                           network->def->mtu, NULL,
+                                           NULL, network->def->mtu, NULL,
                                            VIR_NETDEV_TAP_CREATE_USE_MAC_F=
OR_BRIDGE |
                                            VIR_NETDEV_TAP_CREATE_IFUP |
                                            VIR_NETDEV_TAP_CREATE_PERSIST) =
< 0) {
diff --git a/src/qemu/qemu_interface.c b/src/qemu/qemu_interface.c
index c5dca60f1f65..2057ac9293f2 100644
--- a/src/qemu/qemu_interface.c
+++ b/src/qemu/qemu_interface.c
@@ -545,7 +545,7 @@ qemuInterfaceBridgeConnect(virDomainDefPtr def,
                                            def->uuid, tunpath, tapfd, *tap=
fdSize,
                                            virDomainNetGetActualVirtPortPr=
ofile(net),
                                            virDomainNetGetActualVlan(net),
-                                           net->mtu, mtu,
+                                           net->coalesce, net->mtu, mtu,
                                            tap_create_flags) < 0) {
             virDomainAuditNetDevice(def, net, tunpath, false);
             goto cleanup;
diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c
index 871653c5a64c..bdef78324385 100644
--- a/src/uml/uml_conf.c
+++ b/src/uml/uml_conf.c
@@ -125,7 +125,7 @@ umlConnectTapDevice(virDomainDefPtr vm,
                                        vm->uuid, net->backend.tap, &tapfd,=
 1,
                                        virDomainNetGetActualVirtPortProfil=
e(net),
                                        virDomainNetGetActualVlan(net),
-                                       0, NULL,
+                                       NULL, 0, NULL,
                                        VIR_NETDEV_TAP_CREATE_IFUP |
                                        VIR_NETDEV_TAP_CREATE_PERSIST) < 0)=
 {
         if (template_ifname)
diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c
index 02ef7fd24047..fe452943ab5e 100644
--- a/src/util/virnetdevtap.c
+++ b/src/util/virnetdevtap.c
@@ -584,6 +584,7 @@ virNetDevTapAttachBridge(const char *tapname,
  * @tapfd: array of file descriptor return value for the new tap device
  * @tapfdSize: number of file descriptors in @tapfd
  * @virtPortProfile: bridge/port specific configuration
+ * @coalesce: optional coalesce parameters
  * @mtu: requested MTU for port (or 0 for "default")
  * @actualMTU: MTU actually set for port (after accounting for bridge's MT=
U)
  * @flags: OR of virNetDevTapCreateFlags:
@@ -616,6 +617,7 @@ int virNetDevTapCreateInBridgePort(const char *brname,
                                    size_t tapfdSize,
                                    virNetDevVPortProfilePtr virtPortProfil=
e,
                                    virNetDevVlanPtr virtVlan,
+                                   virNetDevCoalescePtr coalesce,
                                    unsigned int mtu,
                                    unsigned int *actualMTU,
                                    unsigned int flags)
@@ -654,13 +656,17 @@ int virNetDevTapCreateInBridgePort(const char *brname,
         goto error;

     if (virNetDevTapAttachBridge(*ifname, brname, macaddr, vmuuid,
-                                 virtPortProfile, virtVlan, mtu, actualMTU=
) < 0) {
+                                 virtPortProfile, virtVlan,
+                                 mtu, actualMTU) < 0) {
         goto error;
     }

     if (virNetDevSetOnline(*ifname, !!(flags & VIR_NETDEV_TAP_CREATE_IFUP)=
) < 0)
         goto error;

+    if (virNetDevSetCoalesce(*ifname, coalesce) < 0)
+        goto error;
+
     return 0;

  error:
diff --git a/src/util/virnetdevtap.h b/src/util/virnetdevtap.h
index 6bb3b8891c21..bd5ec14d448f 100644
--- a/src/util/virnetdevtap.h
+++ b/src/util/virnetdevtap.h
@@ -24,6 +24,7 @@
 # define __VIR_NETDEV_TAP_H__

 # include "internal.h"
+# include "virnetdev.h"
 # include "virnetdevvportprofile.h"
 # include "virnetdevvlan.h"

@@ -83,6 +84,7 @@ int virNetDevTapCreateInBridgePort(const char *brname,
                                    size_t tapfdSize,
                                    virNetDevVPortProfilePtr virtPortProfil=
e,
                                    virNetDevVlanPtr virtVlan,
+                                   virNetDevCoalescePtr coalesce,
                                    unsigned int mtu,
                                    unsigned int *actualMTU,
                                    unsigned int flags)
diff --git a/tests/bhyvexml2argvmock.c b/tests/bhyvexml2argvmock.c
index fd714694f0bd..7afa0e34c43c 100644
--- a/tests/bhyvexml2argvmock.c
+++ b/tests/bhyvexml2argvmock.c
@@ -28,6 +28,7 @@ int virNetDevTapCreateInBridgePort(const char *brname ATT=
RIBUTE_UNUSED,
                                    size_t tapfdSize ATTRIBUTE_UNUSED,
                                    virNetDevVPortProfilePtr virtPortProfil=
e ATTRIBUTE_UNUSED,
                                    virNetDevVlanPtr virtVlan ATTRIBUTE_UNU=
SED,
+                                   virNetDevCoalescePtr coalesce ATTRIBUTE=
_UNUSED,
                                    unsigned int mtu ATTRIBUTE_UNUSED,
                                    unsigned int *actualMTU ATTRIBUTE_UNUSE=
D,
                                    unsigned int fakeflags ATTRIBUTE_UNUSED)
--=20
2.12.2

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list