breaking: utilize a cached file descriptor for logging & own dnsmasq.log - #2960
breaking: utilize a cached file descriptor for logging & own dnsmasq.log#2960darkexplosiveqwx wants to merge 21 commits into
Conversation
81214c5 to
7f0694d
Compare
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
5932a3a to
64010dc
Compare
|
Conflicts have been resolved. |
64010dc to
0bbd16a
Compare
72e2f60 to
cc36307
Compare
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
cc36307 to
5c0aa93
Compare
|
Conflicts have been resolved. |
5c0aa93 to
c1a9e8b
Compare
|
Had a look at this one while reviewing #2958, even though it is still a draft. The shape of the cached-fd rework is fine, but a few things would bite in production. 1. 2. 3. The dnsmasq timestamp buffer is too small for non-English locales. 4. dnsmasq messages have no fallback left. 5. The per-file mutex is not fork-safe. dnsmasq forks per TCP query while our threads are running. If a fork happens while another thread holds 6. New root-owned log files. 7. Smaller: removing |
Will take a look regarding the code later, but a Core PR already exists. It did get linked, but after that gotten mostly buried. |
1b37397 to
47e1637
Compare
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
1. case CONF_STRING_ALLOCATED:
if(terminating && conf_item->f & FLAG_FTL_LOG)
continue;
free(conf_item->v.s);and the config replacement path calls it with 2. 3. dnsmasq messages still have no fallback. The new open-time warning is good, but it is a one-time notice: 4. The early-startup window is still uncovered. Moving 5. Smaller: Please rebase onto |
47e1637 to
9d7fc53
Compare
|
Conflicts have been resolved. |
Signed-off-by: darkexplosiveqwx <101737077+darkexplosiveqwx@users.noreply.github.com>
Signed-off-by: darkexplosiveqwx <101737077+darkexplosiveqwx@users.noreply.github.com>
the embedded dnsmasq already does a fd cleanup on startup, so this is not strictly necessary, but still good practice Signed-off-by: darkexplosiveqwx <101737077+darkexplosiveqwx@users.noreply.github.com>
Signed-off-by: darkexplosiveqwx <101737077+darkexplosiveqwx@users.noreply.github.com>
Signed-off-by: darkexplosiveqwx <101737077+darkexplosiveqwx@users.noreply.github.com>
Signed-off-by: darkexplosiveqwx <101737077+darkexplosiveqwx@users.noreply.github.com>
message Signed-off-by: darkexplosiveqwx <101737077+darkexplosiveqwx@users.noreply.github.com>
The fd == -1 fast path in write_log_line() sat before the reopen_needed check, so SIGUSR2 could not revive a log whose initial open failed: a missing /var/log/pihole or a transient EACCES disabled that log for the lifetime of the process. Move the reopen before the fd test and access both fields only under the lock (flush_dnsmasq_log() reassigns the descriptor under the lock, so the unlocked fast path was racy). Also drop the fd == -1 early return in FTL_write_dnsmasq_log() which would have bypassed the reopen for pihole.log entirely. Code Review: **2. `write_log_line()` can never recover a log whose initial open failed.** The `if(log->fd == -1) return false;` fast path sits before the `reopen_needed` check, so `SIGUSR2` cannot revive it. A missing `/var/log/pihole` at first start, or a transient `EACCES`, disables that log for the lifetime of the process. Testing the reopen flag first fixes it. **Smaller:** `log->fd` is read outside the lock as a fast path while `flush_dnsmasq_log()` reassigns it under the lock Signed-off-by: darkexplosiveqwx <101737077+darkexplosiveqwx@users.noreply.github.com>
strftime("%b %e %H:%M:%S") into a 16 byte buffer overflows in
non-English locales: init_locale() calls setlocale(LC_ALL, ""), so %b
is the localized month abbreviation (six bytes for ru_RU, more
elsewhere). When it does not fit, strftime() returns 0 and leaves the
buffer contents unspecified, so pihole.log gets garbage. Use dnsmasq's
own idiom instead: ctime(&now) + 4 truncated to 15 characters. ctime()
renders the weekday/month in the C locale regardless of the process
locale, so this cannot overflow and keeps the on-disk format
byte-identical to what we write today.
Code Review:
**3. The dnsmasq timestamp buffer is too small for non-English locales.** `char ts_buf[16]` fits `"Jan 1 12:00:00"` exactly in the C locale, but `init_locale()` calls `setlocale(LC_ALL, "")`, so `%b` is the localized abbreviation - six bytes for `ru_RU`, more elsewhere. When it does not fit, `strftime()` returns 0 and leaves the buffer contents *unspecified*, so `pihole.log` gets garbage. dnsmasq itself sidesteps this with `ctime(&time_now) + 4` and `%.15s`, which is locale-independent and keeps the on-disk format byte-identical to what we write today.
Signed-off-by: darkexplosiveqwx <101737077+darkexplosiveqwx@users.noreply.github.com>
open_log_fds() warned when webserver.log could not be opened but said nothing for pihole.log. A failed open therefore silently disabled every dnsmasq log line for the lifetime of the process. Add the matching warning so the missing log is visible in FTL.log at startup. Code Review: **4. dnsmasq messages have no fallback left.** `my_syslog()` returns before dnsmasq's own syslog path and `FTL_write_dnsmasq_log()` returns silently when the descriptor is -1, so if `pihole.log` cannot be opened every dnsmasq message is lost. `_FTL_log()` and `_log_web()` both fall back, and `open_log_fds()` warns for `webserver.log` but says nothing for `pihole.log`. Signed-off-by: darkexplosiveqwx <101737077+darkexplosiveqwx@users.noreply.github.com>
dnsmasq forks per TCP query while FTL threads are running. If a fork happens while another thread holds dnsmasq_log.lock, the child inherits it locked and the first my_syslog() there blocks forever, hanging that query. Register pthread_atfork() handlers that take all three per-file mutexes before fork() and release them in both parent and child, so a fork can never observe a locked log mutex. Code Review: **5. The per-file mutex is not fork-safe.** dnsmasq forks per TCP query while our threads are running. If a fork happens while another thread holds `dnsmasq_log.lock`, the child inherits it locked and the first `my_syslog()` there blocks forever, hanging that query. Our SHM lock is process-shared and robust for exactly this reason. Since every write is `O_APPEND`, and a single `write()` to a regular file is atomic, the lock only guards the reopen - `pthread_atfork()` handlers or an atomic descriptor swap would be enough. Signed-off-by: darkexplosiveqwx <101737077+darkexplosiveqwx@users.noreply.github.com>
open_log_fds(false) runs before FTL drops privileges, so a fresh install now gets root-owned webserver.log and pihole.log; dnsmasq used to create pihole.log after dropping to pihole, and webserver.log was created on the first request. FTL_fork_and_bind_sockets() chowned only files.log.ftl. Chown the webserver and dnsmasq log files alongside it when actually dropping from root. Code Review: **6. New root-owned log files.** `open_log_fds(false)` runs before we drop privileges, so a fresh install now gets root-owned `webserver.log` and `pihole.log`; dnsmasq used to create `pihole.log` after dropping to `pihole`, and `webserver.log` was created on the first request. `FTL_fork_and_bind_sockets()` chowns only `files.log.ftl` and should cover the other two. Signed-off-by: darkexplosiveqwx <101737077+darkexplosiveqwx@users.noreply.github.com>
my_syslog() bypasses dnsmasq's own logging path and FTL writes every pihole.log line synchronously through a cached descriptor, so the log-async queue is never populated. Emitting log-async in the generated config is misleading dead configuration. Code Review: **7. `log-async` is now dead code in the generated config.** With `my_syslog()` bypassed, dnsmasq's async queue is never used, so query logging became a blocking `write()` in the DNS thread - which is the stall that queue exists to prevent. Either drop the `log-async` lines or say why the synchronous write is acceptable for us. Signed-off-by: darkexplosiveqwx <101737077+darkexplosiveqwx@users.noreply.github.com>
The rest of the tree is ASCII; replace the em dashes introduced in the recent log comments with plain hyphens. Code Review: **Smaller:** five of the new comments contain em dashes while the rest of the tree is ASCII Signed-off-by: darkexplosiveqwx <101737077+darkexplosiveqwx@users.noreply.github.com>
The clamp that protects the writes into the 2048 byte line buffer ran after off had already been used as an offset into line and as the size argument (sizeof(line) - off would underflow if the first snprintf() ever truncated). Clamp off between the two formatting calls in FTL_write_dnsmasq_log(), _FTL_log() and _log_web(). Code Review: **Smaller:** `off` is used as an offset into `line` before it is clamped Signed-off-by: darkexplosiveqwx <101737077+darkexplosiveqwx@users.noreply.github.com>
The open failure warning is shown regardless of the hide_dnsmasq_warn setting, but the message now notes whether dnsmasq warnings are hidden by it, so the notice reflects the actual behaviour instead of always claiming warnings are relayed to the FTL log. Signed-off-by: darkexplosiveqwx <101737077+darkexplosiveqwx@users.noreply.github.com>
Signed-off-by: darkexplosiveqwx <101737077+darkexplosiveqwx@users.noreply.github.com>
9d7fc53 to
91c3ed2
Compare
is_log_fd() was incorrectly stripped of __attribute__((pure)) in an earlier review-fix pass. The attribute is correct: pure means no side effects and may depend on global state (unlike const which is a pure function). GCC only caches the result when it can prove the read state hasn't changed, which it cannot for struct members accessed through pointers that other threads may modify. The compiler itself warns suggest-attribute=pure when the attribute is missing, confirming it belongs here. Also fix the ctime_r() return type: use const char* to match the fallback string literal and avoid -Wdiscarded-qualifiers. Signed-off-by: darkexplosiveqwx <101737077+darkexplosiveqwx@users.noreply.github.com>
free(log->path) is called before path has been set on the first invocation, triggering a spurious WARNING from the custom FTLfree() wrapper. Add a NULL check to avoid the noise. Signed-off-by: darkexplosiveqwx <101737077+darkexplosiveqwx@users.noreply.github.com>
Signed-off-by: darkexplosiveqwx <101737077+darkexplosiveqwx@users.noreply.github.com>
ad81179 to
6dc9399
Compare
The fallback string lacked the weekday that ctime_r() always emits, so the + 4 offset skipped past it and produced a truncated timestamp. Signed-off-by: darkexplosiveqwx <101737077+darkexplosiveqwx@users.noreply.github.com>
Thank you for your contribution to the Pi-hole Community!
Please read the comments below to help us consider your Pull Request.
We are all volunteers and completing the process outlined will help us review your commits quicker.
Please make sure you
What does this PR aim to accomplish?:
Builds upon #2958
Discussed in #2897
How does this PR accomplish the above?:
Link documentation PRs if any are needed to support this PR:
By submitting this pull request, I confirm the following:
git rebase)