Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Chuck Lever III <chuck.lever@oracle.com>
To:     Trond Myklebust <trondmy@hammerspace.com>
CC:     Anna Schumaker <anna.schumaker@netapp.com>,
        Linux NFS Mailing List <linux-nfs@vger.kernel.org>
Subject: Re: [PATCH 2/4] SUNRPC: Widen rpc_task::tk_flags
Thread-Topic: [PATCH 2/4] SUNRPC: Widen rpc_task::tk_flags
Thread-Index: AQHYnfAYpiEwiP5Q3kuMeAXmLUJIKa2KrAOAgAAAjAA=
Date:   Fri, 22 Jul 2022 17:55:25 +0000
Message-ID: <F3BA47F3-DE56-45DA-8E4A-4E8A65D5541A@oracle.com>
References: <165851065336.361126.17865870911497306083.stgit@morisot.1015granger.net>
 <165851073589.361126.4062184829827389945.stgit@morisot.1015granger.net>
 <55155a8f566599ecf802103a8d7d3aa4ea3e421a.camel@hammerspace.com>
In-Reply-To: <55155a8f566599ecf802103a8d7d3aa4ea3e421a.camel@hammerspace.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?Z/zr/oUJzp3dKzIcSde1J2gz6b5vs8k0aGlpsO/ArKHBg/av2mbqwJtbpk0m?=
 =?us-ascii?Q?f9LfbVHDTz7ssEcJKbL1oAtc22DUwBrJayLCM44hsTcUf6nsjikMfgXpuVbW?=
 =?us-ascii?Q?368Ia5vby5sOj6enAINifSbWle+DJylm9KEl/C7QbD6FfOCUitP75ILHvirU?=
 =?us-ascii?Q?/MqD0vzEmDnGfh1GnRQbv0fFfMHmkJ2xQGYJBjv4z49XTkwM6ZUfoAmfoB8Z?=
 =?us-ascii?Q?Jgmh9F6nktUGuij8u1cuMIRNxBExh32vaSwbAKt3AYhljmG3nap+AR3eb//X?=
 =?us-ascii?Q?xOOofnc1pYxEbC2pryUhJIgCnXnyqBBavvxlTNNnXJlI1MEyiC6GUBPG4aRF?=
 =?us-ascii?Q?4ECPCPMA2+crNv7tMdmaifeLluTKG5/4WF7HXOZuKnw3W7YoAL9SFkb8Py6Z?=
 =?us-ascii?Q?2g3jKip3F95r8q6htgugS5+k2RgETL/NK37wEsjGQ23shVbvday3E90d6tVi?=
 =?us-ascii?Q?M0K1k51gE9BrUOpDJIXCRawcKQT9R6t7AGYbEoNbDqSws3epLQHl+m8oQc9N?=
 =?us-ascii?Q?7yYb+AYpV9XhFHtuxjUshmE16cC2xglUbomOGRVZ+YwFRuS2YoNQnMIrEghz?=
 =?us-ascii?Q?MgWJ2ppGmyomZZe2SmAZHGfBfxVLuoHuSAIuMsuIsjRkzcJswLS2Pq23Czvc?=
 =?us-ascii?Q?gkAJghm+deAEXKhU6jS330pHSn8mY03YKLXvkNZjlIhzQwsujup97d/nd08G?=
 =?us-ascii?Q?FUlY2yjFgPLORVReulw3SgTstGvtYEa43i04uTG9UuB3wiTjMxuqGIpmkXd6?=
 =?us-ascii?Q?T5YFSWAO2GuRTIn83ITOhHBdtupjRY4MWdvF9l45kyPhBmZpn5nbFIjp6zii?=
 =?us-ascii?Q?SHFLKCD6WjWnqMwNQ4mo78ymXejMK2SYhnTR8BWaEeNWKOsuGHgHjJmwyZ6a?=
 =?us-ascii?Q?Xy3whGxFksnMnYpFR3MILqRNa2ZtKwu5++aCufzRGRbrS4bxsNP3Viq9Stmz?=
 =?us-ascii?Q?A6j0/f70eDhU6XYAb08fMkwtskbtVsq9E3p658U/H4YpymVsFmSxWzNQE9Tv?=
 =?us-ascii?Q?OWl4evsr2f68HBW6nQBlFaJ7a/ExN0QbBNH/Ahg86lZpD6akjxHofwzA+McW?=
 =?us-ascii?Q?gSAxvHl6niMnO1nUjXXD2ppiPtocCNBimp9EUV5a7p3oNl+aLcqbTcUKU23Z?=
 =?us-ascii?Q?0XvHjdpTVZDbrgTGg921Ep6k7lls7H7rvlL8enoZ9vXJZXZkYfqfa2XEZ4h9?=
 =?us-ascii?Q?xZAi8CAfmEuTg19fpA5064lZUVNsvNb1YCD7y3/axEFJl1/4TN/uAX8d3dnz?=
 =?us-ascii?Q?FNMU9zi1f7gxtbzlI6/YBnu6SH01TIdlmsTOoTEmAtVQPNoxdd6fvCVY9C9Y?=
 =?us-ascii?Q?kLgvOAR8YVuXfwGIzzY5Z17YO4dWI9Dcf/cc/qGS3BzlOehkFjfY+rLtpklN?=
 =?us-ascii?Q?EwaOnf/huus2D854TgXIABCbh6ZzOgkfwfX7QLip5prGsYWwA+ipmpzuzvAM?=
 =?us-ascii?Q?lZL165sIqNGyR9M7FYOPPoxM5t1ACyVOLfO/6iykPHuWLe4WYXw2vTumIHAY?=
 =?us-ascii?Q?lcnhLgGGhzxnkIKHqOqyOsR3sgsA7GQMIvz1TAegiNwOMDCd4ppKJkZuuuyl?=
 =?us-ascii?Q?sg48kSg3Im4659aryl+jjwsnvw5rBfBjUv4gRlgzkSN3uB50rhH+UZwXrVpD?=
 =?us-ascii?Q?Lw=3D=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-ID: <C9D9AA1CF498064CB8B579CA06FB6759@namprd10.prod.outlook.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: BN0PR10MB5128.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: b42baedc-83fc-42f4-68e4-08da6c0b5ad4
X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Jul 2022 17:55:25.0344
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: NNdLn7KD6g+8QDj8UqtQoKCvBMevcQ0Ndurf30ipA0bSbacmwkD27lTKqyDmzoqoeSIjKTrNXN5M5Rr3OXKtYg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR10MB1994
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.883,Hydra:6.0.517,FMLib:17.11.122.1
 definitions=2022-07-22_06,2022-07-21_02,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 spamscore=0 bulkscore=0
 malwarescore=0 adultscore=0 mlxscore=0 phishscore=0 suspectscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000
 definitions=main-2207220074
X-Proofpoint-GUID: A75UXSFn3w2XAcokHnk5G3ID1Kq5HXs6
X-Proofpoint-ORIG-GUID: A75UXSFn3w2XAcokHnk5G3ID1Kq5HXs6
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-nfs.vger.kernel.org>
X-Mailing-List: linux-nfs@vger.kernel.org


> On Jul 22, 2022, at 1:53 PM, Trond Myklebust <trondmy@hammerspace.com> wr=
ote:
>=20
> On Fri, 2022-07-22 at 13:25 -0400, Chuck Lever wrote:
>> There is just one unused bit left in rpc_task::tk_flags, and I will
>> need two in subsequent patches. Double the width of the field to
>> accommodate more flag bits.
>=20
> The values 0x8 and 0x40 are both free, so I'm not seeing why this patch
> is needed at this time.

It's not needed now, but as recently as last year, there were no free
bits (and I needed them for RPC-with-TLS support at that time). We will
have to widen this field sooner or later.

I don't have a problem dropping this one if you'd rather wait.


>> Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
>> Reviewed-by: Jeff Layton <jlayton@kernel.org>
>> Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
>> ---
>> include/linux/sunrpc/clnt.h  |  6 ++++--
>> include/linux/sunrpc/sched.h |  32 ++++++++++++++++----------------
>> net/sunrpc/clnt.c  |  11 ++++++-----
>> net/sunrpc/debugfs.c  |  2 +-
>> 4 files changed, 27 insertions(+), 24 deletions(-)
>>=20
>> diff --git a/include/linux/sunrpc/clnt.h
>> b/include/linux/sunrpc/clnt.h
>> index 90501404fa49..cbdd20dc84b7 100644
>> --- a/include/linux/sunrpc/clnt.h
>> +++ b/include/linux/sunrpc/clnt.h
>> @@ -193,11 +193,13 @@ void rpc_prepare_reply_pages(struct rpc_rqst
>> *req, struct page **pages,
>> unsigned int hdrsize);
>> void  rpc_call_start(struct rpc_task *);
>> int  rpc_call_async(struct rpc_clnt *clnt,
>> -  const struct rpc_message *msg, int
>> flags,
>> +  const struct rpc_message *msg,
>> +  unsigned int flags,
>> const struct rpc_call_ops *tk_ops,
>> void *calldata);
>> int  rpc_call_sync(struct rpc_clnt *clnt,
>> -  const struct rpc_message *msg, int
>> flags);
>> +  const struct rpc_message *msg,
>> +  unsigned int flags);
>> struct rpc_task *rpc_call_null(struct rpc_clnt *clnt, struct
>> rpc_cred *cred,
>> int flags);
>> int  rpc_restart_call_prepare(struct rpc_task *);
>> diff --git a/include/linux/sunrpc/sched.h
>> b/include/linux/sunrpc/sched.h
>> index 1d7a3e51b795..d4b7ebd0a99c 100644
>> --- a/include/linux/sunrpc/sched.h
>> +++ b/include/linux/sunrpc/sched.h
>> @@ -82,7 +82,7 @@ struct rpc_task {
>> ktime_t  tk_start;  /* RPC task init
>> timestamp */
>>=20
>> pid_t  tk_owner;  /* Process id for
>> batching tasks */
>> -  unsigned short  tk_flags;  /* misc flags */
>> +  unsigned int  tk_flags;  /* misc flags */
>> unsigned short  tk_timeouts;  /* maj timeouts */
>>=20
>> #if IS_ENABLED(CONFIG_SUNRPC_DEBUG) ||
>> IS_ENABLED(CONFIG_TRACEPOINTS)
>> @@ -112,27 +112,27 @@ struct rpc_task_setup {
>> const struct rpc_call_ops *callback_ops;
>> void *callback_data;
>> struct workqueue_struct *workqueue;
>> -  unsigned short flags;
>> +  unsigned int flags;
>> signed char priority;
>> };
>>=20
>> /*
>> * RPC task flags
>> */
>> -#define RPC_TASK_ASYNC  0x0001  /* is an async task
>> */
>> -#define RPC_TASK_SWAPPER  0x0002  /* is swapping in/out
>> */
>> -#define RPC_TASK_MOVEABLE  0x0004  /* nfs4.1+ rpc tasks
>> */
>> -#define RPC_TASK_NULLCREDS  0x0010  /* Use AUTH_NULL
>> credential */
>> -#define RPC_CALL_MAJORSEEN  0x0020  /* major timeout seen
>> */
>> -#define RPC_TASK_DYNAMIC  0x0080  /* task was
>> kmalloc'ed */
>> -#define  RPC_TASK_NO_ROUND_ROBIN 0x0100  /* send
>> requests on "main" xprt */
>> -#define RPC_TASK_SOFT  0x0200  /* Use soft timeouts
>> */
>> -#define RPC_TASK_SOFTCONN  0x0400  /* Fail if can't
>> connect */
>> -#define RPC_TASK_SENT  0x0800  /* message was sent
>> */
>> -#define RPC_TASK_TIMEOUT  0x1000  /* fail with
>> ETIMEDOUT on timeout */
>> -#define RPC_TASK_NOCONNECT  0x2000  /* return ENOTCONN if
>> not connected */
>> -#define RPC_TASK_NO_RETRANS_TIMEOUT  0x4000  /* wait
>> forever for a reply */
>> -#define RPC_TASK_CRED_NOREF  0x8000  /* No refcount on the
>> credential */
>> +#define RPC_TASK_ASYNC  0x00000001  /* is an
>> async task */
>> +#define RPC_TASK_SWAPPER  0x00000002  /* is
>> swapping in/out */
>> +#define RPC_TASK_MOVEABLE  0x00000004  /* nfs4.1+
>> rpc tasks */
>> +#define RPC_TASK_NULLCREDS  0x00000010  /* Use
>> AUTH_NULL credential */
>> +#define RPC_CALL_MAJORSEEN  0x00000020  /* major
>> timeout seen */
>> +#define RPC_TASK_DYNAMIC  0x00000080  /* task was
>> kmalloc'ed */
>> +#define  RPC_TASK_NO_ROUND_ROBIN  0x00000100  /*
>> send requests on "main" xprt */
>> +#define RPC_TASK_SOFT  0x00000200  /* Use soft
>> timeouts */
>> +#define RPC_TASK_SOFTCONN  0x00000400  /* Fail if
>> can't connect */
>> +#define RPC_TASK_SENT  0x00000800  /* message
>> was sent */
>> +#define RPC_TASK_TIMEOUT  0x00001000  /* fail with
>> ETIMEDOUT on timeout */
>> +#define RPC_TASK_NOCONNECT  0x00002000  /* return
>> ENOTCONN if not connected */
>> +#define RPC_TASK_NO_RETRANS_TIMEOUT  0x00004000  /* wait
>> forever for a reply */
>> +#define RPC_TASK_CRED_NOREF  0x00008000  /* No
>> refcount on the credential */
>>=20
>> #define RPC_IS_ASYNC(t)  ((t)->tk_flags &
>> RPC_TASK_ASYNC)
>> #define RPC_IS_SWAPPER(t)  ((t)->tk_flags & RPC_TASK_SWAPPER)
>> diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
>> index a97d4e06cae3..476caa4ebf5c 100644
>> --- a/net/sunrpc/clnt.c
>> +++ b/net/sunrpc/clnt.c
>> @@ -1162,7 +1162,8 @@ EXPORT_SYMBOL_GPL(rpc_run_task);
>> * @msg: RPC call parameters
>> * @flags: RPC call flags
>> */
>> -int rpc_call_sync(struct rpc_clnt *clnt, const struct rpc_message
>> *msg, int flags)
>> +int rpc_call_sync(struct rpc_clnt *clnt, const struct rpc_message
>> *msg,
>> +  unsigned int flags)
>> {
>> struct rpc_task *task;
>> struct rpc_task_setup task_setup_data =3D {
>> @@ -1197,9 +1198,9 @@ EXPORT_SYMBOL_GPL(rpc_call_sync);
>> * @tk_ops: RPC call ops
>> * @data: user call data
>> */
>> -int
>> -rpc_call_async(struct rpc_clnt *clnt, const struct rpc_message *msg,
>> int flags,
>> -  const struct rpc_call_ops *tk_ops, void *data)
>> +int rpc_call_async(struct rpc_clnt *clnt, const struct rpc_message
>> *msg,
>> +  unsigned int flags, const struct rpc_call_ops
>> *tk_ops,
>> +  void *data)
>> {
>> struct rpc_task *task;
>> struct rpc_task_setup task_setup_data =3D {
>> @@ -3080,7 +3081,7 @@ static void rpc_show_task(const struct rpc_clnt
>> *clnt,
>> if (RPC_IS_QUEUED(task))
>> rpc_waitq =3D rpc_qname(task->tk_waitqueue);
>>=20
>> -  printk(KERN_INFO "%5u %04x %6d %8p %8p %8ld %8p %sv%u %s
>> a:%ps q:%s\n",
>> +  printk(KERN_INFO "%5u %08x %6d %8p %8p %8ld %8p %sv%u %s
>> a:%ps q:%s\n",
>> task->tk_pid, task->tk_flags, task->tk_status,
>> clnt, task->tk_rqstp, rpc_task_timeout(task), task-
>>> tk_ops,
>> clnt->cl_program->name, clnt->cl_vers,
>> rpc_proc_name(task),
>> diff --git a/net/sunrpc/debugfs.c b/net/sunrpc/debugfs.c
>> index 8df634e63f30..60f20be4e7e5 100644
>> --- a/net/sunrpc/debugfs.c
>> +++ b/net/sunrpc/debugfs.c
>> @@ -30,7 +30,7 @@ tasks_show(struct seq_file *f, void *v)
>> if (task->tk_rqstp)
>> xid =3D be32_to_cpu(task->tk_rqstp->rq_xid);
>>=20
>> -  seq_printf(f, "%5u %04x %6d 0x%x 0x%x %8ld %ps %sv%u %s a:%ps
>> q:%s\n",
>> +  seq_printf(f, "%5u %08x %6d 0x%x 0x%x %8ld %ps %sv%u %s a:%ps
>> q:%s\n",
>> task->tk_pid, task->tk_flags, task->tk_status,
>> clnt->cl_clid, xid, rpc_task_timeout(task), task-
>>> tk_ops,
>> clnt->cl_program->name, clnt->cl_vers,
>> rpc_proc_name(task),
>>=20
>>=20
>=20
> --=20
> Trond Myklebust
> Linux NFS client maintainer, Hammerspace
> trond.myklebust@hammerspace.com

--
Chuck Lever