From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by dpdk.org (Postfix) with ESMTP id A7E131B42B; Thu, 22 Nov 2018 23:04:58 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Nov 2018 14:04:57 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,267,1539673200"; d="scan'208";a="93267747" Received: from fyigit-mobl.ger.corp.intel.com (HELO [10.252.31.157]) ([10.252.31.157]) by orsmga006.jf.intel.com with ESMTP; 22 Nov 2018 14:04:54 -0800 To: Maxime Coquelin , dev@dpdk.org, thomas@monjalon.net, tiwei.bie@intel.com, zhihong.wang@intel.com, jfreiman@redhat.com Cc: stable@dpdk.org References: <20181122170922.15007-1-maxime.coquelin@redhat.com> <5437708e-d8cf-fe17-6fd6-fad67b3a0eb7@redhat.com> <590b480d-e2db-b299-82da-bc96a556a5e9@intel.com> <8f2a2b11-27f0-0602-c9b0-f40c2d6384c7@redhat.com> From: Ferruh Yigit Openpgp: preference=signencrypt Autocrypt: addr=ferruh.yigit@intel.com; prefer-encrypt=mutual; keydata= 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 vM8= Message-ID: <8b74daec-a36f-9757-f218-91a5b6e1e553@intel.com> Date: Thu, 22 Nov 2018 22:04:51 +0000 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.3.1 MIME-Version: 1.0 In-Reply-To: <8f2a2b11-27f0-0602-c9b0-f40c2d6384c7@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Subject: Re: [dpdk-stable] [dpdk-dev] [PATCH] vhost: fix packed ring defines declaration 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: , X-List-Received-Date: Thu, 22 Nov 2018 22:04:59 -0000 On 11/22/2018 7:50 PM, Maxime Coquelin wrote: > > > On 11/22/18 8:20 PM, Ferruh Yigit wrote: >> On 11/22/2018 6:51 PM, Maxime Coquelin wrote: >>> >>> >>> On 11/22/18 7:23 PM, Ferruh Yigit wrote: >>>> On 11/22/2018 5:09 PM, Maxime Coquelin wrote: >>>>> The packed ring defines were declared only if kernel >>>>> header does not declare them. >>>>> The problem is that they are not applied in upstream kernel, >>>>> and some changes in the names have been required. >>>>> >>>>> This patch declares the defines unconditionally, which >>>>> fixes potential build issues. >>>> >>>> +1 to address possible build issues. >>>> >>>>> >>>>> Fixes: 297b1e7350f6 ("vhost: add virtio packed virtqueue defines") >>>>> Cc: stable@dpdk.org >>>>> >>>>> Signed-off-by: Maxime Coquelin >>>>> --- >>>>> lib/librte_vhost/vhost.h | 22 +++++++++++----------- >>>>> 1 file changed, 11 insertions(+), 11 deletions(-) >>>>> >>>>> diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h >>>>> index 760f42192..5218f1b12 100644 >>>>> --- a/lib/librte_vhost/vhost.h >>>>> +++ b/lib/librte_vhost/vhost.h >>>>> @@ -219,13 +219,6 @@ struct vhost_msg { >>>>> >>>>> #define VIRTIO_F_RING_PACKED 34 >>>>> >>>>> -#define VRING_DESC_F_NEXT 1 >>>>> -#define VRING_DESC_F_WRITE 2 >>>>> -#define VRING_DESC_F_INDIRECT 4 >>>> >>>> Why these are not re-defined below? Not used? >>> >>> These defines are in kernel headers since the beginning of virtio >>> support, so there are no reasons to keep them (and they aren't packed- >>> ring specific). >>> >>> I can let them if you prefer, it does not hurt but shouldn't be here. >> >> Not required, I just want to confirm nothing missed. >> >>> >>>>> - >>>>> -#define VRING_DESC_F_AVAIL (1ULL << 7) >>>>> -#define VRING_DESC_F_USED (1ULL << 15) >>>>> - >>>>> struct vring_packed_desc { >>>>> uint64_t addr; >>>>> uint32_t len; >>>>> @@ -233,16 +226,23 @@ struct vring_packed_desc { >>>>> uint16_t flags; >>>>> }; >>>>> >>>>> -#define VRING_EVENT_F_ENABLE 0x0 >>>>> -#define VRING_EVENT_F_DISABLE 0x1 >>>>> -#define VRING_EVENT_F_DESC 0x2 >>>>> - >>>>> struct vring_packed_desc_event { >>>>> uint16_t off_wrap; >>>>> uint16_t flags; >>>>> }; >>>>> #endif >>>>> >>>>> +/* >>>>> + * Declare below packed ring defines unconditionally >>>>> + * as Kernel header might use different names. >>>>> + */ >>>>> +#define VRING_DESC_F_AVAIL (1ULL << 7) >>>>> +#define VRING_DESC_F_USED (1ULL << 15) >>>>> + >>>>> +#define VRING_EVENT_F_ENABLE 0x0 >>>>> +#define VRING_EVENT_F_DISABLE 0x1 >>>>> +#define VRING_EVENT_F_DESC 0x2 >>>> >>>> What if Linux changes mind and uses old names again, build will fail again. If >>>> related part in Linux is not released yet, what do you think being on safe side >>>> and adding these defines with "#ifndef" wrap? >>> >>> There are the "old" ones. >>> In any case it will work (I tested it). >> >> I see they are the old ones but is there any chance that kernel uses them again >> (for some odd reason) ? Which can break the build. Should we add a protection? > > Yes, there is a chance, but that would not break build, it will just > override it. It will give redefined warning if values are different but right, won't cause any issue with same number. > >> >>> >>> In a future release, I plan to get rid of this dependency with Kernel >>> which only causes problems. >>> >>> There was a benefit at the beginning when all needed declarations where >>> in the Kernel headers. But now, every time we add a new virtio feature, >>> we have to check kernel supports it and if not define it. >>> >>> Thanks, >>> Maxime >>>>> + >>>>> /* >>>>> * Available and used descs are in same order >>>>> */ >>>>> >>>> >>