Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp3465592pxj; Sun, 20 Jun 2021 22:13:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwLTYYaAa9XWGAYgw1adCs8NJmPCQuln28pffiOHynVX2RI50HiCfeiu+FHfpGQGsw9Pch+ X-Received: by 2002:a92:7510:: with SMTP id q16mr16295435ilc.291.1624252413277; Sun, 20 Jun 2021 22:13:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624252413; cv=none; d=google.com; s=arc-20160816; b=osjxHr5el9jkpE/85nclAlyis9kkiUmP5fMLJhHSQOl+NNxsy686ho1MDF+SibMPy0 ymSob7TOPfKEmEOxDnjbdzCL9Q9BFYTOge06d/6WULkrH+g5/I0OhV5Qjs2HLnSr+Dgc OL02OYsZE8ySualto9Va1yXBDfs4ohL47QUTtYdaUPXlI7XDOH5SmPq+Gth5FJlYSKKm 5Atr+hkLG8v9oVWSNoD7nuzJeb3hd3npjtNpXLa4thXH1gsPvH9RumKcorP14Wm07LT0 pT4+5RSRRktJd+UODkiRFY1cG+g8t0zXM2s6YZ5qC4tbZcc0HQ8GYbmyYJBtblDDcNHi 9r1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=HaH5unS1AysbRIEpLRFXHHZaHGqckXJCcf5aMH0w3qo=; b=rGWZvP4cZHuxzKlRycyfS2om5Yu9aTYCVXbS+M7X5IlC/TcDqapiav3iXXsm4orb0l Wn8oPdHognHhAr2ZqQ7PqUGPAgMq2NMPqIy3SVbzpGHbRC8Gob5+UgmtLHiaqk9pi7n3 92h9UGGHZOkuFfMgY94ej0iE/7ECtE/fliTdgucgj5OVfz3y6u5OzwXpAPpAJiBVNun6 5ka3d/cT84GukIjCvujVKBPSZBkvVEHd/kOyHcuW0VhaUhRe6k/xDdFmp0NxYo+QLM0e bMeZdXOni6GyCnqhMfx4KUPB3SKnIIsxj6Vy7vlgCoB8oh9F0uDlt2auhC7XXkSBMmUo KbkA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=S7xkkatB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p18si1276307jam.60.2021.06.20.22.13.20; Sun, 20 Jun 2021 22:13:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=S7xkkatB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229610AbhFUFO4 (ORCPT + 99 others); Mon, 21 Jun 2021 01:14:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45382 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229441AbhFUFOy (ORCPT ); Mon, 21 Jun 2021 01:14:54 -0400 Received: from mail-pl1-x633.google.com (mail-pl1-x633.google.com [IPv6:2607:f8b0:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EF28EC061574; Sun, 20 Jun 2021 22:12:37 -0700 (PDT) Received: by mail-pl1-x633.google.com with SMTP id y13so1760732plc.8; Sun, 20 Jun 2021 22:12:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=HaH5unS1AysbRIEpLRFXHHZaHGqckXJCcf5aMH0w3qo=; b=S7xkkatBIxyw8Ml0wapeOghAojKDBfx59rpe6dQB46KQCr7GX8pYnOa0RjfKxFwNXn C1YdFjmWpS7NhFeuW/C/WZ+gLYXRKqRfyGS7WCZnKqVGGsub8rA86Yp4My5jPwwvcNwk xYE5+8GtDo1hNz6FFH4IrO43DXB060Egq9N6qBWhp1NgKhdJQJs3DTL7TDN2qPhIJdev lyQeA7/9ZgZV9QKmJOkmhNFEStjhLE98fVGSG8Iw4d/cUS65xx7iFSl501ERMQod73kO t7mEZIjPUXxKy2mqpvbiFL0gMFPTjDRwr0eVx1c7UxbQ+NV9D2nmL3GIEQptU3/RWlSN YC8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=HaH5unS1AysbRIEpLRFXHHZaHGqckXJCcf5aMH0w3qo=; b=M2nzWx59UuLFYgwKy4WCDOVtlHcAYSFGyqXH9QFIxrcOzhKSal6ZLWvy/DGmtGvcXR 1N4FoN8WqcFAYHy4KU0eVI1+OiylVN8TWl8YFG3s3D9g4hgLcwqC7YsuwFseS2PKdODA /1YEr2kwADyVVZkEIhWrY+4iht2YasMYkY3UP7vnzrYJYIInSOouQCx7PAhZv48n4UGg Z1Hv/DHo1EC2FSPKKMg2hs0LpH0Rx02AwfQ4OMmMmaeTdVqlsUCAOnhHJhIJ5CjFr0WR sTVQxQV5VsUTEizyO5Yt36ADICdEY7YOf9vhNww8vWPW7mkAL2GyMAHxxXUtfOsRmBvG fkgw== X-Gm-Message-State: AOAM533zhQ1Uc/WnU0spRWbBbAWIIqnGSDiH4vf0PDYWMfw+75GnejNi gspRLI8YLt11f9oHny46W0GYrupQiwUo5sMj X-Received: by 2002:a17:90a:9302:: with SMTP id p2mr24082918pjo.202.1624252357305; Sun, 20 Jun 2021 22:12:37 -0700 (PDT) Received: from sz-dl-056.autox.sz ([122.10.161.207]) by smtp.gmail.com with ESMTPSA id u7sm15461024pgl.39.2021.06.20.22.12.35 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 20 Jun 2021 22:12:36 -0700 (PDT) From: Yejune Deng To: davem@davemloft.net, kuba@kernel.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Yejune Deng , kernel test robot Subject: [PATCH v2] net: add pf_family_names[] for protocol family Date: Mon, 21 Jun 2021 13:12:25 +0800 Message-Id: <20210621051225.24018-1-yejune.deng@gmail.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Modify the pr_info content from int to char * in sock_register() and sock_unregister(), this looks more readable. Fixed build error in ARCH=sparc64. Signed-off-by: Yejune Deng Reported-by: kernel test robot --- net/socket.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 50 insertions(+), 2 deletions(-) diff --git a/net/socket.c b/net/socket.c index 4f2c6d2795d0..bd9233da2497 100644 --- a/net/socket.c +++ b/net/socket.c @@ -165,6 +165,54 @@ static const struct file_operations socket_file_ops = { .show_fdinfo = sock_show_fdinfo, }; +static const char * const pf_family_names[] = { + [PF_UNSPEC] = "PF_UNSPEC", + [PF_UNIX] = "PF_UNIX/PF_LOCAL", + [PF_INET] = "PF_INET", + [PF_AX25] = "PF_AX25", + [PF_IPX] = "PF_IPX", + [PF_APPLETALK] = "PF_APPLETALK", + [PF_NETROM] = "PF_NETROM", + [PF_BRIDGE] = "PF_BRIDGE", + [PF_ATMPVC] = "PF_ATMPVC", + [PF_X25] = "PF_X25", + [PF_INET6] = "PF_INET6", + [PF_ROSE] = "PF_ROSE", + [PF_DECnet] = "PF_DECnet", + [PF_NETBEUI] = "PF_NETBEUI", + [PF_SECURITY] = "PF_SECURITY", + [PF_KEY] = "PF_KEY", + [PF_NETLINK] = "PF_NETLINK/PF_ROUTE", + [PF_PACKET] = "PF_PACKET", + [PF_ASH] = "PF_ASH", + [PF_ECONET] = "PF_ECONET", + [PF_ATMSVC] = "PF_ATMSVC", + [PF_RDS] = "PF_RDS", + [PF_SNA] = "PF_SNA", + [PF_IRDA] = "PF_IRDA", + [PF_PPPOX] = "PF_PPPOX", + [PF_WANPIPE] = "PF_WANPIPE", + [PF_LLC] = "PF_LLC", + [PF_IB] = "PF_IB", + [PF_MPLS] = "PF_MPLS", + [PF_CAN] = "PF_CAN", + [PF_TIPC] = "PF_TIPC", + [PF_BLUETOOTH] = "PF_BLUETOOTH", + [PF_IUCV] = "PF_IUCV", + [PF_RXRPC] = "PF_RXRPC", + [PF_ISDN] = "PF_ISDN", + [PF_PHONET] = "PF_PHONET", + [PF_IEEE802154] = "PF_IEEE802154", + [PF_CAIF] = "PF_CAIF", + [PF_ALG] = "PF_ALG", + [PF_NFC] = "PF_NFC", + [PF_VSOCK] = "PF_VSOCK", + [PF_KCM] = "PF_KCM", + [PF_QIPCRTR] = "PF_QIPCRTR", + [PF_SMC] = "PF_SMC", + [PF_XDP] = "PF_XDP", +}; + /* * The protocol list. Each protocol is registered in here. */ @@ -2975,7 +3023,7 @@ int sock_register(const struct net_proto_family *ops) } spin_unlock(&net_family_lock); - pr_info("NET: Registered protocol family %d\n", ops->family); + pr_info("NET: Registered %s protocol family\n", pf_family_names[ops->family]); return err; } EXPORT_SYMBOL(sock_register); @@ -3003,7 +3051,7 @@ void sock_unregister(int family) synchronize_rcu(); - pr_info("NET: Unregistered protocol family %d\n", family); + pr_info("NET: Unregistered %s protocol family\n", pf_family_names[family]); } EXPORT_SYMBOL(sock_unregister); -- 2.32.0