Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1707749/?format=api
{ "id": 1707749, "url": "http://patchwork.ozlabs.org/api/patches/1707749/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linux-um/patch/20221122100759.208290-2-benjamin@sipsolutions.net/", "project": { "id": 60, "url": "http://patchwork.ozlabs.org/api/projects/60/?format=api", "name": "User-mode Linux Development", "link_name": "linux-um", "list_id": "linux-um.lists.infradead.org", "list_email": "linux-um@lists.infradead.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20221122100759.208290-2-benjamin@sipsolutions.net>", "list_archive_url": null, "date": "2022-11-22T10:07:32", "name": "[v2,01/28] um: Switch printk calls to adhere to correct coding style", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "1b3c93320a5492abd4a25a69322aa5a306b7959a", "submitter": { "id": 67525, "url": "http://patchwork.ozlabs.org/api/people/67525/?format=api", "name": "Benjamin Berg", "email": "benjamin@sipsolutions.net" }, "delegate": { "id": 54851, "url": "http://patchwork.ozlabs.org/api/users/54851/?format=api", "username": "rw", "first_name": "Richard", "last_name": "Weinberger", "email": "richard@nod.at" }, "mbox": "http://patchwork.ozlabs.org/project/linux-um/patch/20221122100759.208290-2-benjamin@sipsolutions.net/mbox/", "series": [ { "id": 329466, "url": "http://patchwork.ozlabs.org/api/series/329466/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linux-um/list/?series=329466", "date": "2022-11-22T10:07:37", "name": "Implement SECCOMP based userland", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/329466/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1707749/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1707749/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "\n <linux-um-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@legolas.ozlabs.org", "Authentication-Results": [ "legolas.ozlabs.org;\n spf=none (no SPF record) smtp.mailfrom=lists.infradead.org\n (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org;\n envelope-from=linux-um-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org;\n receiver=<UNKNOWN>)", "legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n secure) header.d=lists.infradead.org header.i=@lists.infradead.org\n header.a=rsa-sha256 header.s=bombadil.20210309 header.b=hUe1BjUi;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n secure) header.d=sipsolutions.net header.i=@sipsolutions.net\n header.a=rsa-sha256 header.s=mail header.b=iuNkD5ZE;\n\tdkim-atps=neutral" ], "Received": [ "from bombadil.infradead.org (bombadil.infradead.org\n [IPv6:2607:7c80:54:3::133])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4NGg5g2x6hz23nm\n\tfor <incoming@patchwork.ozlabs.org>; Tue, 22 Nov 2022 21:11:35 +1100 (AEDT)", "from localhost ([::1] helo=bombadil.infradead.org)\n\tby bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux))\n\tid 1oxQFQ-007g2q-Hd; Tue, 22 Nov 2022 10:11:24 +0000", "from s3.sipsolutions.net ([2a01:4f8:191:4433::2]\n helo=sipsolutions.net)\n\tby bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux))\n\tid 1oxQF1-007feT-Bt\n\tfor linux-um@lists.infradead.org; Tue, 22 Nov 2022 10:11:08 +0000", "by sipsolutions.net with esmtpsa\n (TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256)\n\t(Exim 4.96)\n\t(envelope-from <benjamin@sipsolutions.net>)\n\tid 1oxQEm-006IGn-1i;\n\tTue, 22 Nov 2022 11:10:44 +0100" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;\n\td=lists.infradead.org; s=bombadil.20210309; h=Sender:\n\tContent-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post:\n\tList-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:\n\tMessage-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:\n\tResent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:\n\tList-Owner; bh=XMfsknU3KoQknp541Kw3r6/8zRrWyUfkADSLJw1c8I4=; b=hUe1BjUiYw4XN3\n\tHRAYqyTtYYig2L4ICj7izukEZLrkWhy2p9ofkHj39NOt3z+Nujn3a83v/jwEAGk3w0dYKOYmsIkkF\n\t3MgkyyI4NHFJeGvutiymzMqsnpGLyXCmXmlPh1KKszylE5NXKPtxqqCOEW/RurDU7/sI2roth6Z9l\n\tcdCEWe/2GHnU4rXDHqcrQNKRQY2dmWv2QBzmZHHo6w4F3ZsoVdm02eroeVKQNMCY5Tlc+I8XtSc1e\n\t9dfOmE+BzpkP9PeIItwpHmqKR7iqxn6cPLt0Zg/hlRjzFy+RZesr60s3FvJVmqTloMUXc8FsF+N//\n\tatsoaE9QgzwLM2RoA2kw==;", "v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;\n\td=sipsolutions.net; s=mail; h=Content-Transfer-Encoding:MIME-Version:\n\tReferences:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Content-Type:Sender\n\t:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-To:\n\tResent-Cc:Resent-Message-ID; bh=JB3lfilSF1J9JO/pvnubRjhNm1U9ITXTS4W64o9aBok=;\n\tt=1669111856; x=1670321456; b=iuNkD5ZEvBU1eMvmT63dc+9eN3b/87v8m+gumapM5fjcrWk\n\tk/3t/5gvJBoeYN4RKoHNHJ9+lvEc4b2wLfBHUyN1E+SA9Z4dV5ytSLSCRSeBSeKBI/hwvw1n1Zg8i\n\tSUu1U23uFZQbkVb0Rc/QNKnjnhyjrXpAE8lWYNdyiz1ZJ3WCJ8KuqTQluealeS4dD7lceX8yre9dT\n\ttiB44Hs28yW3oDu/W0wbKgsaa0nre6tdY1w4Srj3nvWC17XwgshRrwbbtcTe/ghcA3tBoKHN+hQgY\n\ts/tY1+hHgb92iACiJdHOOSmpXF7EBVPP7u8AZ5cxsIWFw1iSPXDiW1UHxT8Kw8JA==;" ], "From": "benjamin@sipsolutions.net", "To": "linux-um@lists.infradead.org", "Cc": "Benjamin Berg <benjamin@sipsolutions.net>", "Subject": "[PATCH v2 01/28] um: Switch printk calls to adhere to correct coding\n style", "Date": "Tue, 22 Nov 2022 11:07:32 +0100", "Message-Id": "<20221122100759.208290-2-benjamin@sipsolutions.net>", "X-Mailer": "git-send-email 2.38.1", "In-Reply-To": "<20221122100759.208290-1-benjamin@sipsolutions.net>", "References": "<20221122100759.208290-1-benjamin@sipsolutions.net>", "MIME-Version": "1.0", "X-CRM114-Version": "20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 ", "X-CRM114-CacheID": "sfid-20221122_021059_734848_FE21A931 ", "X-CRM114-Status": "GOOD ( 15.23 )", "X-Spam-Score": "-0.2 (/)", "X-Spam-Report": "Spam detection software,\n running on the system \"bombadil.infradead.org\",\n has NOT identified this incoming email as spam. The original\n message has been attached to this so you can view it or label\n similar future email. If you have any questions, see\n the administrator of that system for details.\n Content preview: From: Benjamin Berg <benjamin@sipsolutions.net> This means\n having the string literal in one line and using __func__ where\n appropriate.\n Signed-off-by: Benjamin Berg <benjamin@sipsolutions.net> ---\n arch/um/kernel/exec.c\n | 4 +- arch/um/os-Linux/skas/mem.c | 19 +++--\n arch/um/os-Linux/skas/process.c\n | 121 ++++++++++++++++ [...]\n Content analysis details: (-0.2 points, 5.0 required)\n pts rule name description\n ---- ----------------------\n --------------------------------------------------\n -0.0 SPF_PASS SPF: sender matches SPF record\n -0.0 SPF_HELO_PASS SPF: HELO matches SPF record\n -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from\n author's domain\n -0.1 DKIM_VALID Message has at least one valid DKIM or DK\n signature\n 0.1 DKIM_SIGNED Message has a DKIM or DK signature,\n not necessarily\n valid\n -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from\n envelope-from domain", "X-BeenThere": "linux-um@lists.infradead.org", "X-Mailman-Version": "2.1.34", "Precedence": "list", "List-Id": "<linux-um.lists.infradead.org>", "List-Unsubscribe": "<http://lists.infradead.org/mailman/options/linux-um>,\n <mailto:linux-um-request@lists.infradead.org?subject=unsubscribe>", "List-Archive": "<http://lists.infradead.org/pipermail/linux-um/>", "List-Post": "<mailto:linux-um@lists.infradead.org>", "List-Help": "<mailto:linux-um-request@lists.infradead.org?subject=help>", "List-Subscribe": "<http://lists.infradead.org/mailman/listinfo/linux-um>,\n <mailto:linux-um-request@lists.infradead.org?subject=subscribe>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Sender": "\"linux-um\" <linux-um-bounces@lists.infradead.org>", "Errors-To": "linux-um-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org" }, "content": "From: Benjamin Berg <benjamin@sipsolutions.net>\n\nThis means having the string literal in one line and using __func__\nwhere appropriate.\n\nSigned-off-by: Benjamin Berg <benjamin@sipsolutions.net>\n---\n arch/um/kernel/exec.c | 4 +-\n arch/um/os-Linux/skas/mem.c | 19 +++--\n arch/um/os-Linux/skas/process.c | 121 ++++++++++++++++----------------\n 3 files changed, 69 insertions(+), 75 deletions(-)", "diff": "diff --git a/arch/um/kernel/exec.c b/arch/um/kernel/exec.c\nindex 58938d75871a..827a0d3fa589 100644\n--- a/arch/um/kernel/exec.c\n+++ b/arch/um/kernel/exec.c\n@@ -29,8 +29,8 @@ void flush_thread(void)\n \n \tret = unmap(¤t->mm->context.id, 0, TASK_SIZE, 1, &data);\n \tif (ret) {\n-\t\tprintk(KERN_ERR \"flush_thread - clearing address space failed, \"\n-\t\t \"err = %d\\n\", ret);\n+\t\tprintk(KERN_ERR \"%s - clearing address space failed, err = %d\\n\",\n+\t\t __func__, ret);\n \t\tforce_sig(SIGKILL);\n \t}\n \tget_safe_registers(current_pt_regs()->regs.gp,\ndiff --git a/arch/um/os-Linux/skas/mem.c b/arch/um/os-Linux/skas/mem.c\nindex 3b4975ee67e2..953fb10f3f93 100644\n--- a/arch/um/os-Linux/skas/mem.c\n+++ b/arch/um/os-Linux/skas/mem.c\n@@ -60,8 +60,8 @@ static inline long do_syscall_stub(struct mm_id * mm_idp, void **addr)\n \t\tprintk(UM_KERN_ERR \"Registers - \\n\");\n \t\tfor (i = 0; i < MAX_REG_NR; i++)\n \t\t\tprintk(UM_KERN_ERR \"\\t%d\\t0x%lx\\n\", i, syscall_regs[i]);\n-\t\tpanic(\"do_syscall_stub : PTRACE_SETREGS failed, errno = %d\\n\",\n-\t\t -n);\n+\t\tpanic(\"%s : PTRACE_SETREGS failed, errno = %d\\n\",\n+\t\t __func__, -n);\n \t}\n \n \terr = ptrace(PTRACE_CONT, pid, 0, 0);\n@@ -81,20 +81,17 @@ static inline long do_syscall_stub(struct mm_id * mm_idp, void **addr)\n \toffset = *((unsigned long *) mm_idp->stack + 1);\n \tif (offset) {\n \t\tdata = (unsigned long *)(mm_idp->stack + offset - STUB_DATA);\n-\t\tprintk(UM_KERN_ERR \"do_syscall_stub : ret = %ld, offset = %ld, \"\n-\t\t \"data = %p\\n\", ret, offset, data);\n+\t\tprintk(UM_KERN_ERR \"%s : ret = %ld, offset = %ld, data = %p\\n\",\n+\t\t __func__, ret, offset, data);\n \t\tsyscall = (unsigned long *)((unsigned long)data + data[0]);\n-\t\tprintk(UM_KERN_ERR \"do_syscall_stub: syscall %ld failed, \"\n-\t\t \"return value = 0x%lx, expected return value = 0x%lx\\n\",\n-\t\t syscall[0], ret, syscall[7]);\n-\t\tprintk(UM_KERN_ERR \" syscall parameters: \"\n-\t\t \"0x%lx 0x%lx 0x%lx 0x%lx 0x%lx 0x%lx\\n\",\n+\t\tprintk(UM_KERN_ERR \"%s: syscall %ld failed, return value = 0x%lx, expected return value = 0x%lx\\n\",\n+\t\t __func__, syscall[0], ret, syscall[7]);\n+\t\tprintk(UM_KERN_ERR \" syscall parameters: 0x%lx 0x%lx 0x%lx 0x%lx 0x%lx 0x%lx\\n\",\n \t\t syscall[1], syscall[2], syscall[3],\n \t\t syscall[4], syscall[5], syscall[6]);\n \t\tfor (n = 1; n < data[0]/sizeof(long); n++) {\n \t\t\tif (n == 1)\n-\t\t\t\tprintk(UM_KERN_ERR \" additional syscall \"\n-\t\t\t\t \"data:\");\n+\t\t\t\tprintk(UM_KERN_ERR \" additional syscall data:\");\n \t\t\tif (n % 4 == 1)\n \t\t\t\tprintk(\"\\n\" UM_KERN_ERR \" \");\n \t\t\tprintk(\" 0x%lx\", data[n]);\ndiff --git a/arch/um/os-Linux/skas/process.c b/arch/um/os-Linux/skas/process.c\nindex b24db6017ded..b1ea53285af1 100644\n--- a/arch/um/os-Linux/skas/process.c\n+++ b/arch/um/os-Linux/skas/process.c\n@@ -118,8 +118,8 @@ void wait_stub_done(int pid)\n \n \t\terr = ptrace(PTRACE_CONT, pid, 0, 0);\n \t\tif (err) {\n-\t\t\tprintk(UM_KERN_ERR \"wait_stub_done : continue failed, \"\n-\t\t\t \"errno = %d\\n\", errno);\n+\t\t\tprintk(UM_KERN_ERR \"%s : continue failed, errno = %d\\n\",\n+\t\t\t __func__, errno);\n \t\t\tfatal_sigsegv();\n \t\t}\n \t}\n@@ -130,11 +130,10 @@ void wait_stub_done(int pid)\n bad_wait:\n \terr = ptrace_dump_regs(pid);\n \tif (err)\n-\t\tprintk(UM_KERN_ERR \"Failed to get registers from stub, \"\n-\t\t \"errno = %d\\n\", -err);\n-\tprintk(UM_KERN_ERR \"wait_stub_done : failed to wait for SIGTRAP, \"\n-\t \"pid = %d, n = %d, errno = %d, status = 0x%x\\n\", pid, n, errno,\n-\t status);\n+\t\tprintk(UM_KERN_ERR \"Failed to get registers from stub, errno = %d\\n\",\n+\t\t -err);\n+\tprintk(UM_KERN_ERR \"%s : failed to wait for SIGTRAP, pid = %d, n = %d, errno = %d, status = 0x%x\\n\",\n+\t __func__, pid, n, errno, status);\n \tfatal_sigsegv();\n }\n \n@@ -195,15 +194,15 @@ static void handle_trap(int pid, struct uml_pt_regs *regs,\n \t\terr = ptrace(PTRACE_POKEUSER, pid, PT_SYSCALL_NR_OFFSET,\n \t\t\t __NR_getpid);\n \t\tif (err < 0) {\n-\t\t\tprintk(UM_KERN_ERR \"handle_trap - nullifying syscall \"\n-\t\t\t \"failed, errno = %d\\n\", errno);\n+\t\t\tprintk(UM_KERN_ERR \"%s - nullifying syscall failed, errno = %d\\n\",\n+\t\t\t __func__, errno);\n \t\t\tfatal_sigsegv();\n \t\t}\n \n \t\terr = ptrace(PTRACE_SYSCALL, pid, 0, 0);\n \t\tif (err < 0) {\n-\t\t\tprintk(UM_KERN_ERR \"handle_trap - continuing to end of \"\n-\t\t\t \"syscall failed, errno = %d\\n\", errno);\n+\t\t\tprintk(UM_KERN_ERR \"%s - continuing to end of syscall failed, errno = %d\\n\",\n+\t\t\t __func__, errno);\n \t\t\tfatal_sigsegv();\n \t\t}\n \n@@ -212,11 +211,10 @@ static void handle_trap(int pid, struct uml_pt_regs *regs,\n \t\t (WSTOPSIG(status) != SIGTRAP + 0x80)) {\n \t\t\terr = ptrace_dump_regs(pid);\n \t\t\tif (err)\n-\t\t\t\tprintk(UM_KERN_ERR \"Failed to get registers \"\n-\t\t\t\t \"from process, errno = %d\\n\", -err);\n-\t\t\tprintk(UM_KERN_ERR \"handle_trap - failed to wait at \"\n-\t\t\t \"end of syscall, errno = %d, status = %d\\n\",\n-\t\t\t errno, status);\n+\t\t\t\tprintk(UM_KERN_ERR \"Failed to get registers from process, errno = %d\\n\",\n+\t\t\t\t -err);\n+\t\t\tprintk(UM_KERN_ERR \"%s - failed to wait at end of syscall, errno = %d, status = %d\\n\",\n+\t\t\t __func__, errno, status);\n \t\t\tfatal_sigsegv();\n \t\t}\n \t}\n@@ -256,8 +254,8 @@ static int userspace_tramp(void *stack)\n \taddr = mmap64((void *) STUB_CODE, UM_KERN_PAGE_SIZE,\n \t\t PROT_EXEC, MAP_FIXED | MAP_PRIVATE, fd, offset);\n \tif (addr == MAP_FAILED) {\n-\t\tprintk(UM_KERN_ERR \"mapping mmap stub at 0x%lx failed, \"\n-\t\t \"errno = %d\\n\", STUB_CODE, errno);\n+\t\tprintk(UM_KERN_ERR \"mapping mmap stub at 0x%lx failed, errno = %d\\n\",\n+\t\t STUB_CODE, errno);\n \t\texit(1);\n \t}\n \n@@ -267,8 +265,7 @@ static int userspace_tramp(void *stack)\n \t\t\t UM_KERN_PAGE_SIZE, PROT_READ | PROT_WRITE,\n \t\t\t MAP_FIXED | MAP_SHARED, fd, offset);\n \t\tif (addr == MAP_FAILED) {\n-\t\t\tprintk(UM_KERN_ERR \"mapping segfault stack \"\n-\t\t\t \"at 0x%lx failed, errno = %d\\n\",\n+\t\t\tprintk(UM_KERN_ERR \"mapping segfault stack at 0x%lx failed, errno = %d\\n\",\n \t\t\t STUB_DATA, errno);\n \t\t\texit(1);\n \t\t}\n@@ -286,8 +283,8 @@ static int userspace_tramp(void *stack)\n \t\tsa.sa_sigaction = (void *) v;\n \t\tsa.sa_restorer = NULL;\n \t\tif (sigaction(SIGSEGV, &sa, NULL) < 0) {\n-\t\t\tprintk(UM_KERN_ERR \"userspace_tramp - setting SIGSEGV \"\n-\t\t\t \"handler failed - errno = %d\\n\", errno);\n+\t\t\tprintk(UM_KERN_ERR \"%s - setting SIGSEGV handler failed - errno = %d\\n\",\n+\t\t\t __func__, errno);\n \t\t\texit(1);\n \t\t}\n \t}\n@@ -322,8 +319,8 @@ int start_userspace(unsigned long stub_stack)\n \t\t MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);\n \tif (stack == MAP_FAILED) {\n \t\terr = -errno;\n-\t\tprintk(UM_KERN_ERR \"start_userspace : mmap failed, \"\n-\t\t \"errno = %d\\n\", errno);\n+\t\tprintk(UM_KERN_ERR \"%s : mmap failed, errno = %d\\n\",\n+\t\t __func__, errno);\n \t\treturn err;\n \t}\n \n@@ -336,8 +333,8 @@ int start_userspace(unsigned long stub_stack)\n \tpid = clone(userspace_tramp, (void *) sp, flags, (void *) stub_stack);\n \tif (pid < 0) {\n \t\terr = -errno;\n-\t\tprintk(UM_KERN_ERR \"start_userspace : clone failed, \"\n-\t\t \"errno = %d\\n\", errno);\n+\t\tprintk(UM_KERN_ERR \"%s : clone failed, errno = %d\\n\",\n+\t\t __func__, errno);\n \t\treturn err;\n \t}\n \n@@ -345,31 +342,31 @@ int start_userspace(unsigned long stub_stack)\n \t\tCATCH_EINTR(n = waitpid(pid, &status, WUNTRACED | __WALL));\n \t\tif (n < 0) {\n \t\t\terr = -errno;\n-\t\t\tprintk(UM_KERN_ERR \"start_userspace : wait failed, \"\n-\t\t\t \"errno = %d\\n\", errno);\n+\t\t\tprintk(UM_KERN_ERR \"%s : wait failed, errno = %d\\n\",\n+\t\t\t __func__, errno);\n \t\t\tgoto out_kill;\n \t\t}\n \t} while (WIFSTOPPED(status) && (WSTOPSIG(status) == SIGALRM));\n \n \tif (!WIFSTOPPED(status) || (WSTOPSIG(status) != SIGSTOP)) {\n \t\terr = -EINVAL;\n-\t\tprintk(UM_KERN_ERR \"start_userspace : expected SIGSTOP, got \"\n-\t\t \"status = %d\\n\", status);\n+\t\tprintk(UM_KERN_ERR \"%s : expected SIGSTOP, got status = %d\\n\",\n+\t\t __func__, status);\n \t\tgoto out_kill;\n \t}\n \n \tif (ptrace(PTRACE_OLDSETOPTIONS, pid, NULL,\n \t\t (void *) PTRACE_O_TRACESYSGOOD) < 0) {\n \t\terr = -errno;\n-\t\tprintk(UM_KERN_ERR \"start_userspace : PTRACE_OLDSETOPTIONS \"\n-\t\t \"failed, errno = %d\\n\", errno);\n+\t\tprintk(UM_KERN_ERR \"%s : PTRACE_OLDSETOPTIONS failed, errno = %d\\n\",\n+\t\t __func__, errno);\n \t\tgoto out_kill;\n \t}\n \n \tif (munmap(stack, UM_KERN_PAGE_SIZE) < 0) {\n \t\terr = -errno;\n-\t\tprintk(UM_KERN_ERR \"start_userspace : munmap failed, \"\n-\t\t \"errno = %d\\n\", errno);\n+\t\tprintk(UM_KERN_ERR \"%s : munmap failed, errno = %d\\n\",\n+\t\t __func__, errno);\n \t\tgoto out_kill;\n \t}\n \n@@ -403,14 +400,14 @@ void userspace(struct uml_pt_regs *regs, unsigned long *aux_fp_regs)\n \t\t * just kill the process.\n \t\t */\n \t\tif (ptrace(PTRACE_SETREGS, pid, 0, regs->gp)) {\n-\t\t\tprintk(UM_KERN_ERR \"userspace - ptrace set regs \"\n-\t\t\t \"failed, errno = %d\\n\", errno);\n+\t\t\tprintk(UM_KERN_ERR \"%s - ptrace set regs failed, errno = %d\\n\",\n+\t\t\t __func__, errno);\n \t\t\tfatal_sigsegv();\n \t\t}\n \n \t\tif (put_fp_registers(pid, regs->fp)) {\n-\t\t\tprintk(UM_KERN_ERR \"userspace - ptrace set fp regs \"\n-\t\t\t \"failed, errno = %d\\n\", errno);\n+\t\t\tprintk(UM_KERN_ERR \"%s - ptrace set fp regs failed, errno = %d\\n\",\n+\t\t\t __func__, errno);\n \t\t\tfatal_sigsegv();\n \t\t}\n \n@@ -421,28 +418,28 @@ void userspace(struct uml_pt_regs *regs, unsigned long *aux_fp_regs)\n \t\t\t\t\t singlestepping(NULL));\n \n \t\tif (ptrace(op, pid, 0, 0)) {\n-\t\t\tprintk(UM_KERN_ERR \"userspace - ptrace continue \"\n-\t\t\t \"failed, op = %d, errno = %d\\n\", op, errno);\n+\t\t\tprintk(UM_KERN_ERR \"%s - ptrace continue failed, op = %d, errno = %d\\n\",\n+\t\t\t __func__, op, errno);\n \t\t\tfatal_sigsegv();\n \t\t}\n \n \t\tCATCH_EINTR(err = waitpid(pid, &status, WUNTRACED | __WALL));\n \t\tif (err < 0) {\n-\t\t\tprintk(UM_KERN_ERR \"userspace - wait failed, \"\n-\t\t\t \"errno = %d\\n\", errno);\n+\t\t\tprintk(UM_KERN_ERR \"%s - wait failed, errno = %d\\n\",\n+\t\t\t __func__, errno);\n \t\t\tfatal_sigsegv();\n \t\t}\n \n \t\tregs->is_user = 1;\n \t\tif (ptrace(PTRACE_GETREGS, pid, 0, regs->gp)) {\n-\t\t\tprintk(UM_KERN_ERR \"userspace - PTRACE_GETREGS failed, \"\n-\t\t\t \"errno = %d\\n\", errno);\n+\t\t\tprintk(UM_KERN_ERR \"%s - PTRACE_GETREGS failed, errno = %d\\n\",\n+\t\t\t __func__, errno);\n \t\t\tfatal_sigsegv();\n \t\t}\n \n \t\tif (get_fp_registers(pid, regs->fp)) {\n-\t\t\tprintk(UM_KERN_ERR \"userspace - get_fp_registers failed, \"\n-\t\t\t \"errno = %d\\n\", errno);\n+\t\t\tprintk(UM_KERN_ERR \"%s - get_fp_registers failed, errno = %d\\n\",\n+\t\t\t __func__, errno);\n \t\t\tfatal_sigsegv();\n \t\t}\n \n@@ -494,8 +491,8 @@ void userspace(struct uml_pt_regs *regs, unsigned long *aux_fp_regs)\n \t\t\t\tunblock_signals_trace();\n \t\t\t\tbreak;\n \t\t\tdefault:\n-\t\t\t\tprintk(UM_KERN_ERR \"userspace - child stopped \"\n-\t\t\t\t \"with signal %d\\n\", sig);\n+\t\t\t\tprintk(UM_KERN_ERR \"%s - child stopped with signal %d\\n\",\n+\t\t\t\t __func__, sig);\n \t\t\t\tfatal_sigsegv();\n \t\t\t}\n \t\t\tpid = userspace_pid[0];\n@@ -555,15 +552,15 @@ int copy_context_skas0(unsigned long new_stack, int pid)\n \terr = ptrace_setregs(pid, thread_regs);\n \tif (err < 0) {\n \t\terr = -errno;\n-\t\tprintk(UM_KERN_ERR \"copy_context_skas0 : PTRACE_SETREGS \"\n-\t\t \"failed, pid = %d, errno = %d\\n\", pid, -err);\n+\t\tprintk(UM_KERN_ERR \"%s : PTRACE_SETREGS failed, pid = %d, errno = %d\\n\",\n+\t\t __func__, pid, -err);\n \t\treturn err;\n \t}\n \n \terr = put_fp_registers(pid, thread_fp_regs);\n \tif (err < 0) {\n-\t\tprintk(UM_KERN_ERR \"copy_context_skas0 : put_fp_registers \"\n-\t\t \"failed, pid = %d, err = %d\\n\", pid, err);\n+\t\tprintk(UM_KERN_ERR \"%s : put_fp_registers failed, pid = %d, err = %d\\n\",\n+\t\t __func__, pid, err);\n \t\treturn err;\n \t}\n \n@@ -574,8 +571,8 @@ int copy_context_skas0(unsigned long new_stack, int pid)\n \terr = ptrace(PTRACE_CONT, pid, 0, 0);\n \tif (err) {\n \t\terr = -errno;\n-\t\tprintk(UM_KERN_ERR \"Failed to continue new process, pid = %d, \"\n-\t\t \"errno = %d\\n\", pid, errno);\n+\t\tprintk(UM_KERN_ERR \"Failed to continue new process, pid = %d, errno = %d\\n\",\n+\t\t pid, errno);\n \t\treturn err;\n \t}\n \n@@ -583,8 +580,8 @@ int copy_context_skas0(unsigned long new_stack, int pid)\n \n \tpid = data->parent_err;\n \tif (pid < 0) {\n-\t\tprintk(UM_KERN_ERR \"copy_context_skas0 - stub-parent reports \"\n-\t\t \"error %d\\n\", -pid);\n+\t\tprintk(UM_KERN_ERR \"%s - stub-parent reports error %d\\n\",\n+\t\t __func__, -pid);\n \t\treturn pid;\n \t}\n \n@@ -594,8 +591,8 @@ int copy_context_skas0(unsigned long new_stack, int pid)\n \t */\n \twait_stub_done(pid);\n \tif (child_data->child_err != STUB_DATA) {\n-\t\tprintk(UM_KERN_ERR \"copy_context_skas0 - stub-child %d reports \"\n-\t\t \"error %ld\\n\", pid, data->child_err);\n+\t\tprintk(UM_KERN_ERR \"%s - stub-child %d reports error %ld\\n\",\n+\t\t __func__, pid, data->child_err);\n \t\terr = data->child_err;\n \t\tgoto out_kill;\n \t}\n@@ -603,8 +600,8 @@ int copy_context_skas0(unsigned long new_stack, int pid)\n \tif (ptrace(PTRACE_OLDSETOPTIONS, pid, NULL,\n \t\t (void *)PTRACE_O_TRACESYSGOOD) < 0) {\n \t\terr = -errno;\n-\t\tprintk(UM_KERN_ERR \"copy_context_skas0 : PTRACE_OLDSETOPTIONS \"\n-\t\t \"failed, errno = %d\\n\", errno);\n+\t\tprintk(UM_KERN_ERR \"%s : PTRACE_OLDSETOPTIONS failed, errno = %d\\n\",\n+\t\t __func__, errno);\n \t\tgoto out_kill;\n \t}\n \n@@ -672,8 +669,8 @@ int start_idle_thread(void *stack, jmp_buf *switch_buf)\n \t\tkmalloc_ok = 0;\n \t\treturn 1;\n \tdefault:\n-\t\tprintk(UM_KERN_ERR \"Bad sigsetjmp return in \"\n-\t\t \"start_idle_thread - %d\\n\", n);\n+\t\tprintk(UM_KERN_ERR \"Bad sigsetjmp return in %s - %d\\n\",\n+\t\t __func__, n);\n \t\tfatal_sigsegv();\n \t}\n \tlongjmp(*switch_buf, 1);\n", "prefixes": [ "v2", "01/28" ] }