From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: passt.top; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: passt.top; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=QwcZtBGb; dkim-atps=neutral Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by passt.top (Postfix) with ESMTP id 5D0455A004E for ; Wed, 27 Nov 2024 15:55:08 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1732719307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=hbzJt876b9JsplSR3FSvffMVRNGoc+GxMimHhIm+oXU=; b=QwcZtBGbAc0uvSE3gnTtqwbkZOVcGaZ4Ju1ion/SFejpEQNX7W5NlWuskvbI4cHObiLZki 6Hkugr2e6091/pTTOoVWKYM0dx9FiNc/Mc/PLzOWDYJBAaA2PfzDHCdovDQC2riBkJ4POR Z5XNV2yK+Kf0WJrO731Q5FRBcK3/mTw= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-372-aygG4RrlPTaegztgLWiDOg-1; Wed, 27 Nov 2024 09:55:03 -0500 X-MC-Unique: aygG4RrlPTaegztgLWiDOg-1 X-Mimecast-MFC-AGG-ID: aygG4RrlPTaegztgLWiDOg Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-38240d9ed31so4081850f8f.3 for ; Wed, 27 Nov 2024 06:55:03 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732719302; x=1733324102; h=content-transfer-encoding:in-reply-to:autocrypt:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=hbzJt876b9JsplSR3FSvffMVRNGoc+GxMimHhIm+oXU=; b=FKSiazgitiZ4cUZmFD3jSAaupsWOJh+/DmlvM/C2qdn7NcDRpG5xkuYqB6RaXMUQbf Vv6uwGmMrSEshrRH4hlQ9IGefAzaA3GuiwWaZ0wB6hMRDX7Yk5FQkUNHpB3eY3WClVt8 2fKQJnI8k5k9NffXlK/NCbzxNPc8F3meVMwgBrZHcYYZ+2IiSv3QEkpx84qUtjOdofII Qr4EXUoeo+tkUTYRRTxHJVk+LMk73XgJdaeiHLzYm108xKWUiw/cWJeFyHR0dUDkznza 5/RFz/tcY0dpbcevjhRlK+tIDoDPJ/VN3wzpZJ/wFKb5OMv97bqFMFfUeSK7L6PWe5hl +mzQ== X-Gm-Message-State: AOJu0YyR0Z2iW8iTCfW0a38YRpfEBU+4WjnbIYSijxbutgSg56V0YUDT iAggyQiPBxRs+Dp3IqIGjjXnoOqSTqKiystdiyxdgp80+aIBFqk0+tMUqZZV7+exYfSQpc57Qk3 FGfG5h7a4W1bA9Jq7fb3ls+KBd0RGAApC3D5JA7iemlTaD+OYCDzqj5rk6A== X-Gm-Gg: ASbGnct3wkyGzeJA0YLMORSplxLofzKCVlS/9BIDe4dG+zcOUkVw2EBZ2SQtuY7cjzC OlMCeeAK8/W5z9cPcIynP6+jeJ5vjWZu7klwqRqotu95JSaEVRT47WbkvTEY5WocjnnT10de2Hl HFMyOQ6A/PnNNsWqVwA65ZeXMYJsBDfCX7pPl3wN3/QAoGtja7jmonXMkTgN4AVDKQJB8iSLDXa Pe/VOeH5rlor7h5QfgQMhEqmjBa0uAZ4GJvCO0+oRcwntlNVOYCA0wcqKzhvnJCxgWJ2Tzn4T5+ kQ0f4n1U2Hru X-Received: by 2002:a05:6000:2ce:b0:385:c8d2:efde with SMTP id ffacd0b85a97d-385c8d2f096mr1604146f8f.48.1732719302190; Wed, 27 Nov 2024 06:55:02 -0800 (PST) X-Google-Smtp-Source: AGHT+IEqIXWhJZutoQC94a9Q21IAfgyyx/u6QJZCxlr8omuiydZPdSX9hZKYAuh8FMCeKaZPg09M4g== X-Received: by 2002:a05:6000:2ce:b0:385:c8d2:efde with SMTP id ffacd0b85a97d-385c8d2f096mr1604135f8f.48.1732719301866; Wed, 27 Nov 2024 06:55:01 -0800 (PST) Received: from ?IPV6:2a01:e0a:e10:ef90:343a:68f:2e91:95c? ([2a01:e0a:e10:ef90:343a:68f:2e91:95c]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-434aa7cd343sm23122475e9.22.2024.11.27.06.55.01 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 27 Nov 2024 06:55:01 -0800 (PST) Message-ID: Date: Wed, 27 Nov 2024 15:55:00 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] musl: fix conflict on ethhdr definition To: Stefano Brivio References: <20241127144130.3637798-1-lvivier@redhat.com> <20241127154809.2a49f2f8@elisabeth> From: Laurent Vivier Autocrypt: addr=lvivier@redhat.com; keydata= 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 In-Reply-To: <20241127154809.2a49f2f8@elisabeth> X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: Dym2GNL-lRo_sFlhATlNtp4GLNy9jH8vXNneNHfl3uU_1732719302 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Message-ID-Hash: Q7MHHBOF3ILW5HBZKTND4YG4I3M6I6NV X-Message-ID-Hash: Q7MHHBOF3ILW5HBZKTND4YG4I3M6I6NV X-MailFrom: lvivier@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: passt-dev@passt.top X-Mailman-Version: 3.3.8 Precedence: list List-Id: Development discussion and patches for passt Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: On 27/11/2024 15:48, Stefano Brivio wrote: > On Wed, 27 Nov 2024 15:41:30 +0100 > Laurent Vivier wrote: > >> there is a conflict between netinet/if_ether.h provided by musl and >> linux/if_ether.h provided by the linux headers: >> >> In file included from passt.h:185, >> from tcp_vu.c:21: >> /usr/include/netinet/if_ether.h:115:8: error: redefinition of 'struct ethhdr' >> 115 | struct ethhdr { >> | ^~~~~~ >> In file included from /usr/include/linux/virtio_net.h:32, >> from tcp_vu.c:17: >> /usr/include/linux/if_ether.h:173:8: note: originally defined here >> 173 | struct ethhdr { >> | ^~~~~~ >> >> The kernel headers provide a flag to disable the definition in this case, >> __UAPI_DEF_ETHHDR (see /usr/include/linux/if_ether.h comment). >> >> Signed-off-by: Laurent Vivier >> --- >> Makefile | 3 +++ >> 1 file changed, 3 insertions(+) >> >> diff --git a/Makefile b/Makefile >> index cb7448079de5..2aa56ada65fd 100644 >> --- a/Makefile >> +++ b/Makefile >> @@ -33,6 +33,9 @@ FLAGS += $(FORTIFY_FLAG) -O2 -pie -fPIE >> FLAGS += -DPAGE_SIZE=$(shell getconf PAGE_SIZE) >> FLAGS += -DVERSION=\"$(VERSION)\" >> FLAGS += -DDUAL_STACK_SOCKETS=$(DUAL_STACK_SOCKETS) >> +ifeq (musl, $(word 4,$(subst -, ,$(TARGET)))) >> +FLAGS += -D__UAPI_DEF_ETHHDR=0 >> +endif > > Uh oh, I just solved this locally (I was about to push, but I stopped > in time) by simply including instead of > from passt.h. > > I'm not sure what's the best solution: mine is simpler, but I'm not > really fond of including Linux-specific stuff if there's no need for > it, so I'd slightly prefer yours. > > On the other hand, it's not just for musl. If somebody tries to build > this against, say, uClibc-ng (no reports about that yet), they will > probably run into trouble as well. In fact, in /usr/include/linux/if_ether.h they say: /* allow libcs like musl to deactivate this, glibc does not implement this. */ So I think musl should set the value and then I found: #define __UAPI_DEF_ETHHDR 0 in /usr/include/netinet/if_ether.h So I think the solution is to include netinet/if_ether.h before linux/if_ether.h > > Or should we just unconditionally #define __UAPI_DEF_ETHHDR=0 just > before including ? If you do that, I think it will not work anymore with glibc Thanks, Laurent >