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 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B02F9EEAA7A for ; Thu, 14 Sep 2023 22:31:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694730706; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Mojpuf2aKmLUj7ETet2/HKn9tRxgzLSrL1sQw3xXROo=; b=OjeOyS3QV0QwTuC1LyIHjjz/FJA92dDeBv9R9TUoUh5vfR0dea6pwyMVhjjcDZ8OpCEDdH uo4Dt5oYHehubC7Ghfxqz2WnZFf2Rx/gdax0lCdjRVKY/vHsVhoAphY4S+KbQZxpscErWb lWbnMnUYhvNUD5S5mAgXFqIT9RGkSt4= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-695-15S6hAg7Nmqd_ydkweELzg-1; Thu, 14 Sep 2023 18:31:43 -0400 X-MC-Unique: 15S6hAg7Nmqd_ydkweELzg-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id F0993101A550; Thu, 14 Sep 2023 22:31:41 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5A94C40C6EA8; Thu, 14 Sep 2023 22:31:40 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 0A749194658C; Thu, 14 Sep 2023 22:31:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 179E61946588 for ; Thu, 14 Sep 2023 22:31:33 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id C9B842156A27; Thu, 14 Sep 2023 22:31:33 +0000 (UTC) Received: from octiron.msp.redhat.com (octiron.msp.redhat.com [10.15.80.209]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A488D21B2413; Thu, 14 Sep 2023 22:31:33 +0000 (UTC) Received: from octiron.msp.redhat.com (localhost.localdomain [127.0.0.1]) by octiron.msp.redhat.com (8.14.9/8.14.9) with ESMTP id 38EMVP2h011522; Thu, 14 Sep 2023 17:31:25 -0500 Received: (from bmarzins@localhost) by octiron.msp.redhat.com (8.14.9/8.14.9/Submit) id 38EMVOTQ011521; Thu, 14 Sep 2023 17:31:24 -0500 Date: Thu, 14 Sep 2023 17:31:24 -0500 From: Benjamin Marzinski To: mwilck@suse.com Message-ID: <20230914223124.GN7412@octiron.msp.redhat.com> References: <20230914145131.15165-1-mwilck@suse.com> <20230914145131.15165-4-mwilck@suse.com> MIME-Version: 1.0 In-Reply-To: <20230914145131.15165-4-mwilck@suse.com> User-Agent: Mutt/1.5.23 (2014-03-12) X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 Subject: Re: [dm-devel] [PATCH v3 38/38] libmultipath: avoid -Warray-bounds error in uatomic operations X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: dm-devel@redhat.com Errors-To: dm-devel-bounces@redhat.com Sender: "dm-devel" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit On Thu, Sep 14, 2023 at 04:51:31PM +0200, mwilck@suse.com wrote: > From: Martin Wilck > > The use of uatomic_xchg() in alias.c causes a -Warray-bounds error > on distributions using gcc 12, such as Fedora 37. This is a similar > error to 2534c4f ("libmultipath: avoid -Warray-bounds error with gcc > 12 and musl libc"). This happens only with liburcu 0.13 and earlier, > and only with certain gcc versions. See liburcu commit 835b9ab > ("Fix: x86 and s390 uatomic: __hp() macro warning with gcc 11"). > > Enhance the fix for 2534c4f by a adding a workaround for uatomic_xchg(), > and introduce the macro URCU_VERSION (originally only used for multipathd) > globally. > Reviewed-by: Benjamin Marzinski > Signed-off-by: Martin Wilck > --- > Makefile.inc | 2 +- > create-config.mk | 5 +++++ > libmultipath/alias.c | 5 +++-- > libmultipath/lock.h | 23 ++++++++++++++--------- > multipathd/Makefile | 2 -- > 5 files changed, 23 insertions(+), 14 deletions(-) > > diff --git a/Makefile.inc b/Makefile.inc > index 6e384e6..04bfa56 100644 > --- a/Makefile.inc > +++ b/Makefile.inc > @@ -95,7 +95,7 @@ OPTFLAGS := -O2 -g $(STACKPROT) --param=ssp-buffer-size=4 > WARNFLAGS := -Werror -Wall -Wextra -Wformat=2 $(WFORMATOVERFLOW) -Werror=implicit-int \ > -Werror=implicit-function-declaration -Werror=format-security \ > $(WNOCLOBBERED) -Werror=cast-qual $(ERROR_DISCARDED_QUALIFIERS) $(W_URCU_TYPE_LIMITS) > -CPPFLAGS := $(FORTIFY_OPT) $(CPPFLAGS) \ > +CPPFLAGS := $(FORTIFY_OPT) $(CPPFLAGS) $(D_URCU_VERSION) \ > -DBIN_DIR=\"$(bindir)\" -DMULTIPATH_DIR=\"$(plugindir)\" \ > -DRUNTIME_DIR=\"$(runtimedir)\" -DCONFIG_DIR=\"$(configdir)\" \ > -DDEFAULT_CONFIGFILE=\"$(configfile)\" -DSTATE_DIR=\"$(statedir)\" \ > diff --git a/create-config.mk b/create-config.mk > index d125597..4d318b9 100644 > --- a/create-config.mk > +++ b/create-config.mk > @@ -73,6 +73,10 @@ TEST_URCU_TYPE_LIMITS = $(shell \ > $(CC) -c -Werror=type-limits -o /dev/null -xc - 2>/dev/null \ > || echo -Wno-type-limits ) > > +URCU_VERSION = $(shell \ > + $(PKG_CONFIG) --modversion liburcu 2>/dev/null | \ > + awk -F. '{ printf("-DURCU_VERSION=0x%06x", 256 * ( 256 * $$1 + $$2) + $$3); }') > + > DEFINES := > > ifneq ($(call check_func,dm_task_no_flush,$(devmapper_incdir)/libdevmapper.h),0) > @@ -168,6 +172,7 @@ $(TOPDIR)/config.mk: $(multipathdir)/autoconfig.h > @echo creating $@ > @echo "FPIN_SUPPORT := $(FPIN_SUPPORT)" >$@ > @echo "FORTIFY_OPT := $(FORTIFY_OPT)" >>$@ > + @echo "D_URCU_VERSION := $(call URCU_VERSION)" >>$@ > @echo "SYSTEMD := $(SYSTEMD)" >>$@ > @echo "ANA_SUPPORT := $(ANA_SUPPORT)" >>$@ > @echo "STACKPROT := $(call TEST_CC_OPTION,-fstack-protector-strong,-fstack-protector)" >>$@ > diff --git a/libmultipath/alias.c b/libmultipath/alias.c > index e5d3f15..74431f3 100644 > --- a/libmultipath/alias.c > +++ b/libmultipath/alias.c > @@ -24,6 +24,7 @@ > #include "devmapper.h" > #include "strbuf.h" > #include "time-util.h" > +#include "lock.h" > > /* > * significant parts of this file were taken from iscsi-bindings.c of the > @@ -300,7 +301,7 @@ void handle_bindings_file_inotify(const struct inotify_event *event) > pthread_mutex_unlock(×tamp_mutex); > > if (changed) { > - uatomic_xchg(&bindings_file_changed, 1); > + uatomic_xchg_int(&bindings_file_changed, 1); > condlog(3, "%s: bindings file must be re-read, new timestamp: %ld.%06ld", > __func__, (long)ts.tv_sec, (long)ts.tv_nsec / 1000); > } else > @@ -775,7 +776,7 @@ static int _read_bindings_file(const struct config *conf, Bindings *bindings, > int rc = 0, ret, fd; > FILE *file; > struct stat st; > - int has_changed = uatomic_xchg(&bindings_file_changed, 0); > + int has_changed = uatomic_xchg_int(&bindings_file_changed, 0); > > if (!force) { > if (!has_changed) { > diff --git a/libmultipath/lock.h b/libmultipath/lock.h > index 9814be7..ac80d1d 100644 > --- a/libmultipath/lock.h > +++ b/libmultipath/lock.h > @@ -13,17 +13,22 @@ struct mutex_lock { > int waiters; /* uatomic access only */ > }; > > -#if !defined(__GLIBC__) && defined(__GNUC__) && __GNUC__ == 12 > -#pragma GCC diagnostic push > -#pragma GCC diagnostic ignored "-Warray-bounds" > -#endif > - > static inline void init_lock(struct mutex_lock *a) > { > pthread_mutex_init(&a->mutex, NULL); > uatomic_set(&a->waiters, 0); > } > > +#if defined(__GNUC__) && __GNUC__ == 12 && URCU_VERSION < 0xe00 > +#pragma GCC diagnostic push > +#pragma GCC diagnostic ignored "-Warray-bounds" > +#endif > + > +static inline int uatomic_xchg_int(int *ptr, int val) > +{ > + return uatomic_xchg(ptr, val); > +} > + > static inline void lock(struct mutex_lock *a) > { > uatomic_inc(&a->waiters); > @@ -31,6 +36,10 @@ static inline void lock(struct mutex_lock *a) > uatomic_dec(&a->waiters); > } > > +#if defined(__GNUC__) && __GNUC__ == 12 && URCU_VERSION < 0xe00 > +#pragma GCC diagnostic pop > +#endif > + > static inline int trylock(struct mutex_lock *a) > { > return pthread_mutex_trylock(&a->mutex); > @@ -51,10 +60,6 @@ static inline bool lock_has_waiters(struct mutex_lock *a) > return (uatomic_read(&a->waiters) > 0); > } > > -#if !defined(__GLIBC__) && defined(__GNUC__) && __GNUC__ == 12 > -#pragma GCC diagnostic pop > -#endif > - > #define lock_cleanup_pop(a) pthread_cleanup_pop(1) > > void cleanup_lock (void * data); > diff --git a/multipathd/Makefile b/multipathd/Makefile > index cdba3db..0ba6ecb 100644 > --- a/multipathd/Makefile > +++ b/multipathd/Makefile > @@ -5,8 +5,6 @@ CLI := multipathc > MANPAGES := multipathd.8 > > CPPFLAGS += -I$(multipathdir) -I$(mpathutildir) -I$(mpathpersistdir) -I$(mpathcmddir) -I$(thirdpartydir) \ > - $(shell $(PKG_CONFIG) --modversion liburcu 2>/dev/null | \ > - awk -F. '{ printf("-DURCU_VERSION=0x%06x", 256 * ( 256 * $$1 + $$2) + $$3); }') \ > -DBINDIR='"$(bindir)"' $(SYSTEMD_CPPFLAGS) > > # > -- > 2.42.0 -- dm-devel mailing list dm-devel@redhat.com https://listman.redhat.com/mailman/listinfo/dm-devel