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 95196C433F5 for ; Mon, 4 Apr 2022 17:05:50 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-575-Sfj3AOMnPD6z8xx_l5LKZQ-1; Mon, 04 Apr 2022 13:05:47 -0400 X-MC-Unique: Sfj3AOMnPD6z8xx_l5LKZQ-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4B22028035A0; Mon, 4 Apr 2022 17:05:39 +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 36C2D1402681; Mon, 4 Apr 2022 17:05:39 +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 94E84194037D; Mon, 4 Apr 2022 17:05:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id F2AE91940367 for ; Mon, 4 Apr 2022 17:05:33 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 60E2FC27E86; Mon, 4 Apr 2022 17:05:33 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast07.extmail.prod.ext.rdu2.redhat.com [10.11.55.23]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5CFC9C27E85 for ; Mon, 4 Apr 2022 17:05:33 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) (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 4619A3C14106 for ; Mon, 4 Apr 2022 17:05:33 +0000 (UTC) Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-308-i6FQmeS0PiC55oN_UOTA1g-1; Mon, 04 Apr 2022 13:05:31 -0400 X-MC-Unique: i6FQmeS0PiC55oN_UOTA1g-1 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 5D0A0210FC; Mon, 4 Apr 2022 17:05:30 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 24BFA12FC5; Mon, 4 Apr 2022 17:05:30 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id wDncBlolS2LICAAAMHmgww (envelope-from ); Mon, 04 Apr 2022 17:05:30 +0000 From: mwilck@suse.com To: Benjamin Marzinski , Christophe Varoqui Date: Mon, 4 Apr 2022 19:04:48 +0200 Message-Id: <20220404170457.16021-7-mwilck@suse.com> In-Reply-To: <20220404170457.16021-1-mwilck@suse.com> References: <20220404170457.16021-1-mwilck@suse.com> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 Subject: [dm-devel] [PATCH v2 06/15] libmultipath: microoptimize uevent filtering and merging 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, Martin Wilck Errors-To: dm-devel-bounces@redhat.com Sender: "dm-devel" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dm-devel-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/mixed; boundary="===============4480887060416045363==" --===============4480887060416045363== Content-Transfer-Encoding: quoted-printable Content-Type: application/octet-stream; x-default=true From: Martin Wilck Simplify and microoptimize the filtering and merging tests. E.g. do the WWID comparison last. Signed-off-by: Martin Wilck Reviewed-by: Benjamin Marzinski --- libmultipath/uevent.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/libmultipath/uevent.c b/libmultipath/uevent.c index 66acd6c..d39f388 100644 --- a/libmultipath/uevent.c +++ b/libmultipath/uevent.c @@ -220,6 +220,10 @@ static bool uevent_can_filter(struct uevent *earlier, struct uevent *later) { =20 +=09if (!strncmp(later->kernel, "dm-", 3) || +=09 strcmp(earlier->kernel, later->kernel)) +=09=09return false; + =09/* =09 * filter earlier uvents if path has removed later. Eg: =09 * "add path1 |chang path1 |add path2 |remove path1" @@ -227,11 +231,8 @@ uevent_can_filter(struct uevent *earlier, struct ueven= t *later) =09 * "add path2 |remove path1" =09 * uevents "add path1" and "chang path1" are filtered out =09 */ -=09if (!strcmp(earlier->kernel, later->kernel) && -=09=09!strcmp(later->action, "remove") && -=09=09strncmp(later->kernel, "dm-", 3)) { +=09if (!strcmp(later->action, "remove")) =09=09return true; -=09} =20 =09/* =09 * filter change uvents if add uevents exist. Eg: @@ -240,12 +241,9 @@ uevent_can_filter(struct uevent *earlier, struct ueven= t *later) =09 * "add path1 |add path2" =09 * uevent "chang path1" is filtered out =09 */ -=09if (!strcmp(earlier->kernel, later->kernel) && -=09=09!strcmp(earlier->action, "change") && -=09=09!strcmp(later->action, "add") && -=09=09strncmp(later->kernel, "dm-", 3)) { +=09if (!strcmp(earlier->action, "change") && +=09 !strcmp(later->action, "add")) =09=09return true; -=09} =20 =09return false; } @@ -278,10 +276,10 @@ merge_need_stop(struct uevent *earlier, struct uevent= *later) =09 * with the same wwid and different action =09 * it would be better to stop merging. =09 */ -=09if (!strcmp(earlier->wwid, later->wwid) && -=09 strcmp(earlier->action, later->action) && +=09if (strcmp(earlier->action, later->action) && =09 strcmp(earlier->action, "change") && -=09 strcmp(later->action, "change")) +=09 strcmp(later->action, "change") && +=09 !strcmp(earlier->wwid, later->wwid)) =09=09return true; =20 =09return false; @@ -296,12 +294,12 @@ uevent_can_merge(struct uevent *earlier, struct ueven= t *later) =09 * and actions are addition or deletion =09 */ =09if (earlier->wwid && later->wwid && -=09 !strcmp(earlier->wwid, later->wwid) && +=09 strncmp(earlier->kernel, "dm-", 3) && =09 !strcmp(earlier->action, later->action) && -=09 strncmp(earlier->action, "change", 6) && -=09 strncmp(earlier->kernel, "dm-", 3)) { +=09 (!strcmp(earlier->action, "add") || +=09 !strcmp(earlier->action, "remove")) && +=09 !strcmp(earlier->wwid, later->wwid)) =09=09return true; -=09} =20 =09return false; } --=20 2.35.1 --===============4480887060416045363== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline -- dm-devel mailing list dm-devel@redhat.com https://listman.redhat.com/mailman/listinfo/dm-devel --===============4480887060416045363==--