From patchwork Sun Apr 17 18:29:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 562884 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:6886:0:0:0:0 with SMTP id m6csp1884401map; Sun, 17 Apr 2022 11:59:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzqTAgWncxodLcFXbBQpvRVMrpItSSKGWQSrEioJxJBgL2M6c0kpE+lif+GcCTAtOyB67sb X-Received: by 2002:a37:b5c6:0:b0:67e:6516:f456 with SMTP id e189-20020a37b5c6000000b0067e6516f456mr4733461qkf.555.1650221974039; Sun, 17 Apr 2022 11:59:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650221974; cv=none; d=google.com; s=arc-20160816; b=ZjppV4XdI/tHcTc81VtD5GaVAje1NYuep6M6oGJAqyoDEzIzWtqzdjFF2YBTMqXpZC I+4EqoojKVw3Z4G5+ctWkwLXZtDgQKBnpeCe8aBSWNfRBe4j1r+8HBlgKWTDGX7PKCJz 29shWJlyXv0irNBWIBI9AAjndXYnilssG8tVhy84sUbFKcywlk4rgPDmAxWBv2g9890q XaqgNnpOgr1IV4+HZiIw8gVntKCPw9goLrAWqkDenm5PapYKyFkmO6N2djyBCep10OFR hcelw11GAjQ3NrWmlqWFuXwWrJoATRdkmj1Ofk0nXFy1NfgKye/bD5cf1diPwHq7CTZo HVOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=f4gZGeDj81kW07oUkPIpEtb00RVDQbHtNOHmkzlnrKI=; b=ALbd5ale36vcbux2Wcm/qnmOGpithLHodULSbN+ffcG6UXByL7G1985Ozj/QZvsLE4 qvE0TV9cjkYAT7bE/025VazAKTyOaBKUPdrS+FN6moZqTQWvp8RHiKRtk0w6z6thDQIB aZeruoNJZeOWkZ5f0780wunuVXpGpsqc/KKsGFEJMrumJaU3DFp0hd5sO/jUnqG3Hnka JtYJ1Cp6actZRHb2MY4ZAaEfICivwk4cVF+p41Vf5tmF1s0df1jC4HqeUYxbSopovjgE QzGm0BKAVjI1We5LOnAw6fJIs6PMJTPuFoXh7j+S0nOwopEjY90xzB135obd4dHQazJv xY6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=NERzjEBP; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id s8-20020a05620a030800b0067e4be23a9fsi2166881qkm.740.2022.04.17.11.59.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 17 Apr 2022 11:59:34 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=NERzjEBP; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:41816 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ngA7R-0007Xx-Ht for patch@linaro.org; Sun, 17 Apr 2022 14:59:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57126) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ng9fN-0000Qb-Qh for qemu-devel@nongnu.org; Sun, 17 Apr 2022 14:30:37 -0400 Received: from mail-pg1-x52a.google.com ([2607:f8b0:4864:20::52a]:39800) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ng9fK-0001kG-9h for qemu-devel@nongnu.org; Sun, 17 Apr 2022 14:30:33 -0400 Received: by mail-pg1-x52a.google.com with SMTP id q19so15082246pgm.6 for ; Sun, 17 Apr 2022 11:30:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=f4gZGeDj81kW07oUkPIpEtb00RVDQbHtNOHmkzlnrKI=; b=NERzjEBPQZm77FSgyODPpu97MEEUqjY1wtPpittKb0uv8l/R4SGkegdnxbJ5QjuaBA 7iDzn3alj3pa6ecHXN2lP1/A1cncf/BbKqo3KTAXHRPs3zkAmmvT9RtVQxJltxWNZMhU Vw/8FmQ5HgWhGSus/H5E3cEvLg9DYINSlSFXgVk6lU9WOOnqNCr2UHmmtvbKTdM8QkPz +aj1WPidkqGghvfVnM2RTYxAzbCyDiBjWfDafs4NgvWConLcdvYqlpT73DEVvux/CXAq u5B0GcSl9x7htYmSY5VPeISjvBEJaNF+338L2aoHikQKYmpHRRnjSolOkIWuAQ+BN3uL vjTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=f4gZGeDj81kW07oUkPIpEtb00RVDQbHtNOHmkzlnrKI=; b=LVhGB7T9mv5zLSH0DzBWOXNTSZzHRnbWVqB/kTwhCEo33nnjUcHxyJjKS69iVY357e MN8QibrrJZkeSniNRLR38pVnk/tj9KIwq2ypfBNthtEnITW5mmTDvUhLZQz7q0A4xCsP Fy8NF0Df7GIBC9Jx3qXRcvKILu5qz7YEe08NbVA88hN/bi6yzb5d6uVlas8FSXvGxvXa GZ1vUG//bQOTlbV5xZNXEvI3D5ZNdz31rHAUHD9enQXMUTn9BBB1S1UEbOzguPFMFf8C WKr6LpV9IV6RCDtyjiAaL6IzWf3LfgOgwn+604Kn4AONUK7ALw90oUYg7MHqFq50JH0q CMAQ== X-Gm-Message-State: AOAM532j6lb1CzrqRdZdfdjQARTddgzLFEbuWmmCo78GtjaFjxcCf9G4 cZL//SiJ9U2vKNh5mMS0+XfnAElKSXZxew== X-Received: by 2002:a05:6a00:1895:b0:50a:6a91:e833 with SMTP id x21-20020a056a00189500b0050a6a91e833mr3131033pfh.26.1650220226133; Sun, 17 Apr 2022 11:30:26 -0700 (PDT) Received: from localhost.localdomain (174-21-142-130.tukw.qwest.net. [174.21.142.130]) by smtp.gmail.com with ESMTPSA id on10-20020a17090b1d0a00b001d08a7d569csm8154011pjb.56.2022.04.17.11.30.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Apr 2022 11:30:25 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 07/39] util/log: Rename qemu_log_lock to qemu_log_trylock Date: Sun, 17 Apr 2022 11:29:47 -0700 Message-Id: <20220417183019.755276-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220417183019.755276-1-richard.henderson@linaro.org> References: <20220417183019.755276-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::52a; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alex.bennee@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This function can fail, which makes it more like ftrylockfile or pthread_mutex_trylock than flockfile or pthread_mutex_lock, so rename it. To closer match the other trylock functions, release rcu_read_lock along the failure path, so that qemu_log_unlock need not be called on failure. Reviewed-by: Alex Bennée Signed-off-by: Richard Henderson --- v2: Rename the function as well as change the semantics, so drop r-b. --- include/exec/log.h | 2 +- include/qemu/log.h | 2 +- accel/tcg/cpu-exec.c | 2 +- accel/tcg/translate-all.c | 2 +- accel/tcg/translator.c | 2 +- cpu.c | 2 +- hw/net/can/can_sja1000.c | 2 +- net/can/can_socketcan.c | 2 +- target/i386/tcg/translate.c | 2 +- tcg/tcg.c | 8 ++++---- tests/unit/test-logging.c | 2 +- util/log.c | 6 ++++-- 12 files changed, 18 insertions(+), 16 deletions(-) diff --git a/include/exec/log.h b/include/exec/log.h index 3c7fa65ead..fb595d1eb7 100644 --- a/include/exec/log.h +++ b/include/exec/log.h @@ -71,7 +71,7 @@ static inline void log_disas(const void *code, unsigned long size) /* page_dump() output to the log file: */ static inline void log_page_dump(const char *operation) { - FILE *logfile = qemu_log_lock(); + FILE *logfile = qemu_log_trylock(); if (logfile) { qemu_log("page layout changed following %s\n", operation); page_dump(logfile); diff --git a/include/qemu/log.h b/include/qemu/log.h index 6a6b1efce5..d090faf22a 100644 --- a/include/qemu/log.h +++ b/include/qemu/log.h @@ -67,7 +67,7 @@ static inline bool qemu_log_separate(void) /* Lock/unlock output. */ -FILE *qemu_log_lock(void); +FILE *qemu_log_trylock(void); void qemu_log_unlock(FILE *fd); /* Logging functions: */ diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index c997c2e8e0..8d0315de75 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -215,7 +215,7 @@ static inline void log_cpu_exec(target_ulong pc, CPUState *cpu, #if defined(DEBUG_DISAS) if (qemu_loglevel_mask(CPU_LOG_TB_CPU)) { - FILE *logfile = qemu_log_lock(); + FILE *logfile = qemu_log_trylock(); int flags = 0; if (qemu_loglevel_mask(CPU_LOG_TB_FPU)) { diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index 5971cd53ab..71ab863c18 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -1528,7 +1528,7 @@ TranslationBlock *tb_gen_code(CPUState *cpu, #ifdef DEBUG_DISAS if (qemu_loglevel_mask(CPU_LOG_TB_OUT_ASM) && qemu_log_in_addr_range(tb->pc)) { - FILE *logfile = qemu_log_lock(); + FILE *logfile = qemu_log_trylock(); int code_size, data_size; const tcg_target_ulong *rx_data_gen_ptr; size_t chunk_start; diff --git a/accel/tcg/translator.c b/accel/tcg/translator.c index f06c314266..1506755f3c 100644 --- a/accel/tcg/translator.c +++ b/accel/tcg/translator.c @@ -139,7 +139,7 @@ void translator_loop(const TranslatorOps *ops, DisasContextBase *db, #ifdef DEBUG_DISAS if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM) && qemu_log_in_addr_range(db->pc_first)) { - FILE *logfile = qemu_log_lock(); + FILE *logfile = qemu_log_trylock(); qemu_log("----------------\n"); ops->disas_log(db, cpu); qemu_log("\n"); diff --git a/cpu.c b/cpu.c index be1f8b074c..ddcbfc724d 100644 --- a/cpu.c +++ b/cpu.c @@ -400,7 +400,7 @@ void cpu_abort(CPUState *cpu, const char *fmt, ...) fprintf(stderr, "\n"); cpu_dump_state(cpu, stderr, CPU_DUMP_FPU | CPU_DUMP_CCOP); if (qemu_log_separate()) { - FILE *logfile = qemu_log_lock(); + FILE *logfile = qemu_log_trylock(); qemu_log("qemu: fatal: "); qemu_log_vprintf(fmt, ap2); qemu_log("\n"); diff --git a/hw/net/can/can_sja1000.c b/hw/net/can/can_sja1000.c index 3ba803e947..300313dfb8 100644 --- a/hw/net/can/can_sja1000.c +++ b/hw/net/can/can_sja1000.c @@ -247,7 +247,7 @@ int can_sja_accept_filter(CanSJA1000State *s, static void can_display_msg(const char *prefix, const qemu_can_frame *msg) { int i; - FILE *logfile = qemu_log_lock(); + FILE *logfile = qemu_log_trylock(); qemu_log("%s%03X [%01d] %s %s", prefix, diff --git a/net/can/can_socketcan.c b/net/can/can_socketcan.c index 4b68f60c6b..4a505643e9 100644 --- a/net/can/can_socketcan.c +++ b/net/can/can_socketcan.c @@ -76,7 +76,7 @@ QEMU_BUILD_BUG_ON(offsetof(qemu_can_frame, data) static void can_host_socketcan_display_msg(struct qemu_can_frame *msg) { int i; - FILE *logfile = qemu_log_lock(); + FILE *logfile = qemu_log_trylock(); qemu_log("[cansocketcan]: %03X [%01d] %s %s", msg->can_id & QEMU_CAN_EFF_MASK, msg->can_dlc, diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c index c393913fe0..3fb8b530d8 100644 --- a/target/i386/tcg/translate.c +++ b/target/i386/tcg/translate.c @@ -2580,7 +2580,7 @@ static void gen_unknown_opcode(CPUX86State *env, DisasContext *s) gen_illegal_opcode(s); if (qemu_loglevel_mask(LOG_UNIMP)) { - FILE *logfile = qemu_log_lock(); + FILE *logfile = qemu_log_trylock(); target_ulong pc = s->pc_start, end = s->pc; qemu_log("ILLOPC: " TARGET_FMT_lx ":", pc); diff --git a/tcg/tcg.c b/tcg/tcg.c index 33a97eabdb..2f09114bf9 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -756,7 +756,7 @@ void tcg_prologue_init(TCGContext *s) #ifdef DEBUG_DISAS if (qemu_loglevel_mask(CPU_LOG_TB_OUT_ASM)) { - FILE *logfile = qemu_log_lock(); + FILE *logfile = qemu_log_trylock(); qemu_log("PROLOGUE: [size=%zu]\n", prologue_size); if (s->data_gen_ptr) { size_t code_size = s->data_gen_ptr - s->code_gen_ptr; @@ -4200,7 +4200,7 @@ int tcg_gen_code(TCGContext *s, TranslationBlock *tb) #ifdef DEBUG_DISAS if (unlikely(qemu_loglevel_mask(CPU_LOG_TB_OP) && qemu_log_in_addr_range(tb->pc))) { - FILE *logfile = qemu_log_lock(); + FILE *logfile = qemu_log_trylock(); qemu_log("OP:\n"); tcg_dump_ops(s, false); qemu_log("\n"); @@ -4245,7 +4245,7 @@ int tcg_gen_code(TCGContext *s, TranslationBlock *tb) #ifdef DEBUG_DISAS if (unlikely(qemu_loglevel_mask(CPU_LOG_TB_OP_IND) && qemu_log_in_addr_range(tb->pc))) { - FILE *logfile = qemu_log_lock(); + FILE *logfile = qemu_log_trylock(); qemu_log("OP before indirect lowering:\n"); tcg_dump_ops(s, false); qemu_log("\n"); @@ -4266,7 +4266,7 @@ int tcg_gen_code(TCGContext *s, TranslationBlock *tb) #ifdef DEBUG_DISAS if (unlikely(qemu_loglevel_mask(CPU_LOG_TB_OP_OPT) && qemu_log_in_addr_range(tb->pc))) { - FILE *logfile = qemu_log_lock(); + FILE *logfile = qemu_log_trylock(); qemu_log("OP after optimization and liveness analysis:\n"); tcg_dump_ops(s, true); qemu_log("\n"); diff --git a/tests/unit/test-logging.c b/tests/unit/test-logging.c index 93c6d666e8..54d7e8e33b 100644 --- a/tests/unit/test-logging.c +++ b/tests/unit/test-logging.c @@ -163,7 +163,7 @@ static void test_logfile_lock(gconstpointer data) * our handle remains valid for use due to RCU. */ qemu_set_log_filename(file_path, &error_abort); - logfile = qemu_log_lock(); + logfile = qemu_log_trylock(); g_assert(logfile); fprintf(logfile, "%s 1st write to file\n", __func__); fflush(logfile); diff --git a/util/log.c b/util/log.c index 1a3121610a..6b7b358573 100644 --- a/util/log.c +++ b/util/log.c @@ -36,15 +36,17 @@ static GArray *debug_regions; /* Lock/unlock output. */ -FILE *qemu_log_lock(void) +FILE *qemu_log_trylock(void) { QemuLogFile *logfile; + rcu_read_lock(); logfile = qatomic_rcu_read(&qemu_logfile); if (logfile) { qemu_flockfile(logfile->fd); return logfile->fd; } else { + rcu_read_unlock(); return NULL; } } @@ -53,8 +55,8 @@ void qemu_log_unlock(FILE *fd) { if (fd) { qemu_funlockfile(fd); + rcu_read_unlock(); } - rcu_read_unlock(); } /* Return the number of characters emitted. */