From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 62932A0518 for ; Fri, 24 Jul 2020 14:00:36 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 59D811BFE3; Fri, 24 Jul 2020 14:00:36 +0200 (CEST) Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by dpdk.org (Postfix) with ESMTP id E00CD1BFE3 for ; Fri, 24 Jul 2020 14:00:35 +0200 (CEST) Received: by mail-wr1-f53.google.com with SMTP id f1so7518052wro.2 for ; Fri, 24 Jul 2020 05:00:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=iS0nILCQVxICdvIulC2xAcKbE00C5/opYlhcDCWIBkY=; b=o8kv4Cjn5z1IHXi241xKtR2mKXoux4Wmnmy5qsgcSH6wQwkQn6uSQC7+thyvXDw43N npi+S+EkmO439lC3LLh+I6LU+lzeUcrsysmHUs+0apFr02L84L1kxkp61kEI17fZfGBG D2iTGAm9r/sOwlpUx4xsx293TrqbQags5fR1mg+XpdX2ATkXf2T5sMWZPeZpHyxNEwxP jkA0SNId2eekudq9mT/gvpzXGeGEoNDg4n6HDO2FmDBzCMTr9dGl5kSMD1Arp4fZZkbf WbWLAqCMkXdXUdFQ1x3nq+4ebSoPz+cWz9cZ9vc20PfqEiAS6GUpQEPMmXlyF+Ts7+XJ 6B1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=iS0nILCQVxICdvIulC2xAcKbE00C5/opYlhcDCWIBkY=; b=ZZdmisANCMozaE1MOJgCscaaGv6tMJKWULEpP09POLFCCeA7tbs6c2HzEpq6icLVee SJbpNixLM6AXIwTSFrsFFk2Td6nEu/1Lp8iWtrqYbP1A7bT5niLV58ZQbcIsqXerpWFx 4qD0ik3pzj1fSctwlAT1JqNAqecdDcl9IXGVgOGWafo5kY92TYNn23cQ5gAoosYh1J/5 h2QMIeu0i4KYIIrYwRlLdt+is5z4h+WkDD8YgGrvu+4XN6H81WUdns7t8foQ1GSxpmVg OEG9JVNlub25A/pn3lxjiVZ7HpVbuoc20M8roAq5QDiB4GcL/aMovI+o/Y23ucKadWs/ I0bQ== X-Gm-Message-State: AOAM5338sTaS8Jo2QzocuZKawXAlYZOCxyrEEMWUc2tsfjH7khP9bw4p BEiRmX1iA3xLgrU8Ic+Sta8= X-Google-Smtp-Source: ABdhPJyoLxVaanzfVCJ8BdL+AlPaWIBm4gXd/PnAFt7d3rvSY9a92roVwe0jC0owAIOdRyBP0YrYlQ== X-Received: by 2002:adf:b7cd:: with SMTP id t13mr8018824wre.424.1595592035605; Fri, 24 Jul 2020 05:00:35 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id p8sm1182486wrq.9.2020.07.24.05.00.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 05:00:34 -0700 (PDT) From: luca.boccassi@gmail.com To: Kevin Traynor Cc: Luca Boccassi , dpdk stable Date: Fri, 24 Jul 2020 12:57:19 +0100 Message-Id: <20200724120030.1863487-1-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'vhost: remove zero-copy and client mode restriction' has been queued to stable release 19.11.4 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/26/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Luca Boccassi --- >From 2819f713763a3796cfc05962770e3c813e459ecf Mon Sep 17 00:00:00 2001 From: Kevin Traynor Date: Wed, 1 Jul 2020 14:53:05 +0100 Subject: [PATCH] vhost: remove zero-copy and client mode restriction Commits [1] were backported as fixes from the latest DPDK release to the stable branches. They are detecting if vhost-user client and zero-copy are being used together. As this can be problematic in some cases, this combination was being rejected by those patches. It might be ok to deprecate this combination in latest DPDK, but for stable releases we should not remove the functionality as it may be in use with earlier releases from the same stable branch. In fact, we know that this functionality is used at least in OVS in multiple releases/active branches. This patch removes the restriction of zero-copy and client mode and adds a warning for the user. [1] commit a6ae060e3995 ("vhost: prevent zero-copy with incompatible client mode") commit 1c2eaf9a9852 ("vhost: fix zero-copy server mode") Signed-off-by: Kevin Traynor Acked-by: Luca Boccassi --- lib/librte_vhost/socket.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/librte_vhost/socket.c b/lib/librte_vhost/socket.c index 2461549fe..dc3ee1e99 100644 --- a/lib/librte_vhost/socket.c +++ b/lib/librte_vhost/socket.c @@ -926,12 +926,10 @@ rte_vhost_driver_register(const char *path, uint64_t flags) ret = -1; goto out_mutex; } - if ((flags & RTE_VHOST_USER_CLIENT) != 0) { - RTE_LOG(ERR, VHOST_CONFIG, - "error: zero copy is incompatible with vhost client mode\n"); - ret = -1; - goto out_mutex; - } + if ((flags & RTE_VHOST_USER_CLIENT) != 0) + RTE_LOG(WARNING, VHOST_CONFIG, + "zero copy may be incompatible with vhost client mode\n"); + vsocket->supported_features &= ~(1ULL << VIRTIO_F_IN_ORDER); vsocket->features &= ~(1ULL << VIRTIO_F_IN_ORDER); -- 2.20.1