From nobody Mon Jul 21 16:43:06 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bm5n03RXQz62rng; Mon, 21 Jul 2025 16:43:16 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-qk1-x735.google.com (mail-qk1-x735.google.com [IPv6:2607:f8b0:4864:20::735]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bm5mz4tXCz3CQs; Mon, 21 Jul 2025 16:43:15 +0000 (UTC) (envelope-from markjdb@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-qk1-x735.google.com with SMTP id af79cd13be357-7e34607e575so798360485a.2; Mon, 21 Jul 2025 09:43:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1753116189; x=1753720989; darn=freebsd.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:sender:from:to:cc:subject:date:message-id :reply-to; bh=emNv9LFRtY0W7hlS9Aa4r2n88HqWOpn+2HiOtMZN2NQ=; b=CWYbtbjDJHL0c1CJl94wQv3E49RueBnoEb5SPJeSwFiloKQJ5Riv4z1Ip8V4FtvIhr ph9X0oxiLaydA7vyOu7wTnm6pNEEKK1ajWv4sOybi9uyr6LQfV3PHG+XzJeOTTKv73fT cJDYpAN3utNN9TGXUkTXy1FgslHYqWcI8ZBK+DoCkBDetsOfEgRNolqULYNriXni0GNS 5vRM4TnEZpxG2HvPYtQUL6BLkSV1FVsFxJC+/6KgIvBbdWXWMFV9gBX+HdiQv5C0uonC +xySierY6mOQO1oQdEUrsMLdsqwB3c6O4HAJvUXCgfaumH5BMtqekuhSFMWjrnkLsZ+s lzBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753116189; x=1753720989; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:sender:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=emNv9LFRtY0W7hlS9Aa4r2n88HqWOpn+2HiOtMZN2NQ=; b=PpPr9IF8FfnR6MqyNx2W6rbJ99goCDOMua6iY8sBdDig3mc0eem8v61+q02sD1hBvL In4Hko6bhhDPY22VQ17bdcXLV7tOpw9MXG350dqPRF03G5Rn4O5k5wGB4/5lNbIRNsGF iV8jTL5vhEt7B7j17HNbi/y56ce+U9crq9XXDTO7vkvJDT6ZovD6JgtK5m3TOexeAA4B Vd15SqwFo9BPo3UWkwTg5PB0bzgJO4Whizbdt5P8PWL7qvKtDWsvYr8SHK8MnECLzxpM NMnbJRSWcNdVTGiuX8wLuui06gtv3B90cMgJzzXxp5vB5VZvCkOeskfK7UVXJy7dK5us O0oA== X-Forwarded-Encrypted: i=1; AJvYcCVPGWYqa++EXiB+OhOiOhlGqbjdzzCw032CtLdr1lV21NoyB/I46A2/P3NnXNIXuAtVFLJuQcZKDPRbNLNvsQ3jCWB2@freebsd.org, AJvYcCWlxuXwSE+eiKuSsL8AYstdgf9slBWuUP7Hyng68c3ZZGxb+x8RQPgvoBJrxriENiHxMG4H3AyVwXOC/p6klpC0iVNGdqE=@freebsd.org X-Gm-Message-State: AOJu0YytDU1jyrCRZI8i1bKPqmlT0mYPqNbqrQSpW4T0GPNjgYtPLUIG s5EHVTBKT3eD7PZUMPKoekZwuyZ3cV18WDeOu2nHZ/7ICQUFFTe0zAlu6Fipowz1 X-Gm-Gg: ASbGnctstmIkJRffRmTn+okDzyWee+/4xkeO6gDPq8+gBw8P4Vx0rdlW/iti58fMPVh M2mO9t5wVebZ0xtw/h3FaNi0XEKzz/civG70Bde/OPKIo+JGIp/5ZDN17Q3U+QZJrKxA1vz3uau +FNz7tufFO6h633iPyrmGkWHR3HZ6AhjEF1WYS9GVRQE4xhM6IG7+KgxofagOFQA78pWMaG9Hl0 T270K4Q4AdB7JVKQa7r7XvFFLEbg55eSasgLewSa/hwcY1kb7eEcGQJKsgXEXtHXbD7YCk8HpYe b0aZXR55GAZV8L+b3l/kG3ptgYrrQSShFzhmK/Jft+MH0xMrmL3pPDXBpDoio5n4Irrz9TshL2t IQTCqbbuBfeHDYHchfA4Jb704iAkMak24Yn8M X-Google-Smtp-Source: AGHT+IHGC5rriCD7DpMnCUCzI5Safgch4xj08id3Snk9BPAYEc+KZLZxDUB2ES2/mpywSsPTLaygqg== X-Received: by 2002:a05:620a:4623:b0:7d3:9260:6dc7 with SMTP id af79cd13be357-7e356a24654mr1878485385a.6.1753116189081; Mon, 21 Jul 2025 09:43:09 -0700 (PDT) Received: from nuc (192-0-220-237.cpe.teksavvy.com. [192.0.220.237]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7e356b2a9a6sm444087085a.8.2025.07.21.09.43.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Jul 2025 09:43:08 -0700 (PDT) Date: Mon, 21 Jul 2025 12:43:06 -0400 From: Mark Johnston To: John Baldwin Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: cc21f6e53f43 - main - amd64: Make a comment less confusing Message-ID: References: <202507211458.56LEwD36053783@gitrepo.freebsd.org> <35003f37-9e55-4a92-ae6e-58b35409700b@FreeBSD.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <35003f37-9e55-4a92-ae6e-58b35409700b@FreeBSD.org> X-Rspamd-Queue-Id: 4bm5mz4tXCz3CQs X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] On Mon, Jul 21, 2025 at 12:37:23PM -0400, John Baldwin wrote: > On 7/21/25 10:58, Mark Johnston wrote: > > The branch main has been updated by markj: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=cc21f6e53f43f0e4c082222460d90ea581f3e2d6 > > > > commit cc21f6e53f43f0e4c082222460d90ea581f3e2d6 > > Author: Mark Johnston > > AuthorDate: 2025-07-21 13:33:31 +0000 > > Commit: Mark Johnston > > CommitDate: 2025-07-21 14:57:58 +0000 > > > > amd64: Make a comment less confusing > > Also merge two printf()s. No functional change intended. > > Reviewed by: kib > > MFC after: 1 week > > Differential Revision: https://reviews.freebsd.org/D51452 > > --- > > sys/amd64/amd64/trap.c | 13 ++++++------- > > 1 file changed, 6 insertions(+), 7 deletions(-) > > > > diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c > > index d9a5f7096a6e..f3469ed5e2bc 100644 > > --- a/sys/amd64/amd64/trap.c > > +++ b/sys/amd64/amd64/trap.c > > @@ -37,7 +37,6 @@ > > * SUCH DAMAGE. > > */ > > -#include > > /* > > * AMD64 Trap and System call handling > > */ > > @@ -898,9 +897,9 @@ trap_diag(struct trapframe *frame, vm_offset_t eva) > > printf("\n\nFatal trap %d: %s while in %s mode\n", type, > > type < nitems(trap_msg) ? trap_msg[type] : UNKNOWN, > > TRAPF_USERMODE(frame) ? "user" : "kernel"); > > - /* two separate prints in case of a trap on an unmapped page */ > > - printf("cpuid = %d; ", PCPU_GET(cpuid)); > > - printf("apic id = %02x\n", PCPU_GET(apic_id)); > > + /* Print these separately in case pcpu accesses trap. */ > > + printf("cpuid = %d; apic id = %02x\n", PCPU_GET(cpuid), > > + PCPU_GET(apic_id)); > > if (type == T_PAGEFLT) { > > printf("fault virtual address = 0x%lx\n", eva); > > printf("fault code = %s %s %s%s%s, %s\n", > > @@ -1021,9 +1020,9 @@ dblfault_handler(struct trapframe *frame) > > frame->tf_cs, frame->tf_ss, frame->tf_ds, frame->tf_es, > > frame->tf_fs, frame->tf_gs, > > rdmsr(MSR_FSBASE), rdmsr(MSR_GSBASE), rdmsr(MSR_KGSBASE)); > > - /* two separate prints in case of a trap on an unmapped page */ > > - printf("cpuid = %d; ", PCPU_GET(cpuid)); > > - printf("apic id = %02x\n", PCPU_GET(apic_id)); > > + /* Print these separately in case pcpu accesses trap. */ > > + printf("cpuid = %d; apic id = %02x\n", PCPU_GET(cpuid), > > + PCPU_GET(apic_id)); > > panic("double fault"); > > Eh, if any of the accesses fault you don't get any of the printf, Right, but I believe the comment is referring to the preceding printf, which doesn't print any PCPU fields. In what situation would PCPU_GET(apic_id) fault while PCPU_GET(cpuid) succeeds? (Yes, my commit message here should have been better.) > so once > you've merged these, the comment is wrong and should just be removed. > FWIW, pre-5.0 (maybe pre-4.0?) per-CPU data on i386 used a fixed virtual > address that was mapped to different backing pages on each CPU instead of > %gs which is why the comment was probably worded that way originally. > > (This meant, btw, that each CPU had its own set of top-level kernel page > table and that cpu_switch had to munge the kernel-half of the top-level > page table of a process, which precluded multiple threads in a process.) > > -- > John Baldwin >