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 X-Spam-Level: X-Spam-Status: No, score=-17.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3EBFDC4361B for ; Fri, 18 Dec 2020 00:00:01 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A27E123A52 for ; Fri, 18 Dec 2020 00:00:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A27E123A52 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=tempfail smtp.mailfrom=dm-devel-bounces@redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608249599; 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=KuM6yt91FcasK4RTvJtGoZVu7rDssXVG/FyAE4Z3bUA=; b=N1R/vSb1tBiejFKh5bPXLMymOQOZxBcXXXOkXS4LPKk5FH1IQX8I3j4n2g/kuQSssbnQJJ 9K2QDgfzinHk3SsXj2yf0iwLd1eF3PR0KsdTddKuJFk7o997CIJLkS4VDW+HpNcHkROPkV owrafnWtYq855EZIopo4ioN3l9rvHgI= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-524-he_jcJIsOUGiKlTIXlb1Fw-1; Thu, 17 Dec 2020 18:59:57 -0500 X-MC-Unique: he_jcJIsOUGiKlTIXlb1Fw-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 229B0192CC40; Thu, 17 Dec 2020 23:59:53 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2BB475D9D5; Thu, 17 Dec 2020 23:59:52 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 88A5E4BB7B; Thu, 17 Dec 2020 23:59:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0BHNueCE015342 for ; Thu, 17 Dec 2020 18:56:40 -0500 Received: by smtp.corp.redhat.com (Postfix) id 97643669FC; Thu, 17 Dec 2020 23:56:40 +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 0B51D5D737; Thu, 17 Dec 2020 23:56:36 +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 0BHNuZfF002197; Thu, 17 Dec 2020 17:56:35 -0600 Received: (from bmarzins@localhost) by octiron.msp.redhat.com (8.14.9/8.14.9/Submit) id 0BHNuZ93002196; Thu, 17 Dec 2020 17:56:35 -0600 Date: Thu, 17 Dec 2020 17:56:35 -0600 From: Benjamin Marzinski To: mwilck@suse.com Message-ID: <20201217235635.GC3103@octiron.msp.redhat.com> References: <20201217110018.3347-1-mwilck@suse.com> <20201217110018.3347-2-mwilck@suse.com> MIME-Version: 1.0 In-Reply-To: <20201217110018.3347-2-mwilck@suse.com> User-Agent: Mutt/1.5.23 (2014-03-12) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: dm-devel@redhat.com Cc: dm-devel@redhat.com Subject: Re: [dm-devel] [PATCH 1/7] libmultipath: move logq_lock handling to log.c X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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-Disposition: inline Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit On Thu, Dec 17, 2020 at 12:00:12PM +0100, mwilck@suse.com wrote: > From: Martin Wilck > > logq_lock protects internal data structures of log.c, and should > be handled there. This patch doesn't change functionality, except > improving cancel-safety somewhat. > Reviewed-by: Benjamin Marzinski > Signed-off-by: Martin Wilck > --- > libmultipath/log.c | 34 ++++++++++++++++++++++++++++++++-- > libmultipath/log_pthread.c | 9 --------- > 2 files changed, 32 insertions(+), 11 deletions(-) > > diff --git a/libmultipath/log.c b/libmultipath/log.c > index debd36d..7f33787 100644 > --- a/libmultipath/log.c > +++ b/libmultipath/log.c > @@ -9,13 +9,16 @@ > #include > #include > #include > +#include > > #include "memory.h" > #include "log.h" > +#include "util.h" > > #define ALIGN(len, s) (((len)+(s)-1)/(s)*(s)) > > struct logarea* la; > +static pthread_mutex_t logq_lock = PTHREAD_MUTEX_INITIALIZER; > > #if LOGDBG > static void dump_logarea (void) > @@ -101,12 +104,17 @@ void log_close (void) > > void log_reset (char *program_name) > { > + pthread_mutex_lock(&logq_lock); > + pthread_cleanup_push(cleanup_mutex, &logq_lock); > + > closelog(); > tzset(); > openlog(program_name, 0, LOG_DAEMON); > + > + pthread_cleanup_pop(1); > } > > -int log_enqueue (int prio, const char * fmt, va_list ap) > +static int _log_enqueue(int prio, const char * fmt, va_list ap) > { > int len, fwd; > char buff[MAX_MSG_SIZE]; > @@ -165,7 +173,18 @@ int log_enqueue (int prio, const char * fmt, va_list ap) > return 0; > } > > -int log_dequeue (void * buff) > +int log_enqueue(int prio, const char *fmt, va_list ap) > +{ > + int ret; > + > + pthread_mutex_lock(&logq_lock); > + pthread_cleanup_push(cleanup_mutex, &logq_lock); > + ret = _log_enqueue(prio, fmt, ap); > + pthread_cleanup_pop(1); > + return ret; > +} > + > +static int _log_dequeue(void *buff) > { > struct logmsg * src = (struct logmsg *)la->head; > struct logmsg * dst = (struct logmsg *)buff; > @@ -194,6 +213,17 @@ int log_dequeue (void * buff) > return 0; > } > > +int log_dequeue(void *buff) > +{ > + int ret; > + > + pthread_mutex_lock(&logq_lock); > + pthread_cleanup_push(cleanup_mutex, &logq_lock); > + ret = _log_dequeue(buff); > + pthread_cleanup_pop(1); > + return ret; > +} > + > /* > * this one can block under memory pressure > */ > diff --git a/libmultipath/log_pthread.c b/libmultipath/log_pthread.c > index 0d48c52..6599210 100644 > --- a/libmultipath/log_pthread.c > +++ b/libmultipath/log_pthread.c > @@ -18,7 +18,6 @@ > static pthread_t log_thr; > > /* logev_lock must not be taken with logq_lock held */ > -static pthread_mutex_t logq_lock = PTHREAD_MUTEX_INITIALIZER; > static pthread_mutex_t logev_lock = PTHREAD_MUTEX_INITIALIZER; > static pthread_cond_t logev_cond = PTHREAD_COND_INITIALIZER; > > @@ -41,10 +40,7 @@ void log_safe (int prio, const char * fmt, va_list ap) > running = logq_running; > > if (running) { > - pthread_mutex_lock(&logq_lock); > - pthread_cleanup_push(cleanup_mutex, &logq_lock); > log_enqueue(prio, fmt, ap); > - pthread_cleanup_pop(1); > > log_messages_pending = 1; > pthread_cond_signal(&logev_cond); > @@ -60,9 +56,7 @@ static void flush_logqueue (void) > int empty; > > do { > - pthread_mutex_lock(&logq_lock); > empty = log_dequeue(la->buff); > - pthread_mutex_unlock(&logq_lock); > if (!empty) > log_syslog(la->buff); > } while (empty == 0); > @@ -138,10 +132,7 @@ void log_thread_start (pthread_attr_t *attr) > void log_thread_reset (void) > { > logdbg(stderr,"resetting log\n"); > - > - pthread_mutex_lock(&logq_lock); > log_reset("multipathd"); > - pthread_mutex_unlock(&logq_lock); > } > > void log_thread_stop (void) > -- > 2.29.0 -- dm-devel mailing list dm-devel@redhat.com https://www.redhat.com/mailman/listinfo/dm-devel